Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: openssl-1.1.1f
@ 2020-04-16 13:51 Johnnynator
  2020-04-18  7:13 ` agausmann
                   ` (62 more replies)
  0 siblings, 63 replies; 64+ messages in thread
From: Johnnynator @ 2020-04-16 13:51 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
@ 2020-04-18  7:13 ` agausmann
  2020-04-18  7:13 ` agausmann
                   ` (61 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: agausmann @ 2020-04-18  7:13 UTC (permalink / raw)
  To: ml

[-- 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.

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
  2020-04-18  7:13 ` agausmann
@ 2020-04-18  7:13 ` agausmann
  2020-04-18  7:44 ` flexibeast
                   ` (60 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: agausmann @ 2020-04-18  7:13 UTC (permalink / raw)
  To: ml

[-- 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.

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
  2020-04-18  7:13 ` agausmann
  2020-04-18  7:13 ` agausmann
@ 2020-04-18  7:44 ` flexibeast
  2020-04-18  7:55 ` agausmann
                   ` (59 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: flexibeast @ 2020-04-18  7:44 UTC (permalink / raw)
  To: ml

[-- 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.

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
                   ` (2 preceding siblings ...)
  2020-04-18  7:44 ` flexibeast
@ 2020-04-18  7:55 ` agausmann
  2020-04-18  7:56 ` agausmann
                   ` (58 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: agausmann @ 2020-04-18  7:55 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
                   ` (3 preceding siblings ...)
  2020-04-18  7:55 ` agausmann
@ 2020-04-18  7:56 ` agausmann
  2020-04-21 22:26 ` xtraeme
                   ` (57 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: agausmann @ 2020-04-18  7:56 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
                   ` (4 preceding siblings ...)
  2020-04-18  7:56 ` agausmann
@ 2020-04-21 22:26 ` xtraeme
  2020-04-22  1:14 ` [PR PATCH] [Updated] " Johnnynator
                   ` (56 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: xtraeme @ 2020-04-21 22:26 UTC (permalink / raw)
  To: ml

[-- 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!

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
                   ` (5 preceding siblings ...)
  2020-04-21 22:26 ` xtraeme
@ 2020-04-22  1:14 ` Johnnynator
  2020-04-23  7:38 ` travankor
                   ` (55 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Johnnynator @ 2020-04-22  1:14 UTC (permalink / raw)
  To: ml

[-- 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"

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
                   ` (6 preceding siblings ...)
  2020-04-22  1:14 ` [PR PATCH] [Updated] " Johnnynator
@ 2020-04-23  7:38 ` travankor
  2021-02-10 22:56 ` [PR PATCH] [Updated] " Johnnynator
                   ` (54 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: travankor @ 2020-04-23  7:38 UTC (permalink / raw)
  To: ml

[-- 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

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
                   ` (7 preceding siblings ...)
  2020-04-23  7:38 ` travankor
@ 2021-02-10 22:56 ` Johnnynator
  2021-02-13 20:21 ` Johnnynator
                   ` (53 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Johnnynator @ 2021-02-10 22:56 UTC (permalink / raw)
  To: ml

[-- 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"
 	}
 }

^ permalink raw reply	[flat|nested] 64+ messages in thread

* Re: [PR PATCH] [Updated] New package: openssl-1.1.1f
  2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
                   ` (8 preceding siblings ...)
  2021-02-10 22:56 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-02-13 20:21 ` Johnnynator
  2021-02-13 21:05 ` Johnnynator
                   ` (52 subsequent siblings)
  62 siblings, 0 replies; 64+ messages in thread
From: Johnnynator @ 2021-02-13 20:21 UTC (permalink / raw)
  To: ml

[-- 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-d