From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: openssl-1.1.1f
Date: Sat, 13 Feb 2021 22:05:08 +0100 [thread overview]
Message-ID: <20210213210508.vFYMtlW-1X-vwEmH-WusMoM9w1pSQ3Har5rDh5fX2SA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-21056@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056
New package: openssl-1.1.1f
Random lists of packages broken with OpenSSL 1.1
- [ ] Ice (Old version, 2013) [Ice.txt](https://void.johnnynator.dev/logs/Ice.txt)
- [ ] acme-client (requires libtls) [acme-client.txt](https://void.johnnynator.dev/logs/acme-client.txt)
- [ ] attic (old) [attic.txt](https://void.johnnynator.dev/logs/attic.txt)
- [ ] bitchx (old) [bitchx.txt](https://void.johnnynator.dev/logs/bitchx.txt)
- [ ] c-client (13y old) [c-client.txt](https://void.johnnynator.dev/logs/c-client.txt)
- [ ] catgirl (needs libtls) [catgirl.txt](https://void.johnnynator.dev/logs/catgirl.txt)
- [ ] dmg2img (incompativle with Openssl-1.1, There is a patch upsteam https://github.com/Lekensteyn/dmg2img/commit/f16f247d30f868e84f31e24792b4464488f1c009 ) [dmg2img.txt](https://void.johnnynator.dev/logs/dmg2img.txt)
- [ ] ipmitool (Incompatible with Openssl-1.1, master should work, sources should be changed to be fetched from https://github.com/ipmitool/ipmitool ) [ipmitool.txt](https://void.johnnynator.dev/logs/ipmitool.txt)
- [ ] libesmtp (dunno) [libesmtp.txt](https://void.johnnynator.dev/logs/libesmtp.txt)
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 482381 bytes --]
From 818b8a0b8435b59dc0e6c747d2e29608ee4906ad Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:24:17 +0100
Subject: [PATCH 001/453] New package: libtls-3.2.4
Move libressl-nc to this package.
---
common/shlibs | 2 +-
srcpkgs/libressl-netcat | 2 +-
srcpkgs/libressl/template | 13 +--
srcpkgs/libtls-devel | 1 +
.../fail-instead-of-trying-fallback.patch | 21 ++++
srcpkgs/libtls/template | 98 +++++++++++++++++++
srcpkgs/libtls/update | 1 +
7 files changed, 124 insertions(+), 14 deletions(-)
create mode 120000 srcpkgs/libtls-devel
create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
create mode 100644 srcpkgs/libtls/template
create mode 100644 srcpkgs/libtls/update
diff --git a/common/shlibs b/common/shlibs
index 70596feb769..72892eb6b64 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3505,7 +3505,7 @@ libfmt.so.7 fmt-7.0.3_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libcrypto.so.46 libcrypto46-3.1.1_1
-libtls.so.20 libtls20-3.1.1_1
+libtls.so.20 libtls-3.2.4_1
libssl.so.48 libssl48-3.1.1_1
libxmlb.so.2 libxmlb-0.2.1_1
libvoikko.so.1 libvoikko-4.2_1
diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat
index cab5b6fcb51..fc098467c59 120000
--- a/srcpkgs/libressl-netcat
+++ b/srcpkgs/libressl-netcat
@@ -1 +1 @@
-libressl
\ No newline at end of file
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index c9266796f7d..731168709b8 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -1,7 +1,7 @@
# Template file for 'libressl'
pkgname=libressl
version=3.1.5
-revision=2
+revision=3
bootstrap=yes
build_style=gnu-configure
configure_args="$(vopt_enable asm)"
@@ -107,14 +107,3 @@ libressl-devel_package() {
vmove usr/share/man/man3
}
}
-
-libressl-netcat_package() {
- short_desc="TCP/IP swiss army knife (LibreSSL variant)"
- alternatives="
- nc:nc:/usr/bin/libressl-nc
- nc:nc.1:/usr/share/man/man1/libressl-nc.1"
- pkg_install() {
- vbin apps/nc/.libs/nc libressl-nc
- vman apps/nc/nc.1 libressl-nc.1
- }
-}
diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel
new file mode 120000
index 00000000000..fc098467c59
--- /dev/null
+++ b/srcpkgs/libtls-devel
@@ -0,0 +1 @@
+libtls
\ No newline at end of file
diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
new file mode 100644
index 00000000000..9df423ed7a2
--- /dev/null
+++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch
@@ -0,0 +1,21 @@
+<chris2> so, current flow for getentropy is
+<chris2> 1) use SYS_getrandom if it exists (true on glibc and musl)
+<chris2> 2) use /dev/urandom
+<chris2> 3) use sysctl (glibc only)
+<chris2> 4) use terrible fallback
+<chris2> and with a one-line patch it can instead kill itself after 3
+<chris2> so that should only affect processes running without /dev/urandom on old kernels
+<chris2> probably no harm else
+<xtraeme> +1
+
+--- crypto/compat/getentropy_linux.c.orig
++++ crypto/compat/getentropy_linux.c
+@@ -162,7 +162,7 @@
+ * sysctl ABI, or consider providing a new failsafe API which
+ * works in a chroot or when file descriptors are exhausted.
+ */
+-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK
++#define FAIL_INSTEAD_OF_TRYING_FALLBACK
+ #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK
+ raise(SIGKILL);
+ #endif
diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
new file mode 100644
index 00000000000..db8d04f9549
--- /dev/null
+++ b/srcpkgs/libtls/template
@@ -0,0 +1,98 @@
+# Template file for 'libtls'
+pkgname=libtls
+version=3.2.4
+revision=1
+wrksrc="libressl-${version}"
+build_style=gnu-configure
+#configure_args="$(vopt_enable asm)"
+short_desc="Version of the TLS/crypto stack forked from OpenSSL"
+maintainer="Leah Neukirchen <leah@vuxu.org>"
+license="OpenSSL, ISC"
+changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog"
+homepage="http://www.libressl.org/"
+distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz"
+checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a
+_lssl_asm_ver="1.1.0"
+
+build_options="asm"
+desc_option_asm="Use platform assembly for faster crypto"
+
+if [ "$build_option_asm" ]; then
+ distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
+ checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789"
+fi
+
+# only enable asm for full chroots by default
+# otherwise we'd be introducing an autotools dependency on the host
+if [ "$CHROOT_READY" ]; then
+ build_options_default="asm"
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+ # disable ssp
+ i686-musl) configure_args+=" --disable-hardening";;
+ # on armv5 always disable asm as it's not supported
+ armv5*) configure_args+=" --disable-asm";;
+esac
+
+if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
+ _regen_build=yes
+fi
+
+if [ -n "$_regen_build" ]; then
+ hostmakedepends=" automake libtool"
+fi
+
+post_extract() {
+ [ -z "$build_option_asm" ] && return 0
+ mv ../libressl-portable-asm-${_lssl_asm_ver} .
+}
+
+pre_configure() {
+ [ -z "$_regen_build" ] && return 0
+ if [ "$build_option_asm" ]; then
+ : # ./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
+ fi
+ autoreconf -if
+}
+
+do_install() {
+ make -C tls install DESTDIR="$DESTDIR"
+ make -C apps/nc install DESTDIR="$DESTDIR"
+}
+
+post_install() {
+ # Use CA file from ca-certificates instead.
+ #rm -f ${DESTDIR}/etc/ssl/cert.pem
+ #ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+
+ vlicense COPYING
+ if [ "$build_option_asm" ]; then
+ vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
+ vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl
+ fi
+ #find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete
+}
+
+libtls-devel_package() {
+ short_desc+=" - development files"
+ depends="libtls-${version}_${revision}"
+ pkg_install() {
+ vinstall include/tls.h 644 usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vinstall libtls.pc 644 usr/lib/pkgconfig
+ for m in man/tls_*; do vman $m; done
+ }
+}
+
+libressl-netcat_package() {
+ short_desc="TCP/IP swiss army knife (LibreSSL variant)"
+ alternatives="
+ nc:nc:/usr/bin/libressl-nc
+ nc:nc.1:/usr/share/man/man1/libressl-nc.1"
+ pkg_install() {
+ vbin apps/nc/.libs/nc libressl-nc
+ vman apps/nc/nc.1 libressl-nc.1
+ }
+}
diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update
new file mode 100644
index 00000000000..a5d5038a832
--- /dev/null
+++ b/srcpkgs/libtls/update
@@ -0,0 +1 @@
+ignore="*.0 *.1"
From 75736d27a6e6ab037462129d105f88ee2b239e44 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:13 +0100
Subject: [PATCH 002/453] catgirl: rebuild for libtls-3.2.4.
---
srcpkgs/catgirl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template
index 24967a8c1f0..a338e53b1e4 100644
--- a/srcpkgs/catgirl/template
+++ b/srcpkgs/catgirl/template
@@ -1,11 +1,11 @@
# Template file for 'catgirl'
pkgname=catgirl
version=1.5
-revision=1
+revision=2
build_style=gnu-configure
make_build_target="all"
hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="libtls-devel ncurses-devel"
short_desc="TLS-only terminal IRC client"
maintainer="Paper <paper@tilde.institute>"
license="GPL-3.0-or-later"
From c12237a1fe6d999f72f0b5959e82c30519b1e2c2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:16 +0100
Subject: [PATCH 003/453] litterbox: rebuild for libtls-3.2.4.
---
srcpkgs/litterbox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template
index ace7ae0b5df..ac855d9474b 100644
--- a/srcpkgs/litterbox/template
+++ b/srcpkgs/litterbox/template
@@ -1,11 +1,11 @@
# Template file for 'litterbox'
pkgname=litterbox
version=1.7
-revision=1
+revision=2
build_style=gnu-configure
make_build_target="all"
hostmakedepends="pkg-config"
-makedepends="sqlite-devel libressl-devel"
+makedepends="sqlite-devel libtls-devel"
short_desc="IRC logger"
maintainer="Allen Sobot <chilledfrogs@disroot.org>"
license="GPL-3.0-or-later"
From a9e3b12193d6c63946435b5b61353cfd831a9f39 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:22 +0100
Subject: [PATCH 004/453] pounce: rebuild for libtls-3.2.4.
---
srcpkgs/pounce/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template
index 57959706a54..62a4c618cac 100644
--- a/srcpkgs/pounce/template
+++ b/srcpkgs/pounce/template
@@ -1,11 +1,11 @@
# Template file for 'pounce'
pkgname=pounce
version=2.2
-revision=1
+revision=2
build_style=gnu-configure
make_build_target="all"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
short_desc="Multi-client, TLS-only IRC bouncer"
maintainer="Paper <paper@tilde.institute>"
license="GPL-3.0-or-later"
From 9fadf65eb4933ef84d41d60a65af23ca5db314ed Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 13 Feb 2021 15:25:30 +0100
Subject: [PATCH 005/453] openntpd: rebuild for libtls-3.2.4.
---
srcpkgs/openntpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index e7b1e2877ac..b7e7db5c41f 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,11 +1,11 @@
# Template file for 'openntpd'
pkgname=openntpd
version=6.2p3
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="libtls-devel"
depends="ca-certificates"
short_desc="FREE, easy to use implementation of the Network Time Protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
From d5210e2df59a51893f99960b350c7ba4e53a5a53 Mon Sep 17 00:00:00 2001
From: John Zimmermann <johnz@posteo.net>
Date: Sat, 12 Jan 2019 02:02:23 +0000
Subject: [PATCH 006/453] New package: openssl-1.1.1f
---
common/shlibs | 5 ++
srcpkgs/libcrypto1.1 | 1 +
srcpkgs/libssl1.1 | 1 +
srcpkgs/openssl-c_rehash | 1 +
srcpkgs/openssl-devel | 1 +
srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++
srcpkgs/openssl/patches/ppc64.patch | 96 ++++++++++++++++++++++++++
srcpkgs/openssl/template | 87 +++++++++++++++++++++++
8 files changed, 209 insertions(+)
create mode 120000 srcpkgs/libcrypto1.1
create mode 120000 srcpkgs/libssl1.1
create mode 120000 srcpkgs/openssl-c_rehash
create mode 120000 srcpkgs/openssl-devel
create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch
create mode 100644 srcpkgs/openssl/patches/ppc64.patch
create mode 100644 srcpkgs/openssl/template
diff --git a/common/shlibs b/common/shlibs
index 72892eb6b64..c095b3966c0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1
libid3-3.8.so.3 id3lib-3.8.3_1
libgirara-gtk3.so.3 girara-0.2.8_1
libjq.so.1 jq-devel-1.4_1
+libcrypto.so.43 libcrypto43-2.7.2_1
+libssl.so.45 libssl45-2.7.2_1
+libtls.so.17 libtls17-2.7.2_1
+libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
+libssl.so.1.1 libssl1.1-1.1.1f_1
libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
libportmidi.so portmidi-217_1
libWildMidi.so.2 libwildmidi-0.4.3_1
diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libcrypto1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/libssl1.1
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-c_rehash
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel
new file mode 120000
index 00000000000..fc538edfef4
--- /dev/null
+++ b/srcpkgs/openssl-devel
@@ -0,0 +1 @@
+openssl
\ No newline at end of file
diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch
new file mode 100644
index 00000000000..b1e1d627c8a
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc-auxv.patch
@@ -0,0 +1,17 @@
+--- crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000
++++ crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000
+@@ -207,11 +207,9 @@
+ return 0;
+ }
+
+-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+-# if __GLIBC_PREREQ(2, 16)
+-# include <sys/auxv.h>
+-# define OSSL_IMPLEMENT_GETAUXVAL
+-# endif
++#if defined(__linux__)
++# include <sys/auxv.h>
++# define OSSL_IMPLEMENT_GETAUXVAL
+ #endif
+
+ /* I wish <sys/auxv.h> was universally available */
diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch
new file mode 100644
index 00000000000..bbb4a6f464f
--- /dev/null
+++ b/srcpkgs/openssl/patches/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- crypto/perlasm/ppc-xlate.pl
++++ crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ /osx/ && do { $name = "_$name";
+ last;
+ };
+- /linux.*(32|64le)/
++ /linux.*(32|64(le|v2))/
+ && do { $ret .= ".globl $name";
+ if (!$$type) {
+ $ret .= "\n.type $name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+ my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+- $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/);
++ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64(le|v2)/);
+ $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+ my ($f,$idx,$ra) = @_;
+ if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ if ($label) {
+ my $xlated = ($GLOBALS{$label} or $label);
+ print "$xlated:";
+- if ($flavour =~ /linux.*64le/) {
++ if ($flavour =~ /linux.*64(le|v2)/) {
+ if ($TYPES{$label} =~ /function/) {
+ printf "\n.localentry %s,0\n",$xlated;
+ }
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- Configure
++++ Configure
+@@ -1402,8 +1402,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+ ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+ : ();
+
++unless ($disabled{asm}) {
++ # big endian systems can use ELFv2 ABI
++ if ($target eq "linux-ppc64") {
++ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++ }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+ if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template
new file mode 100644
index 00000000000..b280c7c768b
--- /dev/null
+++ b/srcpkgs/openssl/template
@@ -0,0 +1,87 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=1.1.1i
+revision=1
+bootstrap=yes
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
+ shared no-ssl3-method $(vopt_if asm ' ' 'no-asm')
+ -Wa,--noexecstack"
+make_cmd=make
+make_build_args='MAKEDEPPROG="$(CC)'
+make_check_target=test
+make_install_args="MANSUFFIX=ssl"
+short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security"
+maintainer="John <johnz@posteo.net>"
+license="OpenSSL-License"
+homepage="https://www.openssl.org"
+distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz"
+checksum=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+conf_files="/etc/ssl/openssl.cnf"
+conflicts="openssl<=3.0.2_2"
+
+build_options=asm
+
+if [ "$CHROOT_READY" ]; then
+ hostmakedepends="perl"
+ build_options_default="asm"
+fi
+
+case $XBPS_TARGET_MACHINE in
+ x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";;
+ i686*) configure_args+=" linux-elf";;
+ aarch64*) configure_args+=" linux-aarch64";;
+ ppc64le*) configure_args+=" linux-ppc64le";;
+ ppc64*) configure_args+=" linux-ppc64";;
+ ppc*) configure_args+=" linux-ppc";;
+ arm*) configure_args+=" linux-armv4";;
+ mips*) configure_args+=" linux-mips32 -mips32";;
+ *) broken="$XBPS_TARGET_MACHINE";;
+esac
+
+pre_configure() {
+ configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
+}
+
+pre_build() {
+ make ${makejobs} depend
+}
+
+libcrypto1.1_package() {
+ short_desc+=" - crypto library"
+ pkg_install() {
+ vmove "usr/lib/libcrypto.so.*"
+ vmove usr/lib/engines-1.1
+ }
+}
+
+libssl1.1_package() {
+ short_desc+=" - SSL/TLS library"
+ pkg_install() {
+ vmove "usr/lib/libssl.so.*"
+ }
+}
+
+openssl-c_rehash_package() {
+ short_desc+=" - c_rehash utility"
+ depends="openssl perl"
+ pkg_install() {
+ vmove usr/bin/c_rehash
+ }
+}
+
+openssl-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}"
+ conflicts="openssl-devel>=0"
+ replaces="openssl-devel>=0"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/share/man/man3
+ vmove usr/share/doc
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ }
+}
From e63d3b3123a3913cfc99975cbcfdcb6e511a6708 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 007/453] libressl: don't provide OpenSSL anymore
---
srcpkgs/libressl/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template
index 731168709b8..11d10e5d745 100644
--- a/srcpkgs/libressl/template
+++ b/srcpkgs/libressl/template
@@ -4,7 +4,7 @@ version=3.1.5
revision=3
bootstrap=yes
build_style=gnu-configure
-configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm) --program-prefix=libressl-"
short_desc="Version of the TLS/crypto stack forked from OpenSSL"
maintainer="Juan RP <xtraeme@gmail.com>"
license="OpenSSL, ISC"
@@ -17,6 +17,7 @@ replaces="openssl>=0"
conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf"
_lssl_asm_ver="1.1.0"
+broken=true
build_options="asm"
desc_option_asm="Use platform assembly for faster crypto"
@@ -64,6 +65,9 @@ post_install() {
rm -f ${DESTDIR}/etc/ssl/cert.pem
ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem
+ # Provided by OpenSSL
+ rm -f ${DESTDIR}/etc/ssl/openssl.cnf
+
vlicense COPYING
if [ "$build_option_asm" ]; then
vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams
@@ -99,6 +103,7 @@ libressl-devel_package() {
libcrypto46-${version}_${revision}
libssl48-${version}_${revision}
libtls20-${version}_${revision}"
+ conflicts="openssl-devel>=0"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From 8f3c9db5516364776a602378e04170ebb6b4b989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 9 Apr 2020 22:04:35 +0200
Subject: [PATCH 008/453] ca-certificates: rebuild for openssl
---
srcpkgs/ca-certificates/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template
index 5d3d01d7fa0..85e539ff9c2 100644
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@@ -5,8 +5,8 @@ revision=1
bootstrap=yes
conf_files="/etc/ca-certificates.conf"
wrksrc="work"
-hostmakedepends="libressl"
-depends="libressl>=2.2.4_2 run-parts"
+hostmakedepends="openssl"
+depends="openssl run-parts"
short_desc="Common CA certificates for SSL/TLS"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, MPL-2.0"
@@ -37,7 +37,6 @@ do_install() {
${DESTDIR}/usr/share/man/man8/update-ca-certificates.8
cd ${DESTDIR}/usr/share/ca-certificates
find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf
- vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem
}
From 583f7acf30799ba9e315f5b57943cb46affc7668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 009/453] FreeRADIUS: rebuild against OpenSSL
---
srcpkgs/FreeRADIUS/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template
index 74fca94bbed..9aacb4ecc35 100644
--- a/srcpkgs/FreeRADIUS/template
+++ b/srcpkgs/FreeRADIUS/template
@@ -1,10 +1,10 @@
# Template file for 'FreeRADIUS'
pkgname=FreeRADIUS
version=3.0.20
-revision=3
+revision=4
wrksrc=freeradius-server-release_${version//./_}
build_style=gnu-configure
-makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \
+makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \
libmariadbclient-devel postgresql-libs-devel json-c-devel"
short_desc="World's most popular RADIUS Server"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
From bfe48f4149fc7099dc290e9496af076fec19b66e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 010/453] Ice: rebuild against OpenSSL
---
srcpkgs/Ice/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index d27bb350c74..db36428fd6d 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -1,9 +1,9 @@
# Template file for 'Ice'
pkgname=Ice
version=3.5.1
-revision=22
+revision=23
build_wrksrc=cpp
-makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel openssl-devel"
short_desc="Internet Communications Engine (Ice)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only, ICE"
From 6cbb432e154ef537b85ab8b38f69293df336a4ad Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 011/453] LGOGDownloader: rebuild against OpenSSL
---
srcpkgs/LGOGDownloader/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6ff1447bb3e..a17a764df38 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,12 +1,12 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.7
-revision=4
+revision=5
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
- jsoncpp-devel boost-devel libressl-devel zlib-devel"
+ jsoncpp-devel boost-devel openssl-devel zlib-devel"
short_desc="Open source downloader for GOG.com games that uses the GOG.com API"
maintainer="RunningDroid <runningdroid@zoho.com>"
license="WTFPL"
From e0a6c2a9e4b3ec85a7e4cb185e132fa56e7f8834 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 012/453] MEGAsdk: rebuild against OpenSSL
---
srcpkgs/MEGAsdk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template
index 0cb3b292064..e9cbeb70f5d 100644
--- a/srcpkgs/MEGAsdk/template
+++ b/srcpkgs/MEGAsdk/template
@@ -1,13 +1,13 @@
# Template file for 'MEGAsdk'
pkgname=MEGAsdk
version=3.7.3c
-revision=1
+revision=2
wrksrc="sdk-${version}"
build_style=gnu-configure
configure_args="--enable-chat --disable-examples $(vopt_with libuv)"
make_build_args='LIBTOOLFLAGS="--tag=CXX"'
hostmakedepends="autogen doxygen autoconf automake gettext libtool"
-makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel
+makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel
zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel
libuv-devel $(vopt_if mediainfo libmediainfo-devel)"
checkdepends="gtest-devel"
From 5df674cc67db8ecd7f70fa60c167bd1a129d9cf9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:42 +0100
Subject: [PATCH 013/453] NetworkManager-l2tp: rebuild against OpenSSL
---
srcpkgs/NetworkManager-l2tp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 1769dc9d267..51e24d1465e 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -1,11 +1,11 @@
# Template file for 'NetworkManager-l2tp'
pkgname=NetworkManager-l2tp
version=1.8.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--runstatedir=/run"
hostmakedepends="pkg-config intltool glib-devel"
-makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel
libsecret-devel nss-devel ppp-devel"
depends="strongswan xl2tpd ppp"
short_desc="NetworkManager VPN plugin for L2TP/IPsec"
From 5064db57d66acb2f5e34becb8154ee1801ef791f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 014/453] OpenRCT2: rebuild against OpenSSL
---
srcpkgs/OpenRCT2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index c99234aaa55..2e369d91b30 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -16,7 +16,7 @@ configure_args="
hostmakedepends="pkg-config unzip"
makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel
libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++
- $(vopt_if multiplayer 'libcurl-devel libressl-devel')
+ $(vopt_if multiplayer 'libcurl-devel openssl-devel')
$(vopt_if scripting duktape-devel)"
short_desc="Open source re-implementation of RollerCoaster Tycoon 2"
maintainer="klardotsh <josh@klar.sh>"
From 2371262d0a61077cb72d9d06f329701b844148bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 015/453] VirtualGL: rebuild against OpenSSL
---
srcpkgs/VirtualGL/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template
index 1a4c708af37..bf25920d2cb 100644
--- a/srcpkgs/VirtualGL/template
+++ b/srcpkgs/VirtualGL/template
@@ -1,13 +1,13 @@
# Template file for 'VirtualGL'
pkgname=VirtualGL
version=2.6.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON
-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib
-DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON"
makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel
- libXtst-devel fltk-devel libressl-devel"
+ libXtst-devel fltk-devel openssl-devel"
short_desc="Run remote OpenGL applications with full acceleration"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From c7b5bcc750dcea9350958e5d3185c265ef5730ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 016/453] aircrack-ng: rebuild against OpenSSL
---
srcpkgs/aircrack-ng/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template
index f711b89509e..604bcefb5a3 100644
--- a/srcpkgs/aircrack-ng/template
+++ b/srcpkgs/aircrack-ng/template
@@ -1,10 +1,10 @@
# Template file for 'aircrack-ng'
pkgname=aircrack-ng
version=1.6
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
-makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel"
+makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel"
short_desc="Complete suite of tools to assess WiFi network security"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL"
From bf56073cf25a43b472176db09c9291139dd094b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:43 +0100
Subject: [PATCH 017/453] alpine: rebuild against OpenSSL
---
srcpkgs/alpine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template
index 108c99547bb..8721a772a33 100644
--- a/srcpkgs/alpine/template
+++ b/srcpkgs/alpine/template
@@ -1,7 +1,7 @@
# Template file for 'alpine'
pkgname=alpine
version=2.24
-revision=1
+revision=2
_githash=3165f59b344fb4d56d161541f294754d56bcb372
_gitshort="${_githash:0:7}"
wrksrc="${pkgname}-${_gitshort}"
From ce4d543881c0f2e2a3d3d657c4600c61825ec766 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 018/453] android-file-transfer-linux: rebuild against OpenSSL
---
srcpkgs/android-file-transfer-linux/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template
index e2d884d4b83..86cd86a99af 100644
--- a/srcpkgs/android-file-transfer-linux/template
+++ b/srcpkgs/android-file-transfer-linux/template
@@ -1,7 +1,7 @@
# Template file for 'android-file-transfer-linux'
pkgname=android-file-transfer-linux
version=4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_SHARED_LIB=1"
hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config"
From 3c0a210539dfcbd22d69a661856ab6412667cfab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 019/453] apache: rebuild against OpenSSL
---
srcpkgs/apache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template
index 23619224f90..54d12f3a57b 100644
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@@ -1,7 +1,7 @@
# Template file for 'apache'
pkgname=apache
version=2.4.46
-revision=1
+revision=2
wrksrc="httpd-${version}"
build_style=gnu-configure
configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all
@@ -28,7 +28,7 @@ conf_files="
/etc/${pkgname}/mime.types"
hostmakedepends="pkg-config perl apr-util-devel"
makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel
- libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
+ openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel"
depends="apache-htpasswd"
short_desc="Apache http server"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9866f29e7e5c6d895f8ea330e331117f81dd9e21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:44 +0100
Subject: [PATCH 020/453] apk-tools: rebuild against OpenSSL
---
srcpkgs/apk-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template
index 633ac417326..48f3ac3ab6f 100644
--- a/srcpkgs/apk-tools/template
+++ b/srcpkgs/apk-tools/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
# Link libapk statically
make_build_args="LUAAPK=no LDFLAGS_apk.static= static"
hostmakedepends="pkg-config lua53 lua53-zlib"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Alpine Package Keeper (Alpine package manager)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
From 71ad0b6d42fb9b5469fac36bdf9487f39fccf08d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 021/453] apr-util: rebuild against OpenSSL
---
srcpkgs/apr-util/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index db439b515e4..4c1215a8906 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -10,7 +10,7 @@ configure_args="
--with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
--with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
hostmakedepends="libtool apr-devel"
-makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel
+makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
postgresql-libs-devel sqlite-devel"
short_desc="Apache Portable Runtime Utility Library"
From 14e6f10465997505d5d9f9ab0c025224ebfbadfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 022/453] argyllcms: rebuild against OpenSSL
---
srcpkgs/argyllcms/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template
index dd10c965b47..5fb8294254f 100644
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@@ -1,10 +1,10 @@
# Template file for 'argyllcms'
pkgname=argyllcms
version=2.1.2
-revision=2
+revision=3
wrksrc="Argyll_V${version}"
hostmakedepends="ftjam zip unzip"
-makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel
+makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel
libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel"
short_desc="ICC compatible color management system"
maintainer="Orphaned <orphan@voidlinux.org>"
From f04b7d26c51cc381a55a5471b908d01e28a9db2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 023/453] aria2: rebuild against OpenSSL
---
srcpkgs/aria2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template
index f88cb53e958..bacfa29e25e 100644
--- a/srcpkgs/aria2/template
+++ b/srcpkgs/aria2/template
@@ -1,14 +1,14 @@
# Template file for 'aria2'
pkgname=aria2
version=1.35.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-openssl --with-libexpat --without-gnutls
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
--with-bashcompletiondir=/usr/share/bash-completion/completions
--enable-libaria2"
hostmakedepends="pkg-config"
-makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel
+makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel
zlib-devel"
depends="ca-certificates"
checkdepends="libcppunit-devel"
From 3a7950370c55302eece5fabd2671764677d08e3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 024/453] attic: rebuild against OpenSSL
---
srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++
srcpkgs/attic/template | 4 +-
2 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/attic/patches/openssl.diff
diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff
new file mode 100644
index 00000000000..c289a1dc267
--- /dev/null
+++ b/srcpkgs/attic/patches/openssl.diff
@@ -0,0 +1,59 @@
+--- attic/crypto.pyx
++++ attic/crypto.pyx
+@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h":
+ pass
+ const EVP_MD *EVP_sha256()
+ const EVP_CIPHER *EVP_aes_256_ctr()
+- void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a)
+- void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a)
++ EVP_CIPHER_CTX *EVP_CIPHER_CTX_new()
++ const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a)
++ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a)
+
+ int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl,
+ const unsigned char *key, const unsigned char *iv)
+@@ -84,16 +85,16 @@ def get_random_bytes(n):
+ cdef class AES:
+ """A thin wrapper around the OpenSSL EVP cipher API
+ """
+- cdef EVP_CIPHER_CTX ctx
++ cdef EVP_CIPHER_CTX * ctx
+
+ def __cinit__(self, key, iv=None):
+- EVP_CIPHER_CTX_init(&self.ctx)
+- if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
++ self.ctx = EVP_CIPHER_CTX_new();
++ if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL):
+ raise Exception('EVP_EncryptInit_ex failed')
+ self.reset(key, iv)
+
+ def __dealloc__(self):
+- EVP_CIPHER_CTX_cleanup(&self.ctx)
++ EVP_CIPHER_CTX_free(self.ctx)
+
+ def reset(self, key=None, iv=None):
+ cdef const unsigned char *key2 = NULL
+@@ -102,12 +103,12 @@ cdef class AES:
+ key2 = key
+ if iv:
+ iv2 = iv
+- if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2):
++ if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2):
+ raise Exception('EVP_EncryptInit_ex failed')
+
+ @property
+ def iv(self):
+- return self.ctx.iv[:16]
++ return EVP_CIPHER_CTX_iv(self.ctx)[:16]
+
+ def encrypt(self, data):
+ cdef int inl = len(data)
+@@ -116,7 +117,7 @@ cdef class AES:
+ if not out:
+ raise MemoryError
+ try:
+- if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl):
++ if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl):
+ raise Exception('EVP_EncryptUpdate failed')
+ return out[:inl]
+ finally:
diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template
index 1b08972b359..153c0341edc 100644
--- a/srcpkgs/attic/template
+++ b/srcpkgs/attic/template
@@ -1,11 +1,11 @@
# Template file for 'attic'
pkgname=attic
version=0.16
-revision=19
+revision=20
wrksrc="Attic-$version"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython python3-Sphinx"
-makedepends="python3-devel libressl-devel acl-devel"
+makedepends="python3-devel openssl-devel acl-devel"
depends="python3-msgpack python3-llfuse"
short_desc="Deduplicating backup program for efficient and secure backups"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From d7769ce0cf50ca754578125d31f4761f7107b35d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:45 +0100
Subject: [PATCH 025/453] axel: rebuild against OpenSSL
---
srcpkgs/axel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template
index b934278782a..9fbfb8237b6 100644
--- a/srcpkgs/axel/template
+++ b/srcpkgs/axel/template
@@ -1,11 +1,11 @@
# Template file for 'axel'
pkgname=axel
version=2.17.10
-revision=1
+revision=2
build_style=gnu-configure
conf_files="/etc/axelrc"
hostmakedepends="gettext-devel pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Download accelerator for FTP and HTTP"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later"
From 02e4349a248309177bdf1c82d9336349dbe18f17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 026/453] bacula-common: rebuild against OpenSSL
---
srcpkgs/bacula-common/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template
index d78eeb3cda3..9a787a24777 100644
--- a/srcpkgs/bacula-common/template
+++ b/srcpkgs/bacula-common/template
@@ -1,14 +1,14 @@
# Template file for 'bacula-common'
pkgname=bacula-common
version=9.4.2
-revision=3
+revision=4
wrksrc="${pkgname%-*}-${version}"
build_style=gnu-configure
configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql
--enable-smartalloc --sysconfdir=/etc/bacula
--with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula"
makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel
- libressl-devel ncurses-devel zlib-devel acl-devel"
+ openssl-devel ncurses-devel zlib-devel acl-devel"
short_desc="Bacula - A Network Backup Tool (common libs)"
maintainer="Matthias Fulz <mfulz@olznet.de>"
license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause"
From 84d9cc455f3d5bff389a39d10bbe4017daef5bb7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 027/453] badvpn: rebuild against OpenSSL
---
srcpkgs/badvpn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template
index 360dc5a9140..3b35580d8b3 100644
--- a/srcpkgs/badvpn/template
+++ b/srcpkgs/badvpn/template
@@ -1,10 +1,10 @@
# Template file for 'badvpn'
pkgname=badvpn
version=1.999.130
-revision=12
+revision=13
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="libressl-devel nspr-devel nss-devel"
+makedepends="openssl-devel nspr-devel nss-devel"
short_desc="Peer-to-peer VPN system"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD"
From 4e653b6c081941a204c040b733d5c56d17f363d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 028/453] baresip: rebuild against OpenSSL
---
srcpkgs/baresip/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index a731d553090..53185713fc8 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk PREFIX=/usr
make_install_args="$make_build_args"
make_use_env=1
hostmakedepends="pkg-config"
-makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel
+makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
tiff-devel twolame-devel
$(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel
From 823931baa535f127705a9160ec3937c522e22a1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 029/453] barrier: rebuild against OpenSSL
---
srcpkgs/barrier/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template
index 0fbbee53ab5..f36a9914585 100644
--- a/srcpkgs/barrier/template
+++ b/srcpkgs/barrier/template
@@ -1,7 +1,7 @@
# Template file for 'barrier'
pkgname=barrier
version=2.3.3
-revision=1
+revision=2
build_style=cmake
configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 66e24b4cd06884b5e1c2ee5c118d2d462b8457e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:46 +0100
Subject: [PATCH 030/453] bind: rebuild against OpenSSL
---
srcpkgs/bind/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template
index 57243a23f4f..9885f3bb0ec 100644
--- a/srcpkgs/bind/template
+++ b/srcpkgs/bind/template
@@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile
--with-libidn2
$(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")"
hostmakedepends="automake libtool perl pkg-config"
-makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
+makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel
libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)"
short_desc="Berkeley Internet Name Domain server"
maintainer="Randy McCaskill <randy@mccaskill.us>"
From 4443158b5b1e3af619bbe5372bd58d9359f65be7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 031/453] bitchx: rebuild against OpenSSL
---
srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++
srcpkgs/bitchx/template | 6 +-
2 files changed, 94 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch
diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..f062675dc67
--- /dev/null
+++ b/srcpkgs/bitchx/patches/openssl-1.1.patch
@@ -0,0 +1,91 @@
+commit 184af728c73c379d1eee57a387b6012572794fa8
+Author: Kevin Easton <caf@bitchx.org>
+Date: Fri Mar 17 00:38:46 2017 +1100
+
+ Add support for OpenSSL 1.1.0 to configure script
+
+ OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see.
+
+ Search for ERR_get_error() instead.
+
+diff --git configure configure
+index d435491..f4af7bb 100755
+--- configure
++++ configure
+@@ -10630,9 +10630,9 @@ esac
+ case "$with_ssl" in
+ yes|check)
+
+-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5
+-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then
++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5
++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6
++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -10650,11 +10650,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char SSLeay ();
++char ERR_get_error ();
+ int
+ main ()
+ {
+-SSLeay ();
++ERR_get_error ();
+ ;
+ return 0;
+ }
+@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_crypto_SSLeay=yes
++ ac_cv_lib_crypto_ERR_get_error=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_crypto_SSLeay=no
++ac_cv_lib_crypto_ERR_get_error=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6
+-if test $ac_cv_lib_crypto_SSLeay = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5
++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6
++if test $ac_cv_lib_crypto_ERR_get_error = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCRYPTO 1
+ _ACEOF
+@@ -10703,7 +10703,7 @@ _ACEOF
+
+ fi
+
+- if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++ if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+
+ echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5
+ echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6
+diff --git configure.in configure.in
+index 63d133f..3694a7f 100644
+--- configure.in
++++ configure.in
+@@ -562,8 +562,8 @@ case "$with_ssl" in
+ esac
+ case "$with_ssl" in
+ yes|check)
+- AC_CHECK_LIB([crypto], [SSLeay], [], [], [])
+- if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then
++ AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
++ if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then
+ AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])
+ fi
+ if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template
index 55ca42d63d4..f4746e263f8 100644
--- a/srcpkgs/bitchx/template
+++ b/srcpkgs/bitchx/template
@@ -1,14 +1,14 @@
# Template file for 'bitchx'
pkgname=bitchx
version=1.2.1
-revision=15
+revision=16
build_style=gnu-configure
configure_args="--with-ssl --with-ipv6 --with-plugins"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
short_desc="A simple IRC client (Internet Relay Chat)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="3-clause-BSD"
-homepage="http://bitchx.com"
+homepage="http://bitchx.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
From 91e98cea4f19e48db38aeb035d17f4e7304e74a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 032/453] bitcoin: rebuild against OpenSSL
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 4eca088632a..3506a68aaeb 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=0.19.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
From cddbff0671191a42150987e93aa61eca074fef26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 033/453] blindfold: rebuild against OpenSSL
---
srcpkgs/blindfold/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template
index 99ebec46adb..ee605e76710 100644
--- a/srcpkgs/blindfold/template
+++ b/srcpkgs/blindfold/template
@@ -1,10 +1,10 @@
# Template file for 'blindfold'
pkgname=blindfold
version=1.0.6
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="CLI gitignore file generator"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
From 3c0518e3457e1bf0b89f2dda8bce1ff77ff934fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:47 +0100
Subject: [PATCH 034/453] borg: rebuild against OpenSSL
---
srcpkgs/borg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template
index cd8d3d79055..157b87f7486 100644
--- a/srcpkgs/borg/template
+++ b/srcpkgs/borg/template
@@ -1,10 +1,10 @@
# Template file for 'borg'
pkgname=borg
version=1.1.15
-revision=1
+revision=2
wrksrc="borgbackup-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools python3-devel libressl-devel"
+hostmakedepends="python3-setuptools python3-devel openssl-devel"
makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel"
depends="python3-llfuse python3-setuptools"
short_desc="Deduplicating backup program with compression and encryption"
From 5c095072fceefba5ee75167a77af3cb2153967c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 035/453] botan: rebuild against OpenSSL
---
srcpkgs/botan/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template
index 9c25da59ab8..ee196bbe4ee 100644
--- a/srcpkgs/botan/template
+++ b/srcpkgs/botan/template
@@ -1,12 +1,12 @@
# Template file for 'botan'
pkgname=botan
version=2.16.0
-revision=2
+revision=3
wrksrc="${pkgname^}-${version}"
build_style=gnu-makefile
pycompile_module="botan.py"
hostmakedepends="doxygen python3"
-makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel"
short_desc="Crypto library written in C++"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="BSD-2-Clause"
From 454d066dffb54e8f171d39da324f70268922b035 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 036/453] burp2-server: rebuild against OpenSSL
---
srcpkgs/burp2-server/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template
index edda1f11f7e..237555ce0e5 100644
--- a/srcpkgs/burp2-server/template
+++ b/srcpkgs/burp2-server/template
@@ -3,13 +3,13 @@ _desc="Network-based backup and restore program"
pkgname=burp2-server
version=2.2.18
-revision=4
+revision=5
wrksrc="burp-${version}"
build_style=gnu-configure
make_install_target=install-all
configure_args="--sysconfdir=/etc/burp"
hostmakedepends="automake libtool pkg-config"
-makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash
+makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash
yajl-devel zlib-devel"
# unique binary for both client and server: server depends on client package.
depends="burp2-client"
@@ -59,7 +59,7 @@ post_install() {
burp2-client_package() {
short_desc="${_desc} - Client"
# openssl binary needed by burp_ca script
- depends="libressl"
+ depends="openssl"
conf_files="/etc/burp/burp.conf"
# burp2-client (v2.x) does not work with burp-server (v1.x):
# give a chance to no break everything by refusing upgrade
From d867523cbc32b4411a99794e114dc599bab68ad5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:48 +0100
Subject: [PATCH 037/453] butt: rebuild against OpenSSL
---
srcpkgs/butt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template
index d78e567f0aa..754b60787f3 100644
--- a/srcpkgs/butt/template
+++ b/srcpkgs/butt/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel
- libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel"
+ libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel"
short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool"
maintainer="1is7ac3 <isaac.qa13@gmail.com>"
license="GPL-2.0-or-later"
From 6b5857150d916dd18bd94c26a0bb02884ebf07f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 038/453] cargo: rebuild against OpenSSL
---
srcpkgs/cargo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template
index 9da9aa4a85c..9c9781d1fc4 100644
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@@ -1,7 +1,7 @@
# Template file for 'cargo'
pkgname=cargo
version=0.49.0
-revision=1
+revision=2
wrksrc="cargo-${version}"
build_helper=rust
hostmakedepends="rust python3 curl cmake pkg-config zlib-devel"
From 8e30cac03e9d6e5a674efb51e34ccfe92e84de4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 039/453] cargo-aoc: rebuild against OpenSSL
---
srcpkgs/cargo-aoc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template
index d8ecf5e2ee8..023401daa9e 100644
--- a/srcpkgs/cargo-aoc/template
+++ b/srcpkgs/cargo-aoc/template
@@ -1,11 +1,11 @@
# Template file for 'cargo-aoc'
pkgname=cargo-aoc
version=0.3.2
-revision=2
+revision=3
build_wrksrc=cargo-aoc
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="CLI helper tool for advent of code in rust"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
From a35869463fe0af1e4dc31c4deb23090d98fcd9ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 040/453] cargo-crev: rebuild against OpenSSL
---
srcpkgs/cargo-crev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template
index 24b6442facd..cd177eac290 100644
--- a/srcpkgs/cargo-crev/template
+++ b/srcpkgs/cargo-crev/template
@@ -1,11 +1,11 @@
# Template file for 'cargo-crev'
pkgname=cargo-crev
version=0.18.0
-revision=1
+revision=2
build_style=cargo
make_install_args="--path ./cargo-crev"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Cryptographically verifiable code review system for cargo"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MPL-2.0, MIT, Apache-2.0"
From 60cbb0d8aac53b02b0e8c2139d641cedf29c8841 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 041/453] cargo-deny: rebuild against OpenSSL
---
srcpkgs/cargo-deny/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template
index c3bfe81bc64..56fbd4eba25 100644
--- a/srcpkgs/cargo-deny/template
+++ b/srcpkgs/cargo-deny/template
@@ -1,11 +1,11 @@
# Template file for 'cargo-deny'
pkgname=cargo-deny
version=0.8.2
-revision=1
+revision=2
build_style=cargo
configure_args="--no-default-features"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Cargo plugin to help you manage large dependency graphs"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
From eba6db8d2acac7ceba0fe26a3ab564a9b2d35b69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:49 +0100
Subject: [PATCH 042/453] cargo-edit: rebuild against OpenSSL
---
srcpkgs/cargo-edit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template
index 6e746c880c7..90e5b108429 100644
--- a/srcpkgs/cargo-edit/template
+++ b/srcpkgs/cargo-edit/template
@@ -1,10 +1,10 @@
# Template file for 'cargo-edit'
pkgname=cargo-edit
version=0.7.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Utility for managing cargo dependencies from the command line"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
From 0ef9e95b62535855618a28981107d5e5942a8a15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 043/453] cargo-geiger: rebuild against OpenSSL
---
srcpkgs/cargo-geiger/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template
index c3fb5386ff5..24a3e3a35e5 100644
--- a/srcpkgs/cargo-geiger/template
+++ b/srcpkgs/cargo-geiger/template
@@ -1,12 +1,12 @@
# Template file for 'cargo-geiger'
pkgname=cargo-geiger
version=0.10.2
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_wrksrc="${pkgname}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
From 13e82da38db2420fae47ae86b3f88aad416bacca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 044/453] cargo-outdated: rebuild against OpenSSL
---
srcpkgs/cargo-outdated/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template
index 7e159bb6f5a..5105eb05af5 100644
--- a/srcpkgs/cargo-outdated/template
+++ b/srcpkgs/cargo-outdated/template
@@ -1,10 +1,10 @@
# Template file for 'cargo-outdated'
pkgname=cargo-outdated
version=0.9.9
-revision=2
+revision=3
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libgit2-devel libressl-devel"
+makedepends="libgit2-devel openssl-devel"
short_desc="Cargo subcommand for displaying when dependencies are out of date"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
From fb54fdd5a4cdc81309684e8310db4a3bc3231c02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 045/453] castor: rebuild against OpenSSL
---
srcpkgs/castor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template
index d3e05c6a435..6c6c5b1dc8e 100644
--- a/srcpkgs/castor/template
+++ b/srcpkgs/castor/template
@@ -1,10 +1,10 @@
# Template file for 'castor'
pkgname=castor
version=0.8.16
-revision=2
+revision=3
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel"
+makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel"
short_desc="Graphical client for plain-text protocols written in Rust with GTK"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
From 014cac16f3610b75c29488611854f09a0a700e37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:50 +0100
Subject: [PATCH 046/453] cbang: rebuild against OpenSSL
---
srcpkgs/cbang/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template
index 85b7d29d543..c4b45f44f2e 100644
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@@ -1,13 +1,13 @@
# Template file for 'cbang'
pkgname=cbang
version=1.6.0
-revision=2
+revision=3
build_style=scons
make_build_args="sharedlib=1 staticlib=1"
make_install_args="${make_build_args}"
hostmakedepends="pkg-config"
makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel
-libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
+openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel"
short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="LGPL-2.1-only"
From ac0ca1e0575fe47a2f6b369a821755205a533577 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 047/453] chatterino2: rebuild against OpenSSL
---
srcpkgs/chatterino2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template
index cef062ad146..7aec8859d72 100644
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@@ -1,7 +1,7 @@
# Template file for 'chatterino2'
pkgname=chatterino2
version=2.2.2
-revision=1
+revision=2
_signals_commit=6665ccad90461c01b7fe704a98a835953d644156
_settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450
_humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be
From 838947506435ef882e937e9fd54f6fe9afd1ba09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 048/453] cloudfuse: rebuild against OpenSSL
---
srcpkgs/cloudfuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template
index bcba5bba859..3a354656e3c 100644
--- a/srcpkgs/cloudfuse/template
+++ b/srcpkgs/cloudfuse/template
@@ -1,7 +1,7 @@
# Template file for 'cloudfuse'
pkgname=cloudfuse
version=1.0
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libxml2-devel libcurl-devel fuse-devel"
From 7c4dd291fa1c7feaba299d7308ff48e73a9bcc91 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:51 +0100
Subject: [PATCH 049/453] cmusfm: rebuild against OpenSSL
---
srcpkgs/cmusfm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template
index 6b5ac2bbee1..6361f832d74 100644
--- a/srcpkgs/cmusfm/template
+++ b/srcpkgs/cmusfm/template
@@ -1,7 +1,7 @@
# Template file for 'cmusfm'
pkgname=cmusfm
version=0.3.3
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--enable-libnotify"
hostmakedepends="automake pkg-config"
From 210618bbde9a48e91e9491ee6a09137dd9113f0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 050/453] coWPAtty: rebuild against OpenSSL
---
srcpkgs/coWPAtty/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template
index 97f085ee607..2bcf90c8457 100644
--- a/srcpkgs/coWPAtty/template
+++ b/srcpkgs/coWPAtty/template
@@ -2,12 +2,12 @@
pkgname=coWPAtty
_pkgname=cowpatty
version=4.8
-revision=3
+revision=4
wrksrc="${_pkgname}-${version}"
build_style=gnu-makefile
make_use_env=1
make_install_args="BINDIR=/usr/bin"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
short_desc="WPA-PSK dictionary attack"
maintainer="nexolight <snow.dream.ch@gmail.com>"
license="GPL-2.0-only"
From 9f8cf397b5db96295c26508200db9243c1a1465f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 051/453] collectd: rebuild against OpenSSL
---
srcpkgs/collectd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template
index 531f2e3a72f..431c257bbcb 100644
--- a/srcpkgs/collectd/template
+++ b/srcpkgs/collectd/template
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl)
$(vopt_enable prometheus write_prometheus)"
conf_files="/etc/collectd.conf"
hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel"
-makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel
+makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel
libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel
libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel
$(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel)
From 85f3323abaaaa39fb5a3d1f2671591327f3f732e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 052/453] coturn: rebuild against OpenSSL
---
srcpkgs/coturn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template
index 412a1269db5..99e37c16ecd 100644
--- a/srcpkgs/coturn/template
+++ b/srcpkgs/coturn/template
@@ -1,10 +1,10 @@
# Template file for 'coturn'
pkgname=coturn
version=4.5.1.3
-revision=1
+revision=2
build_style=gnu-configure
conf_files="/etc/turnserver.conf"
-makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel
+makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel
postgresql-libs-devel libmariadbclient-devel"
short_desc="Server Implementation of TURN and STUN"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From eb480d2981584b450d07eba2c24d0236acae23fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 053/453] cryptsetup: rebuild against OpenSSL
---
srcpkgs/cryptsetup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template
index 898e37a0c40..a852d5ce618 100644
--- a/srcpkgs/cryptsetup/template
+++ b/srcpkgs/cryptsetup/template
@@ -1,13 +1,13 @@
# Template file for 'cryptsetup'
pkgname=cryptsetup
version=2.3.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality)
--enable-cryptsetup-reencrypt --enable-libargon2"
make_check_args="-C tests"
hostmakedepends="pkg-config"
-makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel
+makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel
libargon2-devel $(vopt_if pwquality 'libpwquality-devel')"
checkdepends="procps-ng which jq tar xz xxd"
short_desc="Setup virtual encryption devices under Linux dm-crypt"
From 54d673f90d9e5028299ee55f12f4d24641583d8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:52 +0100
Subject: [PATCH 054/453] curl: rebuild against OpenSSL
---
srcpkgs/curl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 6533875c734..ea10772f054 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config"
makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
$(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
$(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
depends="ca-certificates"
# openssh isn't in checkdepends, because test 581 locks up
checkdepends="perl python3 stunnel nghttp2 groff"
From b57ef2dbb71ed6c30c26de06a1b0ed80006b79e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 055/453] cyrus-sasl: rebuild against OpenSSL
---
srcpkgs/cyrus-sasl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template
index 48221b0789f..2d8f5ffe22a 100644
--- a/srcpkgs/cyrus-sasl/template
+++ b/srcpkgs/cyrus-sasl/template
@@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2
--with-mysql=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool groff pkg-config"
-makedepends="libsasl-devel libressl-devel db-devel libldap-devel
+makedepends="libsasl-devel openssl-devel db-devel libldap-devel
mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel
libmariadbclient-devel"
depends="libsasl>=${version}"
From 9f06c050090fd9d3cd5b64f0ad2963b38469f3db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 056/453] dillo: rebuild against OpenSSL
---
srcpkgs/dillo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template
index 126f0b411c8..3ef02e2ddc7 100644
--- a/srcpkgs/dillo/template
+++ b/srcpkgs/dillo/template
@@ -1,14 +1,14 @@
# Template file for 'dillo'
pkgname=dillo
version=3.0.5
-revision=12
+revision=13
build_style=gnu-configure
configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns"
conf_files="/etc/dillo/dillorc
/etc/dillo/domainrc
/etc/dillo/dpidrc
/etc/dillo/keysrc"
-makedepends="fltk-devel libressl-devel"
+makedepends="fltk-devel openssl-devel"
short_desc="Small and light graphical web browser"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-3.0-or-later"
From 3919e5d133e68226e9b35420db960fdfa1cfdd1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 057/453] dma: rebuild against OpenSSL
---
srcpkgs/dma/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template
index 91fa000a9bc..71892496013 100644
--- a/srcpkgs/dma/template
+++ b/srcpkgs/dma/template
@@ -1,11 +1,11 @@
# Template file for 'dma'
pkgname=dma
version=0.13
-revision=2
+revision=3
conf_files="/etc/dma/*.conf"
make_dirs="/var/spool/dma 2775 root mail"
hostmakedepends="flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Small Mail Transport Agent (MTA), designed for home and office use"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
From 46000007fa6ff226ddb678675149cfb28964b4a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 058/453] dmg2img: rebuild against OpenSSL
---
srcpkgs/dmg2img/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template
index 72918f9e428..a14781b0c3b 100644
--- a/srcpkgs/dmg2img/template
+++ b/srcpkgs/dmg2img/template
@@ -1,9 +1,9 @@
# Template file for 'dmg2img'
pkgname=dmg2img
version=1.6.7
-revision=4
+revision=5
build_style=gnu-makefile
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
short_desc="Convert Apple's compressed dmg to standard image disks"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
From 9978b134c8573a450d0e777c794e3e5592eb05da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:53 +0100
Subject: [PATCH 059/453] dovecot: rebuild against OpenSSL
---
srcpkgs/dovecot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template
index 815ef8f2546..643807a1bd8 100644
--- a/srcpkgs/dovecot/template
+++ b/srcpkgs/dovecot/template
@@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin
--with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma
--with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin"
hostmakedepends="pkg-config perl"
-makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel
+makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel
mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel
clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel
libsodium-devel"
From c808e3bc283c06dae1523c8f4047db715890fa37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 060/453] dpdk: rebuild against OpenSSL
---
srcpkgs/dpdk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
# Template file for 'dpdk'
pkgname=dpdk
version=19.08
-revision=4
+revision=5
# no musl - uses error.h, execinfo.h and argp.h
archs="x86_64 aarch64 ppc64le i686 armv7l"
build_style=meson
configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
depends="python3-pyelftools"
short_desc="Data Plane Development Kit"
maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
}
dpdk-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+ depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/dpdk-pdump
From 78473f48605c46d750a5710b90c9cfea50a8c84c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 061/453] ecryptfs-utils: rebuild against OpenSSL
---
.../patches/openssl-1.1.x.patch | 76 +++++++++++++++++++
srcpkgs/ecryptfs-utils/template | 4 +-
2 files changed, 78 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c 2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++ if (n != NULL)
++ *n = r->n;
++ if (e != NULL)
++ *e = r->e;
++ if (d != NULL)
++ *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ char *path;
+ char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ int len, nbits, ebits, i;
+ int nbytes, ebytes;
++ const BIGNUM *key_n, *key_e;
+ unsigned char *hash;
+ unsigned char *data = NULL;
+ int rc = 0;
+@@ -152,11 +167,13 @@
+ rc = -ENOMEM;
+ goto out;
+ }
+- nbits = BN_num_bits(key->n);
++ RSA_get0_key(key, &key_n, NULL, NULL);
++ nbits = BN_num_bits(key_n);
+ nbytes = nbits / 8;
+ if (nbits % 8)
+ nbytes++;
+- ebits = BN_num_bits(key->e);
++ RSA_get0_key(key, NULL, &key_e, NULL);
++ ebits = BN_num_bits(key_e);
+ ebytes = ebits / 8;
+ if (ebits % 8)
+ ebytes++;
+@@ -179,11 +196,13 @@
+ data[i++] = '\02';
+ data[i++] = (nbits >> 8);
+ data[i++] = nbits;
+- BN_bn2bin(key->n, &(data[i]));
++ RSA_get0_key(key, &key_n, NULL, NULL);
++ BN_bn2bin(key_n, &(data[i]));
+ i += nbytes;
+ data[i++] = (ebits >> 8);
+ data[i++] = ebits;
+- BN_bn2bin(key->e, &(data[i]));
++ RSA_get0_key(key, NULL, &key_e, NULL);
++ BN_bn2bin(key_e, &(data[i]));
+ i += ebytes;
+ SHA1(data, len + 3, hash);
+ to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ BIO *in = NULL;
+ int rc;
+
++ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ CRYPTO_malloc_init();
++ #endif
+ ERR_load_crypto_strings();
+ OpenSSL_add_all_algorithms();
+ ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
# Template file for 'ecryptfs-utils'
pkgname=ecryptfs-utils
version=111
-revision=8
+revision=9
lib32disabled=yes
build_style=gnu-configure
configure_args="--sbindir=/usr/bin
--with-pamdir=/usr/lib/security --enable-gpg --enable-gui
--with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
depends="gettext"
_desc="Ecryptfs cryptographic filesystem"
short_desc="${_desc} - utilities"
From 88295bd4dd17061303cefde40f7c3b9ef5dfeec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 062/453] efitools: rebuild against OpenSSL
---
srcpkgs/efitools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
# Template file for 'efitools'
pkgname=efitools
version=1.9.2
-revision=4
+revision=5
archs="x86_64* i686* arm* aarch64*"
build_style=gnu-makefile
hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
short_desc="Tools to manipulate EFI secure boot platforms"
maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
From 9ecd287abee4e6f4625080ce8c61e152cb3ac57c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 063/453] efl: rebuild against OpenSSL
---
srcpkgs/efl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..df35ce7a1ac 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -27,7 +27,7 @@ configure_args="
$(vopt_bool glib glib)"
hostmakedepends="pkg-config gettext"
makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
avahi-libs-devel eudev-libudev-devel bullet-devel
From 27e0c3597933a31fd229e013a1290ffaa10efc41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 064/453] eggdrop: rebuild against OpenSSL
---
srcpkgs/eggdrop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
# Template file for 'eggdrop'
pkgname=eggdrop
version=1.8.4
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
short_desc="Internet relay chat (IRC) bot"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
From 652dc3f08f870d242917c1c2e4ade825bc1ffb16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 065/453] eid-mw: rebuild against OpenSSL
---
srcpkgs/eid-mw/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
# Template file for 'eid-mw'
pkgname=eid-mw
version=4.4.16
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
depends="pcsc-acsccid pcsc-ccid pcsc-tools"
short_desc="Middleware for Belgian eID"
maintainer="Andrew Benson <abenson+void@gmail.com>"
From 844bdce29b002ce9d804ff6b354fceb0e857939b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 066/453] eiskaltdcpp-qt: rebuild against OpenSSL
---
srcpkgs/eiskaltdcpp-qt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..1718c65780c 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}"
build_style=cmake
configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
From b13bbb401f0d968a07d447d897577481116ef421 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 067/453] ejabberd: rebuild against OpenSSL
---
srcpkgs/ejabberd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
# Template file for 'ejabberd'
pkgname=ejabberd
version=20.07
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
--enable-redis --enable-elixir $(vopt_enable sqlite)"
conf_files="/etc/ejabberd/*"
hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
$(vopt_if sqlite sqlite-devel) gd-devel"
depends="erlang"
short_desc="Robust and massively scalable XMPP platform"
From bd027b9a5c1a00e7ae166b22970a5c3b4d9d9cd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 068/453] elinks: rebuild against OpenSSL
---
srcpkgs/elinks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
# Template file for 'elinks'
pkgname=elinks
version=0.14.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
hostmakedepends="automake libtool pkg-config gettext"
makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
short_desc="Full-Featured Text WWW Browser"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From 1f0d52054b1e544e591faf058296d94bef134696 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 069/453] elog: rebuild against OpenSSL
---
srcpkgs/elog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
# Template file for 'elog'
pkgname=elog
version=3.1.4.1
-revision=3
+revision=4
_distver="${version:0:-2}-${version:(-1)}"
wrksrc="$pkgname-${version%.*}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
system_accounts="elog"
short_desc="Logbook system to manage notes through a Web interface"
maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
license="GPL-3.0-or-later"
homepage="https://elog.psi.ch/elog/"
distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"
From b1c667d71bcf7e0cfb40289fe169105511875581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 070/453] encfs: rebuild against OpenSSL
---
srcpkgs/encfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
# Template file for 'encfs'
pkgname=encfs
version=1.9.5
-revision=4
+revision=5
build_style=cmake
hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
depends="perl" # for encfssh
short_desc="Encrypted filesystem in user-space"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6c3fd93022fd90c34b0592ce5e00215120e1ff54 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 071/453] erlang: rebuild against OpenSSL
---
srcpkgs/erlang/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 2b02c000c7d..50c29dfb814 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}"
build_style=gnu-configure
make_install_target="install install-docs"
hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
short_desc="Concurrent functional programming language developed by Ericsson"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
From e8e2109c48d71ec5f103d1a72614e92f920a6711 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 072/453] ettercap: rebuild against OpenSSL
---
srcpkgs/ettercap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
# Template file for 'ettercap'
pkgname=ettercap
version=0.8.3.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_GTK=OFF"
hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
libltdl-devel libnet-devel libpcap-devel pcre-devel"
conf_files="/etc/${pkgname}/etter.conf"
short_desc="Network sniffer/interceptor/logger for ethernet LANs"
From 66c20644986f318c934d4fe000c3b5b2b6cd1d81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 073/453] facter: rebuild against OpenSSL
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 0bb54b7d36d..d70d66e4b14 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.11
-revision=5
+revision=6
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF"
From e79852d2a3ad9df78f9621a7f03e357888bd767f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 074/453] falkon: rebuild against OpenSSL
---
srcpkgs/falkon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
# Template file for 'falkon'
pkgname=falkon
version=3.1.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="extra-cmake-modules gettext pkg-config
qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"
From 59c50e6d7eb156756dfa2af856beb7e73f8976c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 075/453] fdm: rebuild against OpenSSL
---
srcpkgs/fdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
# Template file for 'fdm'
pkgname=fdm
version=2.0
-revision=4
+revision=5
build_style=gnu-configure
configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
short_desc="Program to fetch and deliver mail"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="ISC"
From 54204412688c360e021cf113612795cf3cb4092e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 076/453] fetchmail: rebuild against OpenSSL
---
srcpkgs/fetchmail/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index 3bf834fe8f7..c984895fead 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
# Template file for 'fetchmail'
pkgname=fetchmail
version=6.4.15
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="fetchmailconf"
short_desc="Remote-mail retrieval utility"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
From 8f6153deb3a2db69ddd4b970d6fbb74e7717a82d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 077/453] ffsend: rebuild against OpenSSL
---
srcpkgs/ffsend/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
# Template file for 'ffsend'
pkgname=ffsend
version=0.2.68
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Fully featured Firefox Send client"
maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
From 73381d9b2a877458baf8ada7f3c36a97384262c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 078/453] fossil: rebuild against OpenSSL
---
srcpkgs/fossil/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..f96574daca1 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -5,7 +5,7 @@ revision=1
build_style=configure
configure_args="--disable-internal-sqlite --prefix=/usr"
hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
short_desc="Simple, high-reliability, distributed software configuration management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 4f9098ceeb78dd7a6a17d8c1fdfa8c28b3ad5a2b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 079/453] fractal: rebuild against OpenSSL
---
srcpkgs/fractal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
# Template file for 'fractal'
pkgname=fractal
version=4.2.2
-revision=2
+revision=3
build_style=meson
build_helper="rust"
hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
gmp-devel libsecret-devel libhandy-devel rust-std"
From ed359f868b02af1dca1d70b37eb0025eec26e7ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 080/453] freerdp: rebuild against OpenSSL
---
srcpkgs/freerdp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.2.0
-revision=2
+revision=3
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
hostmakedepends="pkg-config xmlto wayland-devel"
makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
libxkbcommon-devel wayland-devel cairo-devel"
short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
freerdp-devel_package() {
short_desc+=" - development files"
- depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+ depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
From 1674c9b7d5e146c28e44b033bebdec7329b1ab4a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 081/453] freshplayerplugin: rebuild against OpenSSL
---
srcpkgs/freshplayerplugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
# Template file for 'freshplayerplugin'
pkgname=freshplayerplugin
version=0.3.9
-revision=6
+revision=7
build_style=cmake
hostmakedepends="pkg-config ragel"
makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
From 0cf0e784a25637f967850e34d9112b8b33d41291 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 082/453] gambit: rebuild against OpenSSL
---
srcpkgs/gambit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
# Template file for 'gambit'
pkgname=gambit
version=4.9.3
-revision=5
+revision=6
build_style=gnu-configure
configure_args="
--libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
--enable-compiler-name=gambit-gsc
--enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
--enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Complete, portable, efficient and reliable implementation of Scheme"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-only, Apache-2.0"
From ddee9646319cf5eac5b97cfd1f29fb10bcae2e8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 083/453] gatling: rebuild against OpenSSL
---
srcpkgs/gatling/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
# Template file for 'gatling'
pkgname=gatling
version=0.15
-revision=9
+revision=10
build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
short_desc="High performance web server"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2"
From ce69b2b0f886f451d678ec6c0b19cc31aed8a5a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 084/453] gcsf: rebuild against OpenSSL
---
srcpkgs/gcsf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
# Template file for 'gcsf'
pkgname=gcsf
version=0.1.25
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
short_desc="FUSE file system based on Google Drive"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
From 0a39ba58495fcbc875b57edd4af619970057ed4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 085/453] gemserv: rebuild against OpenSSL
---
srcpkgs/gemserv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
# Template file for 'gemserv'
pkgname=gemserv
version=0.4.5
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Gemini server written in rust"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From 006b445a61b29e49b88d396273bbcd46712437d1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 086/453] gerbil: rebuild against OpenSSL
---
srcpkgs/gerbil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
# Template file for 'gerbil'
pkgname=gerbil
version=0.16
-revision=2
+revision=3
hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
short_desc="Opinionated dialect of Scheme designed for Systems Programming"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later, Apache-2.0"
From 7a0f32216ed764f6213be2f4a9c1b997e2beed46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 087/453] getdns: rebuild against OpenSSL
---
srcpkgs/getdns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
# Template file for 'getdns'
pkgname=getdns
version=1.5.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-libev --with-libevent --with-libuv
--with-ssl=${XBPS_CROSS_BASE}/usr"
From ced14e617d6ae187bccb699a68ba675fcb46a777 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 088/453] gftp: rebuild against OpenSSL
---
srcpkgs/gftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
# Template file for 'gftp'
pkgname=gftp
version=2.0.19
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
short_desc="Graphical file transfer client"
maintainer="psylence <psylence@protonmail.com>"
license="GPL-2"
From 46f1231018ea21311de9ba511923a5989bf51ffc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 089/453] git-brws: rebuild against OpenSSL
---
srcpkgs/git-brws/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
# Template file for 'git-brws'
pkgname=git-brws
version=0.11.12
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="CLI tool for opening web page of the hoster for a git remote"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
From cb3953bd65187410c833d12a18dc7f73e9b2d9dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 090/453] git-crypt: rebuild against OpenSSL
---
srcpkgs/git-crypt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
# Template file for 'git-crypt'
pkgname=git-crypt
version=0.6.0
-revision=6
+revision=7
build_style=gnu-makefile
make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
hostmakedepends="libxslt docbook-xsl"
make_build_args="ENABLE_MAN=yes"
make_install_args="ENABLE_MAN=yes"
From 493a2043071891a8c052ab4011a5904f6fc1d55d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 091/453] gkrellm: rebuild against OpenSSL
---
srcpkgs/gkrellm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
# Template file for 'gkrellm'
pkgname=gkrellm
version=2.3.11
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
short_desc="GTK2 based system monitor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0.or-later"
From 53bac0f612354a60dfaeb28b2098e3cfe2644c9e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 092/453] glusterfs: rebuild against OpenSSL
---
srcpkgs/glusterfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
# Template file for 'glusterfs'
pkgname=glusterfs
version=8.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
ac_cv_file__etc_centos_release=no"
pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
# python is required by gsyncd.
depends="python3"
From a5fbc8c3203fe85850234f14cfbbf15c4e64df64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 093/453] gnome-podcasts: rebuild against OpenSSL
---
srcpkgs/gnome-podcasts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-podcasts'
pkgname=gnome-podcasts
version=0.4.8
-revision=1
+revision=2
wrksrc="podcasts-${version}"
build_style=meson
build_helper="rust"
hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
short_desc="Listen to your favorite podcasts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From 6569108727c6553e8a7f1cea1de9fd5b99fd5551 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 094/453] gogglesmm: rebuild against OpenSSL
---
srcpkgs/gogglesmm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.1
-revision=4
+revision=5
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
depends="hicolor-icon-theme"
short_desc="Music Manager and Player"
From cf23d1a3c40a2b86e33cef699a99a5e24b7b29e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 095/453] grpc: rebuild against OpenSSL
---
srcpkgs/grpc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index db501ccc3c3..9f095fca581 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
-D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
-D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
hostmakedepends="which protobuf"
-makedepends="zlib-devel c-ares-devel libressl-devel
+makedepends="zlib-devel c-ares-devel openssl-devel
libprotoc-devel protobuf-devel gperftools-devel re2-devel"
short_desc="High performance, open source, general RPC framework"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From b2146d8154e3ba5da86563ca1e3e37807e3ac5d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 096/453] grub-customizer: rebuild against OpenSSL
---
srcpkgs/grub-customizer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
# Template file for 'grub-customizer'
pkgname=grub-customizer
version=5.1.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
depends="hicolor-icon-theme grub-utils"
conf_files="/etc/grub-customizer/grub.cfg"
archs="i686* x86_64*"
From 6030d0732f2e1e16e3c11a44f9d1d6f4a93f0315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 097/453] gsoap: rebuild against OpenSSL
---
srcpkgs/gsoap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
# Template file for 'gsoap'
pkgname=gsoap
version=2.8.91
-revision=2
+revision=3
wrksrc="gsoap-${version%.*}"
build_style=gnu-configure
configure_args="--enable-ipv6"
hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="gSOAP-1.3b, GPL-2.0-only"
From db55469e3aab8e0584fba3cf77957805abd6c70d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 098/453] gst-plugins-bad1: rebuild against OpenSSL
---
srcpkgs/gst-plugins-bad1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..df632b3c1c4 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
-Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
From 2d023bd4160f9ddd1e5402cc568eb0fe9daba4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 099/453] gwenhywfar: rebuild against OpenSSL
---
srcpkgs/gwenhywfar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
# Template file for 'gwenhywfar'
pkgname=gwenhywfar
version=5.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-visibility --disable-binreloc
--with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"
From 968fdfd65a54b113f4c819e2aa47f0913dad2fdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 100/453] h2o: rebuild against OpenSSL
---
srcpkgs/h2o/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
# Template file for 'h2o'
pkgname=h2o
version=2.2.6
-revision=2
+revision=3
build_style=cmake
conf_files="/etc/h2o.conf"
hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
depends="perl"
short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
maintainer="Orphaned <orphan@voidlinux.org>"
From 1a28f93956f4293ee9ffd982b5482f936f3d70d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 101/453] haproxy: rebuild against OpenSSL
---
srcpkgs/haproxy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..d2722bc5abd 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-makefile
make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
checkdepends="varnish"
short_desc="Reliable, high performance TCP/HTTP load balancer"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
From 88f8e76e5574d601787fdc748a490a2819633a37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 102/453] hexchat: rebuild against OpenSSL
---
srcpkgs/hexchat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..1e16bd34c13 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
-Dwith-perl=/usr/bin/perl -Dwith-python=python3
-Dwith-lua=$(vopt_if LuaJIT luajit lua)"
hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
depends="desktop-file-utils enchant2"
From 7797315dd0232390ba2dca83ea915e02f5fd38b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 103/453] hfsprogs: rebuild against OpenSSL
---
srcpkgs/hfsprogs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
_distver=540.1
_patchver=3
version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
wrksrc="diskdev_cmds-${version}"
hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
maintainer="Orphaned <orphan@voidlinux.org>"
license="APSL-2.0"
From 136a49c8badb1ca1d038435dd542f4c46a711ffe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 104/453] hitch: rebuild against OpenSSL
---
srcpkgs/hitch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
# Template file for 'hitch'
pkgname=hitch
version=1.5.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
checkdepends="lsof curl"
short_desc="Libev-based high performance SSL/TLS proxy"
maintainer="Jannis Christ <hello@jannis.ovh>"
From 2d624ccd00afd45c0580a979be982ab8ec0e8df1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 105/453] hostapd: rebuild against OpenSSL
---
srcpkgs/hostapd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 3c7af9d0274..87cf12033e4 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
# Template file for 'hostapd'
pkgname=hostapd
version=2.9
-revision=2
+revision=3
build_wrksrc="$pkgname"
conf_files="/etc/hostapd/hostapd.conf"
hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From 098e6420122b5dab8811d22a60c01e1e17b60787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 106/453] hplip: rebuild against OpenSSL
---
srcpkgs/hplip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
# Template file for 'hplip'
pkgname=hplip
version=3.20.9
-revision=4
+revision=5
build_style=gnu-configure
pycompile_dirs="usr/share/hplip"
configure_args="
@@ -21,7 +21,7 @@ configure_args="
conf_files="/etc/hp/hplip.conf"
make_dirs="/var/lib/hp 0755 root root"
hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
avahi-libs-devel"
depends="python3-gobject python3-dbus desktop-file-utils
From 47ccce5c6a4637759ffc01effca559a8d1a90d5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 107/453] httpdirfs: rebuild against OpenSSL
---
srcpkgs/httpdirfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
# Template file for 'httpdirfs'
pkgname=httpdirfs
version=1.2.0
-revision=2
+revision=3
build_style=gnu-makefile
make_install_args="prefix=/usr"
makedepends="libcurl-devel fuse-devel gumbo-parser-devel
From 66f81043bb874426fd53527f29061cd5c24ccb1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 108/453] httrack: rebuild against OpenSSL
---
srcpkgs/httrack/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
# Template file for 'httrack'
pkgname=httrack
version=3.49.2
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
homepage="http://www.httrack.com"
distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
httrack-devel_package() {
short_desc+=" - development files"
From 9781edee063af31087904dd468bb5d62fcbda906 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 109/453] i2pd: rebuild against OpenSSL
---
srcpkgs/i2pd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.33.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
libatomic-devel"
short_desc="Full-featured C++ implementation of I2P client"
maintainer="Obosob <obosob@riseup.net>"
From 6008e9a1e7993fa75ee4cced37adb0ec717c3279 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 110/453] icecast: rebuild against OpenSSL
---
srcpkgs/icecast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
# Template file for 'icecast'
pkgname=icecast
version=2.4.4
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
libtheora-devel libvorbis-devel libxslt-devel"
short_desc="Free server software for streaming multimedia"
maintainer="Orphaned <orphan@voidlinux.org>"
From 18a7ad23ef0a6a21be8225930640c9796adeb0c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 111/453] icinga2: rebuild against OpenSSL
---
srcpkgs/icinga2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..4baa1447caf 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
-DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
yajl-devel postgresql-libs-devel"
depends="monitoring-plugins"
conf_files="/etc/${pkgname}/*.conf
From 6e2904941c0575bfb6f7dbe1c2c800694a385535 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 112/453] imapfilter: rebuild against OpenSSL
---
srcpkgs/imapfilter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
# Template file for 'imapfilter'
pkgname=imapfilter
version=2.6.12
-revision=5
+revision=6
build_style=gnu-makefile
make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
short_desc="Mail filtering utility"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="MIT"
From f930ebe791862bb51860019151e48d36f92c2182 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 113/453] inadyn: rebuild against OpenSSL
---
srcpkgs/inadyn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..3b9c64b00e4 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="--enable-openssl"
hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
short_desc="Small DynDNS client with SSL/TLS support"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From 7eb4a05a4113b9158398de46f80701d416efc885 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 114/453] inspircd: rebuild against OpenSSL
---
srcpkgs/inspircd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
# Template file for 'inspircd'
pkgname=inspircd
version=3.8.1
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
short_desc="Modular Internet Relay Chat server"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
From 5f5036e47f0985ab49cf1c12be6b33cfbd5e4794 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 115/453] ipmitool: rebuild against OpenSSL
---
srcpkgs/ipmitool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
# Template file for 'ipmitool'
pkgname=ipmitool
version=1.8.18
-revision=7
+revision=8
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Command-line interface to IPMI-enabled devices"
maintainer="Frank Steinborn <steinex@nognu.de>"
license="BSD"
From d086a5f63e9c9dc3c771bed036c7fab452d5a8ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 116/453] ipmiutil: rebuild against OpenSSL
---
srcpkgs/ipmiutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
# Template file for 'ipmiutil'
pkgname=ipmiutil
version=3.1.3
-revision=3
+revision=4
archs="i686* x86_64* ppc*"
build_style=gnu-configure
configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Series of utilities that perform common IPMI management functions"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="BSD-2-Clause, BSD-3-Clause"
From d90f97dc91db8045483b1e940313b8a27253c79b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 117/453] iputils: rebuild against OpenSSL
---
srcpkgs/iputils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d7701c5080e..57271f68c47 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -7,7 +7,7 @@ build_style=meson
configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
-DBUILD_TFTPD=false -DBUILD_NINFOD=false"
hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
depends="libcap-progs"
short_desc="Useful utilities for Linux networking (including ping)"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 4221711a24937d77e9116c6c804dd042fb0adba0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 118/453] irssi: rebuild against OpenSSL
---
srcpkgs/irssi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
# Template file for 'irssi'
pkgname=irssi
version=1.2.2
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-static --with-proxy --enable-true-color
--with-otr --with-perl=module"
hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
libotr-devel perl"
depends="ca-certificates"
conf_files="/etc/irssi.conf"
From 82f27f3412e10067853a460aff2144b9ec1803f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 119/453] isync: rebuild against OpenSSL
---
srcpkgs/isync/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index 90bcda4d6c9..a12f57b58c0 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -4,7 +4,7 @@ version=1.3.4
revision=1
build_style=gnu-configure
hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
depends="ca-certificates"
short_desc="IMAP and MailDir mailbox synchronizer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 5dd87b2a6443b45f57cb007c6c9ba3a22c35ec79 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 120/453] john: rebuild against OpenSSL
---
srcpkgs/john/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
# Template file for 'john'
pkgname=john
version=1.9.0
-revision=3
+revision=4
_jumbover=1
wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
build_wrksrc="src"
build_style=gnu-configure
configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-2.0-or-later with OpenSSL-exception"
From fe04907f460a4a6d7460b84b246d3f6cb28ad59f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 121/453] kea: rebuild against OpenSSL
---
srcpkgs/kea/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 0a9c0b03ea2..3b78d0be6c0 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
hostmakedepends="flex bison perl pkg-config automake libtool
doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
$(vopt_if mysql libmariadbclient-devel)
$(vopt_if pgsql postgresql-libs-devel)"
depends="libkea>=0"
From 84074e615d91edaa1a7e8dbeaff5a2f260bd851c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 122/453] keepalived: rebuild against OpenSSL
---
srcpkgs/keepalived/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.1.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
short_desc="Failover and monitoring daemon for LVS clusters"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 38eab8a2d6b3b23557a000a48a28f7f9838c8161 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 123/453] kicad: rebuild against OpenSSL
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..0ef99db2b48 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
$(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
depends="wxPython4"
short_desc="Electronic schematic and PCB design software"
From 59fccc7150980a3695669944410f3837c23b340f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 124/453] kodi: rebuild against OpenSSL
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..b845f0792ae 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -29,7 +29,7 @@ makedepends="
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel
From 6d036910afc1eeb261b8d584a777ae58f26871f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 125/453] kore: rebuild against OpenSSL
---
srcpkgs/kore/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..b05f8f294f2 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -8,7 +8,7 @@ build_style=gnu-makefile
make_use_env=yes
make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
short_desc="Easy to use web platform for writing scalable web APIs in C"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="ISC"
From 1379d06cb49ad1a4c4d1085b4e1147abcdc6f5c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 126/453] kvirc: rebuild against OpenSSL
---
srcpkgs/kvirc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
# Template file for 'kvirc'
pkgname=kvirc
version=5.0.0
-revision=6
+revision=7
wrksrc="KVIrc-$version"
build_style=cmake
configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
qt5-plugin-sqlite qt5-plugin-tds"
short_desc="Qt-based IRC client"
From 38311f5f0ea656417f7b5e26f69209b48b683bd1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 127/453] lastpass-cli: rebuild against OpenSSL
---
srcpkgs/lastpass-cli/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
# Template file for 'lastpass-cli'
pkgname=lastpass-cli
version=1.3.3
-revision=3
+revision=4
build_style=cmake
make_install_target="install install-doc"
hostmakedepends="asciidoc pkg-config"
From 5a345db9f9d8f8510687cfc2649955a335184e5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 128/453] ldapvi: rebuild against OpenSSL
---
srcpkgs/ldapvi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
# Template file for 'ldapvi'
pkgname=ldapvi
version=1.7
-revision=10
+revision=11
build_style=gnu-configure
configure_args="--with-sha"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From c4555e17120856717b6c1affbdd5237f8e213a39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 129/453] ldns: rebuild against OpenSSL
---
srcpkgs/ldns/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
# Template file for 'ldns'
pkgname=ldns
version=1.7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-drill --with-examples --disable-dane-ta-usage
--with-trust-anchor=/etc/dns/root.key
--with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
short_desc="Modern DNS/DNSSEC library -- utils"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
}
}
libldns-devel_package() {
- depends="libldns>=${version}_${revision} libressl-devel"
+ depends="libldns>=${version}_${revision} openssl-devel"
short_desc="Modern DNS/DNSSEC library -- development files"
pkg_install() {
vmove usr/bin/ldns-config
From d267a8e1670236cdb37d7b7e34c61236292c73c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 130/453] lftp: rebuild against OpenSSL
---
srcpkgs/lftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
# Template file for 'lftp'
pkgname=lftp
version=4.9.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-modules --disable-rpath --without-included-regex
--with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
--with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
expat-devel libidn-devel gettext-devel"
short_desc="Sophisticated FTP/HTTP client"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2c3f79f1372c025cb1b6e26597d38f4ad87190a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 131/453] libarchive: rebuild against OpenSSL
---
srcpkgs/libarchive/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 5c9e316c605..605cac399d3 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
# Template file for 'libarchive'
pkgname=libarchive
version=3.5.1
-revision=1
+revision=2
bootstrap=yes
build_style=gnu-configure
configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
hostmakedepends="pkgconf"
makedepends="zlib-devel bzip2-devel liblzma-devel
$(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
- $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)"
+ $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
short_desc="Library to read/write several different streaming archive formats"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD-2-Clause"
From f4c61c43353c290eeb9c1ffe7baff4f6afd80548 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 132/453] libesmtp: rebuild against OpenSSL
---
srcpkgs/libesmtp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template
index 765a9baef4e..6b9d05b03b2 100644
--- a/srcpkgs/libesmtp/template
+++ b/srcpkgs/libesmtp/template
@@ -1,10 +1,10 @@
# Template file for 'libesmtp'
pkgname=libesmtp
version=1.0.6
-revision=20
+revision=21
build_style=gnu-configure
configure_args="--disable-static --with-openssl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Manage submission of emails using SMTP protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 0af250089384c3fbcdbefe1041f23e0d6f0f74df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 133/453] libetpan: rebuild against OpenSSL
---
srcpkgs/libetpan/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
# Template file for 'libetpan'
pkgname=libetpan
version=1.9.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
--with-zlib --with-sasl"
hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
libsasl-devel libcurl-devel"
short_desc="Mail Framework library for C language"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
From 4e3afb0cd6b2b23651da4a9d30c1beba749c263c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 134/453] libevent: rebuild against OpenSSL
---
srcpkgs/libevent/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template
index 5fc4abe05f3..546c43aec74 100644
--- a/srcpkgs/libevent/template
+++ b/srcpkgs/libevent/template
@@ -1,10 +1,10 @@
# Template file for 'libevent'
pkgname=libevent
version=2.1.12
-revision=1
+revision=2
wrksrc="${pkgname}-${version}-stable"
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Abstract asynchronous event notification library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From af965c57b99c5efb1342838b0dbafc8ac32c6017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 135/453] libfetch: rebuild against OpenSSL
---
srcpkgs/libfetch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
# Template file for 'libfetch'
pkgname=libfetch
version=2.34
-revision=22
+revision=23
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="File Transfer Library for URLs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From 01b0a5c610c3ba9cd5e6a275dcbc64feb25d2a8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 136/453] libfido2: rebuild against OpenSSL
---
srcpkgs/libfido2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
# Template file for 'libfido2'
pkgname=libfido2
version=1.6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
short_desc="Library for FIDO 2.0, including communication with a device over USB"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
From 0cabe07687adaca2137824fae55a03909d67063d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 137/453] libgda: rebuild against OpenSSL
---
srcpkgs/libgda/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..0042a25ad1a 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
--enable-system-sqlite"
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
conf_files="/etc/libgda-5.0/config"
From 30c71e5f684da9e2508f0019826e0d0a25078c87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 138/453] libgit2: rebuild against OpenSSL
---
srcpkgs/libgit2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template
index 16b611692eb..2722bd6553f 100644
--- a/srcpkgs/libgit2/template
+++ b/srcpkgs/libgit2/template
@@ -1,10 +1,10 @@
# Template file for 'libgit2'
pkgname=libgit2
version=1.0.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="python3 git pkg-config"
-makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel"
+makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel"
short_desc="Git linkable library"
maintainer="q66 <daniel@octaforge.org>"
license="custom:GPL-2.0-or-later WITH GCC-exception-2.0"
From 655c054e4feee3f47443d201b8189b190b73e600 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 139/453] libimobiledevice: rebuild against OpenSSL
---
srcpkgs/libimobiledevice/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
# Template file for 'libimobiledevice'
pkgname=libimobiledevice
version=1.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
libusb-devel libplist-devel libusbmuxd-devel"
short_desc="Library to communicate with Apple devices"
maintainer="Orphaned <orphan@voidlinux.org>"
From b1384813bc150240fc42286d8ba625c7c3dda5d9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 140/453] libircclient: rebuild against OpenSSL
---
srcpkgs/libircclient/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
# Template file for 'libircclient'
pkgname=libircclient
version=1.10
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="IRC client library"
maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
license="LGPL-3.0-or-later"
From bb741d563a2dedd8b6bb339fae2c49832d2123a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 141/453] libknet1: rebuild against OpenSSL
---
srcpkgs/libknet1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.11
-revision=3
+revision=4
wrksrc=kronosnet-${version}
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-kronosnetd --disable-poc --disable-static"
hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
short_desc="Kronosnet core switching implementation (libraries)"
maintainer="Jiří Bělka <jirib79@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-only"
From 7bf6d0be8dc611b5f553baa99d20c06e347203ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 142/453] libmowgli: rebuild against OpenSSL
---
srcpkgs/libmowgli/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
# Template file for 'libmowgli'
pkgname=libmowgli
version=2.1.3
-revision=7
+revision=8
wrksrc="${pkgname}-2-${version}"
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Performance and usability-oriented extensions to C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From 0a18dd88554267ff738aa83d9c107abe4ca51aeb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 143/453] libnice: rebuild against OpenSSL
---
srcpkgs/libnice/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 40972050300..ce48e719cae 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
# Template file for 'libnice'
pkgname=libnice
version=0.1.18
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
-Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel
+makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel
libglib-devel"
short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
maintainer="Orphaned <orphan@voidlinux.org>"
From dd2f1a5afaa04b1ca65ae2ebd6ba1af55b0fc512 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 144/453] libostree: rebuild against OpenSSL
---
srcpkgs/libostree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
# Template file for 'libostree'
pkgname=libostree
version=2020.8
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="
From b9ee72a567a33d5b2df64eff77025655e97790d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 145/453] librdkafka: rebuild against OpenSSL
---
srcpkgs/librdkafka/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
# Template file for 'librdkafka'
pkgname=librdkafka
version=1.4.4
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
short_desc="Apache Kafka C/C++ library"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="BSD-2-Clause"
From dc97be8ebb87b12ce41bcb02fbb21dcdca4a124c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 146/453] libssh: rebuild against OpenSSL
---
srcpkgs/libssh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
# Template file for 'libssh'
pkgname=libssh
version=0.9.5
-revision=1
+revision=2
build_style=cmake
configure_args="-DUNIT_TESTING=ON"
hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
checkdepends="openssh"
short_desc="Multiplatform C library implementing the SSH v2 protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
From e952bcd8ffe63e6d47c7cbb46e2c4d13f3ec7b58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 147/453] libssh2: rebuild against OpenSSL
---
srcpkgs/libssh2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template
index e82591556f9..0291b28c4a1 100644
--- a/srcpkgs/libssh2/template
+++ b/srcpkgs/libssh2/template
@@ -1,10 +1,10 @@
# Template file for 'libssh2'
pkgname=libssh2
version=1.9.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
short_desc="Library implementing the SSH2 protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From ed7f6623aead2df36e5ed7fb7ee65422567c8bc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 148/453] libstrophe: rebuild against OpenSSL
---
srcpkgs/libstrophe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..714458f8a85 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="$(vopt_enable cares) $(vopt_enable tls)"
hostmakedepends="automake libtool pkg-config"
makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
short_desc="Minimal XMPP library written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
From 6997cb9bae6da83211d8a1858059d24504d1c6a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 149/453] libtd: rebuild against OpenSSL
---
srcpkgs/libtd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
# Template file for 'libtd'
pkgname=libtd
version=1.7.0
-revision=1
+revision=2
wrksrc="td-${version}"
build_style=cmake
build_helper=qemu
hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Cross-platform library for building Telegram clients"
maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
license="BSL-1.0"
From d5263ee72fdfa01ef17d24a4e9c13c96419c3c8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 150/453] libtorrent: rebuild against OpenSSL
---
srcpkgs/libtorrent/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..582bf967439 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="--enable-static --disable-debug --without-kqueue
--enable-aligned --with-posix-fallocate"
hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
# XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
checkdepends="libcppunit-devel"
short_desc="BitTorrent library written in C++"
From 8be65d31484914b7fe1ab187c87260967deb3749 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 151/453] libtorrent-rasterbar: rebuild against OpenSSL
---
srcpkgs/libtorrent-rasterbar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..d67bafaa544 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -7,7 +7,7 @@ build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
short_desc="C++ bittorrent library by Rasterbar Software"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
}
libtorrent-rasterbar-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+ depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
depends+=" libatomic-devel"
fi
From 84d778881269e9e5a11fa6c8623badf1aebb55dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 152/453] libu2f-host: rebuild against OpenSSL
---
srcpkgs/libu2f-host/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
# Template file for 'libu2f-host'
pkgname=libu2f-host
version=1.1.10
-revision=4
+revision=5
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
configure_args="--with-openssl=yes"
hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
depends="libfido2"
short_desc="C library and tool that implements the host-side of the U2F protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
From 22dcefdfed89dd74daf641e031999fd2e546d787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 153/453] libu2f-server: rebuild against OpenSSL
---
srcpkgs/libu2f-server/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
# Template file for 'libu2f-server'
pkgname=libu2f-server
version=1.1.0
-revision=8
+revision=9
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD"
From ace3f4d51be179334afafa45d80dda894a7337f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 154/453] libucl: rebuild against OpenSSL
---
srcpkgs/libucl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
# Template file for 'libucl'
pkgname=libucl
version=0.8.1
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--enable-urls --enable-signatures"
hostmakedepends="automake libtool pkg-config"
From c79620c7e3b86aa167521e16537619ee5bdce9b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 155/453] libwebsockets: rebuild against OpenSSL
---
srcpkgs/libwebsockets/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
# Template file for 'libwebsockets'
pkgname=libwebsockets
version=3.2.2
-revision=4
+revision=5
build_style=cmake
configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
-DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
short_desc="Lightweight client and server websocket library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
CFLAGS="-Wno-error"
libwebsockets-devel_package() {
- depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+ depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin
From c181086ef0ade94b9af0dd6d3a22f1384139337a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 156/453] libzip: rebuild against OpenSSL
---
srcpkgs/libzip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template
index 5edf0e1908b..1104e1a8b3b 100644
--- a/srcpkgs/libzip/template
+++ b/srcpkgs/libzip/template
@@ -1,10 +1,10 @@
# Template file for 'libzip'
pkgname=libzip
version=1.7.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="perl groff pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel"
short_desc="C library for reading, creating, and modifying zip archives"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From eb7ff15c681e6644deecfc9d1f0d819992aa0145 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 157/453] lighttpd: rebuild against OpenSSL
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 8acb7af78f3..30970dc02b0 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.57
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true
-Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true
From edd400696e9b67920a87dff7c65357da25ea8f05 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 158/453] links: rebuild against OpenSSL
---
srcpkgs/links/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
# Template file for 'links'
pkgname=links
version=2.21
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ssl --enable-graphics"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
short_desc="Graphics and text mode web browser, released under GPL"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
From 63c1b4cdf0d9bbaec6a0e7ed2f5f5df5fa064486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 159/453] links-x11: rebuild against OpenSSL
---
srcpkgs/links-x11/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
# Template file for 'links-x11'
pkgname=links-x11
version=2.21
-revision=1
+revision=2
wrksrc="${pkgname%-x11}-${version}"
build_style=gnu-configure
configure_args="--with-ssl --enable-graphics --enable-x"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
libX11-devel libXt-devel"
short_desc="Graphics and text mode web browser (with X11 graphics driver)"
maintainer="newbluemoon <blaumolch@mailbox.org>"
From aa84e561b456fcfac8cf6bb8b15d64c761722a77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 160/453] linux4.14: rebuild against OpenSSL
---
srcpkgs/linux4.14/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 7fa8117415d..ca8665e4bd3 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel"
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel"
case "$XBPS_TARGET_MACHINE" in
ppc64le*) broken="No ppc64le support";;
From 650645f04c7cb4d71e243edf45d510da091cad1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 161/453] linux4.19: rebuild against OpenSSL
---
srcpkgs/linux4.19/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index e21433f132a..31fa1129a99 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -20,7 +20,7 @@ preserve=yes
archs="i686* x86_64* arm* aarch64* ppc*"
hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From 69706071e3064092171195bfdb15c6dbe9f6e763 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 162/453] linux5.10: rebuild against OpenSSL
---
srcpkgs/linux5.10/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 84871cfb37d..4d396181815 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From c8e4c6e8bb441a195333c1cbe3b2b0364ec78b3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 163/453] linux5.4: rebuild against OpenSSL
---
srcpkgs/linux5.4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 75d8e5d8d53..bd6e2752599 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -20,7 +20,7 @@ preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From bd1f6eff386f4a34848a91f212d935ec1c46cb6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 164/453] litecoin: rebuild against OpenSSL
---
srcpkgs/litecoin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 53331cd8851..9b20a8812c6 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.17.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
maintainer="Orphaned <orphan@voidlinux.org>"
From 4b772fa393eb868f7b2926bb2b003be1db5bbfc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 165/453] live555: rebuild against OpenSSL
---
srcpkgs/live555/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
# Template file for 'live555'
pkgname=live555
version=2020.08.11
-revision=1
+revision=2
wrksrc=live
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Set of C++ libraries for multimedia streaming"
maintainer="Denis Revin <denis.revin@gmail.com>"
license="LGPL-3.0-or-later"
From d5191812c01c3bf56aeede8f5abe3df98be755eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 166/453] loudmouth: rebuild against OpenSSL
---
srcpkgs/loudmouth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
# Template file for 'loudmouth'
pkgname=loudmouth
version=1.5.3
-revision=11
+revision=12
build_style=gnu-configure
configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
short_desc="Lightweight Jabber client library written in C/Glib"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 338c5bbef421e5d6a875fb5febc7642194d8768e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 167/453] lua51-luasec: rebuild against OpenSSL
---
srcpkgs/lua51-luasec/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
index c02e45e994d..d9a1ab60631 100644
--- a/srcpkgs/lua51-luasec/template
+++ b/srcpkgs/lua51-luasec/template
@@ -2,11 +2,11 @@
pkgname=lua51-luasec
reverts=0.6_1
version=0.5.1
-revision=11
+revision=12
wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
build_style=gnu-makefile
hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
+makedepends="lua51-devel openssl-devel"
depends="lua51"
short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 84b4ae6cbd485be2d26ec9c4a728dff6959b839f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 168/453] lua52-luasec: rebuild against OpenSSL
---
srcpkgs/lua52-luasec/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
index 6267ba4997a..557292e03a9 100644
--- a/srcpkgs/lua52-luasec/template
+++ b/srcpkgs/lua52-luasec/template
@@ -1,11 +1,11 @@
# Template file for 'lua52-luasec'
pkgname=lua52-luasec
version=0.6
-revision=10
+revision=11
wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
build_style=gnu-makefile
hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
+makedepends="lua52-devel openssl-devel"
depends="lua52"
short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 06861ddfc52203091ac19b072fb1df43849fac84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 169/453] lua53-luasec: rebuild against OpenSSL
---
srcpkgs/lua53-luasec/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
index 16e685daf5a..6cb4c1993b8 100644
--- a/srcpkgs/lua53-luasec/template
+++ b/srcpkgs/lua53-luasec/template
@@ -1,13 +1,13 @@
# Template file for 'lua53-luasec'
pkgname=lua53-luasec
version=0.8.1
-revision=4
+revision=5
wrksrc="luasec-luasec-${version}"
build_style=gnu-makefile
make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
make_install_args="${make_build_args}"
hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
+makedepends="lua53-devel openssl-devel"
depends="lua53"
short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 8c6ebfcb5b95dd24dc284046740e50011452ad29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 170/453] lynx: rebuild against OpenSSL
---
srcpkgs/lynx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
_distver=2.8.9
_patchver=1
version="${_distver}.${_patchver}"
-revision=4
+revision=5
wrksrc="lynx${_distver}rel.${_patchver}"
build_style=gnu-configure
configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
short_desc="A text browser for the World Wide Web"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From 87a120d71332d3e93d0495d2b5062dae7610da42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 171/453] mailx: rebuild against OpenSSL
---
srcpkgs/mailx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
# Template file for 'mailx'
pkgname=mailx
version=12.5
-revision=24
+revision=25
patch_args="-Np1"
wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
conf_files="/etc/mailx.rc"
provides="mail-${version}_${revision}"
short_desc="Feature-rich BSD mail(1)"
From ea73ce883dab04454dfb98f50565cc2505e850b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 172/453] mairix: rebuild against OpenSSL
---
srcpkgs/mairix/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
# Template file for 'mairix'
pkgname=mairix
version=0.24
-revision=7
+revision=8
build_style=configure
configure_args="--prefix=/usr --mandir=/usr/share/man"
hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
short_desc="A program for indexing and searching emails"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
From 7334c801a30d830c4d264a3df1eb5da6f8440848 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 173/453] mariadb: rebuild against OpenSSL
---
srcpkgs/mariadb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template
index b55a0cd36a3..04a1719dcf3 100644
--- a/srcpkgs/mariadb/template
+++ b/srcpkgs/mariadb/template
@@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql
-DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql
-DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql
-DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql
- -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system
+ -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled
-DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO
-DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1
-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
-DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1
-DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1"
-hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel
+hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel
pkg-config"
-makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel
+makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel
libatomic-devel"
depends="mariadb-client"
short_desc="Fast SQL database server, drop-in replacement for MySQL"
From 4c060a3a2f82858c5e68582825159625271993ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 174/453] mbox: rebuild against OpenSSL
---
srcpkgs/mbox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
# Template file for 'mbox'
pkgname=mbox
version=0.0.0.140526
-revision=5
+revision=6
_commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
wrksrc="$pkgname-$_commit"
build_wrksrc=src
build_style=gnu-configure
hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="A lightweight sandbox tool for non-root users"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
From 79af8f3d499f5fd7a7591204d7de99b5475afa23 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 175/453] mbuffer: rebuild against OpenSSL
---
srcpkgs/mbuffer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
# Template file for 'mbuffer'
pkgname=mbuffer
version=20200929
-revision=1
+revision=2
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Buffer data streams with many additional functions"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
From 279da9ca702602d0d474a76af80c8ba37db03a16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 176/453] mdbook-linkcheck: rebuild against OpenSSL
---
srcpkgs/mdbook-linkcheck/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index 9c24020bfb4..35168db82f9 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
# New versions need to be tested for compatibility with mdBook
pkgname=mdbook-linkcheck
version=0.7.2
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Backend for mdBook which will check links for you"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
From 5dde6e7122e4715972e7de49597c418f40109bbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 177/453] mdcat: rebuild against OpenSSL
---
srcpkgs/mdcat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..53a60fe6701 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -6,7 +6,7 @@ revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cargo
hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Cat for markdown"
maintainer="Wilson Birney <wpb@360scada.com>"
license="MPL-2.0"
From 771e877950e2a4f895523528524a4f1006fe28b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 178/453] megatools: rebuild against OpenSSL
---
srcpkgs/megatools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
# Template file for 'megatools'
pkgname=megatools
version=1.10.3
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
short_desc="Command line client for Mega.nz file sharing service"
maintainer="RunningDroid <runningdroid@zoho.com>"
license="GPL-2.0-or-later"
From a73f534808a8d17f734c065549f9611156f263ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 179/453] mit-krb5: rebuild against OpenSSL
---
srcpkgs/mit-krb5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template
index 004e0e02dbe..fa18e58b733 100644
--- a/srcpkgs/mit-krb5/template
+++ b/srcpkgs/mit-krb5/template
@@ -3,7 +3,7 @@
# also update srcpkgs/libgssglue/files/gssapi_mech.conf
pkgname=mit-krb5
version=1.18.3
-revision=1
+revision=2
wrksrc="krb5-${version}"
build_style=gnu-configure
hostmakedepends="e2fsprogs-devel flex perl pkg-config"
From 5d3ec20f277ffccc84a228a4f598943412ff375a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 180/453] mixxx: rebuild against OpenSSL
---
srcpkgs/mixxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 7082db1b596..18cf683fcf5 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
# Template file for 'mixxx'
pkgname=mixxx
version=2.2.4
-revision=6
+revision=7
wrksrc="mixxx-release-${version}"
build_style=scons
hostmakedepends="pkg-config protobuf"
From 1cdfb1fc96877bca66ea171b5427fd8cbb45b1a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 181/453] monero: rebuild against OpenSSL
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index 76537f0e249..f72c1f945ff 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -12,7 +12,7 @@ make_dirs="
/var/lib/monero 0750 monero monero
/var/log/monero 0755 monero monero"
hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
readline-devel unbound-devel miniupnpc-devel expat-devel
cppzmq czmq-devel libsodium-devel"
short_desc="Private, secure, untraceable, decentralised digital currency"
From 1ab55cdc347b42de16e02bee3860ac33edbe6cd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 182/453] mongo-c-driver: rebuild against OpenSSL
---
srcpkgs/mongo-c-driver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..fa18e33e8fe 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
configure_args="-DENABLE_TESTS=OFF"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="High-performance MongoDB driver for C"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
From 7da50fb353ca676239a2b1a9e28971553c44c275 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 183/453] mongoose: rebuild against OpenSSL
---
srcpkgs/mongoose/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
# Template file for 'mongoose'
pkgname=mongoose
version=6.18
-revision=3
+revision=4
build_style=gnu-makefile
make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Easy to use Web server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From 8bba167697521d6243531f2176d023edc0edd330 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 184/453] monit: rebuild against OpenSSL
---
srcpkgs/monit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..f56ddc84772 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -9,7 +9,7 @@ configure_args="
libmonit_cv_vsnprintf_c99_conformant=yes"
conf_files="/etc/monitrc"
hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
short_desc="Utility for monitoring, processes, files, directories and devices"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="AGPL-3.0-only"
From 2f1a648862dbe791b071a06250da1cb005b2e0b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 185/453] monolith: rebuild against OpenSSL
---
srcpkgs/monolith/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
# Template file for 'monolith'
pkgname=monolith
version=2.4.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Save HTML pages with ease "
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Unlicense"
From 60af8a9a9f4269660d2c5989f97300d68ad73f84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 186/453] mosh: rebuild against OpenSSL
---
srcpkgs/mosh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index f3733d3fd84..34f3d46ecb7 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
# Template file for 'mosh'
pkgname=mosh
version=1.3.2
-revision=19
+revision=20
build_style=gnu-configure
hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
depends="perl-IO-Tty"
short_desc="Mobile shell, remote terminal application that allows roaming"
maintainer="Nathan Owens <ndowens04@gmail.com>"
From 49b2c04eada546b20a15942fd11f2be3276df603 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 187/453] mosquitto: rebuild against OpenSSL
---
srcpkgs/mosquitto/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
# Template file for 'mosquitto'
pkgname=mosquitto
version=1.6.3
-revision=4
+revision=5
build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
make_install_args="prefix=/usr"
make_check_target=test
conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
checkdepends="python bcunit-devel"
short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
From d6edda699e2e2eabe01b8f192ff5bc109a67f8e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 188/453] mtd-utils: rebuild against OpenSSL
---
srcpkgs/mtd-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
# Template file for 'mtd-utils'
pkgname=mtd-utils
version=2.1.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf automake libtool pkg-config"
makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
short_desc="Memory Technology Device Utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 88447c2d0dced260247e3aebc04adff2566468f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 189/453] mtree: rebuild against OpenSSL
---
srcpkgs/mtree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
# Template file for 'mtree'
pkgname=mtree
version=1.0.4
-revision=6
+revision=7
wrksrc="${pkgname}-port-${version}"
build_style=gnu-configure
hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Utility for creating and verifying file hierarchies"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From 23d647caf668024b62be16ca4d728b1ef122c079 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 190/453] mtxclient: rebuild against OpenSSL
---
srcpkgs/mtxclient/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.3.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
short_desc="Client API library for the Matrix protocol"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="MIT"
From 242e96632288a9ef13dfe43a778b91e96318a97e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 191/453] muchsync: rebuild against OpenSSL
---
srcpkgs/muchsync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
# Template file for 'muchsync'
pkgname=muchsync
version=6
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
depends="openssh notmuch"
short_desc="Synchronize notmuch mail across machines"
maintainer="Anjandev Momi <anjan@momi.ca>"
From bff357ae8858743fb6d8ecf5e9865f3e721dfaf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 192/453] mumble: rebuild against OpenSSL
---
srcpkgs/mumble/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index f60bf7310cf..cb155ffea3a 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
speech-dispatcher-devel speex-devel portaudio-devel"
depends="desktop-file-utils qt5-plugin-sqlite"
From afe06e23414f308732d296eb688b0a3a2e181742 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 193/453] munge: rebuild against OpenSSL
---
srcpkgs/munge/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
# Template file for 'munge'
pkgname=munge
version=0.5.14
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-crypto-lib=openssl
--with-openssl-prefix=${XBPS_CROSS_BASE}/usr
x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
depends="shadow"
short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
maintainer="pulux <pulux@pf4sh.de>"
From 6991acb605efe131739220bcc9212cbdb10159b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 194/453] mupdf: rebuild against OpenSSL
---
srcpkgs/mupdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
# Template file for 'mupdf'
pkgname=mupdf
version=1.18.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}-source"
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
From 4653c86d2097d6b3f1adb760484bd867a340316e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 195/453] mutt: rebuild against OpenSSL
---
srcpkgs/mutt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..39bf0a5dd1f 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
--with-gdbm=${XBPS_CROSS_BASE}/usr"
conf_files="/etc/${pkgname}/Muttrc"
hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
ncurses-devel"
depends="cyrus-sasl-modules mime-types"
short_desc="Mutt Mail Client"
From 55d33c61097311290362b83377507a749c88d6f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 196/453] namecoin: rebuild against OpenSSL
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=4
+revision=5
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 5d3cf6648bd38fde22bdd82092a9bd73261c756d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 197/453] nasa-wallpaper: rebuild against OpenSSL
---
srcpkgs/nasa-wallpaper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
# Template file for 'nasa-wallpaper'
pkgname=nasa-wallpaper
version=2.0
-revision=2
+revision=3
build_style="cargo"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Change your desktop background with a NASA image"
maintainer="Lugubris <lugubris@disroot.org>"
license="Apache-2.0"
From 6594a6c6c8da89726275c77edb42330b754164dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 198/453] neomutt: rebuild against OpenSSL
---
srcpkgs/neomutt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index 786c88fab1d..4ac918f807e 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
# Template file for 'neomutt'
pkgname=neomutt
version=20201120
-revision=1
+revision=2
wrksrc="neomutt-${version}"
create_wrksrc=true
build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
depends="mime-types"
short_desc="Mutt with misc fixes and feature patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From c0be04044637f7295599e230c5fde02c71e40012 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 199/453] neon: rebuild against OpenSSL
---
srcpkgs/neon/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index ae99ef69353..8367a705e0b 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,12 +1,12 @@
# Template file for 'neon'
pkgname=neon
version=0.31.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-expat --with-ssl=openssl --enable-shared
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
hostmakedepends="pkg-config"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
depends="ca-certificates"
short_desc="HTTP and WebDAV client library, with a C interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 52dcb06e0d1031f53fb12d349c96ab2161eb2510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 200/453] net-snmp: rebuild against OpenSSL
---
srcpkgs/net-snmp/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template
index b5c06106fb2..3abdceb0eca 100644
--- a/srcpkgs/net-snmp/template
+++ b/srcpkgs/net-snmp/template
@@ -1,9 +1,9 @@
# Template file for 'net-snmp'
pkgname=net-snmp
version=5.9
-revision=1
+revision=2
hostmakedepends="pkg-config unzip"
-makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel
+makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel
libsensors-devel pcre-devel"
short_desc="Simple Network Management Protocol (SNMP) suite"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -44,7 +44,7 @@ libnet-snmp_package() {
}
net-snmp-devel_package() {
- depends="libnet-snmp>=${version}_${revision} libressl-devel"
+ depends="libnet-snmp>=${version}_${revision} openssl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/net-snmp-config
From f56a9d7f21f55f1fa01b28495314ebfaaf598c96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 201/453] netdata: rebuild against OpenSSL
---
srcpkgs/netdata/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
# Template file for 'netdata'
pkgname=netdata
version=1.28.0
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=gnu-configure
configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
hostmakedepends="pkg-config autoconf automake"
makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
depends="libcap-progs"
short_desc="Real-time performance monitoring, done right"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
From c89892c6c88aefb6e58399056bb41626584f38d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 202/453] netpgp: rebuild against OpenSSL
---
srcpkgs/netpgp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..3ef9867c3a8 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
# Template file for 'netpgp'
pkgname=netpgp
version=20140220
-revision=18
+revision=19
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
short_desc="PGP signing, verification, encryption and decryption program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="3-clause-BSD"
From b0e2b0ae78c6530967e0af1d3f5bd0c9ecb1ba7d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 203/453] netsurf: rebuild against OpenSSL
---
srcpkgs/netsurf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
# Template file for 'netsurf'
pkgname=netsurf
version=3.10
-revision=2
+revision=3
build_style=gnu-makefile
make_use_env=yes
make_build_args="
From f69e86203ce84323cbf6975f3098aae380fa6d95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 204/453] network-ups-tools: rebuild against OpenSSL
---
srcpkgs/network-ups-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
# Template file for 'network-ups-tools'
pkgname=network-ups-tools
version=2.7.4
-revision=11
+revision=12
wrksrc="nut-${version}"
build_style=gnu-configure
configure_args="
@@ -11,7 +11,7 @@ configure_args="
--with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
--with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
conf_files="
/etc/ups/ups.conf
From cda996332a38767b9f7375af0ba5e862b96533fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 205/453] nextcloud-client: rebuild against OpenSSL
---
srcpkgs/nextcloud-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index dc4398a6319..9969e062461 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
# Template file for 'nextcloud-client'
pkgname=nextcloud-client
version=3.1.1
-revision=1
+revision=2
wrksrc="desktop-${version}"
build_style=cmake
configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True')
From 99dabc347d0b07dfaab8d8e39a1357f924b4c9a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 206/453] nghttp2: rebuild against OpenSSL
---
srcpkgs/nghttp2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template
index 6df92fef8f3..8967d79b244 100644
--- a/srcpkgs/nghttp2/template
+++ b/srcpkgs/nghttp2/template
@@ -1,10 +1,10 @@
# Template file for 'nghttp2'
pkgname=nghttp2
version=1.42.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel libevent-devel jansson-devel
+makedepends="zlib-devel openssl-devel libevent-devel jansson-devel
libev-devel c-ares-devel"
checkdepends="libcppunit-devel"
short_desc="HTTP/2 C Library"
From 5de9352c59d7b928990df21942955fb8c504e443 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 207/453] nginx: rebuild against OpenSSL
---
srcpkgs/nginx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index e05fae00b8d..786d3992ce7 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -2,9 +2,9 @@
pkgname=nginx
reverts="1.17.7_1"
version=1.18.0
-revision=2
+revision=3
build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
makedepends="${hostmakedepends}"
short_desc="High performance web and reverse proxy server"
maintainer="Orphaned <orphan@voidlinux.org>"
From d4e8428d59253069ae098e48307edd340474e6e8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 208/453] ngircd: rebuild against OpenSSL
---
srcpkgs/ngircd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
conf_files="/etc/ngircd.conf"
short_desc="Free, portable and lightweight Internet Relay Chat server"
maintainer="Orphaned <orphan@voidlinux.org>"
From 75bb08a3e4af9d695c90bac6c498a4144231dd84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 209/453] nix: rebuild against OpenSSL
---
srcpkgs/nix/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
# Template file for 'nix'
pkgname=nix
version=2.3.9
-revision=1
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
hostmakedepends="curl pkg-config flex tar xz"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel"
depends="curl tar xz"
short_desc="Purely functional package manager"
From c64729103ed2eb302ad192d8c7cad1ab1b196da3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 210/453] nmap: rebuild against OpenSSL
---
srcpkgs/nmap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..a261abe69ea 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -6,7 +6,7 @@ revision=5
build_style=gnu-configure
configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
$(vopt_if lua lua53-devel)"
short_desc="Utility for network discovery and security auditing"
maintainer="Piraty <piraty1@inbox.ru>"
From b6734dad2e07d11d3e533f701ad2b3de1d16af21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 211/453] nmh: rebuild against OpenSSL
---
srcpkgs/nmh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
# Template file for 'nmh'
pkgname=nmh
version=1.7.1
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
checkdepends="groff lynx tzdata tar"
conf_files="/etc/nmh/*"
short_desc="Message Handling System (New RAND Mail Handler)"
From efab269a0b9de9342120343009ff573abce3aa65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 212/453] nrpe: rebuild against OpenSSL
---
srcpkgs/nrpe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
# Template file for 'nrpe'
pkgname=nrpe
version=4.0.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-pkgsysconfdir=/etc/nagios
--with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
--with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
make_build_args="nrpe"
make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="monitoring-plugins"
make_dirs="/etc/nagios 0775 _nagios _nagios"
conf_files="/etc/nagios/nrpe.cfg"
From f08dc916d3a45117634586a228908441dc6a28bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 213/453] ntp: rebuild against OpenSSL
---
srcpkgs/ntp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
short_desc="Network Time Protocol daemon and utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="NTP"
From 670c1f59730e766359313feec3aad91894cfe6f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 214/453] nushell: rebuild against OpenSSL
---
srcpkgs/nushell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index 843eda01b71..80356e21d42 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,7 +1,7 @@
# Template file for 'nushell'
pkgname=nushell
version=0.21.0
-revision=1
+revision=2
# raw-cpuid does not support other archs
# https://github.com/nushell/nushell/issues/485
# remove when the issue is fixed (should fix all archs)
@@ -9,7 +9,7 @@ archs="x86_64* i686*"
wrksrc="nu-${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Modern shell for the GitHub era"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
From 4a894763fabe774b7524ed46b8addf2b511c8ad9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 215/453] nzbget: rebuild against OpenSSL
---
srcpkgs/nzbget/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
# Template file for 'nzbget'
pkgname=nzbget
version=21.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tlslib=OpenSSL
--with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
--with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
--with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
short_desc="Download from Usenet using .nzb files"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From 31ec87e48b41d095396b9cefad4eea22c0f034c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 216/453] open-iscsi: rebuild against OpenSSL
---
srcpkgs/open-iscsi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
# Template file for 'open-iscsi'
pkgname=open-iscsi
version=2.1.3
-revision=1
+revision=2
conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
short_desc="Open-iSCSI userland tools"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From 04a1bcb1b2c94b0b615761376b8c0c043d49bf77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 217/453] open-isns: rebuild against OpenSSL
---
srcpkgs/open-isns/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..2d7a0ddbef9 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -4,7 +4,7 @@ version=0.101
revision=1
build_style=gnu-configure
configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
short_desc="Server and client for iSNS"
From addd39862798743246fe1d02f900652e0baa66b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 218/453] opendkim: rebuild against OpenSSL
---
.../patches/openssl_1.1.0_compat.patch | 90 +++++++++++++++++++
srcpkgs/opendkim/template | 10 ++-
2 files changed, 97 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+ * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+ - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ AC_MSG_ERROR([libcrypto not found]))
+
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- [
+- if test x"$enable_shared" = x"yes"
+- then
+- AC_MSG_ERROR([Cannot build shared opendkim
+- against static openssl libraries.
+- Configure with --disable-shared
+- to get this working or obtain a
+- shared libssl library for
+- opendkim to use.])
+- fi
+
+- # avoid caching issue - last result of SSL_library_init
+- # shouldn't be cached for this next check
+- unset ac_cv_search_SSL_library_init
+- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- AC_MSG_ERROR([libssl not found]), [-ldl])
+- ]
+- )
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [od_have_ossl="yes";],
++ [od_have_ossl="no";])
++ if test x"$od_have_ossl" = x"no"
++ then
++ if test x"$enable_shared" = x"yes"
++ then
++ AC_MSG_ERROR([Cannot build shared opendkim
++ against static openssl libraries.
++ Configure with --disable-shared
++ to get this working or obtain a
++ shared libssl library for
++ opendkim to use.])
++ fi
++
++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++ AC_MSG_ERROR([libssl not found]), [-ldl])
++ fi
+
+ AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+ AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ {
+ assert(pthread_setspecific(id_key, ptr) == 0);
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ ERR_remove_state(0);
++#endif
+
+ free(ptr);
+
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ if (crypto_init_done)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ CRYPTO_cleanup_all_ex_data();
+ CONF_modules_free();
+ EVP_cleanup();
+ ERR_free_strings();
+ ERR_remove_state(0);
++#endif
+
+ if (nmutexes > 0)
+ {
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
# Template file for 'opendkim'
pkgname=opendkim
version=2.10.3
-revision=11
+revision=12
build_style=gnu-configure
configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
short_desc="DKIM library"
maintainer="John Regan <john@jrjrtech.com>"
license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
python_version=2 #unverified
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vlicense LICENSE
vlicense LICENSE.Sendmail
From aa4f9b10d3c17bf50a012b0e06f82f8cb5d0e77a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 219/453] openfortivpn: rebuild against OpenSSL
---
srcpkgs/openfortivpn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 9369b4c5a6f..5a50ab3f5c2 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
# Template file for 'openfortivpn'
pkgname=openfortivpn
version=1.15.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--enable-proc
@@ -11,7 +11,7 @@ configure_args="
--with-resolvconf=/usr/bin/resolvconf
--with-rt_dst"
hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Client for PPP+SSL VPN tunnel services"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
From eea57a919fa22fd0ac21e9ed1bc4af23adb6288c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 220/453] openldap: rebuild against OpenSSL
---
srcpkgs/openldap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template
index ce708074fbc..5b47c649eaf 100644
--- a/srcpkgs/openldap/template
+++ b/srcpkgs/openldap/template
@@ -1,7 +1,7 @@
# Template file for 'openldap'
pkgname=openldap
version=2.4.52
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--prefix=/usr
--libexecdir=/usr/libexec
@@ -14,7 +14,7 @@ configure_args="--prefix=/usr
--enable-bdb --enable-hdb --enable-overlays=mod
--disable-static --with-yielding_select=yes --enable-modules"
hostmakedepends="pkg-config groff automake libtool"
-makedepends="libressl-devel libsasl-devel db-devel libltdl-devel"
+makedepends="openssl-devel libsasl-devel db-devel libltdl-devel"
depends="openldap-tools>=${version}_${revision}"
conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf"
short_desc="OpenLDAP (Lightweight Directory Access Protocol)"
From 1c20177c8d2974ab3c4f971beb3e81201388a697 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 221/453] opensc: rebuild against OpenSSL
---
srcpkgs/opensc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
# Template file for 'opensc'
pkgname=opensc
version=0.21.0
-revision=1
+revision=2
wrksrc="OpenSC-${version}"
build_style=gnu-configure
configure_args="--enable-man --enable-sm --enable-static=no --enable-doc
--with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
short_desc="Tools and libraries for smart cards"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 45e5fc7fa8a8dbb0d120a419572fe089f5e7680d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 222/453] opensmtpd: rebuild against OpenSSL
---
srcpkgs/opensmtpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..b582821ccee 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
# Template file for 'opensmtpd'
pkgname=opensmtpd
version=6.8.0p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
--with-path-socket=/run --with-path-pidfile=/run
@@ -19,7 +19,7 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
ac_cv_func_strlcat=no
ac_cv_func_strlcpy=no"
hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
depends="ca-certificates"
conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
short_desc="Free implementation of the server-side SMTP protocol"
From 8ac58cb977be2ea0c4d47228ca15d38295bf9db4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 223/453] openssh: rebuild against OpenSSL
---
srcpkgs/openssh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..71d85964fbf 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
hostmakedepends="automake"
makedepends="libedit-devel pam-devel zlib-devel
$(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause, ISC"
From 1833e5df88936b7889bd130bc71297a059f384cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 224/453] openvswitch: rebuild against OpenSSL
---
srcpkgs/openvswitch/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..a4a0b541ed9 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-rundir=/run/openvswitch"
pycompile_dirs="usr/share/openvswitch/python"
hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
depends="python"
short_desc="Production quality, multilayer virtual switch"
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
From ad62913834c7978708a4cfe467e48215054e710c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 225/453] opkg: rebuild against OpenSSL
---
srcpkgs/opkg/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
# Template file for 'opkg'
pkgname=opkg
version=0.4.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
$(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"
From 0c3bbc6909688bf50299cd9e450053161545d623 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 226/453] opmsg: rebuild against OpenSSL
---
srcpkgs/opmsg/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..dc1552b8fb8 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
# Template file for 'opmsg'
pkgname=opmsg
version=1.78s
-revision=3
+revision=4
wrksrc="${pkgname}-rel-${version}"
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
maintainer="travankor <travankor@tuta.io>"
license="GPL-3.0-or-later"
From 8ec1f7faca94a44f36561f5d0fca3daf8023af2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 227/453] opusfile: rebuild against OpenSSL
---
srcpkgs/opusfile/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
# Template file for 'opusfile'
pkgname=opusfile
version=0.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
short_desc="Library for opening, seeking, and decoding .opus files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From b9e034d183bf44e8d4b3530425e376bcffad57cb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 228/453] pacman: rebuild against OpenSSL
---
srcpkgs/pacman/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=1
+revision=2
make_dirs="/var/lib/pacman 0755 root root
/usr/var/cache/pacman/pkg 0755 root root
/usr/share/libalpm/hooks 0755 root root"
From 1a09a7c6578a7029c713b36a30748f93f0af53a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 229/453] pam-u2f: rebuild against OpenSSL
---
srcpkgs/pam-u2f/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
# Template file for 'pam-u2f'
pkgname=pam-u2f
version=1.1.0
-revision=1
+revision=2
wrksrc="${pkgname/-/_}-${version}"
build_style=gnu-configure
configure_args="--with-pam-dir=/usr/lib/security"
hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
short_desc="Pluggable Authentication Module (PAM) for U2F"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD-2-Clause"
From 4f7dc330ccdeda51df500332c8651bb915ec85de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 230/453] pam_ssh: rebuild against OpenSSL
---
srcpkgs/pam_ssh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
# Template file for 'pam_ssh'
pkgname=pam_ssh
version=2.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
--includedir=${XBPS_CROSS_BASE}/usr/include
--libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
short_desc="PAM module providing single sign-on behavior for SSH"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="BSD-2-Clause"
From 3e3332f72a2f30b4e3ec5af43890468187573c10 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 231/453] pam_ssh_agent_auth: rebuild against OpenSSL
---
srcpkgs/pam_ssh_agent_auth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..a4e09ed9584 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,10 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
short_desc="PAM module providing authentication through a ssh agent"
maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
license="MIT"
From bc6f7eeceb32dacaf7f4e918d8ab91033e319f73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 232/453] partclone: rebuild against OpenSSL
---
srcpkgs/partclone/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
# Template file for 'partclone'
pkgname=partclone
version=0.3.17
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
--enable-extfs --enable-hfsp --enable-fat --enable-exfat
--enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
hostmakedepends="pkg-config automake autoconf libtool"
makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
short_desc="File system clone and restore utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 28fa31e04f85390ff906f7f464d66b6c16d37bf4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 233/453] pen: rebuild against OpenSSL
---
srcpkgs/pen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
# Template file for 'pen'
pkgname=pen
version=0.34.1
-revision=5
+revision=6
build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
configure_args="--with-docdir=/usr/share/doc/pen"
short_desc="Load balancer for simple TCP/UDP based protocols"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8a69c0b0e774f6ae1e15eee314239fca753c845b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 234/453] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL
---
srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Crypt-OpenSSL-Bignum'
pkgname=perl-Crypt-OpenSSL-Bignum
version=0.09
-revision=11
+revision=12
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
depends="${hostmakedepends}"
short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9f3c33d8c77d6ff3e900e2ab3d310a6d0e34e2df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 235/453] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL
---
srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Crypt-OpenSSL-RSA'
pkgname=perl-Crypt-OpenSSL-RSA
version=0.31
-revision=6
+revision=7
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
depends="perl"
checkdepends="perl-Crypt-OpenSSL-Random"
short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"
From 7d594b5a436c77460b056e7e5f5d0692b30498dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 236/453] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL
---
srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Crypt-OpenSSL-Random'
pkgname=perl-Crypt-OpenSSL-Random
version=0.15
-revision=9
+revision=10
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
depends="perl"
short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
maintainer="Kevin Berry <kevin@opensourcealchemist.com>"
From b18a65c9e49bcd6dc457b8cd8f4e906508e53ce1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 237/453] perl-DBD-mysql: rebuild against OpenSSL
---
srcpkgs/perl-DBD-mysql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..0f2f563136f 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -5,7 +5,7 @@ revision=6
wrksrc="DBD-mysql-${version}"
build_style=perl-module
hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
depends="perl-DBI"
checkdepends="perl-Test-Deep"
short_desc="DBD::mysql - MySQL DBI driver"
From 874f7375c92bb0443b507100e0b7750011244b49 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 238/453] perl-Net-SSH2: rebuild against OpenSSL
---
srcpkgs/perl-Net-SSH2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Net-SSH2'
pkgname=perl-Net-SSH2
version=0.72
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"
From 0c7e007f5300765dbbc71fe9c461cbdb69938544 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 239/453] perl-Net-SSLeay: rebuild against OpenSSL
---
srcpkgs/perl-Net-SSLeay/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..0170dffa670 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -4,8 +4,8 @@ version=1.90
revision=1
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
depends="perl"
checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
short_desc="Net::SSLeay - Perl extension for using OpenSSL"
From df324c727868d6970b19997488d71b7661f4ada7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 240/453] pev: rebuild against OpenSSL
---
srcpkgs/pev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 54138734945..9e3fc294bdf 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,12 +1,12 @@
# Template file for 'pev'
pkgname=pev
version=0.80
-revision=9
+revision=10
wrksrc=${pkgname}
build_style=gnu-makefile
make_build_args="prefix=/usr sysconfdir=/etc"
make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
# We don't need python for check, only their PE binary is needed
checkdepends="which python3"
short_desc="PE file analysis toolkit"
From 823fbde7cdff462059b0b5efcc1b5ca1e560fc67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 241/453] pgadmin3: rebuild against OpenSSL
---
srcpkgs/pgadmin3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..7c63e3bc5e3 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,10 @@
# Template file for 'pgadmin3'
pkgname=pgadmin3
version=1.22.2
-revision=13
+revision=14
build_style=gnu-configure
configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel openssl-devel"
short_desc="Comprehensive design and management interface for PostgreSQL"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="0BSD"
From 333db67a1f482391e6ec8a7daa86e09e89acb159 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 242/453] pgbackrest: rebuild against OpenSSL
---
srcpkgs/pgbackrest/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
# Template file for 'pgbackrest'
pkgname=pgbackrest
version=2.26
-revision=2
+revision=3
wrksrc="${pkgname}-release-${version}"
build_wrksrc="src"
build_style=gnu-configure
hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
short_desc="Reliable PostgreSQL Backup & Restore"
maintainer="Anachron <gith@cron.world>"
license="MIT"
From cd86af62e30e22b95425f84aaf24f19a783e7adb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 243/453] pidgin-sipe: rebuild against OpenSSL
---
srcpkgs/pidgin-sipe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
# Template file for 'pidgin-sipe'
pkgname=pidgin-sipe
version=1.25.0
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
libnice-devel gst-plugins-base1-devel farstream-devel"
depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
short_desc="SIP/SIMPLE plugin for Pidgin IM"
From 2342c6cc8bd6ebeaef0945c4b2275a150340b3d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 244/453] pijul: rebuild against OpenSSL
---
srcpkgs/pijul/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 6287895016a..e980c418741 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,10 +1,10 @@
# Template file for 'pijul'
pkgname=pijul
version=0.12.2
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-only"
From 777c56aea2aa74eba39a580c61d3484fa50f6b37 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 245/453] pjproject: rebuild against OpenSSL
---
srcpkgs/pjproject/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
# and this template is heavily based on Alpine's APKBUILD.
pkgname=pjproject
version=2.8
-revision=4
+revision=5
disable_parallel_build=yes
build_style=gnu-configure
configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
# libyuv packaged for Void. Thought I could be smart and use
# webrtc-audio-processing, but it doesn't have what I need. Using the
# bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
libsrtp-devel libsamplerate-devel"
short_desc="Open source SIP and media stack"
maintainer="Christopher Brannon <chris@the-brannons.com>"
From b878cdd7495455c5bd65ea36136be78136645d5f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 246/453] pkcs11-helper: rebuild against OpenSSL
---
srcpkgs/pkcs11-helper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
# Template file for 'pkcs11-helper'
pkgname=pkcs11-helper
version=1.25.1
-revision=5
+revision=6
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Library to help simplify interacting with PKCS#11 providers"
maintainer="Aloz1 <kno0001@gmail.com>"
license="GPL-2.0-only, BSD-3-Clause"
From 921db1a3c012255c498780c788bfac8926da5cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 247/453] poco: rebuild against OpenSSL
---
srcpkgs/poco/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..ce317d041bc 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
# Template file for 'poco'
pkgname=poco
version=1.9.4
-revision=2
+revision=3
wrksrc="${pkgname}-${version}-all"
build_style=cmake
configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
short_desc="C++ class libraries for building network-based applications"
maintainer="Julien Dehos <dehos@univ-littoral.fr>"
license="BSL-1.0"
From 881a6ba81616331c12fe569c8de3405c0629542c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 248/453] podofo: rebuild against OpenSSL
---
srcpkgs/podofo/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template
index b0ed2e0e19c..9bb66cbf8e1 100644
--- a/srcpkgs/podofo/template
+++ b/srcpkgs/podofo/template
@@ -4,7 +4,7 @@ version=0.9.7
revision=1
build_style=cmake
configure_args="-DPODOFO_BUILD_SHARED=TRUE"
-makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel"
+makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel"
short_desc="Library to work with the PDF file format"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
From 9d403ad872c8bd91f72c5faf7ae217213ec9ee7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 249/453] postgresql: rebuild against OpenSSL
---
srcpkgs/postgresql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql'
pkgname=postgresql
version=9.6.20
-revision=1
+revision=2
build_style=gnu-configure
make_build_target=world
configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
--without-bonjour --with-libxml --with-libxslt --disable-rpath
--with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
python-devel readline-devel tcl-devel"
checkdepends="tzdata"
short_desc="Sophisticated open-source Object-Relational DBMS"
From 821fe35485c73b4527954d119501143050c07e58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 250/453] postgresql12: rebuild against OpenSSL
---
srcpkgs/postgresql12/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..59d1185c889 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
--without-bonjour --with-libxml --with-libxslt
--with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
python3-devel readline-devel tcl-devel"
checkdepends="tzdata"
short_desc="Sophisticated open-source Object-Relational DBMS"
From 9ec0df61f674329c100968617e6d01c069af78ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 251/453] postgresql13: rebuild against OpenSSL
---
srcpkgs/postgresql13/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index 82ee631a17b..b462d69f279 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
--without-bonjour --with-libxml --with-libxslt
--with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
python3-devel readline-devel tcl-devel"
checkdepends="tzdata"
short_desc="Sophisticated open-source Object-Relational DBMS"
From c8e0442e614c0a43f160bef8a18d90c1572178c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 252/453] ppp: rebuild against OpenSSL
---
srcpkgs/ppp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template
index 64a484a6fc7..5986bd713fd 100644
--- a/srcpkgs/ppp/template
+++ b/srcpkgs/ppp/template
@@ -6,8 +6,8 @@
# When update this package
pkgname=ppp
version=2.4.7
-revision=13
-makedepends="libpcap-devel libressl-devel"
+revision=14
+makedepends="libpcap-devel openssl-devel"
short_desc="PPP (Point-to-Point Protocol) daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain"
From 2c5c731e57285a4eb41a404610377fb33adcc17f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 253/453] prosody: rebuild against OpenSSL
---
srcpkgs/prosody/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 1dbecd585f6..d88227f3b70 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
# Template file for 'prosody'
pkgname=prosody
version=0.11.7
-revision=1
+revision=2
build_style=configure
configure_args="
--ostype=linux
@@ -19,7 +19,7 @@ conf_files="
/etc/prosody/certs/makefile
/etc/prosody/certs/GNUmakefile"
make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
lua51-BitOp"
short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
From 68057d16ef0948162e435e0d7c401a95e6c3aae4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 254/453] pulseaudio: rebuild against OpenSSL
---
srcpkgs/pulseaudio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template
index d54b9c5ba69..9ed82a4a85b 100644
--- a/srcpkgs/pulseaudio/template
+++ b/srcpkgs/pulseaudio/template
@@ -1,7 +1,7 @@
# Template file for 'pulseaudio'
pkgname=pulseaudio
version=14.0
-revision=3
+revision=4
build_style=meson
configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
-Dgtk=disabled -Dsystemd=disabled -Dwebrtc-aec=enabled
@@ -11,7 +11,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled
hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config"
makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel
libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel
- libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel
+ libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel
libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel
webrtc-audio-processing-devel xcb-util-devel check-devel"
depends="rtkit"
From 707dfa9828e2a886fee9917827904f8a64c738f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 255/453] python: rebuild against OpenSSL
---
srcpkgs/python/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python/template b/srcpkgs/python/template
index 4498f6fc67c..fc52e87228e 100644
--- a/srcpkgs/python/template
+++ b/srcpkgs/python/template
@@ -4,11 +4,11 @@
#
pkgname=python
version=2.7.18
-revision=2
+revision=3
wrksrc="Python-${version}"
pycompile_dirs="usr/lib/python2.7"
hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
sqlite-devel bzip2-devel zlib-devel"
depends="ca-certificates"
short_desc="Interpreted, interactive, object-oriented programming language"
From f806364ca111d0efdc17daee46102be1ceb04159 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 256/453] python-M2Crypto: rebuild against OpenSSL
---
srcpkgs/python-M2Crypto/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template
index 7a85be3041a..4c684d18f57 100644
--- a/srcpkgs/python-M2Crypto/template
+++ b/srcpkgs/python-M2Crypto/template
@@ -1,12 +1,12 @@
# Template file for 'python-M2Crypto'
pkgname=python-M2Crypto
version=0.35.2
-revision=5
+revision=6
wrksrc="M2Crypto-${version}"
build_style=python-module
pycompile_module="M2Crypto"
-hostmakedepends="python-setuptools python3-setuptools swig libressl-devel"
-makedepends="libressl-devel python-devel python3-devel"
+hostmakedepends="python-setuptools python3-setuptools swig openssl-devel"
+makedepends="openssl-devel python-devel python3-devel"
depends="python-typing"
short_desc="Python2 crypto and SSL toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
From d809264c74d6d1488d33f1fa00f4082439f328a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 257/453] python-cryptography: rebuild against OpenSSL
---
srcpkgs/python-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..b9801c3c409 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -4,9 +4,9 @@ version=3.3.2
revision=1
wrksrc="cryptography-${version}"
build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
checkdepends="python-cryptography_vectors python-hypothesis python-pretend
python-pytest python-pytz python-iso8601 ${depends}"
From e51b32d263afedc936ed18e1a32f4ebd22c40dc0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 258/453] python3: rebuild against OpenSSL
---
srcpkgs/python3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index cce59898a92..85e1e07fe96 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -4,11 +4,11 @@
#
pkgname=python3
version=3.9.1
-revision=1
+revision=2
wrksrc="Python-${version}"
pycompile_dirs="usr/lib/python${version%.*}"
hostmakedepends="pkgconf"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
depends="ca-certificates"
checkdepends="$depends iana-etc"
From 147c44c690354904ef601fbe5d654b7f13e96658 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 259/453] python3-curl: rebuild against OpenSSL
---
srcpkgs/python3-curl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
# Template file for 'python3-curl'
pkgname=python3-curl
version=7.43.0.3
-revision=9
+revision=10
wrksrc="pycurl-${version}"
build_style=python3-module
hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
short_desc="Python3 interface to cURL library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MIT"
From fedde801d6a6b6b159537a48d15d313be5e1385e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 260/453] python3-scrypt: rebuild against OpenSSL
---
srcpkgs/python3-scrypt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
# Template file for 'python3-scrypt'
pkgname=python3-scrypt
version=0.8.17
-revision=2
+revision=3
wrksrc="scrypt-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
short_desc="Python 3 bindings for the scrypt key derivation function"
maintainer="projectmoon <projectmoon@agnos.is>"
license="BSD-2-Clause"
From 3905c4a1b646c5fa4600dfcb60824057de73adb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 261/453] qca-qt5: rebuild against OpenSSL
---
srcpkgs/qca-qt5/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
# Template file for 'qca-qt5'
pkgname=qca-qt5
version=2.3.1
-revision=1
+revision=2
wrksrc="${pkgname%-*}-${version}"
build_style=cmake
configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
-DUSE_RELATIVE_PATHS=true"
hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
depends="ca-certificates"
short_desc="Qt5 Cryptographic Architecture"
maintainer="John <me@johnnynator.dev>"
From 97e93d9bd9587de81f2e3ec3b9110c8acf90c1f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 262/453] qingy: rebuild against OpenSSL
---
srcpkgs/qingy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..7db124b0e58 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,10 +1,10 @@
# Template file for 'qingy'
pkgname=qingy
version=1.0.0
-revision=28
+revision=29
lib32disabled=yes
build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel openssl-devel
$(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
$(vopt_enable pam) $(vopt_enable x11 x-support)"
From 5f8b4398887400f9634323791625177610f21679 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 263/453] qt5: rebuild against OpenSSL
---
.../patches/qtnetwork-5.15.0-libressl.patch | 420 ------------------
srcpkgs/qt5/template | 9 +-
2 files changed, 6 insertions(+), 423 deletions(-)
delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
deleted file mode 100644
index 997e68156c6..00000000000
--- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Wed, 5 Feb 2020 03:49:35 +0200
-Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support
-
-Upstream-Status: Inappropriate
-[Upstream is not willing to accept any patches for LibreSSL support]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- src/network/ssl/qsslcertificate_openssl.cpp | 2 +-
- src/network/ssl/qsslcontext_openssl.cpp | 19 +++++++-
- src/network/ssl/qsslcontext_openssl_p.h | 7 +++
- src/network/ssl/qsslkey_openssl.cpp | 2 +-
- src/network/ssl/qsslsocket_openssl.cpp | 2 +-
- .../ssl/qsslsocket_openssl_symbols.cpp | 37 ++++++++++++++-
- .../ssl/qsslsocket_openssl_symbols_p.h | 45 ++++++++++++++++++-
- 7 files changed, 107 insertions(+), 7 deletions(-)
-
-diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-index ca9d61ccb1..19774432ce 100644
---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp
-@@ -661,7 +661,7 @@ static QMultiMap<QByteArray, QString> _q_mapFromX509Name(X509_NAME *name)
- unsigned char *data = nullptr;
- int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
- info.insert(name, QString::fromUtf8((char*)data, size));
--#if QT_CONFIG(opensslv11)
-+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER)
- q_CRYPTO_free(data, nullptr, 0);
- #else
- q_CRYPTO_free(data);
-diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp
-index c9f202f573..2ecdbbb7e5 100644
---- qtbase/src/network/ssl/qsslcontext_openssl.cpp
-+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp
-@@ -351,9 +351,11 @@ init_context:
- return;
- }
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- // A nasty hacked OpenSSL using a level that will make our auto-tests fail:
- if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel())
- q_SSL_CTX_set_security_level(sslContext->ctx, 1);
-+#endif
-
- const long anyVersion =
- #if QT_CONFIG(dtls)
-@@ -408,16 +410,28 @@ init_context:
- maxVersion = DTLS1_VERSION;
- break;
- case QSsl::DtlsV1_0OrLater:
-+#ifdef DTLS_MAX_VERSION
- minVersion = DTLS1_VERSION;
- maxVersion = DTLS_MAX_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS_MAX_VERSION
- break;
- case QSsl::DtlsV1_2:
-+#ifdef DTLS1_2_VERSION
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS1_2_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION
- break;
- case QSsl::DtlsV1_2OrLater:
-+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION)
- minVersion = DTLS1_2_VERSION;
- maxVersion = DTLS_MAX_VERSION;
-+#else
-+ Q_UNREACHABLE();
-+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION
- break;
- case QSsl::TlsV1_3OrLater:
- #ifdef TLS1_3_VERSION
-@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
- }
- #endif // ocsp
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
- if (cctx) {
- q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
-@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext)
- sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed"));
- sslContext->errorCode = QSslError::UnspecifiedError;
- }
-- } else {
-+ } else
-+#endif // LIBRESSL_VERSION_NUMBER
-+ {
- sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
- sslContext->errorCode = QSslError::UnspecifiedError;
- }
-diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h
-index 70cb97aad8..01a61cf535 100644
---- qtbase/src/network/ssl/qsslcontext_openssl_p.h
-+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h
-@@ -61,6 +61,13 @@
-
- QT_BEGIN_NAMESPACE
-
-+#ifndef DTLS_ANY_VERSION
-+#define DTLS_ANY_VERSION 0x1FFFF
-+#endif
-+#ifndef TLS_ANY_VERSION
-+#define TLS_ANY_VERSION 0x10000
-+#endif
-+
- #ifndef QT_NO_SSL
-
- class QSslContextPrivate;
-diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp
-index 43cb8c6de8..a27336aa26 100644
---- qtbase/src/network/ssl/qsslkey_openssl.cpp
-+++ qtbase/src/network/ssl/qsslkey_openssl.cpp
-@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data,
- q_EVP_CipherUpdate(ctx,
- reinterpret_cast<unsigned char *>(output.data()), &len,
- reinterpret_cast<const unsigned char *>(data.constData()), data.size());
-- q_EVP_CipherFinal(ctx,
-+ q_EVP_CipherFinal_ex(ctx,
- reinterpret_cast<unsigned char *>(output.data()) + len, &i);
- len += i;
-
-diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp
-index 277037e59c..f599498df5 100644
---- qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext()
- else if (mode == QSslSocket::SslServerMode)
- q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
-
--#if OPENSSL_VERSION_NUMBER >= 0x10101006L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
- // Set the client callback for TLSv1.3 PSK
- if (mode == QSslSocket::SslClientMode
- && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index ed80fc14bd..bad2ee2e41 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return)
- DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
- DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
- DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return)
-+#endif
- DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return)
- DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
- DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
- DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
- DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null
- DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
- DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
-+#else
-+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
-+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
-+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return)
-+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG)
-+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG)
-+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return)
-+#endif // LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return)
- DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver
- DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return)
- DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return)
- DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG)
-+#else
-+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
-+#endif
- DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
- DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return)
- DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return)
-@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash,
- ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid,
- return 0, return)
- DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return)
-+#endif
- DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return)
- DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s,
- int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return)
-@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke
- DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return)
- DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return)
--DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
-+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return)
- DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return)
- #ifndef OPENSSL_NO_DES
- DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return)
-@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
- DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
- DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
- DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-+#ifndef LIBRESSL_VERSION_NUMBER
- DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
- DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
- DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
- DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
- DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
- DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
-+#endif
- DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
- DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
- DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
-@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(EVP_CIPHER_CTX_reset)
- RESOLVEFUNC(EVP_PKEY_up_ref)
- RESOLVEFUNC(EVP_PKEY_CTX_new)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(EVP_PKEY_param_check)
-+#endif
- RESOLVEFUNC(EVP_PKEY_CTX_free)
- RESOLVEFUNC(EVP_PKEY_base_id)
- RESOLVEFUNC(RSA_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(OPENSSL_sk_new_null)
- RESOLVEFUNC(OPENSSL_sk_push)
- RESOLVEFUNC(OPENSSL_sk_free)
- RESOLVEFUNC(OPENSSL_sk_num)
- RESOLVEFUNC(OPENSSL_sk_pop_free)
- RESOLVEFUNC(OPENSSL_sk_value)
-+#endif
- RESOLVEFUNC(DH_get0_pqg)
- RESOLVEFUNC(SSL_CTX_set_options)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(SSL_CTX_get_security_level)
- RESOLVEFUNC(SSL_CTX_set_security_level)
-+#endif
- #ifdef TLS1_3_VERSION
- RESOLVEFUNC(SSL_CTX_set_ciphersuites)
- RESOLVEFUNC(SSL_set_psk_use_session_callback)
-@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols()
-
- RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
- RESOLVEFUNC(DH_bits)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(DSA_bits)
-+#endif
-
- #if QT_CONFIG(dtls)
- RESOLVEFUNC(DTLSv1_listen)
-@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(OCSP_check_validity)
- RESOLVEFUNC(OCSP_cert_to_id)
- RESOLVEFUNC(OCSP_id_get0_info)
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(OCSP_resp_get0_certs)
-+#endif
- RESOLVEFUNC(OCSP_basic_sign)
- RESOLVEFUNC(OCSP_response_create)
- RESOLVEFUNC(i2d_OCSP_RESPONSE)
-@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(EVP_CipherInit)
- RESOLVEFUNC(EVP_CipherInit_ex)
- RESOLVEFUNC(EVP_CipherUpdate)
-- RESOLVEFUNC(EVP_CipherFinal)
-+ RESOLVEFUNC(EVP_CipherFinal_ex)
- RESOLVEFUNC(EVP_get_digestbyname)
- #ifndef OPENSSL_NO_DES
- RESOLVEFUNC(EVP_des_cbc)
-@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols()
- RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
- RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
- RESOLVEFUNC(SSL_CTX_get_cert_store);
-+#ifndef LIBRESSL_VERSION_NUMBER
- RESOLVEFUNC(SSL_CONF_CTX_new);
- RESOLVEFUNC(SSL_CONF_CTX_free);
- RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
- RESOLVEFUNC(SSL_CONF_CTX_set_flags);
- RESOLVEFUNC(SSL_CONF_CTX_finish);
- RESOLVEFUNC(SSL_CONF_cmd);
-+#endif
- RESOLVEFUNC(SSL_accept)
- RESOLVEFUNC(SSL_clear)
- RESOLVEFUNC(SSL_connect)
-diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-index c46afcf53e..3945bada5f 100644
---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE
-
- #define DUMMYARG
-
-+#ifdef LIBRESSL_VERSION_NUMBER
-+typedef _STACK STACK;
-+typedef STACK OPENSSL_STACK;
-+typedef void OPENSSL_INIT_SETTINGS;
-+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx);
-+#endif
-+
- #if !defined QT_LINKED_OPENSSL
- // **************** Shared declarations ******************
- // ret func(arg)
-@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
- Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
- Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- int q_DSA_bits(DSA *a);
-+#else
-+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p)
-+#endif
- int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c);
- Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a);
- EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx);
- int q_EVP_PKEY_base_id(EVP_PKEY *a);
- int q_RSA_bits(RSA *a);
-+
-+#ifndef LIBRESSL_VERSION_NUMBER
- Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *));
- Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null();
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data);
- Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a);
- Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b);
-+#else // LIBRESSL_VERSION_NUMBER
-+int q_sk_num(STACK *a);
-+#define q_OPENSSL_sk_num(a) q_sk_num(a)
-+void q_sk_pop_free(STACK *a, void (*b)(void *));
-+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b)
-+STACK *q_sk_new_null();
-+#define q_OPENSSL_sk_new_null() q_sk_new_null()
-+void q_sk_push(STACK *st, void *data);
-+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data)
-+void q_sk_free(STACK *a);
-+#define q_OPENSSL_sk_free q_sk_free
-+void *q_sk_value(STACK *a, int b);
-+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b)
-+#endif // LIBRESSL_VERSION_NUMBER
-+
- int q_SSL_session_reused(SSL *a);
- unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
- int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh);
- # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
- | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
- #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-+#else
-+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
-+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
-+#endif // LIBRESSL_VERSION_NUMBER
-
- #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
- | OPENSSL_INIT_ADD_ALL_DIGESTS \
-@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh);
- | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL)
-
- int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
-+#ifndef LIBRESSL_VERSION_NUMBER
- void q_CRYPTO_free(void *str, const char *file, int line);
-+#else
-+void q_CRYPTO_free(void *a);
-+#endif
-
- long q_OpenSSL_version_num();
- const char *q_OpenSSL_version(int type);
-@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
- int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
- int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl);
--int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
- const EVP_MD *q_EVP_get_digestbyname(const char *name);
-
- #ifndef OPENSSL_NO_DES
-@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
- int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
- int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
- X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-+#ifndef LIBRESSL_VERSION_NUMBER
- SSL_CONF_CTX *q_SSL_CONF_CTX_new();
- void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
- void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
- unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
- int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
- int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
-+#endif
- void q_SSL_free(SSL *a);
- STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
- const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
-@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n
- int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash,
- ASN1_INTEGER **pserial, OCSP_CERTID *cid);
-
-+#ifndef LIBRESSL_VERSION_NUMBER
- const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs);
-+#else
-+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs)
-+#endif
- Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
- Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid);
- int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
---
-2.29.2
-
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 90d9c9be83f..355c774a7ff 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
- protobuf-devel pulseaudio-devel tslib-devel libressl-devel
+ protobuf-devel pulseaudio-devel tslib-devel openssl-devel
unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel"
depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml
@@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
+_openssl=1
# Work around SSLv3_{client,server}_method missing in libressl-2.3.3
-CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+if [ ! "$_openssl" ]; then
+ CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG"
+fi
CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
# Required for musl libc
LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152"
@@ -1059,7 +1062,7 @@ qt5-tools_package() {
}
qt5-devel_package() {
- depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel
+ depends="zlib-devel openssl-devel libXext-devel libXrender-devel
fontconfig-devel libglib-devel MesaLib-devel mtdev-devel
dbus-devel icu-devel cups-devel
qt5-gui-${version}_${revision}
From dd3fd5a45fa8f56c8c501b61877dd88e59eeb2ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 264/453] qupzilla1: rebuild against OpenSSL
---
srcpkgs/qupzilla1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template
index e72f0f95897..8ea79ae32d8 100644
--- a/srcpkgs/qupzilla1/template
+++ b/srcpkgs/qupzilla1/template
@@ -1,7 +1,7 @@
# Template file for 'qupzilla1'
pkgname=qupzilla1
version=1.8.9
-revision=16
+revision=17
wrksrc="QupZilla-${version}"
build_style=qmake
hostmakedepends="pkg-config"
From f38197004954786e9985acc2c24a7ecaaad14162 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 265/453] rabbitmq-c: rebuild against OpenSSL
---
srcpkgs/rabbitmq-c/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
# Template file for 'rabbitmq-c'
pkgname=rabbitmq-c
version=0.10.0
-revision=1
+revision=2
build_style=cmake
make_check_target=test
hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="RabbitMQ C client"
maintainer="Hans-J. Schmid <knock@myopendoor.de>"
license="MIT"
From 2b3e6f5e5b32d22eebc31c45f435df22d50723ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 266/453] rdedup: rebuild against OpenSSL
---
srcpkgs/rdedup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
# Template file for 'rdedup'
pkgname=rdedup
version=3.1.1
-revision=5
+revision=6
wrksrc=rdedup-rdedup-v${version}
build_style=cargo
hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
short_desc="Data deduplication engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0"
From 6de561e4f52c57fbc85d1d55ff08eafec8f6cb5a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 267/453] rdis-git: rebuild against OpenSSL
---
srcpkgs/rdis-git/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
# Template file for 'rdis-git'
pkgname=rdis-git
version=20150722
-revision=11
+revision=12
hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
short_desc="A binary analysis tool for Linux"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3"
From 6d25c3cf728f93b00903f8eb8d0271bd128a9641 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 268/453] re: rebuild against OpenSSL
---
srcpkgs/re/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/re/template b/srcpkgs/re/template
index 1d866b46543..542c03c133f 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
USE_DTLS_SRTP=yes USE_ZLIB=yes"
make_install_args="$make_build_args"
make_use_env=1
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Portable library for real-time communications"
maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
From df2ac0532c63d490bccf3738dbef641646a8ce7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 269/453] remmina: rebuild against OpenSSL
---
srcpkgs/remmina/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.10
-revision=1
+revision=2
wrksrc="Remmina-v${version}"
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
From aeef28e3d5abbf07990699040d08f7deb739dda7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 270/453] rhash: rebuild against OpenSSL
---
srcpkgs/rhash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template
index 749f9755106..f93e7c512dc 100644
--- a/srcpkgs/rhash/template
+++ b/srcpkgs/rhash/template
@@ -7,7 +7,7 @@ build_style=configure
configure_args="--enable-openssl --disable-openssl-runtime
--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/rhashrc"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Utility for computing hash sums and creating magnet links"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="0BSD"
From 0931642e70500290d1cb4bf70f43c8895c2312b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 271/453] rooster: rebuild against OpenSSL
---
srcpkgs/rooster/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..a3f64c3a52d 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -4,7 +4,7 @@ version=2.9.0
revision=1
build_style=cargo
hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
short_desc="Simple password manager for geeks"
maintainer="Ulf <void@uw.anonaddy.com>"
license="Apache-2.0"
From ea9fd9bf84329746c4fab07d1f4622196226a52d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 272/453] rpi-imager: rebuild against OpenSSL
---
srcpkgs/rpi-imager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
# Template file for 'rpi-imager'
pkgname=rpi-imager
version=1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake"
makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel
From 82c7790029bde9e4a29020690024fe4b049b8853 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 273/453] rspamd: rebuild against OpenSSL
---
srcpkgs/rspamd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index a4c2e4a697e..c8edf0f279d 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
# Template file for 'rspamd'
pkgname=rspamd
version=1.9.4
-revision=4
+revision=5
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
From a5fab03e77ecc530aa96406c584c9d1b2134dec9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 274/453] rstudio: rebuild against OpenSSL
---
srcpkgs/rstudio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.3.1093
-revision=1
+revision=2
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
-DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel
From 237ab60e1f7d35135b270b3211b3819090b1a2b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 275/453] rsync: rebuild against OpenSSL
---
srcpkgs/rsync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
# Template file for 'rsync'
pkgname=rsync
version=3.2.3
-revision=2
+revision=3
build_style=gnu-configure
conf_files="/etc/rsyncd.conf"
hostmakedepends="perl"
makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
short_desc="Remote fast incremental file transfer tool"
maintainer="Lugubris <lugubris@disroot.org>"
license="GPL-3.0-only"
From d151b36f2d407b469ae1614c76be2980bc809914 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 276/453] rtmpdump: rebuild against OpenSSL
---
srcpkgs/rtmpdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..a2bc8ada302 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
# Template file for 'rtmpdump'
pkgname=rtmpdump
version=2.4.20161210
-revision=8
+revision=9
_patchlevel=${version##*.}
create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2, LGPL-2.1"
From 2582b910cb34db2fbcf120580b6f680d1931ecac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 277/453] ruby: rebuild against OpenSSL
---
srcpkgs/ruby/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index cd06d004172..6ba92b5bdef 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath
DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
make_build_args="all capi"
hostmakedepends="pkg-config bison groff"
-makedepends="zlib-devel readline-devel libffi-devel libressl-devel
+makedepends="zlib-devel readline-devel libffi-devel openssl-devel
gdbm-devel libyaml-devel pango-devel"
checkdepends="tzdata"
short_desc="Ruby programming language"
From 2ce2be39d840effb4c2f2e562ddfa02e9ade0c04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 278/453] rust-cargo-audit: rebuild against OpenSSL
---
srcpkgs/rust-cargo-audit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
# Template file for 'rust-cargo-audit'
pkgname=rust-cargo-audit
version=0.13.1
-revision=1
+revision=2
wrksrc="${pkgname/rust-/}-${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
short_desc="Audit Cargo.lock for crates with security vulnerabilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0, MIT"
From 5a20e1a7836ac42dc020d668faca38e5a084b1c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 279/453] rust-sccache: rebuild against OpenSSL
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
version=0.2.13
-revision=2
+revision=3
wrksrc="${pkgname/rust-/}-${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Sccache is a ccache-like tool"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
From 212d0acbdd2d4a1719ce037ed004e17c03c36567 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 280/453] rustup: rebuild against OpenSSL
---
srcpkgs/rustup/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..89676f12e7c 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -8,7 +8,7 @@ build_style=cargo
build_helper=qemu
configure_args="--features no-self-update --bin rustup-init"
hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
short_desc="Rust toolchain installer"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
From 3b4265dd9187a95913df6ac77fd4a8094f3673b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 281/453] s-nail: rebuild against OpenSSL
---
srcpkgs/s-nail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 6c2c55085aa..c892bb98dc0 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -4,7 +4,7 @@ version=14.9.21
revision=1
build_helper="qemu"
hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
conf_files="/etc/s-nail.rc"
short_desc="Mail processing system with a command syntax reminiscent of ed"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 101738c26e4566bd6a83284b255f13627cf0fa8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 282/453] s3fs-fuse: rebuild against OpenSSL
---
srcpkgs/s3fs-fuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
# Template file for 's3fs-fuse'
pkgname=s3fs-fuse
version=1.86
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-openssl ac_cv_file__git=no"
hostmakedepends="automake libtool pkg-config"
From b42231142a8e122f859e9bbfbd57dfb32ee89ce4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 283/453] sbsigntool: rebuild against OpenSSL
---
srcpkgs/sbsigntool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
# Template file for 'sbsigntool'
pkgname=sbsigntool
version=0.9.4
-revision=3
+revision=4
archs="x86_64* i686* aarch64* arm*"
wrksrc=sbsigntools-$version
build_style=gnu-configure
hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
short_desc="Signing utility for UEFI secure boot"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
From 181b8c7e7c34509536b2313da8ba31b17419658b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 284/453] scrypt: rebuild against OpenSSL
---
srcpkgs/scrypt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
# Template file for 'scrypt'
pkgname=scrypt
version=1.3.1
-revision=1
+revision=2
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Scrypt key derivation function"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From bb1c16935b52255af1e4daa81f9fdda57f0a24bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 285/453] seafile-libclient: rebuild against OpenSSL
---
srcpkgs/seafile-libclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
# WARNING: upstream sometimes retag source. Wait for official announcement
pkgname=seafile-libclient
version=7.0.10
-revision=1
+revision=2
_distname="${pkgname/-libclient/}"
wrksrc="${_distname}-${version}"
build_style=gnu-configure
From 34446a0c3c41aad156f63cd2de779990c4101ded Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 286/453] serf: rebuild against OpenSSL
---
srcpkgs/serf/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
# Template file for 'serf'
pkgname=serf
version=1.3.9
-revision=12
+revision=13
build_style=scons
make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
short_desc="High-performance asynchronous HTTP client library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From db0e024730d795cb742d785686468b422468f9bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 287/453] sgfutils: rebuild against OpenSSL
---
srcpkgs/sgfutils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
# Template file for 'sgfutils'
pkgname=sgfutils
version=0.25
-revision=6
+revision=7
build_style=gnu-makefile
short_desc="Collection of utilities to handle SGF files"
maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="ImageMagick"
From 3e24941ebaab05f6e174b54af642e28fbf356ee9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 288/453] signal-backup-decode: rebuild against OpenSSL
---
srcpkgs/signal-backup-decode/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
# Template file for 'signal-backup-decode'
pkgname=signal-backup-decode
version=0.2.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
short_desc="Decode Signal Android Backups"
maintainer="Spencer Burris <sburris@posteo.net>"
license="GPL-3.0-or-later"
From 94fa92451960cf25e343ac92277f63bca3eec8a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 289/453] slrn: rebuild against OpenSSL
---
srcpkgs/slrn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
# Template file for 'slrn'
pkgname=slrn
version=1.0.3a
-revision=7
+revision=8
wrksrc="${pkgname}-${version%a}"
build_style=gnu-configure
configure_args="--with-slrnpull --with-ssl
--with-slanginc=${XBPS_CROSS_BASE}/usr/include
--with-slanglib=${XBPS_CROSS_BASE}/usr/lib
slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
short_desc="Text mode Usenet news reader"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2"
From 96765d9534537962001d27621059223d448fb8e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 290/453] so: rebuild against OpenSSL
---
srcpkgs/so/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..fc753102686 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -4,7 +4,7 @@ version=0.4.3
revision=1
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Terminal interface for Stack Overflow"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
From c9ce77339485c7deffbdc804e8b46bd69b862a61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 291/453] socat: rebuild against OpenSSL
---
srcpkgs/socat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 8f96fccff84..54beac3b452 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
# Template file for 'socat'
pkgname=socat
version=1.7.3.4
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-libwrap --enable-fips
ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
short_desc="Relay for bidirectional data transfer between two independent channels"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From a26a7c315d89738841dc2395af457a848393480c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 292/453] spice: rebuild against OpenSSL
---
srcpkgs/spice/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
# Template file for 'spice'
pkgname=spice
version=0.14.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-tunnel --disable-opengl --enable-smartcard
--with-sasl --disable-static --enable-xinerama --disable-celt051"
hostmakedepends="pkg-config python"
makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
nss-devel"
short_desc="Implements the SPICE protocol"
From 55a268e908a00cc8b77fa24303d7ef01265f8abc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 293/453] spice-gtk: rebuild against OpenSSL
---
srcpkgs/spice-gtk/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'spice-gtk'
pkgname=spice-gtk
version=0.37
-revision=5
+revision=6
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
-Dpulse=disabled -Dgtk_doc=disabled"
hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
spice-gtk-devel_package() {
- depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+ depends="gtk+3-devel pixman-devel openssl-devel opus-devel
libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
json-glib-devel gstreamer1-devel gst-plugins-base1-devel
spice-protocol $(vopt_if gir libgirepository-devel)
From ccbfb6ed727ba24ac3bd64b986c43db9d0332989 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 294/453] spiped: rebuild against OpenSSL
---
srcpkgs/spiped/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
# Template file for 'spiped'
pkgname=spiped
version=1.6.1
-revision=1
+revision=2
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Spiped secure pipe daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 34dd1af41b2a26f281f5a655adf64d14f0ac28ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 295/453] spotify-tui: rebuild against OpenSSL
---
srcpkgs/spotify-tui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..5c197c20cee 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -4,7 +4,7 @@ version=0.23.0
revision=1
build_style=cargo
hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
short_desc="Spotify for the terminal"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From 80db78342968940ded2db9999d494ae0b160c00a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 296/453] spotifyd: rebuild against OpenSSL
---
srcpkgs/spotifyd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index cb77beb238b..b707c4a9806 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -5,7 +5,7 @@ revision=1
build_style=cargo
configure_args="--no-default-features"
hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
$(vopt_if dbus dbus-devel)"
short_desc="Spotify client running as a UNIX daemon"
From 481302d04b67e059506b4d72889edba6d8a728a2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 297/453] sqlcipher: rebuild against OpenSSL
---
srcpkgs/sqlcipher/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
# Template file for 'sqlcipher'
pkgname=sqlcipher
version=4.3.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-tempstore=yes"
hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
short_desc="SQLite extension that provides transparent 256-bit AES encryption"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="BSD-3-Clause"
From 76eb0dfc81dac4a4e54c1163e281de0614aabe68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 298/453] sqmail: rebuild against OpenSSL
---
srcpkgs/sqmail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
# Template file for 'sqmail'
pkgname=sqmail
version=4.0.10
-revision=1
+revision=2
create_wrksrc=yes
build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"
From 1392805097961b4f1a3e33a0d04c79e7b882599c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 299/453] srain: rebuild against OpenSSL
---
srcpkgs/srain/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
# Template file for 'srain'
pkgname=srain
version=1.1.3
-revision=1
+revision=2
build_style=configure
build_helper=gir
configure_args="--prefix=/usr --sysconfdir=/etc"
hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
libsecret-devel libsoup-devel"
short_desc="Modern IRC client written in GTK"
maintainer="avoidr <avoidr@posteo.de>"
From 98d8b3c2c19a3c7bdc286118cf4e7c8fb8ed61ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 300/453] stremio-shell: rebuild against OpenSSL
---
srcpkgs/stremio-shell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
# Template file for 'stremio-shell'
pkgname=stremio-shell
version=4.4.120
-revision=1
+revision=2
_singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
_libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
build_style=qmake
From 5f92aeb50cecffee0b770e58771451f591feaa70 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 301/453] stunnel: rebuild against OpenSSL
---
srcpkgs/stunnel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.46
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
checkdepends="nmap procps-ng"
short_desc="SSL encryption wrapper"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
# One thing OpenBSD does that we don't do here is add a _stunnel user/group and
# modify the configuration samples to chroot and use this by default.
# As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
# LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
# This is probably not a security problem. EDIT: Well, it would break. Badly.
# --
From f03b7235ca1e47aaf83ace530ba9851d03a4c93c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 302/453] supertuxkart: rebuild against OpenSSL
---
srcpkgs/supertuxkart/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=2
+revision=3
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
libopenal-devel fribidi-devel libcurl-devel freetype-devel
libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
short_desc="Kart racing game featuring Tux and his friends"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6c85f0b993c5c82e276f207919f4805b83bd8d83 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 303/453] swi-prolog: rebuild against OpenSSL
---
srcpkgs/swi-prolog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..90996f6a5fd 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -8,7 +8,7 @@ build_helper="qemu"
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="pkg-config"
makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
unixodbc-devel zlib-devel pcre-devel libyaml-devel"
short_desc="Comprehensive free Prolog environment"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 9337239e74a42d4612fff4d5c4507f5eaa3cef22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 304/453] swiften: rebuild against OpenSSL
---
srcpkgs/swiften/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=1
+revision=2
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
lua51-devel miniupnpc-devel sqlite-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
From b636f28b2f5702864d157f322527cb3639360ebe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 305/453] swirc: rebuild against OpenSSL
---
srcpkgs/swirc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 9f35c447670..fb9285bd1fd 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
# Template file for 'swirc'
pkgname=swirc
version=3.2.5
-revision=1
+revision=2
build_style=configure
make_install_args="PREFIX=/usr"
hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
From 004c599c90e9fb98c1bcbf892b2544d5c3f80d95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 306/453] sylpheed: rebuild against OpenSSL
---
srcpkgs/sylpheed/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..f1f5ca80767 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -5,7 +5,7 @@ revision=6
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
short_desc="GTK+ Lightweight and user-friendly e-mail client"
maintainer="Orphaned <orphan@voidlinux.org>"
license=" GPL-2.0-or-later, LGPL-2.1-or-later"
From d7df9982a066c4e0de7768f36db87dbe29cfa71b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 307/453] synergy: rebuild against OpenSSL
---
srcpkgs/synergy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index 252ea57e6d1..76e3d679e6a 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
# Template file for 'synergy'
pkgname=synergy
version=1.8.8
-revision=7
+revision=8
wrksrc="${pkgname}-core-${version}-stable"
build_style=cmake
hostmakedepends="unzip pkg-config"
From 98b4c3d9cbfbd3e4fc1b01c083202304da7810be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 308/453] sysdig: rebuild against OpenSSL
---
srcpkgs/sysdig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index fa7fafc80d2..4ae90f82f02 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.27.1
-revision=5
+revision=6
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
-DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
make_cmd=make
hostmakedepends="wget pkg-config protobuf"
makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
tbb-devel zlib-devel"
depends="dkms"
short_desc="Open source system-level exploration and troubleshooting tool"
From 10bca4eaa674ecc74167329964a625fc9a35394f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 309/453] taisei: rebuild against OpenSSL
---
srcpkgs/taisei/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
# Template file for 'taisei'
pkgname=taisei
version=1.3.1
-revision=3
+revision=4
wrksrc="taisei-v${version}"
build_style=meson
hostmakedepends="pkg-config python3-docutils"
From a4744798305cd463a5e6b99f0a45907623729fe5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 310/453] tarpaulin: rebuild against OpenSSL
---
srcpkgs/tarpaulin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
# Template file for 'tarpaulin'
pkgname=tarpaulin
version=0.14.3
-revision=1
+revision=2
archs="x86_64*"
build_style=cargo
hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Code coverage tool for Rust/Cargo projects"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
From 90ed4e5a6c4c531e5b2bf82ee3d1e7c613d0cc43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 311/453] tcpdump: rebuild against OpenSSL
---
srcpkgs/tcpdump/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..56ca1adb796 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -3,7 +3,7 @@ pkgname=tcpdump
version=4.99.0
revision=1
build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
checkdepends="perl"
short_desc="A tool for network monitoring and data acquisition"
maintainer="Orphaned <orphan@voidlinux.org>"
From d61e6cfc1e6e0abd3d68082c6b14f0f53b1c749b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 312/453] tcpflow: rebuild against OpenSSL
---
srcpkgs/tcpflow/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
# Template file for 'tcpflow'
pkgname=tcpflow
version=1.5.2
-revision=2
+revision=3
wrksrc="$pkgname-$pkgname-$version"
build_style=gnu-configure
hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
short_desc="Captures data transmitted as part of TCP connections"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
From 21297f4e61ea19d9eefebe9cc30975f1ef97ca29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 313/453] tealdeer: rebuild against OpenSSL
---
srcpkgs/tealdeer/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
# Template file for 'tealdeer'
pkgname=tealdeer
version=1.4.1
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
short_desc="Very fast implementation of tldr in Rust"
maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
From 7b9b23ae00b78b45a012892226b520504094cf65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 314/453] tectonic: rebuild against OpenSSL
---
srcpkgs/tectonic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
# Template file for 'tectonic'
pkgname=tectonic
version=0.3.3
-revision=1
+revision=2
wrksrc="tectonic-tectonic-${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
license="MIT"
From b0bb8e03a980478de20fa2c15282e95e76cc420c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 315/453] telegram-desktop: rebuild against OpenSSL
---
srcpkgs/telegram-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=2.5.1
-revision=1
+revision=2
wrksrc="tdesktop-${version}-full"
build_style=cmake
build_helper="qemu"
From 521bd1e80c61c744fd11000fffff27c7e3110922 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 316/453] telepathy-salut: rebuild against OpenSSL
---
srcpkgs/telepathy-salut/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..367ae2b7803 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
# Template file for 'telepathy-salut'
pkgname=telepathy-salut
version=0.8.1
-revision=19
+revision=20
lib32disabled=yes
build_style=gnu-configure
configure_args="--disable-tests --disable-plugins --with-tls=openssl
--disable-avahi-tests --disable-static"
hostmakedepends="pkg-config python xmldiff glib-devel"
makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ openssl-devel libuuid-devel sqlite-devel"
depends="avahi"
short_desc="Link-local XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
From 61fc52b56d77685148e1b45a1c4b4020901556ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 317/453] thc-hydra: rebuild against OpenSSL
---
srcpkgs/thc-hydra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
postgresql-libs-devel libmariadbclient-devel libssh-devel"
short_desc="Tool to guess/crack valid login/password pairs"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
From 16a52856c84257b048015708fc69dfa94f26b281 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 318/453] thrift: rebuild against OpenSSL
---
srcpkgs/thrift/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
# Template file for 'thrift'
pkgname=thrift
version=0.13.0
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
From f6ce9d96905f152a647cf23628547495e722245e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 319/453] tinc: rebuild against OpenSSL
---
srcpkgs/tinc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
# Template file for 'tinc'
pkgname=tinc
version=1.0.36
-revision=2
+revision=3
build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
short_desc="VPN (Virtual Private Network) daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From bf379d84f81dcd392ded5d82302624ab184141b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 320/453] tlsdate: rebuild against OpenSSL
---
srcpkgs/tlsdate/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tlsdate/template b/srcpkgs/tlsdate/template
index ccdbef1a5d7..aa3b54b4c6b 100644
--- a/srcpkgs/tlsdate/template
+++ b/srcpkgs/tlsdate/template
@@ -1,14 +1,14 @@
# Template file for 'tlsdate'
pkgname=tlsdate
version=0.0.13
-revision=15
+revision=16
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
configure_args="--with-polarssl=no ac_cv_func_clock_gettime=yes"
conf_files="/etc/tlsdate/tlsdated.conf"
make_dirs="/var/cache/tlsdated 0755 root root"
hostmakedepends="automake pkg-config libtool"
-makedepends="libressl-devel dbus-devel libevent-devel"
+makedepends="openssl-devel dbus-devel libevent-devel"
depends="ca-certificates"
short_desc="Secure parasitic rdate replacement using HTTPS"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 07842850b587c559f441da37b72839b3483f86df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 321/453] tmplgen: rebuild against OpenSSL
---
srcpkgs/tmplgen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
# Template file for 'tmplgen'
pkgname=tmplgen
version=1.3.1
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Void Linux template generator for language-specific package managers"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From 815debe6370a14dd909196deea3439a007e3c195 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 322/453] tnftp: rebuild against OpenSSL
---
srcpkgs/tnftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
# Template file for 'tnftp'
pkgname=tnftp
version=20200705
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
short_desc="NetBSD enhanced ftp client"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD"
From 3ec26d9348e398bb01052b22b6ba39748944641c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 323/453] tor: rebuild against OpenSSL
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.4.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From ebd3066022b3d58e202b1acd4949bd2d4cc6dd29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 324/453] tpm-tools: rebuild against OpenSSL
---
srcpkgs/tpm-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
# Template file for 'tpm-tools'
pkgname=tpm-tools
version=1.3.9.1
-revision=6
+revision=7
create_wrksrc=yes
build_style=gnu-configure
hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CPL"
From 012966261a6f0cce7f96c6cd7283a9933bae5a8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 325/453] transmission: rebuild against OpenSSL
---
srcpkgs/transmission/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
# Template file for 'transmission'
pkgname=transmission
version=3.00
-revision=4
+revision=5
build_style=cmake
configure_args="-DENABLE_CLI=ON"
hostmakedepends="autoconf automake intltool glib-devel
From 51c8de34405beb1c33065bc99efa4f624f228643 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 326/453] trousers: rebuild against OpenSSL
---
srcpkgs/trousers/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
# Template file for 'trousers'
pkgname=trousers
version=0.3.14
-revision=10
+revision=11
create_wrksrc=yes
build_style=gnu-configure
conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
system_accounts=tss
tss_homedir=/var/lib/tpm
short_desc="Trusted Computing Software Stack for the TPM"
From c2cc3f40ccb1f797e655687ff0b371814af407fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 327/453] ttyd: rebuild against OpenSSL
---
srcpkgs/ttyd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
# Template file for 'ttyd'
pkgname=ttyd
version=1.6.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
libuv-devel"
short_desc="Share your terminal over the web"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From d33929eee332dc05cbe6a760bad0e93d1fbd9fe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 328/453] tvheadend: rebuild against OpenSSL
---
srcpkgs/tvheadend/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
# Template file for 'tvheadend'
pkgname=tvheadend
version=4.2.8
-revision=4
+revision=5
wrksrc=tvheadend-${version}
build_style=gnu-configure
configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
--disable-libx265_static --disable-libvpx_static --disable-libtheora_static
--disable-libvorbis_static --disable-libfdkaac_static"
hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
short_desc="TV streaming server"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-3.0-only"
From 32e7696b17d9df54540266b9afca2a591d69d66d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 329/453] u-boot-tools: rebuild against OpenSSL
---
srcpkgs/u-boot-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template
index c486f52927e..aa1f0981f7c 100644
--- a/srcpkgs/u-boot-tools/template
+++ b/srcpkgs/u-boot-tools/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
make_build_args="HOSTSTRIP=: STRIP=:"
make_build_target="tools envtools"
hostmakedepends="bison flex"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Das U-Boot tools"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From 69e7f6427020ff0c496d0d2f31aafcd7b74c9c52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 330/453] ucspi-ssl: rebuild against OpenSSL
---
srcpkgs/ucspi-ssl/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
pkgname=ucspi-ssl
reverts="0.99e_3 0.99e_2 0.99e_1"
version=0.11.6a
-revision=2
+revision=3
create_wrksrc=yes
build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
depends="ucspi-tcp6"
short_desc="Command-line tools for building SSL client-server applications"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
ucspi-ssl-devel_package() {
short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+ depends="${sourcepkg}>=${version}_${revision} openssl-devel"
pkg_install() {
vinstall ucspissl.a 0644 usr/lib
vinstall ucspissl.h 0644 usr/include
From 746a4c2189992a0c571e7abcc6da38999459dd7b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 331/453] uftp: rebuild against OpenSSL
---
srcpkgs/uftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
# Template file for 'uftp'
pkgname=uftp
version=5.0
-revision=1
+revision=2
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Encrypted multicast file transfer program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 8ddac3a4430845fef5aa2d03348ea6f1accfc3aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 332/453] umurmur: rebuild against OpenSSL
---
srcpkgs/umurmur/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..ec425daa69b 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="--enable-shmapi --with-ssl=openssl"
conf_files="/etc/umurmur/umurmur.conf"
hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
short_desc="Minimalistic Mumble server"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-clause"
From 044d6668b38ffb62245c9d7185000c9053e620bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 333/453] unbound: rebuild against OpenSSL
---
srcpkgs/unbound/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..ed5b00ced6c 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -34,7 +34,7 @@ libunbound_package() {
}
unbound-devel_package() {
- depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+ depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 43f032cfe00c40856f74e9e9830aaa8bbc6713af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 334/453] vanitygen: rebuild against OpenSSL
---
srcpkgs/vanitygen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 5bb6f9c4bde..11a8b09b47f 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,10 +1,10 @@
# Template file for 'vanitygen'
pkgname=vanitygen
version=0.22
-revision=3
+revision=4
_commit=9e04497a127aa6413463ccf4a4aee75f0d581d92
wrksrc="vanitygen-${_commit}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
short_desc="Bitcoin vanity address generator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
From 2a27352157d19c03ef508573292de002ba9ae94e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 335/453] vboot-utils: rebuild against OpenSSL
---
srcpkgs/vboot-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index 61068975964..5bac667ce94 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,11 +1,11 @@
# Template file for 'vboot-utils'
pkgname=vboot-utils
version=45.7262
-revision=13
+revision=14
archs="x86_64* i686* aarch64* arm*"
_githash=0e8c964915fffb58032bb59bdb31949de718ca90
hostmakedepends="pkg-config git"
-makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel"
+makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel"
short_desc="Verified boot kernel utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
From a9f6518c9a7b3067ba457013efc77caa81b5bb6e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 336/453] vde2: rebuild against OpenSSL
---
srcpkgs/vde2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
# Template file for 'vde2'
pkgname=vde2
version=2.3.2
-revision=22
+revision=23
build_style=gnu-configure
configure_args="--disable-static --enable-experimental
--disable-python --enable-kernel-switch"
hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
conf_files="
/etc/vde2/vdecmd
/etc/vde2/libvdemgmt/asyncrecv.rc
From 4907d0de9838163b3a634dc303aa8ac532292b1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 337/453] virtuoso: rebuild against OpenSSL
---
srcpkgs/virtuoso/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.5.1
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64le*"
wrksrc="${pkgname}-opensource-${version}"
build_style=gnu-configure
configure_args="--enable-static"
hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
short_desc="Scalable cross-platform server of virtuoso"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2"
From 5c27521fec7d83521142afbd6c783a0dd30a9da0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 338/453] volta: rebuild against OpenSSL
---
srcpkgs/volta/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 4f59d154235..7904ffeb444 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -5,7 +5,7 @@ revision=1
archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
build_style="cargo"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="JavaScript tool version sync helper"
maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="BSD-2-Clause"
From 9e67360670eed2b65d4541a2f041c91017db2363 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 339/453] vpn-ws: rebuild against OpenSSL
---
srcpkgs/vpn-ws/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
# Template file for 'vpn-ws'
pkgname=vpn-ws
version=0.2
-revision=6
+revision=7
build_style=gnu-makefile
make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="VPN system over webhooks"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
From 7c005f4318dd4e3d82647b6a9996cf67fdcb0348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 340/453] vsftpd: rebuild against OpenSSL
---
srcpkgs/vsftpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
# Template file for 'vsftpd'
pkgname=vsftpd
version=3.0.3
-revision=13
+revision=14
build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
short_desc="FTP daemon with focus on security"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
From b88392e00c7f07175fcfa80f40645705e24ea648 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 341/453] w3m: rebuild against OpenSSL
---
srcpkgs/w3m/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
# Template file for 'w3m'
pkgname=w3m
version=0.5.3+git20210102
-revision=1
+revision=2
wrksrc="${pkgname}-${version/+/-}"
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
--with-nkf=/usr/bin/nkf
--with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
libX11-devel"
short_desc="Text-based Web browser and pager (with Debian patches)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
From 4024b1dc325e7bb238608ae07c23c82bd0b1d58c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 342/453] watchman: rebuild against OpenSSL
---
srcpkgs/watchman/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
# Template file for 'watchman'
pkgname=watchman
version=4.9.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-statedir --enable-lenient"
hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
short_desc="Watches files and records, or triggers actions, when they change"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From 1eb33ab22681eee7ce13c570744d56c16213599e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 343/453] wesnoth: rebuild against OpenSSL
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.13
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
depends="desktop-file-utils"
short_desc="Turn-based fantasy strategy game"
maintainer="Philipp Hirsch <itself@hanspolo.net>"
From 2bc4629a2a874c338af8c8d579dba239ee6f581a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 344/453] wget: rebuild against OpenSSL
---
srcpkgs/wget/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..9e89672141e 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl
conf_files="/etc/wgetrc"
hostmakedepends="perl pkg-config"
makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
depends="ca-certificates"
checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
short_desc="GNU wget download utility"
From 48349fd82f8ddfb37a7c974d23205120087970e0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 345/453] wpa_supplicant: rebuild against OpenSSL
---
srcpkgs/wpa_supplicant/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..72dddc37f6d 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
patch_args="-Np1"
hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
build_options="dbus readline"
build_options_default="dbus readline"
conf_files="/etc/${pkgname}/${pkgname}.conf"
From 44f90e4e125db1fc5b20dedcb930a987f8b66aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 346/453] wrk: rebuild against OpenSSL
---
srcpkgs/wrk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
# Template file for 'wrk'
pkgname=wrk
version=4.1.0
-revision=5
+revision=6
build_style=gnu-makefile
make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
short_desc="Modern HTTP benchmarking tool"
maintainer="Noel Cower <ncower@nil.dev>"
license="Apache-2.0"
From a588f2c4156555f66f7256a3b93b530d4e3a969c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 347/453] wvstreams: rebuild against OpenSSL
---
srcpkgs/wvstreams/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
# Template file for 'wvstreams'
pkgname=wvstreams
version=4.6.1
-revision=19
+revision=20
build_style=gnu-configure
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2"
short_desc="Library for doing network in C++"
homepage="https://code.google.com/p/wvstreams"
distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
conf_files="/etc/uniconf.conf"
From b89e9ef8038a914050a23ff78c7642885bda8775 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 348/453] x11vnc: rebuild against OpenSSL
---
srcpkgs/x11vnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
# Template file for 'x11vnc'
pkgname=x11vnc
version=0.9.16
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
short_desc="VNC server for real X displays"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From 3d54137571ea207bb22a05e76e0391aeb99a7c90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 349/453] xar: rebuild against OpenSSL
---
srcpkgs/xar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
# Template file for 'xar'
pkgname=xar
version=1.6.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
short_desc="Archiver for the eXtensible ARchiver format"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From 619f4d3fbac6ddccaa0395e65c63cfa2e5625856 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 350/453] xarcan: rebuild against OpenSSL
---
srcpkgs/xarcan/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
# Template file for 'xarcan'
pkgname=xarcan
version=0.6.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
-Ddefault_font_path=/usr/share/fonts/X11"
hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
xorgproto"
short_desc="Patched Xserver that bridges connections to Arcan"
maintainer="Piraty <piraty1@inbox.ru>"
From 269ddec25999544aac4981f0ddb940be1787bc88 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 351/453] xbps: rebuild against OpenSSL
---
srcpkgs/xbps/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 728179a46fc..a96512be32c 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a
hostmakedepends="pkgconf"
checkdepends="kyua"
-makedepends="zlib-devel libressl-devel libarchive-devel"
+makedepends="zlib-devel openssl-devel libarchive-devel"
depends="ca-certificates xbps-triggers"
make_dirs="/etc/xbps.d 0755 root root"
From 2083247f591d05713daf8bb68241464d5745ddd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 352/453] xca: rebuild against OpenSSL
---
srcpkgs/xca/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
# Template file for 'xca'
pkgname=xca
version=2.1.2
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
depends="qt5-plugin-sqlite"
short_desc="X Certificate and Key Management"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 6643c7c558aeade7977ce2988da667f329cddb0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 353/453] xmlsec1: rebuild against OpenSSL
---
srcpkgs/xmlsec1/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
# Template file for 'xmlsec1'
pkgname=xmlsec1
version=1.2.31
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gnutls-devel"
makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel
From d13de56f7c1dff33225254e1b019e77098c587f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 354/453] yara: rebuild against OpenSSL
---
srcpkgs/yara/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..9824b70c3d0 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="--enable-magic --enable-cuckoo"
hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
short_desc="Pattern matching swiss knife for malware researchers"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
From 35270722a91120cffcd54d5648321b67fd9295d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 355/453] ympd: rebuild against OpenSSL
---
srcpkgs/ympd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
# Template file for 'ympd'
pkgname=ympd
version=1.3.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
short_desc="Standalone MPD Web GUI written in C"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only"
From a3bfbf73633abb3f05dba6c933434766dd33194e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 356/453] yubico-piv-tool: rebuild against OpenSSL
---
srcpkgs/yubico-piv-tool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
short_desc="Yubikey PIV management tool"
maintainer="Aloz1 <kno0001@gmail.com>"
license="BSD-2-Clause"
From 682015139f745b15bc4e846ae93e833024c0c345 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 357/453] zbackup: rebuild against OpenSSL
---
srcpkgs/zbackup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index c55e64fd7bf..3d3886ce124 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
# Template file for 'zbackup'
pkgname=zbackup
version=1.4.4
-revision=20
+revision=21
build_style=cmake
hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
short_desc="Versatile deduplicating backup tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From ca0a5115fab88d6495c41a20c537be89d617ce8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 358/453] zchunk: rebuild against OpenSSL
---
srcpkgs/zchunk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index aca7fe5b760..069a4d4bfc0 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
# Template file for 'zchunk'
pkgname=zchunk
version=1.1.9
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config"
makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
zchunk-devel_package() {
short_desc+=" - development files"
- depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+ depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.so"
From 70ff53dcd698f58d98f85f1ebe73d496cf5fcd53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 359/453] zeek: rebuild against OpenSSL
---
srcpkgs/zeek/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index b3158659258..89b593c6964 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
# Template file for 'zeek'
pkgname=zeek
version=3.2.3
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
short_desc="Advanced framework for network traffic analysis"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
From 0b310de0acfb9677a5f77be71c4735d062ccb8bf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 360/453] znc: rebuild against OpenSSL
---
srcpkgs/znc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
# Template file for 'znc'
pkgname=znc
version=1.8.2
-revision=3
+revision=4
build_style=gnu-configure
configure_args="
--enable-python
@@ -10,7 +10,7 @@ configure_args="
--enable-cyrus
--with-tcl=$XBPS_CROSS_BASE/usr/lib"
hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
icu-devel zlib-devel perl"
short_desc="Advanced IRC Bouncer"
maintainer="Duncaen <duncaen@voidlinux.org>"
From b4135b5c112c09fc15f5bd6728b18e550db90efb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:02 +0100
Subject: [PATCH 361/453] NetworkManager-openconnect: rebuild against OpenSSL
---
srcpkgs/NetworkManager-openconnect/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template
index f32a075180f..aa80daaa005 100644
--- a/srcpkgs/NetworkManager-openconnect/template
+++ b/srcpkgs/NetworkManager-openconnect/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="pkg-config intltool"
makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel
- libressl-devel libsecret-devel libxml2-devel openconnect-devel"
+ openssl-devel libsecret-devel libxml2-devel openconnect-devel"
depends="openconnect"
short_desc="NetworkManager VPN plugin for OpenConnect"
maintainer="Enno Boland <gottox@voidlinux.org>"
From df60d09c656b562e064ef0dba3863e7dfa6d93c2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:04 +0100
Subject: [PATCH 362/453] amp: rebuild against OpenSSL
---
srcpkgs/amp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template
index 425c0b14bbf..7f703a696c2 100644
--- a/srcpkgs/amp/template
+++ b/srcpkgs/amp/template
@@ -5,7 +5,7 @@ revision=1
build_style=cargo
hostmakedepends="cmake git python3"
makedepends="libxcb-devel"
-depends="libressl libxcb zlib"
+depends="openssl libxcb zlib"
short_desc="Complete text editor for your terminal"
maintainer="Wilson Birney <wpb@360scada.com>"
license="GPL-3.0-or-later"
From 26634b872d4bdda3cc09c27d4225cb6d6c9f03cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:06 +0100
Subject: [PATCH 363/453] android-tools: rebuild against OpenSSL
---
srcpkgs/android-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index a75a37d7076..16d755c4bc0 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -5,7 +5,7 @@ revision=1
archs="armv* aarch64* x86_64* i686* ppc64le*"
build_style=cmake
hostmakedepends="perl go protobuf"
-makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel
+makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel
liblz4-devel libzstd-devel protobuf-devel brotli-devel"
short_desc="Android platform tools (adb and fastboot)"
maintainer="John <me@johnnynator.dev>"
From ed23234a811e9bdf0b78ce47838a57249efc94da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 364/453] beaglebone-kernel: rebuild against OpenSSL
---
srcpkgs/beaglebone-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
nostrip=yes
noverifyrdeps=yes
archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
makedepends="ncurses-devel"
triggers="kernel-hooks"
# These files could be modified when an external module is built.
From b53ff66b595e8def20443c0bdaa16c6bdaa97eaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:17 +0100
Subject: [PATCH 365/453] c-client: rebuild against OpenSSL
---
srcpkgs/c-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template
index 48bbfcee467..6484d7ec507 100644
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@@ -3,7 +3,7 @@ pkgname=c-client
version=2007f
revision=3
wrksrc="imap-${version}"
-makedepends="pam-devel libressl-devel e2fsprogs-devel"
+makedepends="pam-devel openssl-devel e2fsprogs-devel"
short_desc="IMAP client library"
maintainer="John Regan <john@jrjrtech.com>"
license="Apache-2.0"
From 93728309d1756f853965ec08799ea9701d021573 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:20 +0100
Subject: [PATCH 366/453] cgit: rebuild against OpenSSL
---
srcpkgs/cgit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template
index adbf71c7942..719df688847 100644
--- a/srcpkgs/cgit/template
+++ b/srcpkgs/cgit/template
@@ -9,7 +9,7 @@ make_build_args="
CGIT_DATA_PATH=/usr/share/webapps/cgit
CGIT_SCRIPT_PATH=/usr/libexec/cgit"
hostmakedepends="asciidoc"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
checkdepends="perl"
short_desc="Hyperfast web frontend for git repositories written in C"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 5e04410d098dbcb717707877aa1960b770d713e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 367/453] chntpw: rebuild against OpenSSL
---
srcpkgs/chntpw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template
index 78a76973a5c..20bb5178fca 100644
--- a/srcpkgs/chntpw/template
+++ b/srcpkgs/chntpw/template
@@ -4,7 +4,7 @@ version=140201
revision=1
build_style=gnu-makefile
hostmakedepends="unzip"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Offline Windows Password and Registry Editor"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2"
From 6a9de4583359e7eec9706f96c11069fa7302f66a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:29 +0100
Subject: [PATCH 368/453] choosenim: rebuild against OpenSSL
---
srcpkgs/choosenim/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index d76f1a49bc7..b345ef579c2 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,8 +2,8 @@
pkgname=choosenim
version=0.7.4
revision=2
-hostmakedepends="git nim libressl-devel pkg-config"
-makedepends="libressl-devel zlib-devel libarchive-devel"
+hostmakedepends="git nim openssl-devel pkg-config"
+makedepends="openssl-devel zlib-devel libarchive-devel"
depends="gcc"
short_desc="Nim toolchain installer"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
@@ -34,7 +34,7 @@ do_build() {
esac
LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)"
LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)"
- LDFLAGS+=" -lrt -ldl"
+ LDFLAGS+=" -lrt -ldl -lpthread"
: >nim.cfg
if [ -z "$CROSS_BUILD" ]; then
cat >>nim.cfg <<-EOF
From e4071e5b6030473e54a4f55f72586af331d42ec4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 369/453] ci20-kernel: rebuild against OpenSSL
---
srcpkgs/ci20-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
noshlibprovides=yes
archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
makedepends="ncurses-devel"
triggers="kernel-hooks"
# These files could be modified when an external module is built.
From 21f865b1ae10c93d552d01b2bfa4beb678a1b0e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:54 +0100
Subject: [PATCH 370/453] crda: rebuild against OpenSSL
---
srcpkgs/crda/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template
index 59ebaf7d24c..d73db2a6b95 100644
--- a/srcpkgs/crda/template
+++ b/srcpkgs/crda/template
@@ -5,7 +5,7 @@ revision=5
_dbname=wireless-regdb
_dbversion=2016.06.10
_dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/"
-hostmakedepends="libressl python python-M2Crypto pkg-config"
+hostmakedepends="openssl python python-M2Crypto pkg-config"
makedepends="libnl-devel libgcrypt-devel"
depends="iw"
short_desc="Central Regulatory Domain Agent for wireless networks"
From 53452d421c1dd69dfdcd310ecc799f4fa4cef781 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:57 +0100
Subject: [PATCH 371/453] srcpkgs: rebuild against OpenSSL
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 6d4a2f9fb84..ccd1f994c15 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -6,7 +6,7 @@ create_wrksrc=yes
build_style=cmake
configure_args="-DCRYFS_UPDATE_CHECKS=off"
hostmakedepends="git python"
-makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel"
+makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
From e85210059aebe8ffc4508bf4fd9ee19563f7b233 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:00 +0100
Subject: [PATCH 372/453] crystal: rebuild against OpenSSL
---
srcpkgs/crystal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template
index d37fd8b2f19..1e5ad325733 100644
--- a/srcpkgs/crystal/template
+++ b/srcpkgs/crystal/template
@@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config"
makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
libxml2-devel"
depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel
- libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config"
-checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel"
+ libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config"
+checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel"
short_desc="Crystal Programming Language"
maintainer="lvmbdv <ata.kuyumcu@protonmail.com>"
license="Apache-2.0"
From 59bdfff8e66c5ce32a047b468f805cdc9dc28384 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 373/453] dkms: rebuild against OpenSSL
---
srcpkgs/dkms/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template
index ec68606557a..80f59c1a7af 100644
--- a/srcpkgs/dkms/template
+++ b/srcpkgs/dkms/template
@@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
if [ "$CROSS_BUILD" ]; then
- depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex"
+ depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex"
fi
do_install() {
From 6a18d39f56f7c2399b7280f91fe60303dd41cacf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 374/453] dovecot-plugin-pigeonhole: rebuild against OpenSSL
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
short_desc="Sieve implementation for Dovecot"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later"
From 3cccb9e040cf20314d1c403f5d77bc43816ee980 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 375/453] easyrsa: rebuild against OpenSSL
---
srcpkgs/easyrsa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..c6a0372e593 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -3,7 +3,7 @@ pkgname=easyrsa
version=3.0.8
revision=1
wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
short_desc="Simple shell based CA utility"
maintainer="Adam Gausmann <agausmann@fastmail.com>"
license="GPL-2.0-only"
From 6d1b2c60847ea4415d332ebc9491fb4e8eb4fe3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 376/453] fbpdf: rebuild against OpenSSL
---
srcpkgs/fbpdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
_gitshort="${_githash:0:7}"
wrksrc="fbpdf-${_gitshort}"
build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
gumbo-parser-devel mupdf-devel"
short_desc="Small framebuffer PDF/DJVU viewer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From f4fd67e9e52d807991dd904efe1a48070c035dd7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 377/453] godot: rebuild against OpenSSL
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
hostmakedepends="pkg-config clang"
makedepends="
alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
miniupnpc-devel pcre2-devel"
From 2eaccdefee83269a3ceedd598867f1feba2240b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 378/453] gtklp: rebuild against OpenSSL
---
srcpkgs/gtklp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
build_style="gnu-configure"
configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
short_desc="Gtk frontend to cups - IPP support"
maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
license="GPL-2.0-or-later"
From c6ecb7b31d56b2143c1a2d6b54ca5a714255c906 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 379/453] hcxdumptool: rebuild against OpenSSL
---
srcpkgs/hcxdumptool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..6b75577957f 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -3,7 +3,7 @@ pkgname=hcxdumptool
version=6.1.1
revision=1
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Small tool to capture packets from wlan devices"
maintainer="Felix Hanley <felix@userspace.com.au>"
license="MIT"
From 02f2bec5bab6fa2775f9688d7df2fbc1216b65c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 380/453] hcxtools: rebuild against OpenSSL
---
srcpkgs/hcxtools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..22d7f18adea 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -3,7 +3,7 @@ pkgname=hcxtools
version=6.1.1
revision=1
build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
maintainer="Felix Hanley <felix@userspace.com.au>"
license="MIT"
From a9afc624ff974dde8bfca31768bf7b14d16db6d8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 381/453] ifuse: rebuild against OpenSSL
---
srcpkgs/ifuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template
index fcc104db297..0d1944b6137 100644
--- a/srcpkgs/ifuse/template
+++ b/srcpkgs/ifuse/template
@@ -4,7 +4,7 @@ version=1.1.4
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config automake"
-makedepends="libressl-devel fuse-devel libimobiledevice-devel"
+makedepends="openssl-devel fuse-devel libimobiledevice-devel"
depends="usbmuxd"
short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch"
maintainer="Orphaned <orphan@voidlinux.org>"
From df793fc6169d66a0f997c185dfe24477fbecaf73 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 382/453] kodi-addon-inputstream-rtmp: rebuild against OpenSSL
---
srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
short_desc="RTMP input stream add-on for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 337a5010353a725b9ce89a00e9702e55cc565ddc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 383/453] kodi-addon-vfs-sftp: rebuild against OpenSSL
---
srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
short_desc="VFS SFTP addon for Kodi"
maintainer="Foxlet <foxlet@furcode.co>"
license="GPL-2.0-or-later"
From f452bc38613efb15831dea80424c8b53703624cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 384/453] kodi-rpi: rebuild against OpenSSL
---
srcpkgs/kodi-rpi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..e30b07767f1 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -27,7 +27,7 @@ makedepends="
libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
From 9e5e5b2743bcce50c5f6965f736884faa7e66b9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:36 +0100
Subject: [PATCH 385/453] libasr: rebuild against OpenSSL
---
srcpkgs/libasr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template
index 484976cde3c..a3049ffb2f1 100644
--- a/srcpkgs/libasr/template
+++ b/srcpkgs/libasr/template
@@ -4,7 +4,7 @@ version=1.0.4
revision=1
build_style=gnu-configure
hostmakedepends="automake libtool"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Simple and portable asynchronous resolver library"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
From 06fe295e566c16bff8834eef7801a973ca97791e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 386/453] libbsd: rebuild against OpenSSL
---
srcpkgs/libbsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..9b6197fdf0d 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,7 @@ pkgname=libbsd
version=0.10.0
revision=1
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Provides useful functions commonly found on BSD system"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"
From 550f738870f6464d97f2edc577f3b32ccade15d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 387/453] libevhtp: rebuild against OpenSSL
---
srcpkgs/libevhtp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..f26da5d93a5 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -3,7 +3,7 @@ pkgname=libevhtp
version=1.2.18
revision=1
build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="BSD-3-Clause"
From 0f6030365dc6f08581575fbd635833e9bd8ff4d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:08 +0100
Subject: [PATCH 388/453] librepcb: rebuild against OpenSSL
---
srcpkgs/librepcb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template
index dfd5c86e785..4950f2761af 100644
--- a/srcpkgs/librepcb/template
+++ b/srcpkgs/librepcb/template
@@ -5,7 +5,7 @@ revision=1
build_style=qmake
configure_args="-r librepcb.pro"
hostmakedepends="unzip qt5-qmake qt5-host-tools"
-makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel"
+makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel"
short_desc="Powerful, innovative and intuitive EDA tool for everyone"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 1554ad6c55c9f85b350d0f27ee4e2c86856b9595 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 389/453] libsignal-protocol-c: rebuild against OpenSSL
---
srcpkgs/libsignal-protocol-c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..c56f32df49f 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,7 +4,7 @@ version=2.3.3
revision=2
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
checkdepends="pkg-config check-devel"
short_desc="Signal Protocol C Library"
maintainer="teldra <teldra@rotce.de>"
From 1a2bcea371d1fc27ca0305c77088944eef949485 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 390/453] libvncserver: rebuild against OpenSSL
---
srcpkgs/libvncserver/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..847c91c4395 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -5,7 +5,7 @@ revision=1
wrksrc="libvncserver-LibVNCServer-${version}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel"
short_desc="C libraries to easily implement VNC server or client functionality"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 16311e8d0b64285a8399f16c04e068c02d1c5c44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 391/453] linux-tools: rebuild against OpenSSL
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
slang-devel"
depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
From 3df32aba2829a6237a54513a9c07b11cc1d1c1d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 392/453] linux4.4: rebuild against OpenSSL
---
srcpkgs/linux4.4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index b837ced471e..e81afe07bdd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
case "$XBPS_TARGET_MACHINE" in
ppc64le*) broken="No ppc64le support";;
From 96084c2cec8d7b429f53e6d285b1d8a4eb47517d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 393/453] linux4.9: rebuild against OpenSSL
---
srcpkgs/linux4.9/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index 8b613c09ee8..cd9a1fd97e4 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -19,7 +19,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel"
case "$XBPS_TARGET_MACHINE" in
ppc64le*) broken="No ppc64le support";;
From 14c8ce86b65a320d736933d30cc7aeb5e554bf4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 394/453] miniupnpd: rebuild against OpenSSL
---
srcpkgs/miniupnpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
/etc/miniupnpd/*.conf
/etc/miniupnpd/*.sh"
hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
short_desc="Lightweight UPnP IGD daemon"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
From abadf61501730fa381fca1645e11703cfaa89b40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 395/453] mktorrent: rebuild against OpenSSL
---
srcpkgs/mktorrent/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..fcd5d3d707a 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -4,7 +4,7 @@ version=1.1
revision=2
build_style=gnu-makefile
make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Simple command line utility to create BitTorrent metainfo files"
maintainer="Georg Schabel <gescha@posteo.de>"
license="GPL-2.0-or-later"
From 2599cc1263272a8bf107328639c14a7ea8c2ae1d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 396/453] musikcube: rebuild against OpenSSL
---
srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
srcpkgs/musikcube/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+
+--- src/plugins/server/HttpServer.h.orig 2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..47e7dd85bbc 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -7,7 +7,7 @@ make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
hostmakedepends="pkg-config"
makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
sndio-devel"
short_desc="Terminal-based music player in c++"
From f11c66cfc2c835cd51d6632cd8aa1099f023cc39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 397/453] next: rebuild against OpenSSL
---
srcpkgs/next/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..7a00d3b089e 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -5,8 +5,8 @@ revision=1
wrksrc=nyxt-${version}
build_style=gnu-makefile
hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="sqlite xclip libfixposix-devel openssl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
From 05c2d2a6c17e5876247ecfca78d89eab2ae2feba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 398/453] fixup! Resign as maintainer of all packages except
xbps.
---
srcpkgs/ngrep/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
short_desc="Like GNU grep applied to the network layer"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From d73e971013b0d003df15e5c54ebb41a4ab5df7b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:09 +0100
Subject: [PATCH 399/453] nim: rebuild against OpenSSL
---
srcpkgs/nim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template
index fd3a0e45510..0e1d3a5445c 100644
--- a/srcpkgs/nim/template
+++ b/srcpkgs/nim/template
@@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb
create_wrksrc=yes
build_wrksrc="Nim-$version"
hostmakedepends="ed"
-depends="gcc libressl-devel"
+depends="gcc openssl-devel"
short_desc="Nim programming language"
maintainer="allan <mail@may.mooo.com>"
license="MIT"
From 470737e6c4d16ef00b30a4b815aba8cf0898ee16 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 400/453] nodejs-lts-10: rebuild against OpenSSL
---
srcpkgs/nodejs-lts-10/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel)"
makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel)"
short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
desc_option_libuv="Enable shared libuv"
desc_option_http_parser="Enable shared http-parser"
desc_option_icu="Enable shared icu"
From f4bec240bd8e9005f3823f72e0a8a1d1038a386c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 401/453] nodejs-lts: rebuild against OpenSSL
---
srcpkgs/nodejs-lts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..75cf9c33500 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -9,7 +9,7 @@ hostmakedepends="pkg-config python libatomic-devel zlib-devel which
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
desc_option_libuv="Enable shared libuv"
desc_option_http_parser="Enable shared http-parser and llhttp"
desc_option_icu="Enable shared icu"
From b03de67edc928e3e7c2d7815b3eb289e6875bd2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 402/453] nodejs: rebuild against OpenSSL
---
srcpkgs/nodejs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
desc_option_libuv="Enable shared libuv"
desc_option_http_parser="Enable shared http-parser and llhttp"
desc_option_icu="Enable shared icu"
From 984e6bd21f528c9500a7d4e6527269f59f8bad6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 403/453] tree-wide: rebuild against OpenSSL
---
srcpkgs/odroid-u2-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
nostrip=yes
noverifyrdeps=yes
archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
makedepends="ncurses-devel"
depends="kmod>=11_2"
triggers="kernel-hooks"
From fee2f430dc3497da9229afc1a9d584bcec7b10c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 404/453] open-vm-tools: rebuild against OpenSSL
---
srcpkgs/open-vm-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
--without-xmlsecurity --without-kernel-modules
$(vopt_with x11 x) $(vopt_with pam)"
hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
$(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
short_desc="Open source implementation of VMware Tools"
From 3426b1b47d80ba383627c074e2433ff6f465e849 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 405/453] openjdk11: rebuild against OpenSSL
---
srcpkgs/openjdk11/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
make_build_args="images $(vopt_if docs docs)"
make_check_target="test-hotspot-gtest"
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
fontconfig-devel zlib-devel lcms2-devel"
From c91914c6f1dcf0af30c127b604b5fc3d4c5a93ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 406/453] opensmtpd-extras: rebuild against OpenSSL
---
srcpkgs/opensmtpd-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
--with-table-postgres --with-table-socketmap --with-table-sqlite"
hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
libmariadbclient-devel sqlite-devel"
depends="opensmtpd"
short_desc="Free implementation of the server-side SMTP protocol - extras"
From 9a21a55703c871726034afec66ed11ead5d3065d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 407/453] openvpn: rebuild against OpenSSL
---
srcpkgs/openvpn/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..43eedcd2da0 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
$(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
short_desc="Easy-to-use, robust, and highly configurable VPN"
maintainer="Orphaned <orphan@voidlinux.org>"
From 769c70cc1a2941670d8fcbabb3f730ceaa6d4ee8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 408/453] passwordsafe: rebuild against OpenSSL
---
srcpkgs/passwordsafe/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 435612f3ae7..a73067d8fb3 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON"
# build process uses perl to generate core_st.cpp and zip to generate help files
hostmakedepends="perl zip pkg-config gettext"
makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
short_desc="Simple & Secure Password Management"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="Artistic-2.0"
From fbb7e55cb3cbdf1ac120c3735890c17846632d20 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 409/453] pinebookpro-kernel: rebuild against OpenSSL
---
srcpkgs/pinebookpro-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 79931617762..f64e68bb459 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From d53751bc52a80e7c4c170c317cc89d231a5f6f43 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 410/453] pinephone-kernel: rebuild against OpenSSL
---
srcpkgs/pinephone-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index 56d1028beb6..16b6b68d379 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From 08292ec8cef74e69914ac8776b805e4eb5713da6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 411/453] pmbootstrap: rebuild against OpenSSL
---
srcpkgs/pmbootstrap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..4fa80fff8ed 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -4,7 +4,7 @@ version=1.29.1
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
short_desc="PostmarketOS's chroot, build and flash tool"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
From 2a02911c6555eb28cfbfc879da8ab9cdb44922e6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 412/453] python-tkinter: rebuild against OpenSSL
---
srcpkgs/python-tkinter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
wrksrc="Python-${version}"
pycompile_dirs="usr/lib/python2.7/lib-tk"
hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
sqlite-devel bzip2-devel zlib-devel tk-devel"
short_desc="${_desc} - GUI toolkit for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
From 595e027675ff6060dd823d25bfb60595e38938b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 413/453] python3-grpcio: rebuild against OpenSSL
---
srcpkgs/python3-grpcio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index 76b88b3c8c4..63787382630 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel openssl-devel"
depends="python3-six"
short_desc="HTTP/2-based gRPC framework for Python"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From 356a7de7fced7139298750a0a8bcdc4e76ddb39e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 414/453] python3-mysqlclient: rebuild against OpenSSL
---
srcpkgs/python3-mysqlclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
wrksrc="mysqlclient-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
short_desc="Python3 interface to MySQL/MariaDB"
maintainer="Alin Dobre <alin.dobre@outlook.com>"
license="GPL-2.0-or-later"
From a577fd80d7deadb56c2b532e3cd572311afb9fbf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 415/453] python3-tkinter: rebuild against OpenSSL
---
srcpkgs/python3-tkinter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 580463b906b..9fc2d44bce5 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -15,7 +15,7 @@ pycompile_dirs="
usr/lib/python${version%.*}/turtledemo
usr/lib/python${version%.*}/turtle.py"
hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
short_desc="${_desc} - GUI toolkit for Python3"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From b2ed15e1e6a0ef59184c3a19a58729e1e5e36ea0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:32 +0100
Subject: [PATCH 416/453] rdesktop: rebuild against OpenSSL
---
srcpkgs/rdesktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template
index 70c8cf288c8..616ee3541ef 100644
--- a/srcpkgs/rdesktop/template
+++ b/srcpkgs/rdesktop/template
@@ -5,7 +5,7 @@ revision=3
build_style=gnu-configure
configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="pkg-config automake"
-makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
+makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel
pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel
nettle-devel gnutls-devel"
short_desc="Open source client for Windows Remote Desktop Services"
From bd55979f3de3e89332ebb33dda08e23d7adda6f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 417/453] remwharead: rebuild against OpenSSL
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..f219b008811 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
revision=1
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel"
short_desc="Saves URIs of things you want to remember in a database"
maintainer="teldra <teldra@rotce.de>"
license="GPL-3.0-only"
From f40acabba21a5b052330166229fc88ec364f554f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:00:19 +0100
Subject: [PATCH 418/453] rkt: rebuild against OpenSSL
---
srcpkgs/rkt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rkt/template b/srcpkgs/rkt/template
index 84d4e32837a..0eed248718c 100644
--- a/srcpkgs/rkt/template
+++ b/srcpkgs/rkt/template
@@ -8,7 +8,7 @@ configure_args="--enable-tpm=no --enable-sdjournal=no
--with-stage1-flavors=fly,coreos,host
--with-stage1-default-location=/usr/lib/rkt/stage1.aci"
hostmakedepends="automake wget cpio squashfs-tools bc gnupg git go"
-makedepends="acl-devel zlib-devel libressl-devel"
+makedepends="acl-devel zlib-devel openssl-devel"
depends="virtual?rkt-stage1"
short_desc="App Container runtime for Linux"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
From 9a1c72ed2ded03e12c8ca890d7f3143e92af6ee3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 419/453] rmilter: rebuild against OpenSSL
---
srcpkgs/rmilter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
short_desc="Postfix/sendmail integration for rspamd"
maintainer="John Regan <john@jrjrtech.com>"
license="BSD"
From a08d596171a298820e5e68502e980b9bba14ce65 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 420/453] rpi-kernel: rebuild against OpenSSL
---
srcpkgs/rpi-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
# RPi, RPi2, RPi3
archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
makedepends="ncurses-devel"
triggers="kernel-hooks"
# These files could be modified when an external module is built.
From e6e56647732d67540b2ce21a615a1a34d319de04 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 421/453] rtags: rebuild against OpenSSL
---
srcpkgs/rtags/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
# Don't run tests in do_install, please.
configure_args="-DSKIP_CTEST=TRUE"
hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
checkdepends="perl python3-PyHamcrest python3-nose"
short_desc="C/C++ indexer with integration for Emacs based on clang"
maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
From e0a8dff41aa4689de0ab66b158dfedf01b50bf17 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:21 +0100
Subject: [PATCH 422/453] s6-networking: rebuild against OpenSSL
---
srcpkgs/s6-networking/template | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template
index 969f65823f1..4c28d6a94cf 100644
--- a/srcpkgs/s6-networking/template
+++ b/srcpkgs/s6-networking/template
@@ -3,11 +3,11 @@ pkgname=s6-networking
version=2.4.0.0
revision=2
build_style=configure
-configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl)
+configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl)
$(vopt_if bearssl --enable-ssl=bearssl)
--with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
--with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
-makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel
+makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel
s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)"
short_desc="Suite of small network utilities for Unix systems"
maintainer="lemmi <lemmi@nerd2nerd.org>"
@@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html"
distfiles="${homepage}/${pkgname}-${version}.tar.gz"
checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb
-build_options="bearssl libressl"
+build_options="bearssl openssl"
build_options_default="bearssl"
desc_option_bearssl="Use BearSSL as SSL library"
-desc_option_libressl="Use LibreSSL as SSL library"
-vopt_conflict bearssl libressl
+desc_option_openssl="Use LibreSSL as SSL library"
+vopt_conflict bearssl openssl
case "$XBPS_TARGET_MACHINE" in
*-musl)
@@ -46,7 +46,7 @@ s6-networking-doc_package() {
s6-networking-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} skalibs-devel
- $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)"
+ $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
From ca2a98dcc2621787e137c012ca956db3696ff1c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 423/453] sane: rebuild against OpenSSL
---
srcpkgs/sane/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
$(vopt_with snmp)"
hostmakedepends="pkg-config"
makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
$(vopt_if snmp net-snmp-devel)"
depends="$(vopt_if snmp net-snmp)"
conf_files="/etc/sane.d/*.conf"
From 5f8e23b2988a7263a03c109767b20bee69ed6fa9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 424/453] slurm-wlm: rebuild against OpenSSL
---
srcpkgs/slurm-wlm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="perl cgit python pkg-config"
# XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
freeipmi-devel"
short_desc="Workload manager for Linux clusters of all sizes"
From a3dfb39bbfad8db37d339f53227f34b3fe7fd896 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 425/453] sun7i-kernel: rebuild against OpenSSL
---
srcpkgs/sun7i-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index 755636a526d..9649421e793 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -27,7 +27,7 @@ _kernver="${version}_${revision}"
nostrip=yes
noverifyrdeps=yes
archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
makedepends="ncurses-devel"
triggers="kernel-hooks"
# These files could be modified when an external module is built.
From 495393fb5b217e2dccb57952f747290c5f9d9fbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 426/453] sysbench: rebuild against OpenSSL
---
srcpkgs/sysbench/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
--with-system-ck
--with-system-luajit"
hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
postgresql-libs-devel zlib-devel"
short_desc="Scriptable database and system performance benchmark"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 98d2a974e3a61a9686febf751c69edd9919f9ee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:08 +0100
Subject: [PATCH 427/453] tagparser: rebuild against OpenSSL
---
srcpkgs/tagparser/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index 1b013eb6f5c..95bafecd321 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
hostmakedepends="pkg-config"
-makedepends="cpp-utilities-devel zlib-devel libressl-devel"
+makedepends="cpp-utilities-devel zlib-devel openssl-devel"
short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
From fbfded8688f7aaa1f4ba8dcd4e3550bfc211ae22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:28 +0100
Subject: [PATCH 428/453] taizen: rebuild against OpenSSL
---
srcpkgs/taizen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template
index fe2e78bc723..8bd61b187e6 100644
--- a/srcpkgs/taizen/template
+++ b/srcpkgs/taizen/template
@@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e
wrksrc="${pkgname}-${_githash}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
short_desc="Browse mediawiki pages from the command line"
maintainer="travankor <travankor@tuta.io>"
license="MIT"
@@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen"
distfiles="${homepage}/archive/${_githash}.tar.gz"
checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15
nocross="Attempts to run non-native binaries during build"
-broken="constraints force old openssl, incompatible with libressl"
+broken="constraints force old openssl, incompatible with openssl"
pre_build() {
cargo update --package openssl-sys --precise 0.9.35
From d23d58e4d4c5e84b4714d5a353e1c0f9f480ce0e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 429/453] tarsnap: rebuild against OpenSSL
---
srcpkgs/tarsnap/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..c316e666ada 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -5,7 +5,7 @@ revision=1
wrksrc=${pkgname}-autoconf-${version}
build_style=gnu-configure
configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
depends="bzip2 xz"
conf_files="/etc/tarsnap/tarsnap.conf"
short_desc="An online encrypted backup service (client)"
From ccb3ab525aa8a4a50e9bdb4269b410309071d24c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 430/453] testssl.sh: rebuild against OpenSSL
---
srcpkgs/testssl.sh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..0592cc11945 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -2,7 +2,7 @@
pkgname=testssl.sh
version=3.0.2
revision=2
-depends="libressl bind-utils"
+depends="openssl bind-utils"
short_desc="Command line tool which checks a server for the support of TLS/SSL"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
From b653194f1077488f465d77cfeb1af911288ad31c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 431/453] tg_owt: rebuild against OpenSSL
---
srcpkgs/tg_owt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index c772b0cbb61..ceff7a631a8 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=OFF"
hostmakedepends="pkg-config yasm protobuf25"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
depends="$makedepends"
short_desc="WebRTC library for Telegram-desktop"
From 91cc2bc79d4c090fa78ddd9fb6ef17fb20c5562d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 432/453] turbovnc: rebuild against OpenSSL
---
srcpkgs/turbovnc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
-DTVNC_SYSTEMLIBS=ON"
hostmakedepends="rsync"
makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
depends="perl"
short_desc="Optimized version of TightVNC VNC client and server"
maintainer="Orphaned <orphan@voidlinux.org>"
From f87485951a0a2f4ba0148648e8458b2ce9de92f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 433/453] websocat: rebuild against OpenSSL
---
srcpkgs/websocat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..c7b3e552b4e 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -4,7 +4,7 @@ version=1.6.0
revision=1
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Netcat, curl and socat for WebSockets"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
From a7925d371a71a356f2c6bc6a49191787ab2ebd66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 434/453] xen: rebuild against OpenSSL
---
srcpkgs/xen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
depends="bridge-utils perl xen-hypervisor"
short_desc="Xen hypervisor utilities"
From 101db70b41550e44f9b733bb077d02dcd359d984 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 435/453] srcpkgs: rebuild against OpenSSL
---
srcpkgs/xorg-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 116d922ca8a007828edd074643302cd4c0bd095e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:56 +0100
Subject: [PATCH 436/453] zathura-pdf-mupdf: rebuild against OpenSSL
---
srcpkgs/zathura-pdf-mupdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template
index 799dfb3189e..aaa55ee19dd 100644
--- a/srcpkgs/zathura-pdf-mupdf/template
+++ b/srcpkgs/zathura-pdf-mupdf/template
@@ -4,7 +4,7 @@ version=0.3.6
revision=2
build_style=meson
hostmakedepends="pkg-config"
-makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel
+makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel
libjpeg-turbo-devel libjbig2dec"
depends="zathura"
short_desc="PDF support for zathura (using mupdf)"
From c9a6842c2f750263c2ba47c4b30685c4bfd7dfd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 437/453] zeroinstall: rebuild against OpenSSL
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
short_desc="Cross-distribution software installation system"
maintainer="mobinmob <mobinmob@disroot.org>"
From 873058664c950577a391e0bb90cd212090142f2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:07 +0100
Subject: [PATCH 438/453] zola: rebuild against OpenSSL
---
srcpkgs/zola/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template
index 982f970698c..7b60c37e0de 100644
--- a/srcpkgs/zola/template
+++ b/srcpkgs/zola/template
@@ -4,7 +4,7 @@ version=0.13.0
revision=1
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel libsass-devel oniguruma-devel"
+makedepends="openssl-devel libsass-devel oniguruma-devel"
short_desc="Fast opinionated static site generator written in rust"
maintainer="Carson Page <pagem.carson@gmail.com>"
license="MIT"
From f5324a23efaf2c551ea422152cf50a250cd9b51d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:28 +0100
Subject: [PATCH 439/453] zou: rebuild against OpenSSL
---
srcpkgs/zou/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zou/template b/srcpkgs/zou/template
index e000cdc557d..6dd643127e2 100644
--- a/srcpkgs/zou/template
+++ b/srcpkgs/zou/template
@@ -4,14 +4,14 @@ version=0.2.0
revision=6
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Simple and fast download accelerator, written in Rust"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/k0pernicus/zou"
distfiles="https://github.com/k0pernicus/zou/archive/v${version}.tar.gz"
checksum=cb47cb1023991135c2ae168f436f3ddae497393d7ac3c8b15a174eef2a191f3f
-broken="constraints force old openssl crate, incompatible with libressl"
+broken="constraints force old openssl crate, incompatible with openssl"
pre_build() {
cargo update
From 3937ce4c828413858db260eb274ee99448a2d5f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 25 Jan 2021 18:21:24 +0100
Subject: [PATCH 440/453] libluv: rebuild against OpenSSL
---
srcpkgs/libluv/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template
index 767f729527e..569b30e8242 100644
--- a/srcpkgs/libluv/template
+++ b/srcpkgs/libluv/template
@@ -13,14 +13,14 @@ maintainer="andry-dev <peketribal2@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/luvit/luv"
distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz
- https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
+ https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in"
checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445
be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e"
skip_extraction="libluv.pc.in"
-if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
- hostmakedepends+=" gcc-multilib"
-fi
+#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then
+# hostmakedepends+=" gcc-multilib"
+#fi
post_extract() {
cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in
From c1fdc1bd50b42add1182229286b9f4b6aeb07754 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 3 Feb 2021 00:44:57 +0100
Subject: [PATCH 441/453] mumble: build umurmur without Ice rpc support
---
srcpkgs/mumble/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index cb155ffea3a..fc694a08570 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -6,9 +6,10 @@ build_style=qmake
configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
$(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations
- CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
-hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
-makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
+ CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice
+ DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
+hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
+makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel
libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
speech-dispatcher-devel speex-devel portaudio-devel"
From 063dac9da8f096f8b344385d55dfb7b7d0970db9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 5 Feb 2021 20:22:52 +0100
Subject: [PATCH 442/453] environment/configure/gnu-configure-args.sh: do not
expand exec_prefix
---
common/environment/configure/gnu-configure-args.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..dafbf5dc110 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -17,7 +17,7 @@ export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
# Always use wordsize-specific libdir even though the real path is lib
# This is to make sure 32-bit and 64-bit libs can coexist when looking
# up things (the opposite-libdir is always symlinked as libNN)
-export configure_args+=" --libdir=/usr/lib${XBPS_TARGET_WORDSIZE}"
+export configure_args+=" --libdir=\${exec_prefix}/lib${XBPS_TARGET_WORDSIZE}"
_AUTOCONFCACHEDIR=${XBPS_COMMONDIR}/environment/configure/autoconf_cache
From 1df875be6178551c6b96f23fcb592f070acfa898 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 443/453] vpnc: switch to OpenSSL
---
srcpkgs/vpnc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..00f2c46e500 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -9,7 +9,7 @@ make_use_env=yes
make_build_args="SBINDIR=/usr/bin"
make_check_target=test
hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
depends="net-tools vpnc-scripts"
short_desc="Client for cisco vpn concentrator"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 2d059e1bc111feab397ccee3a507c4493d705d31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 444/453] libsasl: remove libressl patch
---
srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
1 file changed, 61 deletions(-)
delete mode 100644 srcpkgs/libsasl/patches/libressl.patch
diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
-
- rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- if (rc != LDAP_OPT_SUCCESS) {
-- syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+ syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- }
-
- rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- if (rc != LDAP_OPT_SUCCESS) {
-- syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+ syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- }
-
- rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
-
- int rc, i, tlen = 0;
- char *text;
-- EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+ EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
-
- if (enc_ctx == NULL)
- return LAK_NOMEM;
-
- text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- if (text == NULL) {
-- EVP_ENCODE_CTX_free(enc_ctx);
-+ free(enc_ctx);
- return LAK_NOMEM;
- }
-
- EVP_DecodeInit(enc_ctx);
- rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- if (rc < 0) {
-- EVP_ENCODE_CTX_free(enc_ctx);
-+ free(enc_ctx);
- free(text);
- return LAK_FAIL;
- }
- tlen += i;
- EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
-
-- EVP_ENCODE_CTX_free(enc_ctx);
-+ free(enc_ctx);
-
- *ret = text;
- if (rlen != NULL)
From 3545116eb915ab4ebe82531bf4494cb6aeca8259 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 445/453] starship: switch to OpenSSL
---
srcpkgs/starship/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..af48a7894d7 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -5,7 +5,7 @@ revision=1
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
checkdepends="git fish-shell"
short_desc="Minimal, fast and customizable cross-shell prompt"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
From ead043862f681cd3958253b0ee688c7d31ada0b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 7 Feb 2021 14:41:26 +0100
Subject: [PATCH 446/453] catch2: remove upstreamed patch
---
srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ----
1 file changed, 4 deletions(-)
rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%)
diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch
similarity index 82%
rename from srcpkgs/catch2/patches/musl-test.patch
rename to srcpkgs/catch2/patches/errno-tests.patch
index f469dc45e02..ad5c67918dd 100644
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/errno-tests.patch
@@ -1,7 +1,3 @@
-From: Johnnynator
-
-errno on Musl and Glibc expand differently by one space
----
--- scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +0100
+++ - 2020-12-31 16:19:56.118506507 +0100
@@ -44,7 +44,7 @@
From e8d0990fb1065a5f2a8f7ba58af13b5320bb5a18 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 447/453] maturin: switch to OpenSSL
---
srcpkgs/maturin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 268d12ffd7a..87491d9fbba 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -7,7 +7,7 @@ build_style=cargo
# The list of enabled features should be reconciled with each new release
configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="python3-toml"
short_desc="Build and publish crates as python packages"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From 9dc24e1095002bb6c0876b9d6ed2d8f89991e366 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 448/453] python3-adblock: switch to OpenSSL
---
srcpkgs/python3-adblock/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..0e91c4077dc 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -5,8 +5,8 @@ revision=1
wrksrc="${pkgname/python3/python}-${version}"
build_style=python3-pep517
build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
depends="python3"
checkdepends="python3-pytest"
short_desc="Brave's adblock library in Python"
From a7b74e14748eabc96583f1187e2e624c803d030c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 449/453] python3-cryptography: switch to OpenSSL
---
srcpkgs/python3-cryptography/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index dff0d3b211f..ee751c6216f 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
build_helper="rust"
hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
depends="python3-cffi"
checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
python3-cryptography_vectors python3-pretend python3-hypothesis $depends"
From 2ab3dbbb2d7ea767db0fe140a13fb9348e330ba8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:38:48 +0100
Subject: [PATCH 450/453] acme-client: make broken
---
srcpkgs/acme-client/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template
index d583ddfa476..7a6f3833940 100644
--- a/srcpkgs/acme-client/template
+++ b/srcpkgs/acme-client/template
@@ -15,6 +15,8 @@ homepage="https://kristaps.bsd.lv/acme-client/"
distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz"
checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667
+broken="Doesn't work with OpenSSL"
+
CFLAGS="-fcommon -DHAVE_CONFIG_H"
case "$XBPS_TARGET_MACHINE" in
*-musl) CFLAGS+=" -DMUSL_LIBC" ;;
From b1920a56267c828ca263097e3b0cc53226e2e78c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 18:39:34 +0100
Subject: [PATCH 451/453] Ice: mark broken
---
srcpkgs/Ice/template | 2 ++
1 file changed, 2 insertions(+)
diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template
index db36428fd6d..b3019f4add4 100644
--- a/srcpkgs/Ice/template
+++ b/srcpkgs/Ice/template
@@ -12,6 +12,8 @@ distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz"
checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
python_version=2 #unverified
+broken="Nobody cares to update this, far to ancient for OpenSSL"
+
if [ "$CROSS_BUILD" ]; then
# Cross build requires the host's slice2cpp and slice2freeze
hostmakedepends+=" Ice"
From b4ec0066fc5a711b0331890f4a15e907df2800f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:05:24 +0100
Subject: [PATCH 452/453] *-luasec: update to 1.0
unify into a single template and add lua54 support
---
srcpkgs/lua51-luasec | 1 +
srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
srcpkgs/lua51-luasec/template | 29 -------
srcpkgs/lua52-luasec | 1 +
srcpkgs/lua52-luasec/template | 28 -------
srcpkgs/lua53-luasec | 1 +
srcpkgs/lua53-luasec/template | 34 --------
srcpkgs/lua54-luasec/template | 87 +++++++++++++++++++++
8 files changed, 90 insertions(+), 127 deletions(-)
create mode 120000 srcpkgs/lua51-luasec
delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
delete mode 100644 srcpkgs/lua51-luasec/template
create mode 120000 srcpkgs/lua52-luasec
delete mode 100644 srcpkgs/lua52-luasec/template
create mode 120000 srcpkgs/lua53-luasec
delete mode 100644 srcpkgs/lua53-luasec/template
create mode 100644 srcpkgs/lua54-luasec/template
diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
- }
- return 1;
- }
--
-+
- /**
- * Return the compression method used.
- */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
- const COMP_METHOD *comp;
-+#endif
- p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
- if (ssl->state != LSEC_STATE_CONNECTED) {
- lua_pushnil(L);
- lua_pushstring(L, "closed");
- return 2;
- }
-+#if !defined(OPENSSL_NO_COMP)
- comp = SSL_get_current_compression(ssl->ssl);
- if (comp)
- lua_pushstring(L, SSL_COMP_get_name(comp));
- else
- lua_pushnil(L);
-+#else
-+ lua_pushnil(L);
-+#endif
- return 1;
- }
-
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index d9a1ab60631..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=12
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel openssl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
- lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
- make linux CC=$CC LD=$CC \
- INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
- LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 557292e03a9..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel openssl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
- lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
- make linux CC=$CC LD=$CC \
- INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
- LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
- export LUAPATH=${DESTDIR}/usr/share/lua/5.2
- export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
- vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 6cb4c1993b8..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=5
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel openssl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
- lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
- make linux CC=$CC LD=$CC \
- INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
- LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
- vlicense LICENSE
-}
-
-luasec_package() {
- depends="lua53-luasec>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
- build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+ mkdir -p lua5.1
+ mv * lua5.1 || true
+ cp -a lua5.1 lua5.2
+ cp -a lua5.1 lua5.3
+ cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+ for luaver in 5.1 5.2 5.3 5.4; do
+ pushd lua${luaver}
+ lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+ popd
+ done
+}
+
+do_build() {
+ for luaver in 5.1 5.2 5.3 5.4; do
+ pushd lua${luaver}
+ make linux CC=$CC LD=$CC \
+ INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+ LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+ popd
+ done
+}
+
+do_install() {
+ for luaver in 5.1 5.2 5.3 5.4; do
+ pushd lua${luaver}
+ make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+ popd
+ done
+ vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+ depends="lua51"
+ short_desc="${_desc} (5.1.x)"
+ pkg_install() {
+ vlicense "${wrksrc}/lua5.1/LICENSE"
+ vmove usr/lib/lua/5.1
+ vmove usr/share/lua/5.1
+ }
+}
+
+lua52-luasec_package() {
+ depends="lua52"
+ short_desc="${_desc} (5.2.x)"
+ pkg_install() {
+ vlicense "${wrksrc}/lua5.2/LICENSE"
+ vmove usr/lib/lua/5.2
+ vmove usr/share/lua/5.2
+ }
+}
+
+lua53-luasec_package() {
+ depends="lua53"
+ short_desc="${_desc} (5.3.x)"
+ pkg_install() {
+ vlicense "${wrksrc}/lua5.3/LICENSE"
+ vmove usr/lib/lua/5.3
+ vmove usr/share/lua/5.3
+ }
+}
+
+luasec_package() {
+ depends="lua53-luasec>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
From fab08c2508abe5c9465f681fe1deefb991373176 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 13 Feb 2021 21:43:45 +0100
Subject: [PATCH 453/453] sitecopy: remove package
---
srcpkgs/removed-packages/template | 3 ++-
srcpkgs/sitecopy/patches/fix-docdir.patch | 11 -----------
srcpkgs/sitecopy/patches/fix-sslv2.patch | 20 --------------------
srcpkgs/sitecopy/template | 14 --------------
4 files changed, 2 insertions(+), 46 deletions(-)
delete mode 100644 srcpkgs/sitecopy/patches/fix-docdir.patch
delete mode 100644 srcpkgs/sitecopy/patches/fix-sslv2.patch
delete mode 100644 srcpkgs/sitecopy/template
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1c869a6950f..a344abc2901 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=24
+revision=25
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -212,6 +212,7 @@ replaces="
scantailor<=0.9.12.1_2
seriespl<=2.3.5_2
simple-obfs<=0.0.5_2
+ sitecopy<=0.16.6_11
skypetab-ng<=20150201_3
soulseekqt<=20160117_2
spacefm-ng<=1.0.6_3
diff --git a/srcpkgs/sitecopy/patches/fix-docdir.patch b/srcpkgs/sitecopy/patches/fix-docdir.patch
deleted file mode 100644
index e260ffb46d4..00000000000
--- a/srcpkgs/sitecopy/patches/fix-docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2008-07-07 20:55:29.000000000 +0000
-+++ Makefile.in 2016-12-10 18:31:21.499245804 +0000
-@@ -11,7 +11,7 @@
- bindir = @bindir@
- mandir = @mandir@
- man1dir = $(mandir)/man1
--docdir = $(prefix)/doc/sitecopy
-+docdir = @docdir@/sitecopy
- localedir = $(datadir)/locale
- datadir = @datadir@
- datarootdir = @datarootdir@
diff --git a/srcpkgs/sitecopy/patches/fix-sslv2.patch b/srcpkgs/sitecopy/patches/fix-sslv2.patch
deleted file mode 100644
index a5b362874b9..00000000000
--- a/srcpkgs/sitecopy/patches/fix-sslv2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/neon/ne_openssl.c 2008-02-06 12:27:38.000000000 +0100
-+++ lib/neon/ne_openssl.c 2016-05-11 23:11:29.244939342 +0200
-@@ -550,7 +550,7 @@
- ctx->ctx = SSL_CTX_new(SSLv23_server_method());
- SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
- } else {
-- ctx->ctx = SSL_CTX_new(SSLv2_server_method());
-+ ctx->ctx = SSL_CTX_new(SSLv23_server_method());
- SSL_CTX_set_session_cache_mode(ctx->ctx, SSL_SESS_CACHE_CLIENT);
- }
- return ctx;
-@@ -688,7 +688,7 @@
- if (ctx->sess) {
- SSL_SESSION *newsess = SSL_get0_session(ssl);
- /* Replace the session if it has changed. */
-- if (newsess != ctx->sess || SSL_SESSION_cmp(ctx->sess, newsess)) {
-+ if (newsess != ctx->sess || memcmp(ctx->sess, newsess, sizeof(*newsess))) {
- SSL_SESSION_free(ctx->sess);
- ctx->sess = SSL_get1_session(ssl); /* bumping the refcount */
- }
diff --git a/srcpkgs/sitecopy/template b/srcpkgs/sitecopy/template
deleted file mode 100644
index 5fc4d36362f..00000000000
--- a/srcpkgs/sitecopy/template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'sitecopy'
-pkgname=sitecopy
-version=0.16.6
-revision=9
-build_style=gnu-configure
-configure_args="--with-ssl=openssl"
-hostmakedepends="pkg-config"
-makedepends="libressl-devel neon-devel"
-short_desc="Program to easily maintain remote web sites"
-maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
-homepage="http://www.manyfish.co.uk/sitecopy/"
-distfiles="https://sources.voidlinux.org/sitecopy-${version}/sitecopy-${version}.tar.gz"
-checksum=e06fdda007e54ddc6fae90a4e79768e5bfb7770c1139bcaac2e10d841d7458af
next prev parent reply other threads:[~2021-02-13 21:05 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 13:51 [PR PATCH] " 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
2020-04-18 7:56 ` agausmann
2020-04-21 22:26 ` xtraeme
2020-04-22 1:14 ` [PR PATCH] [Updated] " Johnnynator
2020-04-23 7:38 ` travankor
2021-02-10 22:56 ` [PR PATCH] [Updated] " Johnnynator
2021-02-13 20:21 ` Johnnynator
2021-02-13 21:05 ` Johnnynator [this message]
2021-02-13 23:24 ` Johnnynator
2021-02-15 15:30 ` Johnnynator
2021-02-17 19:20 ` Johnnynator
2021-02-17 21:41 ` Johnnynator
2021-02-17 22:33 ` Johnnynator
2021-02-18 19:54 ` Johnnynator
2021-02-18 20:25 ` [PR PATCH] [Updated] New package: openssl-1.1.1j Johnnynator
2021-02-20 13:25 ` Johnnynator
2021-02-21 18:38 ` Johnnynator
2021-02-21 21:05 ` Johnnynator
2021-02-21 21:09 ` Johnnynator
2021-02-21 21:14 ` [PR PATCH] [Updated] " Johnnynator
2021-02-21 21:49 ` ericonr
2021-02-22 20:39 ` [PR PATCH] [Updated] " Johnnynator
2021-02-22 21:51 ` Johnnynator
2021-02-23 19:22 ` Johnnynator
2021-02-23 22:57 ` Johnnynator
2021-02-24 17:46 ` ericonr
2021-02-24 17:59 ` ericonr
2021-02-24 18:03 ` Johnnynator
2021-02-24 18:05 ` Johnnynator
2021-02-24 18:08 ` ericonr
2021-02-24 18:13 ` Johnnynator
2021-02-24 18:13 ` ericonr
2021-02-24 18:13 ` ericonr
2021-02-24 18:14 ` Johnnynator
2021-02-24 18:15 ` ericonr
2021-02-24 18:16 ` Johnnynator
2021-02-24 18:16 ` Johnnynator
2021-02-24 18:21 ` Johnnynator
2021-02-24 18:21 ` Johnnynator
2021-02-24 18:24 ` Johnnynator
2021-02-24 18:30 ` Johnnynator
2021-02-24 18:30 ` Johnnynator
2021-02-24 18:33 ` Johnnynator
2021-02-24 18:36 ` [PR PATCH] [Updated] " Johnnynator
2021-02-24 18:37 ` Johnnynator
2021-02-24 18:56 ` Johnnynator
2021-02-25 20:19 ` [PR PATCH] [Updated] " Johnnynator
2021-02-26 21:30 ` Johnnynator
2021-02-28 16:23 ` Johnnynator
2021-02-28 23:43 ` Johnnynator
2021-03-01 7:07 ` fosslinux
2021-03-01 8:54 ` Johnnynator
2021-03-01 8:56 ` [PR PATCH] [Updated] " Johnnynator
2021-03-01 10:40 ` Johnnynator
2021-03-02 19:35 ` ericonr
2021-03-02 19:37 ` ericonr
2021-03-02 19:39 ` ericonr
2021-03-02 19:42 ` ericonr
2021-03-02 19:59 ` ericonr
2021-03-02 20:04 ` [PR PATCH] [Updated] " Johnnynator
2021-03-04 21:43 ` Johnnynator
2021-03-04 22:37 ` Johnnynator
2021-03-04 23:05 ` Johnnynator
2021-03-04 23:53 ` Johnnynator
2021-03-05 18:21 ` Johnnynator
2021-03-06 3:21 ` ericonr
2021-03-06 3:21 ` [PR PATCH] [Closed]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210213210508.vFYMtlW-1X-vwEmH-WusMoM9w1pSQ3Har5rDh5fX2SA@z \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).