From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: openssl-1.1.1j
Date: Fri, 05 Mar 2021 19:21:58 +0100 [thread overview]
Message-ID: <20210305182158.AnEfixcxUrP1OF70YNEdqKJRaf4NG9xGv0r1NYIdC7A@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: 514 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages openssl
https://github.com/void-linux/void-packages/pull/21056
New package: openssl-1.1.1j
[ci skip]
Depends on https://github.com/void-linux/void-packages/pull/28911 #28732 #28948
News post: https://github.com/void-linux/void-linux.github.io/pull/135/
TODO items: #29187
A patch file from https://github.com/void-linux/void-packages/pull/21056.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openssl-21056.patch --]
[-- Type: text/x-diff, Size: 483034 bytes --]
From fff702bc514f12a7a302b133dc68ea0be409ce26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:49 +0100
Subject: [PATCH 001/358] libbsd: drop unused LibreSSL makedepends
---
srcpkgs/libbsd/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template
index 1600ec38023..19098cb84aa 100644
--- a/srcpkgs/libbsd/template
+++ b/srcpkgs/libbsd/template
@@ -3,7 +3,6 @@ pkgname=libbsd
version=0.10.0
revision=1
build_style=gnu-configure
-makedepends="libressl-devel"
short_desc="Provides useful functions commonly found on BSD system"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause"
From bf9955cba8c7756ea9a01f88197da70126abe564 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 7 Apr 2020 23:18:09 +0200
Subject: [PATCH 002/358] libressl: remove package
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 0ccaeb5c872..30c8631ebb1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1789,6 +1789,7 @@ libid3.so id3lib-3.8.3_1
libid3-3.8.so.3 id3lib-3.8.3_1
libgirara-gtk3.so.3 girara-0.2.8_1
libjq.so.1 jq-devel-1.4_1
+libtls.so.17 libtls17-2.7.2_1
libcrypto.so.1.1 libcrypto1.1-1.1.1f_1
libssl.so.1.1 libssl1.1-1.1.1f_1
libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6
From 1a491131646863666dba7474e4f6b8b099fdfc06 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 003/358] dpdk: rebuild against OpenSSL
---
common/shlibs | 268 +++++++++++++++++++++---------------------
srcpkgs/dpdk/template | 6 +-
2 files changed, 137 insertions(+), 137 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 30c8631ebb1..9592aab4466 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3659,140 +3659,140 @@ libicns.so.1 libicns-0.8.1_1
librabbitmq.so.4 rabbitmq-c-0.9.0_1
libuInputPlus.so.0 libuInputPlus-0.1.3_1
libevdevPlus.so.0 libevdevPlus-0.1.0_1
-librte_lpm.so.2 dpdk-19.08_1
-librte_sched.so.3 dpdk-19.08_1
-librte_eal.so.11 dpdk-19.08_1
-librte_pci.so.1 dpdk-19.08_1
-librte_gro.so.1 dpdk-19.08_1
-librte_jobstats.so.1 dpdk-19.08_1
-librte_bpf.so.1 dpdk-19.08_1
-librte_ip_frag.so.1 dpdk-19.08_1
-librte_port.so.3 dpdk-19.08_1
-librte_latencystats.so.1 dpdk-19.08_1
-librte_pipeline.so.3 dpdk-19.08_1
-librte_distributor.so.1 dpdk-19.08_1
-librte_pmd_vmxnet3.so.1 dpdk-19.08_1
-librte_pmd_dpaa_sec.so.1 dpdk-19.08_1
-librte_common_octeontx.so.1 dpdk-19.08_1
-librte_pmd_iavf.so.1 dpdk-19.08_1
-librte_pmd_octeontx_event.so.1 dpdk-19.08_1
-librte_pmd_ring.so.2 dpdk-19.08_1
-librte_rawdev_skeleton.so.1 dpdk-19.08_1
-librte_pmd_qat.so.1 dpdk-19.08_1
-librte_pmd_hinic.so.1 dpdk-19.08_1
-librte_bus_vmbus.so.2 dpdk-19.08_1
-librte_pmd_null.so.2 dpdk-19.08_1
-librte_pmd_bbdev_null.so.1 dpdk-19.08_1
-librte_common_dpaax.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_event.so.2 dpdk-19.08_1
-librte_pmd_bnxt.so.2 dpdk-19.08_1
-librte_bus_ifpga.so.2 dpdk-19.08_1
-librte_pmd_pcap.so.1 dpdk-19.08_1
-librte_pmd_kni.so.1 dpdk-19.08_1
-librte_pmd_enetc.so.1 dpdk-19.08_1
-librte_pmd_atlantic.so.1 dpdk-19.08_1
-librte_mempool_stack.so.1 dpdk-19.08_1
-librte_pmd_opdl_event.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_1
-librte_pmd_avp.so.1 dpdk-19.08_1
-librte_pmd_cxgbe.so.1 dpdk-19.08_1
-librte_pmd_crypto_scheduler.so.1 dpdk-19.08_1
-librte_pmd_openssl.so.1 dpdk-19.08_1
-librte_pmd_octeontx2_event.so.1 dpdk-19.08_1
-librte_pmd_sfc.so.1 dpdk-19.08_1
-librte_pmd_i40e.so.2 dpdk-19.08_1
-librte_pmd_e1000.so.1 dpdk-19.08_1
-librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_1
-librte_rawdev_ioat.so.1 dpdk-19.08_1
-librte_pmd_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_sw_event.so.1 dpdk-19.08_1
-librte_mempool_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_1
-librte_rawdev_ntb.so.1 dpdk-19.08_1
-librte_pmd_memif.so.1 dpdk-19.08_1
-librte_pmd_dpaa2_sec.so.2 dpdk-19.08_1
-librte_pmd_failsafe.so.1 dpdk-19.08_1
-librte_pmd_thunderx.so.1 dpdk-19.08_1
-librte_pmd_octeontx.so.1 dpdk-19.08_1
-librte_pmd_dpaa.so.1 dpdk-19.08_1
-librte_pmd_caam_jr.so.1 dpdk-19.08_1
-librte_pmd_virtio.so.1 dpdk-19.08_1
-librte_pmd_octeontx_compress.so.1 dpdk-19.08_1
-librte_pmd_zlib.so.1 dpdk-19.08_1
-librte_bus_pci.so.2 dpdk-19.08_1
-librte_pmd_bond.so.2 dpdk-19.08_1
-librte_pmd_ice.so.1 dpdk-19.08_1
-librte_pmd_skeleton_event.so.1 dpdk-19.08_1
-librte_mempool_ring.so.1 dpdk-19.08_1
-librte_pmd_octeontx2.so.1 dpdk-19.08_1
-librte_mempool_octeontx.so.1 dpdk-19.08_1
-librte_pmd_ark.so.1 dpdk-19.08_1
-librte_pmd_null_crypto.so.1 dpdk-19.08_1
-librte_pmd_ena.so.1 dpdk-19.08_1
-librte_pmd_axgbe.so.1 dpdk-19.08_1
-librte_common_cpt.so.1 dpdk-19.08_1
-librte_pmd_af_packet.so.1 dpdk-19.08_1
-librte_pmd_vhost.so.2 dpdk-19.08_1
-librte_pmd_softnic.so.1 dpdk-19.08_1
-librte_pmd_nfp.so.1 dpdk-19.08_1
-librte_bus_fslmc.so.2 dpdk-19.08_1
-librte_bus_dpaa.so.2 dpdk-19.08_1
-librte_pmd_fm10k.so.1 dpdk-19.08_1
-librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_1
-librte_mempool_dpaa2.so.2 dpdk-19.08_1
-librte_pmd_ipn3ke.so.1 dpdk-19.08_1
-librte_pmd_vdev_netvsc.so.1 dpdk-19.08_1
-librte_mempool_dpaa.so.1 dpdk-19.08_1
-librte_pmd_bnx2x.so.1 dpdk-19.08_1
-librte_pmd_enic.so.1 dpdk-19.08_1
-librte_pmd_ixgbe.so.2 dpdk-19.08_1
-librte_common_octeontx2.so.1 dpdk-19.08_1
-librte_pmd_liquidio.so.1 dpdk-19.08_1
-librte_pmd_netvsc.so.2 dpdk-19.08_1
-librte_mempool_bucket.so.1 dpdk-19.08_1
-librte_pmd_virtio_crypto.so.1 dpdk-19.08_1
-librte_pmd_ccp.so.1 dpdk-19.08_1
-librte_bus_vdev.so.2 dpdk-19.08_1
-librte_pmd_tap.so.1 dpdk-19.08_1
-librte_pmd_octeontx_crypto.so.1 dpdk-19.08_1
-librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_1
-librte_pmd_dsw_event.so.1 dpdk-19.08_1
-librte_pmd_dpaa_event.so.1 dpdk-19.08_1
-librte_pmd_ifc.so.1 dpdk-19.08_1
-librte_stack.so.1 dpdk-19.08_1
-librte_kvargs.so.1 dpdk-19.08_1
-librte_security.so.2 dpdk-19.08_1
-librte_bitratestats.so.2 dpdk-19.08_1
-librte_rcu.so.1 dpdk-19.08_1
-librte_gso.so.1 dpdk-19.08_1
-librte_efd.so.1 dpdk-19.08_1
-librte_cmdline.so.2 dpdk-19.08_1
-librte_telemetry.so.1 dpdk-19.08_1
-librte_pdump.so.3 dpdk-19.08_1
-librte_eventdev.so.7 dpdk-19.08_1
-librte_vhost.so.4 dpdk-19.08_1
-librte_net.so.1 dpdk-19.08_1
-librte_meter.so.3 dpdk-19.08_1
-librte_acl.so.2 dpdk-19.08_1
-librte_mempool.so.5 dpdk-19.08_1
-librte_table.so.3 dpdk-19.08_1
-librte_power.so.1 dpdk-19.08_1
-librte_reorder.so.1 dpdk-19.08_1
-librte_ring.so.2 dpdk-19.08_1
-librte_ethdev.so.12 dpdk-19.08_1
-librte_bbdev.so.1 dpdk-19.08_1
-librte_ipsec.so.1 dpdk-19.08_1
-librte_timer.so.1 dpdk-19.08_1
-librte_cfgfile.so.2 dpdk-19.08_1
-librte_member.so.1 dpdk-19.08_1
-librte_compressdev.so.1 dpdk-19.08_1
-librte_mbuf.so.5 dpdk-19.08_1
-librte_hash.so.2 dpdk-19.08_1
-librte_flow_classify.so.1 dpdk-19.08_1
-librte_metrics.so.1 dpdk-19.08_1
-librte_cryptodev.so.8 dpdk-19.08_1
-librte_rawdev.so.1 dpdk-19.08_1
-librte_kni.so.2 dpdk-19.08_1
+librte_lpm.so.2 dpdk-19.08_5
+librte_sched.so.3 dpdk-19.08_5
+librte_eal.so.11 dpdk-19.08_5
+librte_pci.so.1 dpdk-19.08_5
+librte_gro.so.1 dpdk-19.08_5
+librte_jobstats.so.1 dpdk-19.08_5
+librte_bpf.so.1 dpdk-19.08_5
+librte_ip_frag.so.1 dpdk-19.08_5
+librte_port.so.3 dpdk-19.08_5
+librte_latencystats.so.1 dpdk-19.08_5
+librte_pipeline.so.3 dpdk-19.08_5
+librte_distributor.so.1 dpdk-19.08_5
+librte_pmd_vmxnet3.so.1 dpdk-19.08_5
+librte_pmd_dpaa_sec.so.1 dpdk-19.08_5
+librte_common_octeontx.so.1 dpdk-19.08_5
+librte_pmd_iavf.so.1 dpdk-19.08_5
+librte_pmd_octeontx_event.so.1 dpdk-19.08_5
+librte_pmd_ring.so.2 dpdk-19.08_5
+librte_rawdev_skeleton.so.1 dpdk-19.08_5
+librte_pmd_qat.so.1 dpdk-19.08_5
+librte_pmd_hinic.so.1 dpdk-19.08_5
+librte_bus_vmbus.so.2 dpdk-19.08_5
+librte_pmd_null.so.2 dpdk-19.08_5
+librte_pmd_bbdev_null.so.1 dpdk-19.08_5
+librte_common_dpaax.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_event.so.2 dpdk-19.08_5
+librte_pmd_bnxt.so.2 dpdk-19.08_5
+librte_bus_ifpga.so.2 dpdk-19.08_5
+librte_pmd_pcap.so.1 dpdk-19.08_5
+librte_pmd_kni.so.1 dpdk-19.08_5
+librte_pmd_enetc.so.1 dpdk-19.08_5
+librte_pmd_atlantic.so.1 dpdk-19.08_5
+librte_mempool_stack.so.1 dpdk-19.08_5
+librte_pmd_opdl_event.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_cmdif.so.2 dpdk-19.08_5
+librte_pmd_avp.so.1 dpdk-19.08_5
+librte_pmd_cxgbe.so.1 dpdk-19.08_5
+librte_pmd_crypto_scheduler.so.1 dpdk-19.08_5
+librte_pmd_openssl.so.1 dpdk-19.08_5
+librte_pmd_octeontx2_event.so.1 dpdk-19.08_5
+librte_pmd_sfc.so.1 dpdk-19.08_5
+librte_pmd_i40e.so.2 dpdk-19.08_5
+librte_pmd_e1000.so.1 dpdk-19.08_5
+librte_rawdev_octeontx2_dma.so.1 dpdk-19.08_5
+librte_rawdev_ioat.so.1 dpdk-19.08_5
+librte_pmd_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_sw_event.so.1 dpdk-19.08_5
+librte_mempool_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_bbdev_fpga_lte_fec.so.1 dpdk-19.08_5
+librte_rawdev_ntb.so.1 dpdk-19.08_5
+librte_pmd_memif.so.1 dpdk-19.08_5
+librte_pmd_dpaa2_sec.so.2 dpdk-19.08_5
+librte_pmd_failsafe.so.1 dpdk-19.08_5
+librte_pmd_thunderx.so.1 dpdk-19.08_5
+librte_pmd_octeontx.so.1 dpdk-19.08_5
+librte_pmd_dpaa.so.1 dpdk-19.08_5
+librte_pmd_caam_jr.so.1 dpdk-19.08_5
+librte_pmd_virtio.so.1 dpdk-19.08_5
+librte_pmd_octeontx_compress.so.1 dpdk-19.08_5
+librte_pmd_zlib.so.1 dpdk-19.08_5
+librte_bus_pci.so.2 dpdk-19.08_5
+librte_pmd_bond.so.2 dpdk-19.08_5
+librte_pmd_ice.so.1 dpdk-19.08_5
+librte_pmd_skeleton_event.so.1 dpdk-19.08_5
+librte_mempool_ring.so.1 dpdk-19.08_5
+librte_pmd_octeontx2.so.1 dpdk-19.08_5
+librte_mempool_octeontx.so.1 dpdk-19.08_5
+librte_pmd_ark.so.1 dpdk-19.08_5
+librte_pmd_null_crypto.so.1 dpdk-19.08_5
+librte_pmd_ena.so.1 dpdk-19.08_5
+librte_pmd_axgbe.so.1 dpdk-19.08_5
+librte_common_cpt.so.1 dpdk-19.08_5
+librte_pmd_af_packet.so.1 dpdk-19.08_5
+librte_pmd_vhost.so.2 dpdk-19.08_5
+librte_pmd_softnic.so.1 dpdk-19.08_5
+librte_pmd_nfp.so.1 dpdk-19.08_5
+librte_bus_fslmc.so.2 dpdk-19.08_5
+librte_bus_dpaa.so.2 dpdk-19.08_5
+librte_pmd_fm10k.so.1 dpdk-19.08_5
+librte_pmd_bbdev_turbo_sw.so.1 dpdk-19.08_5
+librte_mempool_dpaa2.so.2 dpdk-19.08_5
+librte_pmd_ipn3ke.so.1 dpdk-19.08_5
+librte_pmd_vdev_netvsc.so.1 dpdk-19.08_5
+librte_mempool_dpaa.so.1 dpdk-19.08_5
+librte_pmd_bnx2x.so.1 dpdk-19.08_5
+librte_pmd_enic.so.1 dpdk-19.08_5
+librte_pmd_ixgbe.so.2 dpdk-19.08_5
+librte_common_octeontx2.so.1 dpdk-19.08_5
+librte_pmd_liquidio.so.1 dpdk-19.08_5
+librte_pmd_netvsc.so.2 dpdk-19.08_5
+librte_mempool_bucket.so.1 dpdk-19.08_5
+librte_pmd_virtio_crypto.so.1 dpdk-19.08_5
+librte_pmd_ccp.so.1 dpdk-19.08_5
+librte_bus_vdev.so.2 dpdk-19.08_5
+librte_pmd_tap.so.1 dpdk-19.08_5
+librte_pmd_octeontx_crypto.so.1 dpdk-19.08_5
+librte_rawdev_dpaa2_qdma.so.2 dpdk-19.08_5
+librte_pmd_dsw_event.so.1 dpdk-19.08_5
+librte_pmd_dpaa_event.so.1 dpdk-19.08_5
+librte_pmd_ifc.so.1 dpdk-19.08_5
+librte_stack.so.1 dpdk-19.08_5
+librte_kvargs.so.1 dpdk-19.08_5
+librte_security.so.2 dpdk-19.08_5
+librte_bitratestats.so.2 dpdk-19.08_5
+librte_rcu.so.1 dpdk-19.08_5
+librte_gso.so.1 dpdk-19.08_5
+librte_efd.so.1 dpdk-19.08_5
+librte_cmdline.so.2 dpdk-19.08_5
+librte_telemetry.so.1 dpdk-19.08_5
+librte_pdump.so.3 dpdk-19.08_5
+librte_eventdev.so.7 dpdk-19.08_5
+librte_vhost.so.4 dpdk-19.08_5
+librte_net.so.1 dpdk-19.08_5
+librte_meter.so.3 dpdk-19.08_5
+librte_acl.so.2 dpdk-19.08_5
+librte_mempool.so.5 dpdk-19.08_5
+librte_table.so.3 dpdk-19.08_5
+librte_power.so.1 dpdk-19.08_5
+librte_reorder.so.1 dpdk-19.08_5
+librte_ring.so.2 dpdk-19.08_5
+librte_ethdev.so.12 dpdk-19.08_5
+librte_bbdev.so.1 dpdk-19.08_5
+librte_ipsec.so.1 dpdk-19.08_5
+librte_timer.so.1 dpdk-19.08_5
+librte_cfgfile.so.2 dpdk-19.08_5
+librte_member.so.1 dpdk-19.08_5
+librte_compressdev.so.1 dpdk-19.08_5
+librte_mbuf.so.5 dpdk-19.08_5
+librte_hash.so.2 dpdk-19.08_5
+librte_flow_classify.so.1 dpdk-19.08_5
+librte_metrics.so.1 dpdk-19.08_5
+librte_cryptodev.so.8 dpdk-19.08_5
+librte_rawdev.so.1 dpdk-19.08_5
+librte_kni.so.2 dpdk-19.08_5
libredwg.so.0 libredwg-0.9_1
libgcj-tools.so.17 libgcj-6.5.0_1
libgcj_bc.so.1 libgcj-6.5.0_1
diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template
index 69867609507..9a2ca615b25 100644
--- a/srcpkgs/dpdk/template
+++ b/srcpkgs/dpdk/template
@@ -1,14 +1,14 @@
# Template file for 'dpdk'
pkgname=dpdk
version=19.08
-revision=4
+revision=5
# no musl - uses error.h, execinfo.h and argp.h
archs="x86_64 aarch64 ppc64le i686 armv7l"
build_style=meson
configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false"
hostmakedepends="doxygen python3-Sphinx pkg-config elfutils"
makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel
- zlib-devel libressl-devel libbsd-devel libelf libmnl"
+ zlib-devel openssl-devel libbsd-devel libelf libmnl"
depends="python3-pyelftools"
short_desc="Data Plane Development Kit"
maintainer="Hans-J. Schmid <knock@myopendoor.de>"
@@ -45,7 +45,7 @@ do_check() {
}
dpdk-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel"
+ depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/dpdk-pdump
From d079823211624c6c43769c5e179d3479b20508b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 004/358] ecryptfs-utils: rebuild against OpenSSL
---
common/shlibs | 2 +-
.../patches/openssl-1.1.x.patch | 76 +++++++++++++++++++
srcpkgs/ecryptfs-utils/template | 4 +-
3 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
diff --git a/common/shlibs b/common/shlibs
index 9592aab4466..43347238c4e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1116,7 +1116,7 @@ libvdemgmt.so.0 libvde2-2.3.2_1
libvdehist.so.0 libvde2-2.3.2_1
libvdesnmp.so.0 libvde2-2.3.2_1
libsbc.so.1 sbc-1.0_1
-libecryptfs.so.1 libecryptfs-104_1
+libecryptfs.so.1 libecryptfs-111_9
libnuma.so.1 libnuma-2.0.7_1
libxar.so.1 xar-1.5.2_1
libmikmod.so.3 libmikmod-3.1.12_1
diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
new file mode 100644
index 00000000000..5c3e419a91d
--- /dev/null
+++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch
@@ -0,0 +1,76 @@
+=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c'
+--- src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000
++++ src/key_mod/ecryptfs_key_mod_openssl.c 2017-03-13 20:34:27 +0000
+@@ -50,6 +50,20 @@
+ #include "../include/ecryptfs.h"
+ #include "../include/decision_graph.h"
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++void RSA_get0_key(const RSA *r,
++ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
++{
++ if (n != NULL)
++ *n = r->n;
++ if (e != NULL)
++ *e = r->e;
++ if (d != NULL)
++ *d = r->d;
++}
++#endif
++
++
+ struct openssl_data {
+ char *path;
+ char *passphrase;
+@@ -142,6 +156,7 @@
+ {
+ int len, nbits, ebits, i;
+ int nbytes, ebytes;
++ const BIGNUM *key_n, *key_e;
+ unsigned char *hash;
+ unsigned char *data = NULL;
+ int rc = 0;
+@@ -152,11 +167,13 @@
+ rc = -ENOMEM;
+ goto out;
+ }
+- nbits = BN_num_bits(key->n);
++ RSA_get0_key(key, &key_n, NULL, NULL);
++ nbits = BN_num_bits(key_n);
+ nbytes = nbits / 8;
+ if (nbits % 8)
+ nbytes++;
+- ebits = BN_num_bits(key->e);
++ RSA_get0_key(key, NULL, &key_e, NULL);
++ ebits = BN_num_bits(key_e);
+ ebytes = ebits / 8;
+ if (ebits % 8)
+ ebytes++;
+@@ -179,11 +196,13 @@
+ data[i++] = '\02';
+ data[i++] = (nbits >> 8);
+ data[i++] = nbits;
+- BN_bn2bin(key->n, &(data[i]));
++ RSA_get0_key(key, &key_n, NULL, NULL);
++ BN_bn2bin(key_n, &(data[i]));
+ i += nbytes;
+ data[i++] = (ebits >> 8);
+ data[i++] = ebits;
+- BN_bn2bin(key->e, &(data[i]));
++ RSA_get0_key(key, NULL, &key_e, NULL);
++ BN_bn2bin(key_e, &(data[i]));
+ i += ebytes;
+ SHA1(data, len + 3, hash);
+ to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE);
+@@ -278,7 +297,9 @@
+ BIO *in = NULL;
+ int rc;
+
++ #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ CRYPTO_malloc_init();
++ #endif
+ ERR_load_crypto_strings();
+ OpenSSL_add_all_algorithms();
+ ENGINE_load_builtin_engines();
+
+
diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template
index 8f80772d00f..3d25252fffe 100644
--- a/srcpkgs/ecryptfs-utils/template
+++ b/srcpkgs/ecryptfs-utils/template
@@ -1,14 +1,14 @@
# Template file for 'ecryptfs-utils'
pkgname=ecryptfs-utils
version=111
-revision=8
+revision=9
lib32disabled=yes
build_style=gnu-configure
configure_args="--sbindir=/usr/bin
--with-pamdir=/usr/lib/security --enable-gpg --enable-gui
--with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python"
-makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel"
+makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel"
depends="gettext"
_desc="Ecryptfs cryptographic filesystem"
short_desc="${_desc} - utilities"
From 9bfa77057453b6b22de25a07e7a4fa46daef2c31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 005/358] efitools: rebuild against OpenSSL
---
srcpkgs/efitools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template
index f125ae41053..83dc738ccbe 100644
--- a/srcpkgs/efitools/template
+++ b/srcpkgs/efitools/template
@@ -1,11 +1,11 @@
# Template file for 'efitools'
pkgname=efitools
version=1.9.2
-revision=4
+revision=5
archs="x86_64* i686* arm* aarch64*"
build_style=gnu-makefile
hostmakedepends="perl-File-Slurp"
-makedepends="gnu-efi-libs libressl-devel"
+makedepends="gnu-efi-libs openssl-devel"
short_desc="Tools to manipulate EFI secure boot platforms"
maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
license="GPL-2.0-only"
From 96f2369c54fb1177172d39430e3077027eb32cdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 006/358] efl: rebuild against OpenSSL
---
common/shlibs | 78 ++++++++++++++++++++++----------------------
srcpkgs/efl/template | 4 +--
2 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 43347238c4e..16c5fcb9f6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1482,42 +1482,42 @@ libvlc_xcb_events.so.0 libvlc-3.0.2_1
libcmocka.so.0 cmocka-1.1.1_1
libbtrfs.so.0 libbtrfs-3.12_1
libbtrfsutil.so.1 libbtrfsutil-5.4_1
-libecore_audio.so.1 efl-1.12.0_1
-libecore_con.so.1 efl-1.12.0_1
-libecore_evas.so.1 efl-1.12.0_1
-libecore_file.so.1 efl-1.12.0_1
-libecore_imf_evas.so.1 efl-1.12.0_1
-libecore_imf.so.1 efl-1.12.0_1
-libecore_input_evas.so.1 efl-1.12.0_1
-libecore_input.so.1 efl-1.12.0_1
-libecore_ipc.so.1 efl-1.12.0_1
-libecore.so.1 efl-1.12.0_1
-libecore_x.so.1 efl-1.12.0_1
-libecore_wl2.so.1 efl-1.24.2_1
-libecore_drm2.so.1 efl-1.24.2_1
-libedje.so.1 efl-1.12.0_1
-libeet.so.1 efl-1.12.0_1
-libeeze.so.1 efl-1.12.0_1
-libefreet_mime.so.1 efl-1.12.0_1
-libefreet.so.1 efl-1.12.0_1
-libefreet_trash.so.1 efl-1.12.0_1
-libeina.so.1 efl-1.12.0_1
-libeio.so.1 efl-1.12.0_1
-libeldbus.so.1 efl-1.12.0_1
-libelput.so.1 efl-1.24.2_1
-libembryo.so.1 efl-1.12.0_1
-libemotion.so.1 efl-1.12.0_1
-libeo.so.1 efl-1.12.0_1
-libethumb_client.so.1 efl-1.12.0_1
-libethumb.so.1 efl-1.12.0_1
-libevas.so.1 efl-1.12.0_1
-libefl.so.1 efl-1.12.0_1
-libefl_canvas_wl.so.1 efl-1.24.2_1
-libelua.so.1 efl-1.13.0_1
-libelocation.so.1 efl-1.13.0_1
-libelementary.so.1 efl-1.18.0_1
-libector.so.1 efl-1.18.1_1
-libemile.so.1 efl-1.18.1_1
+libecore_audio.so.1 efl-1.25.1_2
+libecore_con.so.1 efl-1.25.1_2
+libecore_evas.so.1 efl-1.25.1_2
+libecore_file.so.1 efl-1.25.1_2
+libecore_imf_evas.so.1 efl-1.25.1_2
+libecore_imf.so.1 efl-1.25.1_2
+libecore_input_evas.so.1 efl-1.25.1_2
+libecore_input.so.1 efl-1.25.1_2
+libecore_ipc.so.1 efl-1.25.1_2
+libecore.so.1 efl-1.25.1_2
+libecore_x.so.1 efl-1.25.1_2
+libecore_wl2.so.1 efl-1.25.1_2
+libecore_drm2.so.1 efl-1.25.1_2
+libedje.so.1 efl-1.25.1_2
+libeet.so.1 efl-1.25.1_2
+libeeze.so.1 efl-1.25.1_2
+libefreet_mime.so.1 efl-1.25.1_2
+libefreet.so.1 efl-1.25.1_2
+libefreet_trash.so.1 efl-1.25.1_2
+libeina.so.1 efl-1.25.1_2
+libeio.so.1 efl-1.25.1_2
+libeldbus.so.1 efl-1.25.1_2
+libelput.so.1 efl-1.25.1_2
+libembryo.so.1 efl-1.25.1_2
+libemotion.so.1 efl-1.25.1_2
+libeo.so.1 efl-1.25.1_2
+libethumb_client.so.1 efl-1.25.1_2
+libethumb.so.1 efl-1.25.1_2
+libevas.so.1 efl-1.25.1_2
+libefl.so.1 efl-1.25.1_2
+libefl_canvas_wl.so.1 efl-1.25.1_2
+libelua.so.1 efl-1.25.1_2
+libelocation.so.1 efl-1.25.1_2
+libelementary.so.1 efl-1.25.1_2
+libector.so.1 efl-1.25.1_2
+libemile.so.1 efl-1.25.1_2
libcjs.so.0 cjs-2.0.0_1
libmuffin.so.0 muffin-2.0.5_1
libmuffin-cogl-pango-0.so muffin-4.0.5_1
@@ -1884,9 +1884,9 @@ libfontembed.so.1 libcups-filters-1.17.5_1
libjemalloc.so.2 jemalloc-4.0.0_1
liblucene++.so.0 Lucene++-3.0.6_1
liblucene++-contrib.so.0 Lucene++-3.0.6_1
-libeolian.so.1 efl-1.11.2_2
-libecore_avahi.so.1 efl-1.11.2_2
-libephysics.so.1 efl-1.11.2_2
+libeolian.so.1 efl-1.25.1_2
+libecore_avahi.so.1 efl-1.25.1_2
+libephysics.so.1 efl-1.25.1_2
libgunicode.so.5 fontforge-2.0.20190317_1
libgutils.so.3 fontforge-2.0.20190317_1
libgioftp.so.2 fontforge-2.0.20140101_3
diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index da39b6a38bb..16918622db9 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
# Template file for 'efl'
pkgname=efl
version=1.25.1
-revision=1
+revision=2
build_style=meson
configure_args="
-Dbuild-examples=false
@@ -27,7 +27,7 @@ configure_args="
$(vopt_bool glib glib)"
hostmakedepends="pkg-config gettext"
makedepends="
- gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel
+ gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel
fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel)
libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel
avahi-libs-devel eudev-libudev-devel bullet-devel
From 3f96cd788515931103dfd3ba325482e8a331c238 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:54 +0100
Subject: [PATCH 007/358] eggdrop: rebuild against OpenSSL
---
srcpkgs/eggdrop/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template
index 107bf00e429..7790a5d6daf 100644
--- a/srcpkgs/eggdrop/template
+++ b/srcpkgs/eggdrop/template
@@ -1,10 +1,10 @@
# Template file for 'eggdrop'
pkgname=eggdrop
version=1.8.4
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="tcl-devel"
-makedepends="tcl-devel libressl-devel zlib-devel"
+makedepends="tcl-devel openssl-devel zlib-devel"
short_desc="Internet relay chat (IRC) bot"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="GPL-2.0-or-later"
From d452778560082051dd2fe638586c49ec840a4ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 008/358] eid-mw: rebuild against OpenSSL
---
srcpkgs/eid-mw/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template
index 6e36044d10b..0734bdb1301 100644
--- a/srcpkgs/eid-mw/template
+++ b/srcpkgs/eid-mw/template
@@ -1,11 +1,11 @@
# Template file for 'eid-mw'
pkgname=eid-mw
version=4.4.16
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel
gdk-pixbuf-devel"
-makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel"
+makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel"
depends="pcsc-acsccid pcsc-ccid pcsc-tools"
short_desc="Middleware for Belgian eID"
maintainer="Andrew Benson <abenson+void@gmail.com>"
From d0e78dd33f0129d16c0483ea9314d311583ec8d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 009/358] eiskaltdcpp-qt: rebuild against OpenSSL
---
srcpkgs/eiskaltdcpp-qt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..618fa29772d 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,12 +1,12 @@
# Template file for 'eiskaltdcpp-qt'
pkgname=eiskaltdcpp-qt
version=2.4.1
-revision=1
+revision=2
wrksrc="eiskaltdcpp-${version}"
build_style=cmake
configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
-makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel
+makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel
miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite
qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds"
short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
From f22f5a32004970f38a418afc777c93078b966892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 010/358] ejabberd: rebuild against OpenSSL
---
srcpkgs/ejabberd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template
index 8423e0942fc..be10fd98a2e 100644
--- a/srcpkgs/ejabberd/template
+++ b/srcpkgs/ejabberd/template
@@ -1,13 +1,13 @@
# Template file for 'ejabberd'
pkgname=ejabberd
version=20.07
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam
--enable-redis --enable-elixir $(vopt_enable sqlite)"
conf_files="/etc/ejabberd/*"
hostmakedepends="automake erlang git elixir"
-makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel
+makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel
$(vopt_if sqlite sqlite-devel) gd-devel"
depends="erlang"
short_desc="Robust and massively scalable XMPP platform"
From 357d34dc236b3b908af57fd46a75c389613e46f4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 011/358] elinks: rebuild against OpenSSL
---
srcpkgs/elinks/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template
index 4e2047cc8a8..ec37f315d05 100644
--- a/srcpkgs/elinks/template
+++ b/srcpkgs/elinks/template
@@ -1,12 +1,12 @@
# Template file for 'elinks'
pkgname=elinks
version=0.14.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-true-color --enable-fastmem --without-spidermonkey"
hostmakedepends="automake libtool pkg-config gettext"
makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel
- ncurses-devel libressl-devel"
+ ncurses-devel openssl-devel"
short_desc="Full-Featured Text WWW Browser"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From 27442ec8f58e0f228f682dfa55a3f415f89a84c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:55 +0100
Subject: [PATCH 012/358] elog: rebuild against OpenSSL
---
srcpkgs/elog/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template
index de0a8161992..b22afbbe9b1 100644
--- a/srcpkgs/elog/template
+++ b/srcpkgs/elog/template
@@ -1,7 +1,7 @@
# Template file for 'elog'
pkgname=elog
version=3.1.4.1
-revision=3
+revision=4
_distver="${version:0:-2}-${version:(-1)}"
wrksrc="$pkgname-${version%.*}"
build_style=gnu-makefile
@@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg"
system_accounts="elog"
short_desc="Logbook system to manage notes through a Web interface"
maintainer="Christian Poulwey <christian.poulwey@t-online.de>"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
license="GPL-3.0-or-later"
homepage="https://elog.psi.ch/elog/"
distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz"
From b5f4a0352e69d9458115b1986578721b38d9df0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 013/358] encfs: rebuild against OpenSSL
---
srcpkgs/encfs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template
index 36a4613197c..d041dace80d 100644
--- a/srcpkgs/encfs/template
+++ b/srcpkgs/encfs/template
@@ -1,10 +1,10 @@
# Template file for 'encfs'
pkgname=encfs
version=1.9.5
-revision=4
+revision=5
build_style=cmake
hostmakedepends="gettext pkg-config perl"
-makedepends="fuse-devel libressl-devel gettext-devel"
+makedepends="fuse-devel openssl-devel gettext-devel"
depends="perl" # for encfssh
short_desc="Encrypted filesystem in user-space"
maintainer="Orphaned <orphan@voidlinux.org>"
From 887e0eb66d13040aa7c7e6388f9d16cbeb297df4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 014/358] erlang: rebuild against OpenSSL
---
srcpkgs/erlang/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template
index 98001d59fcd..e8cb892fc97 100644
--- a/srcpkgs/erlang/template
+++ b/srcpkgs/erlang/template
@@ -1,13 +1,13 @@
# Template file for 'erlang'
pkgname=erlang
version=23.2.6
-revision=1
+revision=2
create_wrksrc=yes
build_wrksrc="otp-OTP-${version}"
build_style=gnu-configure
make_install_target="install install-docs"
hostmakedepends="autoconf libxslt perl tar"
-makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel"
+makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel"
short_desc="Concurrent functional programming language developed by Ericsson"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="Apache-2.0"
From cee224d1571c30a7d7125164e7b5e9cb3d389d29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 015/358] ettercap: rebuild against OpenSSL
---
srcpkgs/ettercap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index 0a096f4ad57..7fe4c340a07 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,11 +1,11 @@
# Template file for 'ettercap'
pkgname=ettercap
version=0.8.3.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_GTK=OFF"
hostmakedepends="flex"
-makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel
+makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel
libltdl-devel libnet-devel libpcap-devel pcre-devel"
conf_files="/etc/${pkgname}/etter.conf"
short_desc="Network sniffer/interceptor/logger for ethernet LANs"
From a0f8ee790edff62b095aa628d6635a13edfc9d87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 016/358] facter: rebuild against OpenSSL
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 9fca63a366b..41a1a9d8ba3 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=1
+revision=2
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From 5c25442d1131ffbe1443237e48b5d234e3babd0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:56 +0100
Subject: [PATCH 017/358] falkon: rebuild against OpenSSL
---
srcpkgs/falkon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template
index 70d3df9a9c0..1a5eb3cd60b 100644
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@@ -1,7 +1,7 @@
# Template file for 'falkon'
pkgname=falkon
version=3.1.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="extra-cmake-modules gettext pkg-config
qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)"
From c45f38cedb00daf6e858516dbe606d9d9c620fe1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 018/358] fdm: rebuild against OpenSSL
---
srcpkgs/fdm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template
index 9523085603b..561f7f0b1cd 100644
--- a/srcpkgs/fdm/template
+++ b/srcpkgs/fdm/template
@@ -1,11 +1,11 @@
# Template file for 'fdm'
pkgname=fdm
version=2.0
-revision=4
+revision=5
build_style=gnu-configure
configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre"
hostmakedepends="automake bison"
-makedepends="zlib-devel libressl-devel tdb-devel pcre-devel"
+makedepends="zlib-devel openssl-devel tdb-devel pcre-devel"
short_desc="Program to fetch and deliver mail"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="ISC"
From d724793d622ea0d5b37999dea755c0ec58f6b7e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 019/358] fetchmail: rebuild against OpenSSL
---
srcpkgs/fetchmail/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template
index a6362c04e12..a5afbb3c3b4 100644
--- a/srcpkgs/fetchmail/template
+++ b/srcpkgs/fetchmail/template
@@ -1,11 +1,11 @@
# Template file for 'fetchmail'
pkgname=fetchmail
version=6.4.16
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="python3"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="fetchmailconf"
short_desc="Remote-mail retrieval utility"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
From 529b3b26a4fd15f6a291b9cbc8e155a2999a1b0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 020/358] ffsend: rebuild against OpenSSL
---
srcpkgs/ffsend/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template
index ef0c63b83f1..ea63f719284 100644
--- a/srcpkgs/ffsend/template
+++ b/srcpkgs/ffsend/template
@@ -1,10 +1,10 @@
# Template file for 'ffsend'
pkgname=ffsend
version=0.2.68
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Fully featured Firefox Send client"
maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
From ae1df115fa15cb8114575d38d0362188477c37a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 021/358] fossil: rebuild against OpenSSL
---
srcpkgs/fossil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template
index df8d4cb415c..148b7248089 100644
--- a/srcpkgs/fossil/template
+++ b/srcpkgs/fossil/template
@@ -1,11 +1,11 @@
# Template file for 'fossil'
pkgname=fossil
version=2.14
-revision=1
+revision=2
build_style=configure
configure_args="--disable-internal-sqlite --prefix=/usr"
hostmakedepends="tcl"
-makedepends="zlib-devel libressl-devel readline-devel sqlite-devel"
+makedepends="zlib-devel openssl-devel readline-devel sqlite-devel"
short_desc="Simple, high-reliability, distributed software configuration management"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From ed5662157b0295408246758c6932b2fac77a0ef9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:57 +0100
Subject: [PATCH 022/358] fractal: rebuild against OpenSSL
---
srcpkgs/fractal/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template
index a5a31a33ccd..115057b6d42 100644
--- a/srcpkgs/fractal/template
+++ b/srcpkgs/fractal/template
@@ -1,11 +1,11 @@
# Template file for 'fractal'
pkgname=fractal
version=4.2.2
-revision=2
+revision=3
build_style=meson
build_helper="rust"
hostmakedepends="cargo pkg-config glib-devel gettext"
-makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel
+makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel
cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel
gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel
gmp-devel libsecret-devel libhandy-devel rust-std"
From 81019b198f834f5a517164a2e7156aad4ee03b2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 023/358] freerdp: rebuild against OpenSSL
---
common/shlibs | 26 +++++++++++++-------------
srcpkgs/freerdp/template | 6 +++---
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 16c5fcb9f6a..5f2589cf8b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1624,19 +1624,19 @@ libKF5Mime.so.5 kmime-17.12.1_1
libKF5Kirigami2.so.5 kirigami2-5.47.0_1
libtaskmanager.so.6 plasma-workspace-5.8.4_1
libnotificationmanager.so.1 plasma-workspace-5.15.90_1
-libfreerdp-client2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr2.so.2 libfreerdp-2.0.0rc1_1
-libwinpr-tools2.so.2 libfreerdp-2.0.0rc1_1
-libfreerdp-core.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-channels.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-rail.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-kbd.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-utils.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-codec.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-gdi.so.1.0 libfreerdp-1.0.2_2
-libfreerdp-cache.so.1.0 libfreerdp-1.0.2_2
-libuwac0.so.0 libfreerdp-2.2.0_1
+libfreerdp-client2.so.2 libfreerdp-2.2.0_3
+libfreerdp2.so.2 libfreerdp-2.2.0_3
+libwinpr2.so.2 libfreerdp-2.2.0_3
+libwinpr-tools2.so.2 libfreerdp-2.2.0_3
+libfreerdp-core.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-channels.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-rail.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-kbd.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-utils.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-codec.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-gdi.so.1.0 libfreerdp-2.2.0_3
+libfreerdp-cache.so.1.0 libfreerdp-2.2.0_3
+libuwac0.so.0 libfreerdp-2.2.0_3
libcppunit-1.14.so.0 libcppunit-1.14.0_1
libcalc.so.2.12.7.1 libcalc-2.12.7.1_1
libcustcalc.so.2.12.7.1 libcalc-2.12.7.1_1
diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template
index bb1214e9c3f..07e4f232101 100644
--- a/srcpkgs/freerdp/template
+++ b/srcpkgs/freerdp/template
@@ -1,7 +1,7 @@
# Template file for 'freerdp'
pkgname=freerdp
version=2.2.0
-revision=2
+revision=3
wrksrc="FreeRDP-${version}"
build_style=cmake
configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
@@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON
hostmakedepends="pkg-config xmlto wayland-devel"
makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel
libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel
- libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel
+ libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel
libxkbcommon-devel wayland-devel cairo-devel"
short_desc="Free RDP (Remote Desktop Protocol) client"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -38,7 +38,7 @@ libfreerdp_package() {
freerdp-devel_package() {
short_desc+=" - development files"
- depends="libressl-devel lib${sourcepkg}>=${version}_${revision}"
+ depends="openssl-devel lib${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/cmake
From eb870dc18399d9cc27ed44d6b9a4b8328b28840c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 024/358] freshplayerplugin: rebuild against OpenSSL
---
srcpkgs/freshplayerplugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 516778fecca..a6205c0ba98 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
# Template file for 'freshplayerplugin'
pkgname=freshplayerplugin
version=0.3.9
-revision=6
+revision=7
build_style=cmake
hostmakedepends="pkg-config ragel"
makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
From 8d7f93c8617805e605781ef95fe628123192379a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 025/358] gambit: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/gambit/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5f2589cf8b4..63007692ab4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3640,7 +3640,7 @@ libbcc_bpf.so.0 bcc-0.10.0_1
libde265.so.0 libde265-1.0.3_1
libheif.so.1 libheif-1.4.0_1
libuninameslist.so.1 libuninameslist-20190701_1
-libgambit.so.4 gambit-4.9.3_1
+libgambit.so.4 gambit-4.9.3_6
liblog4cpp.so.5 log4cpp-1.1.3_1
libnuspell.so.4 libnuspell-4.2.0_1
liblog4c.so.3 log4c-1.2.4_1
diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template
index 39c040ea37a..3f7ec840d26 100644
--- a/srcpkgs/gambit/template
+++ b/srcpkgs/gambit/template
@@ -1,14 +1,14 @@
# Template file for 'gambit'
pkgname=gambit
version=4.9.3
-revision=5
+revision=6
build_style=gnu-configure
configure_args="
--libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit
--enable-compiler-name=gambit-gsc
--enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs
--enable-single-host --enable-gcc-opts --enable-openssl --enable-poll"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Complete, portable, efficient and reliable implementation of Scheme"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-only, Apache-2.0"
From 67f10e187518ee5d47d9e8d2ce82a2defa1db52f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:58 +0100
Subject: [PATCH 026/358] gatling: rebuild against OpenSSL
---
srcpkgs/gatling/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template
index 653c93c5ca7..d1d83c20226 100644
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@@ -1,9 +1,9 @@
# Template file for 'gatling'
pkgname=gatling
version=0.15
-revision=9
+revision=10
build_style=gnu-makefile
-makedepends="libowfat libressl-devel zlib-devel"
+makedepends="libowfat openssl-devel zlib-devel"
short_desc="High performance web server"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2"
From 12f4e72b860a4581fc4130c2dead0bff7673d8e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 027/358] gcsf: rebuild against OpenSSL
---
srcpkgs/gcsf/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template
index 7863437b8ef..7d4cc54bb19 100644
--- a/srcpkgs/gcsf/template
+++ b/srcpkgs/gcsf/template
@@ -1,10 +1,10 @@
# Template file for 'gcsf'
pkgname=gcsf
version=0.1.25
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="fuse-devel libressl-devel"
+makedepends="fuse-devel openssl-devel"
short_desc="FUSE file system based on Google Drive"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
From a99e02ad5cc5ef26a4112d29db09b5952bdffc9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 028/358] gemserv: rebuild against OpenSSL
---
srcpkgs/gemserv/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template
index d779f17886e..c1dfb792740 100644
--- a/srcpkgs/gemserv/template
+++ b/srcpkgs/gemserv/template
@@ -1,11 +1,11 @@
# Template file for 'gemserv'
pkgname=gemserv
version=0.4.5
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Gemini server written in rust"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From ca00985adb0b659b7fdcd0834e49662a4ec046ed Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 029/358] gerbil: rebuild against OpenSSL
---
srcpkgs/gerbil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template
index d5377b6b030..3d141bee627 100644
--- a/srcpkgs/gerbil/template
+++ b/srcpkgs/gerbil/template
@@ -1,9 +1,9 @@
# Template file for 'gerbil'
pkgname=gerbil
version=0.16
-revision=2
+revision=3
hostmakedepends="gambit rsync"
-makedepends="libressl-devel sqlite-devel zlib-devel"
+makedepends="openssl-devel sqlite-devel zlib-devel"
short_desc="Opinionated dialect of Scheme designed for Systems Programming"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later, Apache-2.0"
From 1fc0e55c49fe133b61a571cc114a7c1773e5b0e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 030/358] getdns: rebuild against OpenSSL
---
common/shlibs | 8 ++++----
srcpkgs/getdns/template | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 63007692ab4..65e582d61d7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3511,10 +3511,10 @@ libKF5KDEGames.so.7 libkdegames-18.08.3_1
libKF5KDEGamesPrivate.so.1 libkdegames-19.12.3_1
libidn2.so.0 libidn2-2.1.1_1
libgmime-3.0.so.0 gmime3-3.2.3_1
-libgetdns.so.10 getdns-1.5.0_1
-libgetdns_ext_event.so.10 getdns-1.5.0_1
-libgetdns_ext_ev.so.10 getdns-1.5.0_1
-libgetdns_ext_uv.so.10 getdns-1.5.0_1
+libgetdns.so.10 getdns-1.5.1_7
+libgetdns_ext_event.so.10 getdns-1.5.1_7
+libgetdns_ext_ev.so.10 getdns-1.5.1_7
+libgetdns_ext_uv.so.10 getdns-1.5.1_7
libzck.so.1 zchunk-1.0.2_2
librec.so.1 librec1-1.8_1
libfixposix.so.3 libfixposix-0.4.3_1
diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template
index b0bb313b3af..c2ddfde9fbc 100644
--- a/srcpkgs/getdns/template
+++ b/srcpkgs/getdns/template
@@ -1,7 +1,7 @@
# Template file for 'getdns'
pkgname=getdns
version=1.5.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-libev --with-libevent --with-libuv
--with-ssl=${XBPS_CROSS_BASE}/usr"
From 3cd4f243a9507ac4ba618b15631d49135a33ed21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:17:59 +0100
Subject: [PATCH 031/358] gftp: rebuild against OpenSSL
---
srcpkgs/gftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template
index 1ba37c8e51d..bdbad8e9c2b 100644
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@@ -1,10 +1,10 @@
# Template file for 'gftp'
pkgname=gftp
version=2.0.19
-revision=7
+revision=8
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="gtk+-devel libressl-devel"
+makedepends="gtk+-devel openssl-devel"
short_desc="Graphical file transfer client"
maintainer="psylence <psylence@protonmail.com>"
license="GPL-2"
From ce5997bd81f92fd47dd86d7a939664798d1be573 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 032/358] git-brws: rebuild against OpenSSL
---
srcpkgs/git-brws/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template
index ea7e571e6d2..bb301c16020 100644
--- a/srcpkgs/git-brws/template
+++ b/srcpkgs/git-brws/template
@@ -1,10 +1,10 @@
# Template file for 'git-brws'
pkgname=git-brws
version=0.11.12
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="CLI tool for opening web page of the hoster for a git remote"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
From 48001a45619839a0b22dbf388302c64a5f0a3913 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 033/358] git-crypt: rebuild against OpenSSL
---
srcpkgs/git-crypt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template
index 1c642ee7d45..0f81c8dc313 100644
--- a/srcpkgs/git-crypt/template
+++ b/srcpkgs/git-crypt/template
@@ -1,10 +1,10 @@
# Template file for 'git-crypt'
pkgname=git-crypt
version=0.6.0
-revision=6
+revision=7
build_style=gnu-makefile
make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
hostmakedepends="libxslt docbook-xsl"
make_build_args="ENABLE_MAN=yes"
make_install_args="ENABLE_MAN=yes"
From 01ae910021c4a48b8b06966941500fb92fd546fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 034/358] gkrellm: rebuild against OpenSSL
---
srcpkgs/gkrellm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template
index b7fef8fea9d..f2c1721ac5e 100644
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@@ -1,10 +1,10 @@
# Template file for 'gkrellm'
pkgname=gkrellm
version=2.3.11
-revision=2
+revision=3
build_style=gnu-makefile
hostmakedepends="pkg-config gettext which"
-makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel"
+makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel"
short_desc="GTK2 based system monitor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0.or-later"
From 1f0f779db151714b62e743245591c1d3da30871e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:00 +0100
Subject: [PATCH 035/358] glusterfs: rebuild against OpenSSL
---
common/shlibs | 14 +++++++-------
srcpkgs/glusterfs/template | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 65e582d61d7..09623ac45c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1462,13 +1462,13 @@ libgdiplus.so.0 libgdiplus-2.10.9_1
libmonosgen-2.0.so.1 mono-3.2.3_1
libshout-idjc.so.3 libshout-idjc-2.3.1_1
libmonoboehm-2.0.so.1 mono-3.2.3_1
-libglusterfs.so.0 libglusterfs-3.8.0_1
-libgfdb.so.0 libglusterfs-3.8.0_1
-libgfchangelog.so.0 libglusterfs-3.8.0_1
-libgfrpc.so.0 libglusterfs-3.8.0_1
-libgfxdr.so.0 libglusterfs-3.8.0_1
-libgfapi.so.0 libglusterfs-3.8.0_1
-libglusterd.so.0 libglusterfs-8.1_1
+libglusterfs.so.0 libglusterfs-8.3_2
+libgfdb.so.0 libglusterfs-8.3_2
+libgfchangelog.so.0 libglusterfs-8.3_2
+libgfrpc.so.0 libglusterfs-8.3_2
+libgfxdr.so.0 libglusterfs-8.3_2
+libgfapi.so.0 libglusterfs-8.3_2
+libglusterd.so.0 libglusterfs-8.3_2
libsnapper.so.5 libsnapper-0.4.1_1
libtsm.so.3 libtsm-3_1
libxine.so.2 libxine-1.2.4_1
diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template
index 97cf36dd9e1..158a5c5b795 100644
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@@ -1,14 +1,14 @@
# Template file for 'glusterfs'
pkgname=glusterfs
version=8.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no
ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no
ac_cv_file__etc_centos_release=no"
pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon"
hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto"
-makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel
+makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel
liburcu-devel libxml2-devel rdma-core-devel sqlite-devel"
# python is required by gsyncd.
depends="python3"
From 66520900fea1cd42a0e07191b4c248ccfcba4717 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 036/358] gnome-podcasts: rebuild against OpenSSL
---
srcpkgs/gnome-podcasts/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template
index aa8fe3d2f5b..8f104462ae5 100644
--- a/srcpkgs/gnome-podcasts/template
+++ b/srcpkgs/gnome-podcasts/template
@@ -1,13 +1,13 @@
# Template file for 'gnome-podcasts'
pkgname=gnome-podcasts
version=0.4.8
-revision=1
+revision=2
wrksrc="podcasts-${version}"
build_style=meson
build_helper="rust"
hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel"
makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel
- gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std"
+ gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std"
short_desc="Listen to your favorite podcasts"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From 29599e8ac04c0bde8d1019019b83be348c567073 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 037/358] gogglesmm: rebuild against OpenSSL
---
srcpkgs/gogglesmm/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template
index 3bb2961c891..29579786726 100644
--- a/srcpkgs/gogglesmm/template
+++ b/srcpkgs/gogglesmm/template
@@ -1,12 +1,12 @@
# Template file for 'gogglesmm'
pkgname=gogglesmm
version=1.2.1
-revision=4
+revision=5
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
hostmakedepends="pkg-config desktop-file-utils"
makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel
- libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel
+ libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel
faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel"
depends="hicolor-icon-theme"
short_desc="Music Manager and Player"
From bad6bf7411ca73f563f1897ccf4eed9ac34f6c38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 038/358] grpc: rebuild against OpenSSL
---
common/shlibs | 24 ++++++++++++------------
srcpkgs/grpc/template | 4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 09623ac45c6..cbdb207d7cf 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3601,18 +3601,18 @@ liboblibs.so.0.1 oblibs-0.1.1.1_1
libaal-1.0.so.7 libaal-1.0.7_1
libaal-minimal.so.0 libaal-1.0.7_1
libcli.so.1.9 libcli-1.9.8.4_1
-libaddress_sorting.so.15 grpc-1.36.0_1
-libgpr.so.15 grpc-1.36.0_1
-libgrpc++.so.1 grpc-1.19.1_1
-libgrpc++_alts.so.1 grpc-1.32.0_1
-libgrpc++_error_details.so.1 grpc-1.19.1_1
-libgrpc++_reflection.so.1 grpc-1.19.1_1
-libgrpc++_unsecure.so.1 grpc-1.19.1_1
-libgrpc.so.15 grpc-1.36.0_1
-libgrpc_plugin_support.so.1 grpc-1.32.0_1
-libgrpc_unsecure.so.15 grpc-1.36.0_1
-libgrpcpp_channelz.so.1 grpc-1.19.1_1
-libupb.so.15 grpc-1.36.0_1
+libaddress_sorting.so.15 grpc-1.36.0_2
+libgpr.so.15 grpc-1.36.0_2
+libgrpc++.so.1 grpc-1.36.0_2
+libgrpc++_alts.so.1 grpc-1.36.0_2
+libgrpc++_error_details.so.1 grpc-1.36.0_2
+libgrpc++_reflection.so.1 grpc-1.36.0_2
+libgrpc++_unsecure.so.1 grpc-1.36.0_2
+libgrpc.so.15 grpc-1.36.0_2
+libgrpc_plugin_support.so.1 grpc-1.36.0_2
+libgrpc_unsecure.so.15 grpc-1.36.0_2
+libgrpcpp_channelz.so.1 grpc-1.36.0_2
+libupb.so.15 grpc-1.36.0_2
libircclient.so.1 libircclient-1.10_1
libFAudio.so.0 FAudio-19.05_1
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template
index a2d328497b0..708cd5b6518 100644
--- a/srcpkgs/grpc/template
+++ b/srcpkgs/grpc/template
@@ -1,7 +1,7 @@
# Template file for 'grpc'
pkgname=grpc
version=1.36.0
-revision=2
+revision=3
_abseilver=6f9d96a1f41439ac172ee2ef7ccd8edf0e5d068c
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON
@@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON
-D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so
-D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include"
hostmakedepends="which protobuf"
-_devel_depends="c-ares-devel re2-devel zlib-devel libressl-devel"
+_devel_depends="c-ares-devel re2-devel zlib-devel openssl-devel"
makedepends="libprotoc-devel protobuf-devel gperftools-devel ${_devel_depends}"
short_desc="High performance, open source, general RPC framework"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From 88755b3ba09da5f502eb30a1dd2f3c0d28dad486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 039/358] grub-customizer: rebuild against OpenSSL
---
srcpkgs/grub-customizer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template
index 1fa8ee27d6e..37a8467653f 100644
--- a/srcpkgs/grub-customizer/template
+++ b/srcpkgs/grub-customizer/template
@@ -1,10 +1,10 @@
# Template file for 'grub-customizer'
pkgname=grub-customizer
version=5.1.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="gtkmm-devel libressl-devel libarchive-devel"
+makedepends="gtkmm-devel openssl-devel libarchive-devel"
depends="hicolor-icon-theme grub-utils"
conf_files="/etc/grub-customizer/grub.cfg"
archs="i686* x86_64*"
From 5006689497d1eceb523630370c16c85aa442e95a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:01 +0100
Subject: [PATCH 040/358] gsoap: rebuild against OpenSSL
---
srcpkgs/gsoap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template
index 481f099805e..c0cf0340566 100644
--- a/srcpkgs/gsoap/template
+++ b/srcpkgs/gsoap/template
@@ -1,12 +1,12 @@
# Template file for 'gsoap'
pkgname=gsoap
version=2.8.91
-revision=2
+revision=3
wrksrc="gsoap-${version%.*}"
build_style=gnu-configure
configure_args="--enable-ipv6"
hostmakedepends="unzip flex autoconf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="gSOAP-1.3b, GPL-2.0-only"
From 84f4ade3d6c793342a19125836e781a6bd466d29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 041/358] gst-plugins-bad1: rebuild against OpenSSL
---
common/shlibs | 12 ++++++------
srcpkgs/gst-plugins-bad1/template | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cbdb207d7cf..7d8641b6a05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1155,12 +1155,12 @@ libgstpbutils-1.0.so.0 gst-plugins-base1-1.0.0_1
libgstriff-1.0.so.0 gst-plugins-base1-1.0.0_1
libgstapp-1.0.so.0 gst-plugins-base1-1.0.0_1
libgstallocators-1.0.so.0 gst-plugins-base1-1.1.1_1
-libgstphotography-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1
-libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1
+libgstphotography-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstsignalprocessor-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasevideo-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.18.3_2
+libgstplayer-1.0.so.0 gst-plugins-bad1-1.18.3_2
libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1
libgnome-desktop-3.so.19 gnome-desktop-3.37.90.1_1
libsecret-1.so.0 libsecret-0.10_1
diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template
index e94d8095e0b..f56e0b414b2 100644
--- a/srcpkgs/gst-plugins-bad1/template
+++ b/srcpkgs/gst-plugins-bad1/template
@@ -1,7 +1,7 @@
# Template file for 'gst-plugins-bad1'
pkgname=gst-plugins-bad1
version=1.18.3
-revision=1
+revision=2
wrksrc="${pkgname/1/}-${version}"
build_helper="gir"
build_style=meson
@@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false
-Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled"
hostmakedepends="automake gettext libtool pkg-config python3 glib-devel
orc wayland-devel"
-makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel
+makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel
gst-plugins-base1-devel libdca-devel orc-devel libmms-devel
libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel
faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel
From bf8fcd61642033bb51c18081dd87343b49dfa98a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 042/358] gwenhywfar: rebuild against OpenSSL
---
common/shlibs | 10 +++++-----
srcpkgs/gwenhywfar/template | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7d8641b6a05..a813883aa00 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1546,11 +1546,11 @@ libdom.so.0 libdom-0.0.1_1
libslang.so.2 slang-2.2.4_1
libtre.so.5 tre-0.8.0_1
libktoblzcheck.so.1 ktoblzcheck-1.43_2
-libgwenhywfar.so.79 gwenhywfar-5.1.0_1
-libgwengui-gtk2.so.79 gwenhywfar-gtk-5.3.0_1
-libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.3.0_1
-libgwengui-cpp.so.79 gwenhywfar-5.3.0_1
-libgwengui-qt5.so.79 gwenhywfar-qt5-5.3.0_1
+libgwenhywfar.so.79 gwenhywfar-5.4.0_2
+libgwengui-gtk2.so.79 gwenhywfar-gtk-5.4.0_2
+libgwengui-gtk3.so.79 gwenhywfar-gtk3-5.4.0_2
+libgwengui-cpp.so.79 gwenhywfar-5.4.0_2
+libgwengui-qt5.so.79 gwenhywfar-qt5-5.4.0_2
libaqbanking.so.44 aqbanking-6.0.0_1
libaqnone.so.35 aqbanking-5.6.10_1
libaqhbci.so.24 aqbanking-5.7.8_1
diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template
index f2287e9706a..89adfe05124 100644
--- a/srcpkgs/gwenhywfar/template
+++ b/srcpkgs/gwenhywfar/template
@@ -1,7 +1,7 @@
# Template file for 'gwenhywfar'
pkgname=gwenhywfar
version=5.4.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-visibility --disable-binreloc
--with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic"
From 131a7641c4a07e24c967d6793a05c113804c5892 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 043/358] h2o: rebuild against OpenSSL
---
srcpkgs/h2o/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 4610bac2840..3b300024f05 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -1,11 +1,11 @@
# Template file for 'h2o'
pkgname=h2o
version=2.2.6
-revision=2
+revision=3
build_style=cmake
conf_files="/etc/h2o.conf"
hostmakedepends="pkg-config"
-makedepends="libressl-devel libuv-devel zlib-devel"
+makedepends="openssl-devel libuv-devel zlib-devel"
depends="perl"
short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7d2d449c7202688cc66ec334f3c7f39846402eb4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 044/358] haproxy: rebuild against OpenSSL
---
srcpkgs/haproxy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 0baba697f26..ff5411c3422 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,11 +1,11 @@
# Template file for 'haproxy'
pkgname=haproxy
version=2.3.5
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
hostmakedepends="lua53-devel"
-makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel"
+makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel"
checkdepends="varnish"
short_desc="Reliable, high performance TCP/HTTP load balancer"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
From 6769159248fa3f2d2a96cd58f1fd66070847731a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:02 +0100
Subject: [PATCH 045/358] hexchat: rebuild against OpenSSL
---
srcpkgs/hexchat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template
index b0dd3fbbf17..90b8de48193 100644
--- a/srcpkgs/hexchat/template
+++ b/srcpkgs/hexchat/template
@@ -1,13 +1,13 @@
# Template file for 'hexchat'
pkgname=hexchat
version=2.14.3
-revision=4
+revision=5
build_style=meson
configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false
-Dwith-perl=/usr/bin/perl -Dwith-python=python3
-Dwith-lua=$(vopt_if LuaJIT luajit lua)"
hostmakedepends="gettext pkg-config glib-devel"
-makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel
+makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel
libcanberra-devel libxml2-devel pciutils-devel libproxy-devel
iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)"
depends="desktop-file-utils enchant2"
From 88119bab7e379b27763801a680f014262d71fdc7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 046/358] hfsprogs: rebuild against OpenSSL
---
srcpkgs/hfsprogs/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template
index 5a17b5e22cc..41bd475db09 100644
--- a/srcpkgs/hfsprogs/template
+++ b/srcpkgs/hfsprogs/template
@@ -3,10 +3,10 @@ pkgname=hfsprogs
_distver=540.1
_patchver=3
version="${_distver}.linux${_patchver}"
-revision=7
+revision=8
wrksrc="diskdev_cmds-${version}"
hostmakedepends="clang"
-makedepends="libressl-devel libuuid-devel"
+makedepends="openssl-devel libuuid-devel"
short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems"
maintainer="Orphaned <orphan@voidlinux.org>"
license="APSL-2.0"
From b7923f3efbccd5aabe3e9e4d1ca099c5468b6b15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 047/358] hitch: rebuild against OpenSSL
---
srcpkgs/hitch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template
index 37207973dca..2ccae03e306 100644
--- a/srcpkgs/hitch/template
+++ b/srcpkgs/hitch/template
@@ -1,11 +1,11 @@
# Template file for 'hitch'
pkgname=hitch
version=1.5.2
-revision=2
+revision=3
build_style=gnu-configure
configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes"
hostmakedepends="pkg-config automake"
-makedepends="libev-devel libressl-devel"
+makedepends="libev-devel openssl-devel"
checkdepends="lsof curl"
short_desc="Libev-based high performance SSL/TLS proxy"
maintainer="Jannis Christ <hello@jannis.ovh>"
From 123e1d247f473677f017f2787042b6d9152e1420 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 048/358] hostapd: rebuild against OpenSSL
---
srcpkgs/hostapd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index b8de7c3c9ce..20e16a32fc0 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,11 +1,11 @@
# Template file for 'hostapd'
pkgname=hostapd
version=2.9
-revision=2
+revision=3
build_wrksrc="$pkgname"
conf_files="/etc/hostapd/hostapd.conf"
hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel"
+makedepends="libnl3-devel openssl-devel"
short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From 8deee564e9a9eeea071b002fe92556a72427a4c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:03 +0100
Subject: [PATCH 049/358] hplip: rebuild against OpenSSL
---
srcpkgs/hplip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 8ebc49b7a8f..397508c55a3 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
# Template file for 'hplip'
pkgname=hplip
version=3.20.9
-revision=4
+revision=5
build_style=gnu-configure
pycompile_dirs="usr/share/hplip"
configure_args="
@@ -21,7 +21,7 @@ configure_args="
conf_files="/etc/hp/hplip.conf"
make_dirs="/var/lib/hp 0755 root root"
hostmakedepends="pkg-config automake libtool python3"
-makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel
+makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel
ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel
avahi-libs-devel"
depends="python3-gobject python3-dbus desktop-file-utils
From 864d849796854df447e4da2a1d19212cf02de264 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 050/358] httpdirfs: rebuild against OpenSSL
---
srcpkgs/httpdirfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 9ec780456ec..cbff9e7ae25 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,7 +1,7 @@
# Template file for 'httpdirfs'
pkgname=httpdirfs
version=1.2.0
-revision=2
+revision=3
build_style=gnu-makefile
make_install_args="prefix=/usr"
makedepends="libcurl-devel fuse-devel gumbo-parser-devel
From ae1c968c6a39accbe41dbe677a649175516d65d7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 051/358] httrack: rebuild against OpenSSL
---
common/shlibs | 4 ++--
srcpkgs/httrack/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a813883aa00..3af0ecf79ea 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2176,8 +2176,8 @@ libOpenImageIO.so.1.8 openimageio-1.8.12_1
libOpenColorIO.so.1 opencolorio-1.0.8_1
libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1
libpaper.so.1 libpaper-1.1.24_1
-libhtsjava.so.2 httrack-3.48.21_1
-libhttrack.so.2 httrack-3.48.21_1
+libhtsjava.so.2 httrack-3.49.2_7
+libhttrack.so.2 httrack-3.49.2_7
libbg.so.2 bglibs-2.03_3
libcvm-command.so.1 cvm-0.97_1
libcvm-local.so.1 cvm-0.97_1
diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template
index 4550f0df36c..090ec56ca85 100644
--- a/srcpkgs/httrack/template
+++ b/srcpkgs/httrack/template
@@ -1,7 +1,7 @@
# Template file for 'httrack'
pkgname=httrack
version=3.49.2
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr"
short_desc="A free and easy-to-use offline browser utility"
@@ -10,7 +10,7 @@ license="GPL-3"
homepage="http://www.httrack.com"
distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz"
checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
httrack-devel_package() {
short_desc+=" - development files"
From becf3565c903d52833fa20ffc181d0d5599063f2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 052/358] i2pd: rebuild against OpenSSL
---
srcpkgs/i2pd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index 6a93f6f94c5..de188117e81 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,10 +1,10 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.33.0
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
-makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel
+makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
libatomic-devel"
short_desc="Full-featured C++ implementation of I2P client"
maintainer="Obosob <obosob@riseup.net>"
From 95d74db2362c8a2ee4201825da6569f36f92f637 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 053/358] icecast: rebuild against OpenSSL
---
srcpkgs/icecast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template
index 39108b0f40d..920d6ffe9d3 100644
--- a/srcpkgs/icecast/template
+++ b/srcpkgs/icecast/template
@@ -1,10 +1,10 @@
# Template file for 'icecast'
pkgname=icecast
version=2.4.4
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config libxml2-devel"
-makedepends="libressl-devel libcurl-devel speex-devel
+makedepends="openssl-devel libcurl-devel speex-devel
libtheora-devel libvorbis-devel libxslt-devel"
short_desc="Free server software for streaming multimedia"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6e8e1238007c97475fd98fa6928b9d5bbb7128c8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:04 +0100
Subject: [PATCH 054/358] icinga2: rebuild against OpenSSL
---
srcpkgs/icinga2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index 20fe23ad04d..3ad8943fb26 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,14 +1,14 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=4
+revision=5
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
-DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run
-DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/"
hostmakedepends="flex git"
-makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel
+makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel
yajl-devel postgresql-libs-devel"
depends="monitoring-plugins"
conf_files="/etc/${pkgname}/*.conf
From 0a633f6401999eb3182fe1d1a9854683e12c2e4d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 055/358] imapfilter: rebuild against OpenSSL
---
srcpkgs/imapfilter/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template
index 77e36d4d1e5..8f516f768c9 100644
--- a/srcpkgs/imapfilter/template
+++ b/srcpkgs/imapfilter/template
@@ -1,11 +1,11 @@
# Template file for 'imapfilter'
pkgname=imapfilter
version=2.6.12
-revision=5
+revision=6
build_style=gnu-makefile
make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3"
hostmakedepends="lua53-devel"
-makedepends="pcre-devel lua53-devel libressl-devel"
+makedepends="pcre-devel lua53-devel openssl-devel"
short_desc="Mail filtering utility"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="MIT"
From 02ef77e3c69491e5e73ebe381e4ed6009b60c5e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 056/358] inadyn: rebuild against OpenSSL
---
srcpkgs/inadyn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template
index 1dfb82c0be6..7b395277e93 100644
--- a/srcpkgs/inadyn/template
+++ b/srcpkgs/inadyn/template
@@ -1,11 +1,11 @@
# Template file for 'inadyn'
pkgname=inadyn
version=2.8.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-openssl"
hostmakedepends="automake libtool pkg-config"
-makedepends="confuse-devel libressl-devel"
+makedepends="confuse-devel openssl-devel"
short_desc="Small DynDNS client with SSL/TLS support"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From 35ee407b2b1febf0bfb91ea1cdc848c03fc6882d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 057/358] inspircd: rebuild against OpenSSL
---
srcpkgs/inspircd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template
index 27c8eae0722..7a1f1477a97 100644
--- a/srcpkgs/inspircd/template
+++ b/srcpkgs/inspircd/template
@@ -1,10 +1,10 @@
# Template file for 'inspircd'
pkgname=inspircd
version=3.8.1
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="perl pkg-config"
-makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel"
+makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel"
short_desc="Modular Internet Relay Chat server"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="GPL-2.0-only"
From 365fa788a8ab1f1bc0934c8e886a5959d342420c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 058/358] ipmitool: rebuild against OpenSSL
---
.../patches/ipmitool-openssl-1.1.patch | 89 +++++++++++++++++++
srcpkgs/ipmitool/template | 4 +-
2 files changed, 91 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
new file mode 100644
index 00000000000..18dd076cbd9
--- /dev/null
+++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch
@@ -0,0 +1,89 @@
+diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c
+--- src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ uint8_t * output,
+ uint32_t * bytes_written)
+ {
+- EVP_CIPHER_CTX ctx;
+- EVP_CIPHER_CTX_init(&ctx);
+- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+- EVP_CIPHER_CTX_set_padding(&ctx, 0);
++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++ EVP_CIPHER_CTX_init(ctx);
++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+
+ *bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+
+
+- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ {
+ /* Error */
+ *bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ {
+ uint32_t tmplen;
+
+- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ {
+ *bytes_written = 0;
+ return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ {
+ /* Success */
+ *bytes_written += tmplen;
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_cleanup(ctx);
++ EVP_CIPHER_CTX_free(ctx);
+ }
+ }
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ uint8_t * output,
+ uint32_t * bytes_written)
+ {
+- EVP_CIPHER_CTX ctx;
+- EVP_CIPHER_CTX_init(&ctx);
+- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+- EVP_CIPHER_CTX_set_padding(&ctx, 0);
++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++ EVP_CIPHER_CTX_init(ctx);
++ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++ EVP_CIPHER_CTX_set_padding(ctx, 0);
+
+
+ if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+
+
+- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ {
+ /* Error */
+ lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ {
+ uint32_t tmplen;
+
+- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ {
+ char buffer[1000];
+ ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ {
+ /* Success */
+ *bytes_written += tmplen;
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_cleanup(ctx);
++ EVP_CIPHER_CTX_free(ctx);
+ }
+ }
+
diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template
index f70f335b4d0..eab8e525c87 100644
--- a/srcpkgs/ipmitool/template
+++ b/srcpkgs/ipmitool/template
@@ -1,9 +1,9 @@
# Template file for 'ipmitool'
pkgname=ipmitool
version=1.8.18
-revision=7
+revision=8
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Command-line interface to IPMI-enabled devices"
maintainer="Frank Steinborn <steinex@nognu.de>"
license="BSD"
From 3814b27afbb3cfbf0f703b9d9fb6631a44ad75dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:05 +0100
Subject: [PATCH 059/358] ipmiutil: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/ipmiutil/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 3af0ecf79ea..9482462f94d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2604,7 +2604,7 @@ libbuffer.so opencollada-0.0.20160223_1
libftoa.so opencollada-0.0.20160223_1
libzlib.so opencollada-1.6.51_1
libfbclient.so.2 libfbclient3-3.0.4.33054_1
-libipmiutil.so.1 ipmiutil-3.0.0_1
+libipmiutil.so.1 ipmiutil-3.1.3_4
libqxmpp.so.3 qxmpp-1.2.0_1
libunwind.so.1 llvm-libunwind-3.8.0_1
libc++abi.so.1 libcxxabi-3.8.0_1
diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template
index 0508008d9ba..6662a7f65d5 100644
--- a/srcpkgs/ipmiutil/template
+++ b/srcpkgs/ipmiutil/template
@@ -1,11 +1,11 @@
# Template file for 'ipmiutil'
pkgname=ipmiutil
version=3.1.3
-revision=3
+revision=4
archs="i686* x86_64* ppc*"
build_style=gnu-configure
configure_args="--disable-systemd --libdir=/usr/lib"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Series of utilities that perform common IPMI management functions"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="BSD-2-Clause, BSD-3-Clause"
From 096418c2de737556c3550f6b98ba6887c06851c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 060/358] iputils: rebuild against OpenSSL
---
srcpkgs/iputils/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template
index d0a6a92f358..a65a49c48e6 100644
--- a/srcpkgs/iputils/template
+++ b/srcpkgs/iputils/template
@@ -6,7 +6,7 @@ build_style=meson
configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false
-DBUILD_TFTPD=false -DBUILD_NINFOD=false"
hostmakedepends="pkg-config docbook2x docbook-xsl-ns"
-makedepends="libcap-devel libressl-devel"
+makedepends="libcap-devel openssl-devel"
depends="libcap-progs"
short_desc="Useful utilities for Linux networking (including ping)"
maintainer="Enno Boland <gottox@voidlinux.org>"
From 7e85c7bad8c0879eba9c951b25cb87f87a97637e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 061/358] irssi: rebuild against OpenSSL
---
srcpkgs/irssi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template
index 0e4d21205a8..4d8df6bfd24 100644
--- a/srcpkgs/irssi/template
+++ b/srcpkgs/irssi/template
@@ -1,12 +1,12 @@
# Template file for 'irssi'
pkgname=irssi
version=1.2.2
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-static --with-proxy --enable-true-color
--with-otr --with-perl=module"
hostmakedepends="pkg-config perl"
-makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel
+makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel
libotr-devel perl"
depends="ca-certificates"
conf_files="/etc/irssi.conf"
From 78fda6008a3f47af8be2100ec215ae1d6f708d98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 062/358] isync: rebuild against OpenSSL
---
srcpkgs/isync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template
index a67f57ec57c..003288d1203 100644
--- a/srcpkgs/isync/template
+++ b/srcpkgs/isync/template
@@ -1,10 +1,10 @@
# Template file for 'isync'
pkgname=isync
version=1.3.5
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libsasl-devel db-devel zlib-devel"
+makedepends="openssl-devel libsasl-devel db-devel zlib-devel"
depends="ca-certificates"
short_desc="IMAP and MailDir mailbox synchronizer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 54694f596c65d1111350099410cee9250666adaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 063/358] john: rebuild against OpenSSL
---
srcpkgs/john/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/john/template b/srcpkgs/john/template
index a4994b7b4cc..fc807f4e7c8 100644
--- a/srcpkgs/john/template
+++ b/srcpkgs/john/template
@@ -1,13 +1,13 @@
# Template file for 'john'
pkgname=john
version=1.9.0
-revision=3
+revision=4
_jumbover=1
wrksrc="${pkgname}-${version}-jumbo-${_jumbover}"
build_wrksrc="src"
build_style=gnu-configure
configure_args="--with-systemwide $(vopt_enable simd)"
-makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
+makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel"
short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
maintainer="Piraty <piraty1@inbox.ru>"
license="GPL-2.0-or-later with OpenSSL-exception"
From c3090f8fe71243a937956252cdeca174f6de7c99 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:06 +0100
Subject: [PATCH 064/358] kea: change botan build-option to use OpenSSL
---
common/shlibs | 40 ++++++++++++++++++++--------------------
srcpkgs/kea/template | 4 ++--
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9482462f94d..9f1bd0d9cff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2860,26 +2860,26 @@ libkj-http-0.8.0.so capnproto-0.8.0_1
libkj-async-0.8.0.so capnproto-0.8.0_1
libkj-test-0.8.0.so capnproto-0.8.0_1
libkj-0.8.0.so capnproto-0.8.0_1
-libkea-asiodns.so.12 libkea-1.9.4_1
-libkea-asiolink.so.23 libkea-1.9.5_1
-libkea-cc.so.22 libkea-1.9.5_1
-libkea-cfgclient.so.22 libkea-1.9.4_1
-libkea-cryptolink.so.16 libkea-1.9.2_1
-libkea-database.so.21 libkea-1.9.5_1
-libkea-dhcp++.so.33 libkea-1.9.5_1
-libkea-dhcp_ddns.so.15 libkea-1.9.4_1
-libkea-dhcpsrv.so.43 libkea-1.9.5_1
-libkea-dns++.so.16 libkea-1.9.4_1
-libkea-eval.so.25 libkea-1.9.5_1
-libkea-exceptions.so.0 libkea-1.1.0_1
-libkea-hooks.so.31 libkea-1.9.5_1
-libkea-http.so.23 libkea-1.9.4_1
-libkea-log.so.18 libkea-1.9.4_1
-libkea-pgsql.so.18 libkea-1.9.4_1
-libkea-process.so.26 libkea-1.9.5_1
-libkea-stats.so.18 libkea-1.9.4_1
-libkea-util-io.so.0 libkea-1.1.0_1
-libkea-util.so.32 libkea-1.9.5_1
+libkea-asiodns.so.12 libkea-1.9.5_2
+libkea-asiolink.so.23 libkea-1.9.5_2
+libkea-cc.so.22 libkea-1.9.5_2
+libkea-cfgclient.so.22 libkea-1.9.5_2
+libkea-cryptolink.so.16 libkea-1.9.5_2
+libkea-database.so.21 libkea-1.9.5_2
+libkea-dhcp++.so.33 libkea-1.9.5_2
+libkea-dhcp_ddns.so.15 libkea-1.9.5_2
+libkea-dhcpsrv.so.43 libkea-1.9.5_2
+libkea-dns++.so.16 libkea-1.9.5_2
+libkea-eval.so.25 libkea-1.9.5_2
+libkea-exceptions.so.0 libkea-1.9.5_2
+libkea-hooks.so.31 libkea-1.9.5_2
+libkea-http.so.23 libkea-1.9.5_2
+libkea-log.so.18 libkea-1.9.5_2
+libkea-pgsql.so.18 libkea-1.9.5_2
+libkea-process.so.26 libkea-1.9.5_2
+libkea-stats.so.18 libkea-1.9.5_2
+libkea-util-io.so.0 libkea-1.9.5_2
+libkea-util.so.32 libkea-1.9.5_2
libytnef.so.0 ytnef-1.8_1
libpisock.so.9 pilot-link-0.12.5_1
libpisync.so.1 pilot-link-0.12.5_1
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index 5da5b0a3c81..aab6022e495 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
@@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
hostmakedepends="flex bison perl pkg-config automake libtool
doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme"
makedepends="boost-devel log4cplus-devel python3-devel
- $(vopt_if botan botan-devel libressl-devel)
+ $(vopt_if botan botan-devel openssl-devel)
$(vopt_if mysql libmariadbclient-devel)
$(vopt_if pgsql postgresql-libs-devel)"
depends="libkea>=0"
From e1626dfef0bf32a3170fe3de1d8dac0f6fd1179a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 065/358] keepalived: rebuild against OpenSSL
---
srcpkgs/keepalived/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template
index 0b1b73f19e1..7fd6b2b118e 100644
--- a/srcpkgs/keepalived/template
+++ b/srcpkgs/keepalived/template
@@ -1,11 +1,11 @@
# Template file for 'keepalived'
pkgname=keepalived
version=2.1.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha1"
hostmakedepends="pkg-config"
-makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel"
+makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel"
short_desc="Failover and monitoring daemon for LVS clusters"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 1d40399dcb54ce0df58dc3b859b434e934ada3ef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 066/358] kicad: rebuild against OpenSSL
---
srcpkgs/kicad/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 22e74879754..d7cc9e2ba7a 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=5.1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON
@@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON
-DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)"
hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3"
makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel
- libressl-devel boost-devel libcurl-devel glm libgomp-devel
+ openssl-devel boost-devel libcurl-devel glm libgomp-devel
$(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)"
depends="wxPython4"
short_desc="Electronic schematic and PCB design software"
From ff19b101f090442638d5059fdc1c988f7be848de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 067/358] kodi: rebuild against OpenSSL
---
srcpkgs/kodi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index f82aa332575..bff11d8ae5a 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=18.9
-revision=5
+revision=6
_codename="Leia"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
@@ -29,7 +29,7 @@ makedepends="
libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel
libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel
- jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel
+ jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel
libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel
enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel
libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel
From 9bc7fe23f9ec98cf5e4eee953442d8bcd612939b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:07 +0100
Subject: [PATCH 068/358] kore: rebuild against OpenSSL
---
srcpkgs/kore/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index d2394349639..6c6e2d1378c 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,14 +1,14 @@
# Template file for 'kore'
pkgname=kore
version=4.1.0
-revision=1
+revision=2
# arch specific seccomp stuff
archs="x86_64* aarch64* ppc64*"
build_style=gnu-makefile
make_use_env=yes
make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
hostmakedepends="postgresql-libs-devel"
-makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
+makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel"
short_desc="Easy to use web platform for writing scalable web APIs in C"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="ISC"
From 961274afbf0de37bd37c89fe8b2303d301eb9b1b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 069/358] kvirc: rebuild against OpenSSL
---
srcpkgs/kvirc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template
index 68bcc327ead..41255b18e92 100644
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@@ -1,12 +1,12 @@
# Template file for 'kvirc'
pkgname=kvirc
version=5.0.0
-revision=6
+revision=7
wrksrc="KVIrc-$version"
build_style=cmake
configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0"
hostmakedepends="perl"
-makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl
+makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl
qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql
qt5-plugin-sqlite qt5-plugin-tds"
short_desc="Qt-based IRC client"
From 4f39724bbed33bbdb8d9d5df799842b08813f552 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 070/358] lastpass-cli: rebuild against OpenSSL
---
srcpkgs/lastpass-cli/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template
index e9860677f4a..505360bc039 100644
--- a/srcpkgs/lastpass-cli/template
+++ b/srcpkgs/lastpass-cli/template
@@ -1,7 +1,7 @@
# Template file for 'lastpass-cli'
pkgname=lastpass-cli
version=1.3.3
-revision=3
+revision=4
build_style=cmake
make_install_target="install install-doc"
hostmakedepends="asciidoc pkg-config"
From 42d544500150c4cabdaf6aed29d98023797af895 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 071/358] ldapvi: rebuild against OpenSSL
---
srcpkgs/ldapvi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template
index 4f2e420b726..1dda3c2ae6e 100644
--- a/srcpkgs/ldapvi/template
+++ b/srcpkgs/ldapvi/template
@@ -1,7 +1,7 @@
# Template file for 'ldapvi'
pkgname=ldapvi
version=1.7
-revision=10
+revision=11
build_style=gnu-configure
configure_args="--with-sha"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From c193baedd384f32502aeed31a5d68cefc1343684 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:08 +0100
Subject: [PATCH 072/358] ldns: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/ldns/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9f1bd0d9cff..ca6b8f815b4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2029,7 +2029,7 @@ libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
libstfl.so.0 stfl-0.23_1
libCDApplet.so cairo-dock-plugins-3.4.0_1
-libldns.so.3 libldns-1.7.1_1
+libldns.so.3 libldns-1.7.1_4
libopenjpeg.so.5 libopenjpeg-1.5.2_1
liboping.so.0 liboping-1.8.0_1
libloudmouth-1.so.0 loudmouth-1.4.3_1
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 7a02c108b6d..6be7b24bfd1 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,13 +1,13 @@
# Template file for 'ldns'
pkgname=ldns
version=1.7.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-drill --with-examples --disable-dane-ta-usage
--with-trust-anchor=/etc/dns/root.key
--with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
-makedepends="libpcap-devel libressl-devel dnssec-anchors"
+makedepends="libpcap-devel openssl-devel dnssec-anchors"
short_desc="Modern DNS/DNSSEC library -- utils"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
@@ -30,7 +30,7 @@ libldns_package() {
}
}
libldns-devel_package() {
- depends="libldns>=${version}_${revision} libressl-devel"
+ depends="libldns>=${version}_${revision} openssl-devel"
short_desc="Modern DNS/DNSSEC library -- development files"
pkg_install() {
vmove usr/bin/ldns-config
From d4dbdc1afc4ed3ee973460ae7befcde963de4fbe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 073/358] lftp: rebuild against OpenSSL
---
...ftp-ssl-unbreak-libressl-compilation.patch | 29 -------------------
srcpkgs/lftp/template | 4 +--
2 files changed, 2 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
diff --git a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch b/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
deleted file mode 100644
index c0353b4089a..00000000000
--- a/srcpkgs/lftp/patches/0001-lftp-ssl-unbreak-libressl-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From d98d1b76e74948d9c7f966f9c52561a304050afb Mon Sep 17 00:00:00 2001
-From: Anthony Iliopoulos <ailiop@altatus.com>
-Date: Sun, 13 Sep 2020 12:27:12 +0200
-Subject: [PATCH] lftp/ssl: unbreak libressl compilation
-
-Commit 537f3789 ("lftp: fix compilation without deprecated OpenSSL
-APIs") broke libressl compilation, fix it.
-
-Signed-off-by: Anthony Iliopoulos <ailiop@altatus.com>
----
- src/lftp_ssl.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/lftp_ssl.cc src/lftp_ssl.cc
-index 14a3b9d4..83cbda1b 100644
---- src/lftp_ssl.cc
-+++ src/lftp_ssl.cc
-@@ -34,7 +34,7 @@
- #include "misc.h"
- #include "network.h"
- #include "buffer.h"
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define X509_STORE_CTX_get_by_subject X509_STORE_get_by_subject
- #endif
- extern "C" {
---
-2.28.0
-
diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template
index 50f18cb4b25..322d64ba114 100644
--- a/srcpkgs/lftp/template
+++ b/srcpkgs/lftp/template
@@ -1,13 +1,13 @@
# Template file for 'lftp'
pkgname=lftp
version=4.9.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-modules --disable-rpath --without-included-regex
--with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr
--with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes"
hostmakedepends="pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel libressl-devel
+makedepends="zlib-devel ncurses-devel readline-devel openssl-devel
expat-devel libidn-devel gettext-devel"
short_desc="Sophisticated FTP/HTTP client"
maintainer="Orphaned <orphan@voidlinux.org>"
From ed12dd89824d0191f1a796295e967a89bad723a7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:09 +0100
Subject: [PATCH 074/358] libetpan: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libetpan/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ca6b8f815b4..06a32037044 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2168,7 +2168,7 @@ libutf8proc.so.2 libutf8proc-2.2.0_1
libnsutils.so.0 libnsutils-0.0.1_1
libtoxcore.so.2 toxcore-0.2.0_1
libgom-1.0.so.0 gom-0.3.0_1
-libetpan.so.20 libetpan-1.7.2_1
+libetpan.so.20 libetpan-1.9.3_4
libxmp.so.4 libxmp-4.3.7_1
libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1
libOpenImageIO_Util.so.1.8 openimageio-1.8.12_1
diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template
index 9a4a32a1ec9..fb6c96eb33f 100644
--- a/srcpkgs/libetpan/template
+++ b/srcpkgs/libetpan/template
@@ -1,12 +1,12 @@
# Template file for 'libetpan'
pkgname=libetpan
version=1.9.3
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl
--with-zlib --with-sasl"
hostmakedepends="libtool automake"
-makedepends="db-devel expat-devel libressl-devel zlib-devel
+makedepends="db-devel expat-devel openssl-devel zlib-devel
libsasl-devel libcurl-devel"
short_desc="Mail Framework library for C language"
maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>"
From f9d08b21e66e972922b72b7152caf14c1ea411fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 075/358] libfetch: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libfetch/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 06a32037044..cf926291e21 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -775,7 +775,7 @@ libenca.so.0 libenca-1.13_1
libwavpack.so.1 libwavpack-4.60.1_1
libSDL_net-1.2.so.0 SDL_net-1.2.7_1
libmodplug.so.1 libmodplug-0.8.8_1
-libfetch.so.2 libfetch-2.34_8
+libfetch.so.2 libfetch-2.34_23
libneon.so.27 neon-0.29.5_1
libsvn_subr-1.so.0 libsvn-1.7.5_1
libsvn_diff-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template
index b24a291cbc5..49ae77a163d 100644
--- a/srcpkgs/libfetch/template
+++ b/srcpkgs/libfetch/template
@@ -1,9 +1,9 @@
# Template file for 'libfetch'
pkgname=libfetch
version=2.34
-revision=22
+revision=23
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="File Transfer Library for URLs"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From 2f8affb992831f5795dbd07792570b14125c3550 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 076/358] libfido2: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libfido2/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cf926291e21..eec8b8711c1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3832,7 +3832,7 @@ libmpirxx.so.8 mpir-3.0.0_1
libcaribou.so.0 libcaribou-0.4.21_3
libtinyclipboard.so.1 tinyclipboard-16.01_1
libcbor.so.0.8 libcbor-0.8.0_1
-libfido2.so.1 libfido2-1.3.0_1
+libfido2.so.1 libfido2-1.6.0_2
libjanet.so.1.15 janet-1.15.1_1
libOpenImageDenoise.so.1 openimagedenoise-1.3.0_1
libcbang0.so cbang-1.6.0_3
diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template
index 6933277caaa..a329477e119 100644
--- a/srcpkgs/libfido2/template
+++ b/srcpkgs/libfido2/template
@@ -1,11 +1,11 @@
# Template file for 'libfido2'
pkgname=libfido2
version=1.6.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d"
hostmakedepends="pkg-config"
-makedepends="libcbor-devel libressl-devel eudev-libudev-devel"
+makedepends="libcbor-devel openssl-devel eudev-libudev-devel"
short_desc="Library for FIDO 2.0, including communication with a device over USB"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause"
From fe53d23c1ad8a9580c0002aab997413d8b72201d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:10 +0100
Subject: [PATCH 077/358] libgda: rebuild against OpenSSL
---
common/shlibs | 8 ++++----
srcpkgs/libgda/template | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index eec8b8711c1..96446153215 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1417,10 +1417,10 @@ libmbim-glib.so.4 libmbim-1.10.0_1
libmm-glib.so.0 libmm-glib-1.0.0_1
libgpm.so.2 libgpm-1.20.7_1
libgdl-3.so.5 gdl-3.8.1_1
-libgda-5.0.so.4 libgda-5.1.2_1
-libgda-report-5.0.so.4 libgda-5.1.2_1
-libgda-ui-5.0.so.4 libgda-5.1.2_1
-libgda-xslt-5.0.so.4 libgda-5.1.2_1
+libgda-5.0.so.4 libgda-5.2.9_4
+libgda-report-5.0.so.4 libgda-5.2.9_4
+libgda-ui-5.0.so.4 libgda-5.2.9_4
+libgda-xslt-5.0.so.4 libgda-5.2.9_4
libamtk-5.so.0 amtk-5.0.0_1
libdevhelp-3.so.6 devhelp-libs-3.30.0_1
libunistring.so.2 libunistring-0.9.4_1
diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template
index d5f301edcaa..d9a79ff60b2 100644
--- a/srcpkgs/libgda/template
+++ b/srcpkgs/libgda/template
@@ -1,14 +1,14 @@
# Template file for 'libgda'
pkgname=libgda
version=5.2.9
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json
--enable-system-sqlite"
hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode"
makedepends="gtk+3-devel libxml2-devel libxslt-devel
- libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
+ openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel
libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel
json-glib-devel readline-devel libmariadbclient-devel"
conf_files="/etc/libgda-5.0/config"
From f442e00945f0958dfb2371c956d133ec3ff7b7c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 078/358] libimobiledevice: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libimobiledevice/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 96446153215..8e8e46c40c2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2026,7 +2026,7 @@ libnpth.so.0 npth-1.1_1
libnpupnp.so.4 libnpupnp-4.0.2_1
libglfw.so.3 glfw-3.0.4_1
libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1
-libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_1
+libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2
libstfl.so.0 stfl-0.23_1
libCDApplet.so cairo-dock-plugins-3.4.0_1
libldns.so.3 libldns-1.7.1_4
diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template
index 43fbd4531b7..a8bb2d08e09 100644
--- a/srcpkgs/libimobiledevice/template
+++ b/srcpkgs/libimobiledevice/template
@@ -1,10 +1,10 @@
# Template file for 'libimobiledevice'
pkgname=libimobiledevice
version=1.3.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkgconf python3-Cython"
-makedepends="python3-devel libglib-devel libressl-devel
+makedepends="python3-devel libglib-devel openssl-devel
libusb-devel libplist-devel libusbmuxd-devel"
short_desc="Library to communicate with Apple devices"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6576cd0b9e1669760e02dc140ae2de1d9b907527 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 079/358] libircclient: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libircclient/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8e8e46c40c2..efb783d4194 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3613,7 +3613,7 @@ libgrpc_plugin_support.so.1 grpc-1.36.0_2
libgrpc_unsecure.so.15 grpc-1.36.0_2
libgrpcpp_channelz.so.1 grpc-1.36.0_2
libupb.so.15 grpc-1.36.0_2
-libircclient.so.1 libircclient-1.10_1
+libircclient.so.1 libircclient-1.10_5
libFAudio.so.0 FAudio-19.05_1
libqaccessibilityclient-qt5.so.0 libqaccessibilityclient-0.4.0_1
libnitrokey.so.3 libnitrokey-3.4.1_1
diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template
index f5ba5bdc199..ae9adf37d68 100644
--- a/srcpkgs/libircclient/template
+++ b/srcpkgs/libircclient/template
@@ -1,11 +1,11 @@
# Template file for 'libircclient'
pkgname=libircclient
version=1.10
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared"
hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="IRC client library"
maintainer="maciozo@maciozo.com <maciozo@maciozo.com>"
license="LGPL-3.0-or-later"
From 10d6a44cbd99addbea415170e5ae0ad4ea98fd33 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 080/358] libknet1: rebuild against OpenSSL
---
common/shlibs | 4 ++--
srcpkgs/libknet1/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index efb783d4194..57f1557debc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3646,11 +3646,11 @@ libnuspell.so.4 libnuspell-4.2.0_1
liblog4c.so.3 log4c-1.2.4_1
libqb.so.100 libqb-2.0.0_1
libusbguard.so.1 usbguard-1.0.0_1
-libknet.so.1 libknet1-1.11_1
+libknet.so.1 libknet1-1.11_4
libdrumstick-file.so.1 drumstick-1.1.2_1
libdrumstick-alsa.so.1 drumstick-1.1.2_1
libdrumstick-rt.so.1 drumstick-1.1.2_1
-libnozzle.so.1 libnozzle1-1.11_2
+libnozzle.so.1 libnozzle1-1.11_4
libmygpo-qt5.so.1 libmygpo-qt-1.1.0_1
libluv.so.1 libluv-1.30.1.0_1
libarmadillo.so.9 armadillo-9.700.2_1
diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template
index 4e073b09bdd..bdd6d2b14db 100644
--- a/srcpkgs/libknet1/template
+++ b/srcpkgs/libknet1/template
@@ -2,14 +2,14 @@
# only libraries and development files now, if interested in kronosnetd update!
pkgname=libknet1
version=1.11
-revision=3
+revision=4
wrksrc=kronosnet-${version}
build_style=gnu-configure
configure_args="--disable-dependency-tracking --disable-libknet-sctp
--disable-kronosnetd --disable-poc --disable-static"
hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel"
makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel
- libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
+ openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel"
short_desc="Kronosnet core switching implementation (libraries)"
maintainer="Jiří Bělka <jirib79@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-only"
From 2f4fb59f1549c9c8f246063739d48b1f443d3fa0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:11 +0100
Subject: [PATCH 081/358] libmowgli: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libmowgli/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 57f1557debc..9a89f234881 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1132,7 +1132,7 @@ libpathplan.so.4 graphviz-libs-2.28.0_6
liblab_gamut.so.1 graphviz-libs-2.40.1_1
libflowcanvas.so.5 flowcanvas-0.7.1_1
liblash.so.1 ladish-1_1
-libmowgli-2.so.0 libmowgli-2.0.0_1
+libmowgli-2.so.0 libmowgli-2.1.3_8
libgts-0.7.so.5 gts-0.7.6_1
libguess.so.1 libguess-1.1_1
libaudcore.so.5 audacious-3.9_1
diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template
index 51004676d45..cf17648a4b7 100644
--- a/srcpkgs/libmowgli/template
+++ b/srcpkgs/libmowgli/template
@@ -1,11 +1,11 @@
# Template file for 'libmowgli'
pkgname=libmowgli
version=2.1.3
-revision=7
+revision=8
wrksrc="${pkgname}-2-${version}"
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Performance and usability-oriented extensions to C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From d119117424b6b038bf535b96b2ec5c596236ab09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 082/358] libnice: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libnice/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9a89f234881..49ae6ae0cac 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -823,7 +823,7 @@ libfolks.so.25 folks-0.14.0_1
libfolks-dummy.so.25 folks-0.14.0_1
libfolks-telepathy.so.25 folks-0.14.0_1
libfolks-eds.so.25 folks-0.14.0_1
-libnice.so.10 libnice-0.1.0_1
+libnice.so.10 libnice-0.1.18_3
libgupnp-igd-1.0.so.4 gupnp-igd-0.2.0_1
libtelepathy-logger.so.3 telepathy-logger-0.6.0_1
libmission-control-plugins.so.0 telepathy-mission-control-5.9.2_1
diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template
index 84721a66e73..6ccfa29c6c8 100644
--- a/srcpkgs/libnice/template
+++ b/srcpkgs/libnice/template
@@ -1,13 +1,13 @@
# Template file for 'libnice'
pkgname=libnice
version=0.1.18
-revision=2
+revision=3
build_style=meson
build_helper="gir"
configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled
-Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)"
hostmakedepends="glib-devel pkg-config"
-makedepends="gstreamer1-devel gupnp-igd-devel libressl-devel libglib-devel"
+makedepends="gstreamer1-devel gupnp-igd-devel openssl-devel libglib-devel"
short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 2fc72054936aee5661655eb2de2c5c7c8c8b47dc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 083/358] libostree: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libostree/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 49ae6ae0cac..747cf27aaf1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2948,7 +2948,7 @@ libbearssl.so.0 bearssl-0.3_1
libXfont2.so.2 libXfont2-2.0.1_1
libqalculate.so.21 libqalculate-3.0.0_1
libweston-9.so.0 weston-9.0.0_1
-libostree-1.so.1 libostree-2017.3_1
+libostree-1.so.1 libostree-2020.8_2
librhash.so.0 rhash-1.3.4_1
libostree-1.so.1 libostree-2020.8_2
librhash.so.0 rhash-1.4.1_2
diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template
index abad94721be..918f1604061 100644
--- a/srcpkgs/libostree/template
+++ b/srcpkgs/libostree/template
@@ -1,7 +1,7 @@
# Template file for 'libostree'
pkgname=libostree
version=2020.8
-revision=1
+revision=2
build_style=gnu-configure
build_helper="gir"
configure_args="
From e7b3a805c8871e546ad6e4fc29c0ea4d65797030 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 084/358] librdkafka: rebuild against OpenSSL
---
common/shlibs | 4 ++--
srcpkgs/librdkafka/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 747cf27aaf1..2f450e7e32f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3817,8 +3817,8 @@ libjsonnet.so.0 jsonnet-0.14.0_2
libjsonnet++.so.0 jsonnet-0.14.0_2
libigdgmm.so.11 intel-gmmlib-19.4.1_1
libgtk-layer-shell.so.0 gtk-layer-shell-0.1.0_1
-librdkafka.so.1 librdkafka-1.3.0_1
-librdkafka++.so.1 librdkafka-1.3.0_1
+librdkafka.so.1 librdkafka-1.4.4_3
+librdkafka++.so.1 librdkafka-1.4.4_3
libco.so.0 libco-20_1
libraft.so.0 raft-0.9.16_1
libmdnsd.so.1 libmdnsd-0.9_1
diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template
index 78a8d404618..4b6c741bf25 100644
--- a/srcpkgs/librdkafka/template
+++ b/srcpkgs/librdkafka/template
@@ -1,10 +1,10 @@
# Template file for 'librdkafka'
pkgname=librdkafka
version=1.4.4
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr"
-makedepends="zlib-devel libressl-devel libsasl-devel"
+makedepends="zlib-devel openssl-devel libsasl-devel"
short_desc="Apache Kafka C/C++ library"
maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>"
license="BSD-2-Clause"
From 2c1398391e1ea563585596d6bac2b08bce1cc0d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:12 +0100
Subject: [PATCH 085/358] libssh: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libssh/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2f450e7e32f..0ade45d8c1d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1388,7 +1388,7 @@ libiodbcinst.so.2 libiodbc-3.52.8_1
libsolarus.so.1 solarus-1.6.2_1
libsolarus-gui.so.1 solarus-1.6.2_1
libplank.so.1 plank-0.11.0_1
-libssh.so.4 libssh-0.5.4_1
+libssh.so.4 libssh-0.9.5_2
libxcb-render-util.so.0 xcb-util-renderutil-0.3.8_1
libKPimGAPIContacts.so.5 libkgapi-17.12.3_1
libKPimGAPIBlogger.so.5 libkgapi-17.12.3_1
diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template
index 50b6097a21a..9b57379bfc8 100644
--- a/srcpkgs/libssh/template
+++ b/srcpkgs/libssh/template
@@ -1,11 +1,11 @@
# Template file for 'libssh'
pkgname=libssh
version=0.9.5
-revision=1
+revision=2
build_style=cmake
configure_args="-DUNIT_TESTING=ON"
hostmakedepends="pkg-config python3"
-makedepends="zlib-devel libressl-devel cmocka-devel"
+makedepends="zlib-devel openssl-devel cmocka-devel"
checkdepends="openssh"
short_desc="Multiplatform C library implementing the SSH v2 protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7fd83e907cd2f8435b99e1f01ee5295d402268f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 086/358] libstrophe: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libstrophe/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0ade45d8c1d..cc4cd5da5d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1819,7 +1819,7 @@ libfcgi.so.0 fcgi-2.4.0_2
libdshconfig.so.1 libdshconfig-0.20.13_1
libpar2.so.1 libpar2-0.4_1
libsodium.so.23 libsodium-1.0.15_1
-libstrophe.so.0 libstrophe-0.8.6_1
+libstrophe.so.0 libstrophe-0.10.1_2
libganv-1.so.1 ganv-1.4.2_1
libblas.so.3 blas-3.5.0_1
libcblas.so.3 cblas-3.6.0_1
diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template
index 4d90ded8f47..5dad32e3826 100644
--- a/srcpkgs/libstrophe/template
+++ b/srcpkgs/libstrophe/template
@@ -1,12 +1,12 @@
# Template file for 'libstrophe'
pkgname=libstrophe
version=0.10.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable cares) $(vopt_enable tls)"
hostmakedepends="automake libtool pkg-config"
makedepends="$(vopt_if cares c-ares-devel) expat-devel
- $(vopt_if tls libressl-devel) zlib-devel"
+ $(vopt_if tls openssl-devel) zlib-devel"
short_desc="Minimal XMPP library written in C"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
From a90da928cf28d2d5bddb5c6917fcec5a85f52897 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 087/358] libtd: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libtd/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index cc4cd5da5d6..d790a9906a1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3881,7 +3881,7 @@ libcglm.so.0 cglm-0.7.6_1
libfcft.so.3 fcft-2.2.2_1
libaml.so.0 aml-0.1.0_1
libneatvnc.so.0 neatvnc-0.3.2_1
-libtdjson.so.1.7.0 libtd-1.7.0_1
+libtdjson.so.1.7.0 libtd-1.7.0_2
libJudy.so.1 judy-1.0.5_1
libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index d39de7663c2..f719ab4d3f1 100644
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -1,12 +1,12 @@
# Template file for 'libtd'
pkgname=libtd
version=1.7.0
-revision=1
+revision=2
wrksrc="td-${version}"
build_style=cmake
build_helper=qemu
hostmakedepends="gperf"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Cross-platform library for building Telegram clients"
maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
license="BSL-1.0"
From 44f66540c27ad7db90c268eceae4c872dd469f69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 088/358] libtorrent: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libtorrent/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d790a9906a1..90954f1be63 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -841,7 +841,7 @@ libosp.so.5 opensp-1.5.2_1
libogrove.so.0 openjade-1.3.2_1
libospgrove.so.0 openjade-1.3.2_1
libostyle.so.0 openjade-1.3.2_1
-libtorrent.so.21 libtorrent-0.13.8_1
+libtorrent.so.21 libtorrent-0.13.8_4
libgiblib.so.1 giblib-1.2.4_1
libgc.so.1 gc-7.6.4_1
libcord.so.1 gc-7.4_1
diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template
index fe2e4d73c21..cadf0f5bb1d 100644
--- a/srcpkgs/libtorrent/template
+++ b/srcpkgs/libtorrent/template
@@ -1,12 +1,12 @@
# Template file for 'libtorrent'
pkgname=libtorrent
version=0.13.8
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-static --disable-debug --without-kqueue
--enable-aligned --with-posix-fallocate"
hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
# XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit
checkdepends="libcppunit-devel"
short_desc="BitTorrent library written in C++"
From 4b1d8e5345d51170bc600ebe1b3031e5ac0ee642 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 089/358] libtorrent-rasterbar: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libtorrent-rasterbar/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 90954f1be63..c1918413af2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2033,7 +2033,7 @@ libldns.so.3 libldns-1.7.1_4
libopenjpeg.so.5 libopenjpeg-1.5.2_1
liboping.so.0 liboping-1.8.0_1
libloudmouth-1.so.0 loudmouth-1.4.3_1
-libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.2_1
+libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
libcapstone.so.4 capstone-4.0_1
libhavege.so.2 libhaveged-1.9.11_1
libnih.so.1 libnih-1.0.3_1
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 831e507c127..0588acd81bd 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,12 +2,12 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.12
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
hostmakedepends="pkg-config intltool libtool python3-devel"
-makedepends="libressl-devel boost-devel geoip-devel python3-devel"
+makedepends="openssl-devel boost-devel geoip-devel python3-devel"
short_desc="C++ bittorrent library by Rasterbar Software"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="BSD-3-Clause"
@@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() {
}
libtorrent-rasterbar-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel"
+ depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel"
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
depends+=" libatomic-devel"
fi
From 149ee257df28b24fd9ab9fbcce0ce4d6729cf9b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:13 +0100
Subject: [PATCH 090/358] libu2f-host: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libu2f-host/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c1918413af2..ae5713e2cf2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2448,7 +2448,7 @@ libboinc_graphics2.so.7 boinc-nox-7.16.16_2
libsynfig.so.0 synfig-1.0.1_1
libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
-libu2f-host.so.0 libu2f-host-1.0.0_1
+libu2f-host.so.0 libu2f-host-1.1.10_5
libu2f-server.so.0 libu2f-server-1.0.1_2
libsqlcipher.so.0 sqlcipher-3.3.1_1
libgta.so.1 libgta-1.2.0_1
diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template
index c16dae4a2d1..c2cd5b754dc 100644
--- a/srcpkgs/libu2f-host/template
+++ b/srcpkgs/libu2f-host/template
@@ -1,12 +1,12 @@
# Template file for 'libu2f-host'
pkgname=libu2f-host
version=1.1.10
-revision=4
+revision=5
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
configure_args="--with-openssl=yes"
hostmakedepends="automake gengetopt libtool pkg-config"
-makedepends="hidapi-devel json-c-devel libressl-devel"
+makedepends="hidapi-devel json-c-devel openssl-devel"
depends="libfido2"
short_desc="C library and tool that implements the host-side of the U2F protocol"
maintainer="Orphaned <orphan@voidlinux.org>"
From f5f41631f12d96fab334b3e18e4e15e59011a745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 091/358] libu2f-server: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libu2f-server/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index ae5713e2cf2..3ce1b86d4c9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2449,7 +2449,7 @@ libsynfig.so.0 synfig-1.0.1_1
libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
libu2f-host.so.0 libu2f-host-1.1.10_5
-libu2f-server.so.0 libu2f-server-1.0.1_2
+libu2f-server.so.0 libu2f-server-1.1.0_9
libsqlcipher.so.0 sqlcipher-3.3.1_1
libgta.so.1 libgta-1.2.0_1
libgdal.so.26 libgdal-3.0.0_1
diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template
index 5a46ee56633..661fc934531 100644
--- a/srcpkgs/libu2f-server/template
+++ b/srcpkgs/libu2f-server/template
@@ -1,11 +1,11 @@
# Template file for 'libu2f-server'
pkgname=libu2f-server
version=1.1.0
-revision=8
+revision=9
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gengetopt check"
-makedepends="json-c-devel hidapi-devel libressl-devel check-devel"
+makedepends="json-c-devel hidapi-devel openssl-devel check-devel"
short_desc="Yubico Universal 2nd Factor (U2F) Server C Library"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD"
From c9e511317bb80e5089f9e65ca2f87e5ad087a9e9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 092/358] libucl: rebuild against OpenSSL
---
common/shlibs | 2 +-
...1327180cff73904b28f04cfdb604fc7d0773.patch | 41 +++++++++++++++++++
srcpkgs/libucl/template | 2 +-
3 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
diff --git a/common/shlibs b/common/shlibs
index 3ce1b86d4c9..dc0c8ec175d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1869,7 +1869,7 @@ libawt_xawt.so openjdk10-bootstrap-10.0.2p13_1
libjava.so openjdk10-bootstrap-10.0.2p13_1
libjli.so openjdk10-bootstrap-10.0.2p13_1
libjvm.so openjdk10-bootstrap-10.0.2p13_1
-libucl.so.5 libucl-0.8.1_1
+libucl.so.5 libucl-0.8.1_6
libhandle.so.1 xfsprogs-3.2.1_1
libnfnetlink.so.0 libnfnetlink-1.0.1_1
libnetfilter_log.so.1 libnetfilter_log-1.0.1_1
diff --git a/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
new file mode 100644
index 00000000000..e049a1b8b17
--- /dev/null
+++ b/srcpkgs/libucl/patches/c7141327180cff73904b28f04cfdb604fc7d0773.patch
@@ -0,0 +1,41 @@
+From c7141327180cff73904b28f04cfdb604fc7d0773 Mon Sep 17 00:00:00 2001
+From: Alexandru Guzinschi <alex@gentle.ro>
+Date: Fri, 11 Sep 2020 11:41:54 +0300
+Subject: [PATCH] fix: Changed OpenSSL check inside configure.am
+
+In OpenSSL 1.1.0 the `EVP_MD_CTX_create()` and `EVP_MD_CTX_destroy()`
+functions were renamed to `EVP_MD_CTX_new()` and `EVP_MD_CTX_free()`.
+Because a check for `EVP_MD_CTX_create()` was in place inside
+configure.am, building with newer OpenSSL versions could not be done.
+
+Checking for `EVP_MD_CTX_create` function from configure.am was
+replaced with a check for `CRYPTO_new_ex_data()` function.
+
+Because a [compatibility layer][1] was introduced in OpenSSL 1.1.0,
+no code changes are necessary.
+
+Fixes: #203
+
+[1]: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0/include/openssl/evp.h#L500-L502
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8aa3d17..731b711 100644
+--- configure.ac
++++ configure.ac
+@@ -73,11 +73,11 @@ AC_ARG_ENABLE([utils],
+ AM_CONDITIONAL([UTILS], [test x$utils = xtrue])
+
+ AS_IF([test "x$enable_signatures" = "xyes"], [
+- AC_SEARCH_LIBS([EVP_MD_CTX_create], [crypto], [
++ AC_SEARCH_LIBS([CRYPTO_new_ex_data], [crypto], [
+ AC_DEFINE(HAVE_OPENSSL, 1, [Define to 1 if you have the 'crypto' library (-lcrypto).])
+ LIBCRYPTO_LIB="-lcrypto"
+ LIBS_EXTRA="${LIBS_EXTRA} -lcrypto"
+- ], [AC_MSG_ERROR([unable to find the EVP_MD_CTX_create() function])])
++ ], [AC_MSG_ERROR([unable to find the CRYPTO_new_ex_data() function])])
+ ])
+ AC_SUBST(LIBCRYPTO_LIB)
+ AC_PATH_PROG(PANDOC, pandoc, [/non/existent])
diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template
index afb8f8dcbc0..04b2608684d 100644
--- a/srcpkgs/libucl/template
+++ b/srcpkgs/libucl/template
@@ -1,7 +1,7 @@
# Template file for 'libucl'
pkgname=libucl
version=0.8.1
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--enable-urls --enable-signatures"
hostmakedepends="automake libtool pkg-config"
From cb3edaa11dbfe1e59bfb239a837ab3ab1a3a6abb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 093/358] libwebsockets: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libwebsockets/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dc0c8ec175d..e82af057151 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2191,7 +2191,7 @@ libcvm-v2client.so.1 cvm-0.97_1
libudns.so.0 udns-0.4_1
libcriu.so.2 criu-3.13_2
libcompel.so.1 criu-3.13_2
-libwebsockets.so.15 libwebsockets-3.2.0_1
+libwebsockets.so.15 libwebsockets-3.2.2_5
libnfc.so.6 libnfc-1.8.0_1
libfuzzy.so.2 libfuzzy-2.12_1
libSDL_gfx.so.15 SDL_gfx-2.0.25_2
diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template
index e82f1946352..9311fe3afcd 100644
--- a/srcpkgs/libwebsockets/template
+++ b/srcpkgs/libwebsockets/template
@@ -1,11 +1,11 @@
# Template file for 'libwebsockets'
pkgname=libwebsockets
version=3.2.2
-revision=4
+revision=5
build_style=cmake
configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON
-DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON"
-makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel"
+makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel"
short_desc="Lightweight client and server websocket library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-only"
@@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c
CFLAGS="-Wno-error"
libwebsockets-devel_package() {
- depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel"
+ depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin
From 66bef29b9692732752bc9940c0cb4f56107779d3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:14 +0100
Subject: [PATCH 094/358] lighttpd: rebuild against OpenSSL
---
srcpkgs/lighttpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template
index 0babfffe4d3..7ae82aecfc3 100644
--- a/srcpkgs/lighttpd/template
+++ b/srcpkgs/lighttpd/template
@@ -1,7 +1,7 @@
# Template file for 'lighttpd'
pkgname=lighttpd
version=1.4.59
-revision=1
+revision=2
build_style=meson
configure_args="-Dwith_brotli=false -Dwith_bzip=false
-Dwith_fam=false -Dwith_gdbm=true
From b3050dfdf768107bdacdd20c4df5ffd4d6d9a8fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 095/358] links: rebuild against OpenSSL
---
srcpkgs/links/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/links/template b/srcpkgs/links/template
index b42bac91a13..06ca6e43960 100644
--- a/srcpkgs/links/template
+++ b/srcpkgs/links/template
@@ -1,11 +1,11 @@
# Template file for 'links'
pkgname=links
version=2.21
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-ssl --enable-graphics"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel"
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel"
short_desc="Graphics and text mode web browser, released under GPL"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-or-later"
From 7d2ebac551aea5bac38b5ceb09a26d51f7c77be5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 096/358] links-x11: rebuild against OpenSSL
---
srcpkgs/links-x11/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template
index 3f68f321580..eb60b9fca0d 100644
--- a/srcpkgs/links-x11/template
+++ b/srcpkgs/links-x11/template
@@ -1,12 +1,12 @@
# Template file for 'links-x11'
pkgname=links-x11
version=2.21
-revision=1
+revision=2
wrksrc="${pkgname%-x11}-${version}"
build_style=gnu-configure
configure_args="--with-ssl --enable-graphics --enable-x"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel
+makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel
libX11-devel libXt-devel"
short_desc="Graphics and text mode web browser (with X11 graphics driver)"
maintainer="newbluemoon <blaumolch@mailbox.org>"
From c6e0cd1f81e4e7b5575f2c15a1ab50e2d8ac0f6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 097/358] litecoin: rebuild against OpenSSL
---
srcpkgs/litecoin/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index a46278b0c12..ad455be556d 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,12 +1,12 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
- --disable-tests --with-libressl"
+ --disable-tests --with-openssl"
hostmakedepends="automake libtool pkg-config yasm protobuf which"
-makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel
+makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel
qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel"
short_desc="Peer-to-peer Internet currency based on scrypt cryptography"
maintainer="Orphaned <orphan@voidlinux.org>"
From 6a2e4e4183b5bd6a52151ee3f2de2e6ffb54d1df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 098/358] live555: rebuild against OpenSSL
---
common/shlibs | 8 ++++----
srcpkgs/live555/template | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e82af057151..d3575935f9a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2994,10 +2994,10 @@ libyaz_icu.so.5 yaz-5.23.1_1
libyaz.so.5 yaz-5.23.1_1
libyaz_server.so.5 yaz-5.23.1_1
libgcab-1.0.so.0 gcab-0.7_1
-libliveMedia.so.81 live555-2020.08.11_1
-libgroupsock.so.8 live555-2018.12.14_1
-libUsageEnvironment.so.3 live555-2018.12.14_1
-libBasicUsageEnvironment.so.1 live555-2018.12.14_1
+libliveMedia.so.81 live555-2020.08.11_2
+libgroupsock.so.8 live555-2020.08.11_2
+libUsageEnvironment.so.3 live555-2020.08.11_2
+libBasicUsageEnvironment.so.1 live555-2020.08.11_2
libappstream.so.4 AppStream-0.12.2_1
libappstream-glib.so.8 appstream-glib-0.6.13_1
libappstream-builder.so.8 appstream-glib-0.6.13_1
diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template
index c731916dda1..181675b6f3a 100644
--- a/srcpkgs/live555/template
+++ b/srcpkgs/live555/template
@@ -1,10 +1,10 @@
# Template file for 'live555'
pkgname=live555
version=2020.08.11
-revision=1
+revision=2
wrksrc=live
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Set of C++ libraries for multimedia streaming"
maintainer="Denis Revin <denis.revin@gmail.com>"
license="LGPL-3.0-or-later"
From 0c08a900df1d9ce367a6107c5b93827d14817aae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 099/358] loudmouth: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/loudmouth/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d3575935f9a..0dd14caba3f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2032,7 +2032,7 @@ libCDApplet.so cairo-dock-plugins-3.4.0_1
libldns.so.3 libldns-1.7.1_4
libopenjpeg.so.5 libopenjpeg-1.5.2_1
liboping.so.0 liboping-1.8.0_1
-libloudmouth-1.so.0 loudmouth-1.4.3_1
+libloudmouth-1.so.0 loudmouth-1.5.3_12
libtorrent-rasterbar.so.10 libtorrent-rasterbar-1.2.12_2
libcapstone.so.4 capstone-4.0_1
libhavege.so.2 libhaveged-1.9.11_1
diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template
index 37212d47d81..4178683d5de 100644
--- a/srcpkgs/loudmouth/template
+++ b/srcpkgs/loudmouth/template
@@ -1,11 +1,11 @@
# Template file for 'loudmouth'
pkgname=loudmouth
version=1.5.3
-revision=11
+revision=12
build_style=gnu-configure
configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no"
hostmakedepends="pkg-config automake libtool glib-devel gtk-doc"
-makedepends="libglib-devel libidn-devel libressl-devel"
+makedepends="libglib-devel libidn-devel openssl-devel"
short_desc="Lightweight Jabber client library written in C/Glib"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From d254f4e945be195b35706f5786444ef77d8afd14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 100/358] lynx: rebuild against OpenSSL
---
srcpkgs/lynx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template
index dc5e3aeb224..73d88a39498 100644
--- a/srcpkgs/lynx/template
+++ b/srcpkgs/lynx/template
@@ -3,11 +3,11 @@ pkgname=lynx
_distver=2.8.9
_patchver=1
version="${_distver}.${_patchver}"
-revision=4
+revision=5
wrksrc="lynx${_distver}rel.${_patchver}"
build_style=gnu-configure
configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6"
-makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel"
short_desc="A text browser for the World Wide Web"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
From da196bf17ffd868a66aa7987c1576bbbdd99cb7f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 101/358] mailx: rebuild against OpenSSL
---
srcpkgs/mailx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template
index 5dd28b31ea5..63ec23e72e0 100644
--- a/srcpkgs/mailx/template
+++ b/srcpkgs/mailx/template
@@ -1,10 +1,10 @@
# Template file for 'mailx'
pkgname=mailx
version=12.5
-revision=24
+revision=25
patch_args="-Np1"
wrksrc="mailx-${version}"
-makedepends="libressl-devel mit-krb5-devel"
+makedepends="openssl-devel mit-krb5-devel"
conf_files="/etc/mailx.rc"
provides="mail-${version}_${revision}"
short_desc="Feature-rich BSD mail(1)"
From 3e59f1192a2ce54573ae6638663b12771b05843b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:18 +0100
Subject: [PATCH 102/358] mairix: rebuild against OpenSSL
---
srcpkgs/mairix/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template
index ca8d9ff53da..49f73671bcb 100644
--- a/srcpkgs/mairix/template
+++ b/srcpkgs/mairix/template
@@ -1,11 +1,11 @@
# Template file for 'mairix'
pkgname=mairix
version=0.24
-revision=7
+revision=8
build_style=configure
configure_args="--prefix=/usr --mandir=/usr/share/man"
hostmakedepends="flex bison"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
short_desc="A program for indexing and searching emails"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-only"
From d10f2a083a717f967d8193247656dc098c1e764b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 103/358] mbox: rebuild against OpenSSL
---
srcpkgs/mbox/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template
index 723f1621788..efcc71eaaa6 100644
--- a/srcpkgs/mbox/template
+++ b/srcpkgs/mbox/template
@@ -1,13 +1,13 @@
# Template file for 'mbox'
pkgname=mbox
version=0.0.0.140526
-revision=5
+revision=6
_commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048
wrksrc="$pkgname-$_commit"
build_wrksrc=src
build_style=gnu-configure
hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="A lightweight sandbox tool for non-root users"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
From 27ff200b76ce914bfa647b9b7d472aa85da8219a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 104/358] mbuffer: rebuild against OpenSSL
---
srcpkgs/mbuffer/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template
index b6dfb7f4cc3..a3a17c73a84 100644
--- a/srcpkgs/mbuffer/template
+++ b/srcpkgs/mbuffer/template
@@ -1,9 +1,9 @@
# Template file for 'mbuffer'
pkgname=mbuffer
version=20200929
-revision=1
+revision=2
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Buffer data streams with many additional functions"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
From 39d82e78f03e6a3e4a0b8e29e716847f381a33c1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 105/358] mdbook-linkcheck: rebuild against OpenSSL
---
srcpkgs/mdbook-linkcheck/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template
index fa737c2324e..3ec4add319f 100644
--- a/srcpkgs/mdbook-linkcheck/template
+++ b/srcpkgs/mdbook-linkcheck/template
@@ -2,10 +2,10 @@
# New versions need to be tested for compatibility with mdBook
pkgname=mdbook-linkcheck
version=0.7.4
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Backend for mdBook which will check links for you"
maintainer="Érico Nogueira <ericonr@disroot.org>"
license="MIT"
From b7e448e3cd0027c607de259dd4ba15057398b1da Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 106/358] mdcat: rebuild against OpenSSL
---
srcpkgs/mdcat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template
index df89652f874..869aecd1b4b 100644
--- a/srcpkgs/mdcat/template
+++ b/srcpkgs/mdcat/template
@@ -2,11 +2,11 @@
pkgname=mdcat
reverts="0.22.2_1"
version=0.22.1
-revision=2
+revision=3
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cargo
hostmakedepends="cmake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Cat for markdown"
maintainer="Wilson Birney <wpb@360scada.com>"
license="MPL-2.0"
From 9b2d5415f870965e781bf7c59a0279bd45ad36b9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:19 +0100
Subject: [PATCH 107/358] megatools: rebuild against OpenSSL
---
srcpkgs/megatools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template
index 0f9e8539bfb..bb7e5322186 100644
--- a/srcpkgs/megatools/template
+++ b/srcpkgs/megatools/template
@@ -1,10 +1,10 @@
# Template file for 'megatools'
pkgname=megatools
version=1.10.3
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config asciidoc"
-makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
+makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel"
short_desc="Command line client for Mega.nz file sharing service"
maintainer="RunningDroid <runningdroid@zoho.com>"
license="GPL-2.0-or-later"
From cca3da356113369ce9eae6a83a88b0b89abd6f77 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 108/358] monero: rebuild against OpenSSL
---
srcpkgs/monero/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bb2f0600d94..45072e81b82 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.1.9
-revision=1
+revision=2
_randomx_version="1.1.8"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
@@ -12,7 +12,7 @@ make_dirs="
/var/lib/monero 0750 monero monero
/var/log/monero 0755 monero monero"
hostmakedepends="pkg-config"
-makedepends="libressl-devel boost-devel libldns-devel libunwind-devel
+makedepends="openssl-devel boost-devel libldns-devel libunwind-devel
readline-devel unbound-devel miniupnpc-devel expat-devel
cppzmq czmq-devel libsodium-devel"
short_desc="Private, secure, untraceable, decentralised digital currency"
From 2ae5b782736eedf3fcd723a990b04026d2216c03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:20 +0100
Subject: [PATCH 109/358] mongo-c-driver: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/mongo-c-driver/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0dd14caba3f..2d9cbd05b36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3887,7 +3887,7 @@ libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2
libKSeExprUI.so.4.0.1.0 seexpr-krita-4.0.1.0_1
libKSeExpr.so.4.0.1.0 seexpr-krita-4.0.1.0_1
liburing.so.1 liburing-0.7_1
-libbson-1.0.so.0 libbson-1.17.0_1
+libbson-1.0.so.0 libbson-1.17.4_2
libsonic.so.0 libsonic-0.2.0_1
libtickit.so.3 libtickit-0.4.1_1
libnotcurses.so.2 notcurses-2.0.4_1
diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template
index e360a5c65b1..3557648f816 100644
--- a/srcpkgs/mongo-c-driver/template
+++ b/srcpkgs/mongo-c-driver/template
@@ -1,11 +1,11 @@
# Template file for 'mongo-c-driver'
pkgname=mongo-c-driver
version=1.17.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_TESTS=OFF"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="High-performance MongoDB driver for C"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="Apache-2.0"
From 6d8a313c27a83d8c6a4915b01c04ef7f424cf636 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 110/358] mongoose: rebuild against OpenSSL
---
srcpkgs/mongoose/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index 9a6226dca8a..eddadc64733 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,10 +1,10 @@
# Template file for 'mongoose'
pkgname=mongoose
version=6.18
-revision=3
+revision=4
build_style=gnu-makefile
make_use_env=compliant
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Easy to use Web server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From d268b3c0f0050108f60f329f789e1cb76f4ae510 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 111/358] monit: rebuild against OpenSSL
---
srcpkgs/monit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template
index 969135db82d..1b0766e194a 100644
--- a/srcpkgs/monit/template
+++ b/srcpkgs/monit/template
@@ -1,7 +1,7 @@
# Template file for 'monit'
pkgname=monit
version=5.27.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--with-ssl-dir=${XBPS_CROSS_BASE}/usr
@@ -9,7 +9,7 @@ configure_args="
libmonit_cv_vsnprintf_c99_conformant=yes"
conf_files="/etc/monitrc"
hostmakedepends="automake libtool perl"
-makedepends="pam-devel libressl-devel zlib-devel"
+makedepends="pam-devel openssl-devel zlib-devel"
short_desc="Utility for monitoring, processes, files, directories and devices"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="AGPL-3.0-only"
From 9d14d6935c4784db972e8ced607e8449d22361c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 112/358] monolith: rebuild against OpenSSL
---
srcpkgs/monolith/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template
index 64619618d91..b83fc229ffa 100644
--- a/srcpkgs/monolith/template
+++ b/srcpkgs/monolith/template
@@ -1,10 +1,10 @@
# Template file for 'monolith'
pkgname=monolith
version=2.4.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Save HTML pages with ease "
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="Unlicense"
From cd644e4ebb76d476d0400ed5d21ab31d3ec220a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:21 +0100
Subject: [PATCH 113/358] mosh: rebuild against OpenSSL
---
srcpkgs/mosh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template
index 651cd9de60b..7f0231c305d 100644
--- a/srcpkgs/mosh/template
+++ b/srcpkgs/mosh/template
@@ -1,10 +1,10 @@
# Template file for 'mosh'
pkgname=mosh
version=1.3.2
-revision=20
+revision=21
build_style=gnu-configure
hostmakedepends="pkg-config protobuf"
-makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel"
+makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel"
depends="perl-IO-Tty"
short_desc="Mobile shell, remote terminal application that allows roaming"
maintainer="Nathan Owens <ndowens04@gmail.com>"
From 7a95cfb2ad9f5c8f236d42a1751e73e574f6e113 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 114/358] mosquitto: rebuild against OpenSSL
---
common/shlibs | 4 ++--
srcpkgs/mosquitto/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2d9cbd05b36..6874350335e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2145,8 +2145,8 @@ liblxqt-globalkeys-ui.so.0 lxqt-globalkeys-0.9.0_1
libenet.so.7 libenet-1.3.12_1
librrd.so.8 rrdtool-1.6.0_1
librrd_th.so.4 rrdtool-1.4.9_1
-libmosquitto.so.1 libmosquitto-1.4_1
-libmosquittopp.so.1 libmosquittopp-1.4_1
+libmosquitto.so.1 libmosquitto-1.6.3_5
+libmosquittopp.so.1 libmosquittopp-1.6.3_5
libmpv.so.1 mpv-0.8.0_2
libmbedtls.so.12 mbedtls-2.13.1_1
libmbedcrypto.so.3 mbedtls-2.9.0_1
diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template
index 2f4ac6ccda2..78d19cba196 100644
--- a/srcpkgs/mosquitto/template
+++ b/srcpkgs/mosquitto/template
@@ -1,13 +1,13 @@
# Template file for 'mosquitto'
pkgname=mosquitto
version=1.6.3
-revision=4
+revision=5
build_style=gnu-makefile
-make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl
+make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl
make_install_args="prefix=/usr"
make_check_target=test
conf_files="/etc/mosquitto/mosquitto.conf"
-makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel"
+makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel"
checkdepends="python bcunit-devel"
short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker"
maintainer="Lukas Braun <koomi@hackerspace-bamberg.de>"
From 8b4450a141947e0be54526ae9dcc41b4e675a6a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 115/358] mtd-utils: rebuild against OpenSSL
---
srcpkgs/mtd-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template
index af56075e3c7..0cbb7f1e70f 100644
--- a/srcpkgs/mtd-utils/template
+++ b/srcpkgs/mtd-utils/template
@@ -1,11 +1,11 @@
# Template file for 'mtd-utils'
pkgname=mtd-utils
version=2.1.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="autoconf automake libtool pkg-config"
makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel
- zlib-devel libressl-devel libzstd-devel"
+ zlib-devel openssl-devel libzstd-devel"
short_desc="Memory Technology Device Utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 45b9f3830614c1ae7ba88bd2dc03e8b2e2c0fc97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 116/358] mtree: rebuild against OpenSSL
---
srcpkgs/mtree/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template
index ceea99b34af..4eba212dbbb 100644
--- a/srcpkgs/mtree/template
+++ b/srcpkgs/mtree/template
@@ -1,11 +1,11 @@
# Template file for 'mtree'
pkgname=mtree
version=1.0.4
-revision=6
+revision=7
wrksrc="${pkgname}-port-${version}"
build_style=gnu-configure
hostmakedepends="automake"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Utility for creating and verifying file hierarchies"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
From 065ca56b4be46faf0caa70ab737ef0a90e1129b7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:22 +0100
Subject: [PATCH 117/358] mtxclient: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/mtxclient/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 6874350335e..c6d7fe39c5f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -416,7 +416,7 @@ libFLAC++.so.6 libflac-1.2.1_1
libMAC.so.6 libMAC-5.28_1
libmad.so.0 libmad-0.15.1b_1
libmatroska.so.7 libmatroska-1.6.0_1
-libmatrix_client.so.0.3.1 mtxclient-0.3.1_1
+libmatrix_client.so.0.3.1 mtxclient-0.3.1_3
libebml.so.5 libebml-1.4.0_1
libdvdread.so.8 libdvdread-6.1.1_1
libdvdnav.so.4 libdvdnav-4.1.3_1
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index ccefdca1c90..5c5806d3cf7 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,11 +1,11 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.3.1
-revision=2
+revision=3
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON"
hostmakedepends="pkg-config"
-makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel"
+makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel"
short_desc="Client API library for the Matrix protocol"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="MIT"
From baa89c3c1d209e891d00013ff24d51489c922e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 118/358] muchsync: rebuild against OpenSSL
---
srcpkgs/muchsync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template
index adb969d9450..e1703b4bf9c 100644
--- a/srcpkgs/muchsync/template
+++ b/srcpkgs/muchsync/template
@@ -1,10 +1,10 @@
# Template file for 'muchsync'
pkgname=muchsync
version=6
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config libxapian"
-makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel"
+makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel"
depends="openssh notmuch"
short_desc="Synchronize notmuch mail across machines"
maintainer="Anjandev Momi <anjan@momi.ca>"
From 338d4e16fef9616b5a3821206f86d1d3b2765ee1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 119/358] mumble: rebuild against OpenSSL
---
srcpkgs/mumble/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template
index db23e747ecf..5493688b12e 100644
--- a/srcpkgs/mumble/template
+++ b/srcpkgs/mumble/template
@@ -1,7 +1,7 @@
# Template file for 'mumble'
pkgname=mumble
version=1.3.4
-revision=3
+revision=4
build_style=qmake
configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio
@@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update
CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble"
hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which"
makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel
- libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel
+ libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel
pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel
speech-dispatcher-devel speex-devel portaudio-devel"
depends="desktop-file-utils qt5-plugin-sqlite"
From 22d5ee3db8d14ed78eeeaedc5ae86516dabf73ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 120/358] munge: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/munge/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index c6d7fe39c5f..dca29474b45 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2525,7 +2525,7 @@ libshout.so.3 libshout-2.4.1_1
libfirm.so.1.22 libfirm-1.22.0_1
libaudiofile.so.1 audiofile-0.3.6_1
libbs2b.so.0 libbs2b-3.1.0_1
-libmunge.so.2 munge-libs-0.5.11_1
+libmunge.so.2 munge-libs-0.5.14_3
libmgba.so.0.8 libmgba-0.8.1_1
libglabels-3.0.so.8 libglabels30-3.2.1_1
libglbarcode-3.0.so.0 libglabels30-3.2.1_1
diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template
index fbb4ac54f4b..9d8e339b979 100644
--- a/srcpkgs/munge/template
+++ b/srcpkgs/munge/template
@@ -1,13 +1,13 @@
# Template file for 'munge'
pkgname=munge
version=0.5.14
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-crypto-lib=openssl
--with-openssl-prefix=${XBPS_CROSS_BASE}/usr
x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no"
hostmakedepends="pkg-config"
-makedepends="bzip2-devel libressl-devel zlib-devel"
+makedepends="bzip2-devel openssl-devel zlib-devel"
depends="shadow"
short_desc="MUNGE Uid 'N' Gid Emporium authentication service"
maintainer="pulux <pulux@pf4sh.de>"
From 7d66a2369ec8b161fd890bb742a64ae2443999bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 121/358] mupdf: rebuild against OpenSSL
---
srcpkgs/mupdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template
index 3e50870b95d..c8f05d1d345 100644
--- a/srcpkgs/mupdf/template
+++ b/srcpkgs/mupdf/template
@@ -1,7 +1,7 @@
# Template file for 'mupdf'
pkgname=mupdf
version=1.18.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}-source"
hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel
libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel
From f855b57ce7ceb29af5373f81ca3b92d0d2c1f4ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:23 +0100
Subject: [PATCH 122/358] mutt: rebuild against OpenSSL
---
srcpkgs/mutt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index e0394db84e2..7bede2a16e9 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
# Template file for 'mutt'
pkgname=mutt
version=2.0.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
--enable-gpgme --with-regex --with-idn2 --with-ssl --with-sasl --enable-sidebar
@@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
--with-gdbm=${XBPS_CROSS_BASE}/usr"
conf_files="/etc/${pkgname}/Muttrc"
hostmakedepends="libidn2-devel perl pkg-config"
-makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel
+makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel
ncurses-devel"
depends="cyrus-sasl-modules mime-types"
short_desc="Mutt Mail Client"
From fc213ac6758f7597ccd53450514f42d918f78317 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 123/358] namecoin: rebuild against OpenSSL
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index 91ae3c35d9a..e4cfb3777b7 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=4
+revision=5
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 0e4985350dccf840c51c6b957e76e92564c39991 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 124/358] nasa-wallpaper: rebuild against OpenSSL
---
srcpkgs/nasa-wallpaper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template
index 59857b342e8..c53d0c1b4b1 100644
--- a/srcpkgs/nasa-wallpaper/template
+++ b/srcpkgs/nasa-wallpaper/template
@@ -1,10 +1,10 @@
# Template file for 'nasa-wallpaper'
pkgname=nasa-wallpaper
version=2.0
-revision=2
+revision=3
build_style="cargo"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Change your desktop background with a NASA image"
maintainer="Lugubris <lugubris@disroot.org>"
license="Apache-2.0"
From 9913dc3fe5b60375c68ba94ffc5885af12ef7348 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 125/358] neomutt: rebuild against OpenSSL
---
srcpkgs/neomutt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template
index eda14c53ef3..77f9065023c 100644
--- a/srcpkgs/neomutt/template
+++ b/srcpkgs/neomutt/template
@@ -1,7 +1,7 @@
# Template file for 'neomutt'
pkgname=neomutt
version=20210205
-revision=1
+revision=2
wrksrc="neomutt-${version}"
create_wrksrc=true
build_wrksrc="$wrksrc"
@@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc"
hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m"
makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel
rocksdb-devel tdb-devel
- libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel"
+ libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel"
depends="mime-types"
short_desc="Mutt with misc fixes and feature patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From 8ee4f6a76936e8d889a717a12c3e689c3515fb53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:24 +0100
Subject: [PATCH 126/358] neon: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/neon/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index dca29474b45..341e3b1908a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -776,7 +776,7 @@ libwavpack.so.1 libwavpack-4.60.1_1
libSDL_net-1.2.so.0 SDL_net-1.2.7_1
libmodplug.so.1 libmodplug-0.8.8_1
libfetch.so.2 libfetch-2.34_23
-libneon.so.27 neon-0.29.5_1
+libneon.so.27 neon-0.31.2_2
libsvn_subr-1.so.0 libsvn-1.7.5_1
libsvn_diff-1.so.0 libsvn-1.7.5_1
libsvn_client-1.so.0 libsvn-1.7.5_1
diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template
index 125a1e158b9..9ace92c0fdd 100644
--- a/srcpkgs/neon/template
+++ b/srcpkgs/neon/template
@@ -1,7 +1,7 @@
# Template file for 'neon'
pkgname=neon
version=0.31.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-expat --with-ssl=openssl --enable-shared
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static
@@ -9,7 +9,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared
make_build_args="all docs"
make_install_args="install"
hostmakedepends="automake libtool pkg-config xmlto"
-makedepends="zlib-devel expat-devel libressl-devel libproxy-devel"
+makedepends="zlib-devel expat-devel openssl-devel libproxy-devel"
depends="ca-certificates"
short_desc="HTTP and WebDAV client library, with a C interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From f52631c765895016ecbaa059ef879d503e39fc25 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 127/358] netdata: rebuild against OpenSSL
---
srcpkgs/netdata/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template
index d93f85660e8..69bb2a788e9 100644
--- a/srcpkgs/netdata/template
+++ b/srcpkgs/netdata/template
@@ -1,13 +1,13 @@
# Template file for 'netdata'
pkgname=netdata
version=1.28.0
-revision=1
+revision=2
wrksrc="${pkgname}-v${version}"
build_style=gnu-configure
configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
hostmakedepends="pkg-config autoconf automake"
makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel
- libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel"
+ libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel"
depends="libcap-progs"
short_desc="Real-time performance monitoring, done right"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
From 88d81dfacad8f2b1fc3766e0c62178b1d2f4412d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 128/358] netpgp: rebuild against OpenSSL
---
common/shlibs | 4 +-
.../patches/lib_openssl__crypto.c.patch | 417 ++++++++++++++++++
srcpkgs/netpgp/patches/lib_signature_c.patch | 31 +-
srcpkgs/netpgp/template | 6 +-
4 files changed, 451 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
diff --git a/common/shlibs b/common/shlibs
index 341e3b1908a..aa083a5c7ff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -710,8 +710,8 @@ libevent_openssl-2.1.so.7 libevent-2.1.12_2
libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
libapr-1.so.0 apr-1.4.2_1
libaprutil-1.so.0 apr-util-1.6.1_11
-libnetpgp.so.0 libnetpgp-20100313_1
-libmj.so.0 libmj-20140211_1
+libnetpgp.so.0 libnetpgp-20140220_19
+libmj.so.0 libmj-20140220_19
libmca_common_sm.so.40 libopenmpi-3.0.1_1
libmca_common_dstore.so.1 libopenmpi-4.0.1_1
libmca_common_ompio.so.41 libopenmpi-3.0.1_1
diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
new file mode 100644
index 00000000000..afa077902d9
--- /dev/null
+++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch
@@ -0,0 +1,417 @@
+$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $
+
+Sync with NetBSD src to fix build with OpenSSL 1.1.
+
+--- src/lib/openssl_crypto.c.orig 2020-04-25 11:54:50.243962468 +0000
++++ src/lib/openssl_crypto.c
+@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The
+ #include "netpgpdigest.h"
+ #include "packet.h"
+
++static void
++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk)
++{
++ const BIGNUM *n, *e, *d, *q, *p;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ RSA_get0_key(orsa, &n, &e, &d);
++ RSA_get0_factors(orsa, &q, &p);
++#else
++ n = orsa->n;
++ e = orsa->e;
++ d = orsa->d;
++ p = orsa->p;
++ q = orsa->q;
++#endif
++ if (sk) {
++ sk->d = BN_dup(d);
++ sk->p = BN_dup(p);
++ sk->q = BN_dup(q);
++ }
++ if (pk) {
++ pk->n = BN_dup(n);
++ pk->e = BN_dup(e);
++ }
++}
+
+-static void
+-test_seckey(const pgp_seckey_t *seckey)
++static RSA *
++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey)
++{
++ BIGNUM *n, *e, *d, *p, *q;
++ RSA *orsa;
++
++ orsa = RSA_new();
++ n = BN_dup(pubkey->n);
++ e = BN_dup(pubkey->e);
++
++ if (seckey) {
++ d = BN_dup(seckey->d);
++ p = BN_dup(seckey->p);
++ q = BN_dup(seckey->q);
++ } else {
++ d = p = q = NULL;
++ }
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ RSA_set0_key(orsa, n, e, d);
++ RSA_set0_factors(orsa, p, q);
++#else
++ BN_free(orsa->n);
++ BN_free(orsa->e);
++ orsa->n = n;
++ orsa->e = e;
++ if (d) {
++ BN_free(orsa->d);
++ orsa->d = d;
++ }
++ if (p) {
++ BN_free(orsa->p);
++ orsa->p = p;
++ }
++ if (q) {
++ BN_free(orsa->q);
++ orsa->q = q;
++ }
++#endif
++ return orsa;
++}
++
++static DSA_SIG *
++makeDSA_SIG(const pgp_dsa_sig_t *sig)
++{
++ DSA_SIG *osig;
++ BIGNUM *r, *s;
++
++ osig = DSA_SIG_new();
++ r = BN_dup(sig->r);
++ s = BN_dup(sig->s);
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ DSA_SIG_set0(osig, r, s);
++#else
++ BN_free(osig->r);
++ BN_free(osig->s);
++ osig->r = r;
++ osig->s = s;
++#endif
++
++ return osig;
++}
++
++static DSA *
++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa)
+ {
+- RSA *test = RSA_new();
++ DSA *odsa;
++ BIGNUM *p, *q, *g, *y, *x;
+
+- test->n = BN_dup(seckey->pubkey.key.rsa.n);
+- test->e = BN_dup(seckey->pubkey.key.rsa.e);
++ odsa = DSA_new();
+
+- test->d = BN_dup(seckey->key.rsa.d);
+- test->p = BN_dup(seckey->key.rsa.p);
+- test->q = BN_dup(seckey->key.rsa.q);
++ p = BN_dup(dsa->p);
++ q = BN_dup(dsa->q);
++ g = BN_dup(dsa->g);
++ y = BN_dup(dsa->y);
++ x = secdsa ? secdsa->x : NULL;
++
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ DSA_set0_key(odsa, y, x);
++#else
++ BN_free(odsa->p);
++ BN_free(odsa->q);
++ BN_free(odsa->g);
++ BN_free(odsa->pub_key);
++ odsa->p = p;
++ odsa->q = q;
++ odsa->g = g;
++ odsa->pub_key = y;
++ if (x) {
++ BN_free(odsa->priv_key);
++ odsa->priv_key = x;
++ }
++#endif
++ return odsa;
++}
++
++static void
++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk)
++{
++ const BIGNUM *x;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ DSA_get0_key(odsa, NULL, &x);
++#else
++ x = odsa->priv_key;
++#endif
++ sk->x = BN_dup(x);
++}
++
++static void
++test_seckey(const pgp_seckey_t *seckey)
++{
++ RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa);
+
+ if (RSA_check_key(test) != 1) {
+ (void) fprintf(stderr,
+@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size
+ const pgp_dsa_pubkey_t *dsa)
+ {
+ unsigned qlen;
+- DSA_SIG *osig;
+- DSA *odsa;
++ DSA_SIG *osig = makeDSA_SIG(sig);
++ DSA *odsa = makeDSA(dsa, NULL);
+ int ret;
+
+- osig = DSA_SIG_new();
+- osig->r = sig->r;
+- osig->s = sig->s;
+-
+- odsa = DSA_new();
+- odsa->p = dsa->p;
+- odsa->q = dsa->q;
+- odsa->g = dsa->g;
+- odsa->pub_key = dsa->y;
+-
+ if (pgp_get_debug_level(__FILE__)) {
+ hexdump(stderr, "input hash", hash, hash_length);
+- (void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q));
++ (void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q));
+ }
+- if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) {
++ if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) {
+ hash_length = qlen;
+ }
+ ret = DSA_do_verify(hash, (int)hash_length, osig, odsa);
+@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size
+ return 0;
+ }
+
+- odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL;
+ DSA_free(odsa);
+-
+- osig->r = osig->s = NULL;
+ DSA_SIG_free(osig);
+
+ return (unsigned)ret;
+@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out,
+ size_t length,
+ const pgp_rsa_pubkey_t *pubkey)
+ {
+- RSA *orsa;
+- int n;
+-
+- orsa = RSA_new();
+- orsa->n = pubkey->n;
+- orsa->e = pubkey->e;
++ RSA *orsa = makeRSA(pubkey, NULL);
++ int ret;
+
+- n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++ ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+
+- orsa->n = orsa->e = NULL;
+ RSA_free(orsa);
+
+- return n;
++ return ret;
+ }
+
+ /**
+@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ const pgp_rsa_seckey_t *seckey,
+ const pgp_rsa_pubkey_t *pubkey)
+ {
+- RSA *orsa;
+- int n;
++ RSA *orsa = makeRSA(pubkey, seckey);
++ int ret;
+
+- orsa = RSA_new();
+- orsa->n = BN_dup(pubkey->n);
+- orsa->d = seckey->d;
+- orsa->p = seckey->q; /* p and q are round the other way in openssl */
+- orsa->q = seckey->p;
+-
+- /* debug */
+- orsa->e = BN_dup(pubkey->e);
+- /* If this isn't set, it's very likely that the programmer hasn't */
+- /* decrypted the secret key. RSA_check_key segfaults in that case. */
+- /* Use pgp_decrypt_seckey() to do that. */
+- if (orsa->d == NULL) {
++ if (seckey->d == NULL) {
+ (void) fprintf(stderr, "orsa is not set\n");
+ return 0;
+ }
+@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out,
+ }
+ /* end debug */
+
+- n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
++ ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING);
+
+- orsa->n = orsa->d = orsa->p = orsa->q = NULL;
+ RSA_free(orsa);
+
+- return n;
++ return ret;
+ }
+
+ /**
+@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ const pgp_rsa_seckey_t *seckey,
+ const pgp_rsa_pubkey_t *pubkey)
+ {
+- RSA *keypair;
++ RSA *keypair = makeRSA(pubkey, seckey);
+ int n;
+ char errbuf[1024];
+
+- keypair = RSA_new();
+- keypair->n = pubkey->n; /* XXX: do we need n? */
+- keypair->d = seckey->d;
+- keypair->p = seckey->q;
+- keypair->q = seckey->p;
+-
+- /* debug */
+- keypair->e = pubkey->e;
+ if (RSA_check_key(keypair) != 1) {
+ (void) fprintf(stderr, "RSA_check_key is not set\n");
+ return 0;
+@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out,
+ ERR_error_string(err, &errbuf[0]);
+ (void) fprintf(stderr, "openssl error : %s\n", errbuf);
+ }
+- keypair->n = keypair->d = keypair->p = keypair->q = NULL;
+ RSA_free(keypair);
+
+ return n;
+@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ size_t length,
+ const pgp_rsa_pubkey_t *pubkey)
+ {
+- RSA *orsa;
++ RSA *orsa = makeRSA(pubkey, NULL);
+ int n;
+
+ /* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */
+
+- orsa = RSA_new();
+- orsa->n = pubkey->n;
+- orsa->e = pubkey->e;
+-
+ /* printf("len: %ld\n", length); */
+ /* pgp_print_bn("n: ", orsa->n); */
+ /* pgp_print_bn("e: ", orsa->e); */
+@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out,
+ fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE);
+ ERR_print_errors(fd_out);
+ }
+- orsa->n = orsa->e = NULL;
+ RSA_free(orsa);
+
+ return n;
+@@ -656,7 +738,9 @@ void
+ pgp_crypto_finish(void)
+ {
+ CRYPTO_cleanup_all_ex_data();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ ERR_remove_state((unsigned long)0);
++#endif
+ }
+
+ /**
+@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ BN_CTX *ctx;
+ pgp_output_t *output;
+ pgp_memory_t *mem;
++ BIGNUM *bne;
++ pgp_rsa_pubkey_t *pk;
++ pgp_rsa_seckey_t *sk;
+
+ ctx = BN_CTX_new();
+ pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY);
+ seckey = pgp_get_writable_seckey(keydata);
++ pk = &seckey->pubkey.key.rsa;
++ sk = &seckey->key.rsa;
+
+ /* generate the key pair */
+
+- rsa = RSA_generate_key(numbits, e, NULL, NULL);
++ bne = BN_new();
++ BN_set_word(bne, e);
++
++ rsa = RSA_new();
++ RSA_generate_key_ex(rsa, numbits, bne, NULL);
++ BN_free(bne);
+
+ /* populate pgp key from ssl key */
++ takeRSA(rsa, pk, sk);
+
+ seckey->pubkey.version = PGP_V4;
+ seckey->pubkey.birthtime = time(NULL);
+ seckey->pubkey.days_valid = 0;
+ seckey->pubkey.alg = PGP_PKA_RSA;
+
+- seckey->pubkey.key.rsa.n = BN_dup(rsa->n);
+- seckey->pubkey.key.rsa.e = BN_dup(rsa->e);
+-
+ seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED;
+ seckey->s2k_specifier = PGP_S2KS_SALTED;
+ /* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */
+@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata,
+ seckey->octetc = 0;
+ seckey->checksum = 0;
+
+- seckey->key.rsa.d = BN_dup(rsa->d);
+- seckey->key.rsa.p = BN_dup(rsa->p);
+- seckey->key.rsa.q = BN_dup(rsa->q);
+- seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx);
+- if (seckey->key.rsa.u == NULL) {
++ sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx);
++ if (sk->u == NULL) {
+ (void) fprintf(stderr, "seckey->key.rsa.u is NULL\n");
+ return 0;
+ }
+@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf,
+ const pgp_dsa_pubkey_t *pubdsa)
+ {
+ DSA_SIG *dsasig;
+- DSA *odsa;
+-
+- odsa = DSA_new();
+- odsa->p = pubdsa->p;
+- odsa->q = pubdsa->q;
+- odsa->g = pubdsa->g;
+- odsa->pub_key = pubdsa->y;
+- odsa->priv_key = secdsa->x;
++ DSA *odsa = makeDSA(pubdsa, secdsa);
+
+ dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa);
+
+- odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL;
+ DSA_free(odsa);
+
+ return dsasig;
+@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p
+ rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass);
+ } while (rsa == NULL);
+ }
+- key->key.seckey.key.rsa.d = rsa->d;
+- key->key.seckey.key.rsa.p = rsa->p;
+- key->key.seckey.key.rsa.q = rsa->q;
+- key->key.seckey.key.rsa.d = rsa->d;
++ takeRSA(rsa, NULL, &key->key.seckey.key.rsa);
+ } else if (strcmp(type, "ssh-dss") == 0) {
+ if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) {
+ ok = 0;
+ } else {
+- key->key.seckey.key.dsa.x = dsa->priv_key;
++ takeDSA(dsa, &key->key.seckey.key.dsa);
+ }
+ } else {
+ ok = 0;
diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch
index 7fe2a78598f..3438dcdaf0f 100644
--- a/srcpkgs/netpgp/patches/lib_signature_c.patch
+++ b/srcpkgs/netpgp/patches/lib_signature_c.patch
@@ -1,10 +1,37 @@
-$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $
+$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $
+
+Fix build with OpenSSL 1.1 by syncing with NetBSD src
Output signatures to the standard output for "-".
--- src/lib/signature.c.orig 2012-03-05 02:20:18.000000000 +0000
+++ src/lib/signature.c
-@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output,
+@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash,
+ unsigned t;
+ uint8_t hashbuf[NETPGP_BUFSIZ];
+ DSA_SIG *dsasig;
++ const BIGNUM *r, *s;
+
+ /* hashsize must be "equal in size to the number of bits of q, */
+ /* the group generated by the DSA key's generator value */
+@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash,
+ dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa);
+
+ /* convert and write the sig out to memory */
+- pgp_write_mpi(output, dsasig->r);
+- pgp_write_mpi(output, dsasig->s);
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ DSA_SIG_get0(dsasig, &r, &s);
++#else
++ r = dsasig->r;
++ s = dsasig->s;
++#endif
++ pgp_write_mpi(output, r);
++ pgp_write_mpi(output, s);
+ DSA_SIG_free(dsasig);
+ return 1;
+ }
+@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output,
/* setup output file */
if (outname) {
diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template
index b8801c35ac7..2bc40e253d0 100644
--- a/srcpkgs/netpgp/template
+++ b/srcpkgs/netpgp/template
@@ -1,10 +1,10 @@
# Template file for 'netpgp'
pkgname=netpgp
version=20140220
-revision=18
+revision=19
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
-makedepends="zlib-devel bzip2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel openssl-devel"
short_desc="PGP signing, verification, encryption and decryption program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="3-clause-BSD"
@@ -12,7 +12,7 @@ homepage="http://www.netbsd.org"
distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz"
checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf
-CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
+CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow"
pre_configure() {
autoreconf -fi
From 7192bd064b9acc05faca0ebb5c4f29827dcd1d01 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 129/358] netsurf: rebuild against OpenSSL
---
srcpkgs/netsurf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template
index 2443180f8df..a91ff22b098 100644
--- a/srcpkgs/netsurf/template
+++ b/srcpkgs/netsurf/template
@@ -1,7 +1,7 @@
# Template file for 'netsurf'
pkgname=netsurf
version=3.10
-revision=2
+revision=3
build_style=gnu-makefile
make_use_env=yes
make_build_args="
From b0f2c7a35dfa4e3b2a96a3b6a1ed570d093eddda Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:25 +0100
Subject: [PATCH 130/358] network-ups-tools: rebuild against OpenSSL
---
common/shlibs | 6 +-
.../patches/openssl-1.1.patch | 181 ++++++++++++++++++
srcpkgs/network-ups-tools/template | 4 +-
3 files changed, 186 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch
diff --git a/common/shlibs b/common/shlibs
index aa083a5c7ff..b9ead4f1761 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1685,9 +1685,9 @@ libgdkglext-x11-1.0.so.0 gtkglext-1.2.0_4
libXaw3d.so.8 libXaw3d-1.6.2_1
libshiboken2.so.5.15 libshiboken2-5.15.0_1
libpyside2.so.5.15 libpyside2-python3-5.15.0_1
-libupsclient.so.4 libnetwork-ups-tools-2.7.2_1
-libnutclient.so.0 libnetwork-ups-tools-2.7.2_1
-libnutscan.so.1 libnetwork-ups-tools-2.7.3_3
+libupsclient.so.4 libnetwork-ups-tools-2.7.4_12
+libnutclient.so.0 libnetwork-ups-tools-2.7.4_12
+libnutscan.so.1 libnetwork-ups-tools-2.7.4_12
libsphinxad.so.0 sphinxbase-0.8_1
libsphinxbase.so.1 sphinxbase-0.8_1
libpocketsphinx.so.1 libpocketsphinx-0.8_3
diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
new file mode 100644
index 00000000000..a83f1ca7b38
--- /dev/null
+++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch
@@ -0,0 +1,181 @@
+From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001
+From: Arjen de Korte <build+lede@de-korte.org>
+Date: Mon, 27 Nov 2017 21:10:13 +0100
+Subject: [PATCH] Add support for openssl-1.1.0
+
+--- clients/upsclient.c
++++ clients/upsclient.c
+@@ -299,11 +299,6 @@
+ {
+ #ifdef WITH_OPENSSL
+ int ret, ssl_mode = SSL_VERIFY_NONE;
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+- const SSL_METHOD *ssl_method;
+-#else
+- SSL_METHOD *ssl_method;
+-#endif
+ #elif defined(WITH_NSS) /* WITH_OPENSSL */
+ SECStatus status;
+ #endif /* WITH_OPENSSL | WITH_NSS */
+@@ -315,22 +310,32 @@
+ }
+
+ #ifdef WITH_OPENSSL
+-
+- SSL_library_init();
+- SSL_load_error_strings();
+
+- ssl_method = TLSv1_client_method();
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ SSL_load_error_strings();
++ SSL_library_init();
+
+- if (!ssl_method) {
+- return 0;
+- }
++ ssl_ctx = SSL_CTX_new(SSLv23_client_method());
++#else
++ ssl_ctx = SSL_CTX_new(TLS_client_method());
++#endif
+
+- ssl_ctx = SSL_CTX_new(ssl_method);
+ if (!ssl_ctx) {
+ upslogx(LOG_ERR, "Can not initialize SSL context");
+ return -1;
+ }
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ /* set minimum protocol TLSv1 */
++ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++ ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION);
++ if (ret != 1) {
++ upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1");
++ return -1;
++ }
++#endif
++
+ if (!certpath) {
+ if (certverify == 1) {
+ upslogx(LOG_ERR, "Can not verify certificate if any is specified");
+@@ -737,7 +742,7 @@
+ switch(res)
+ {
+ case 1:
+- upsdebugx(3, "SSL connected");
++ upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl));
+ break;
+ case 0:
+ upslog_with_errno(1, "SSL_connect do not accept handshake.");
+--- clients/upssched.c
++++ clients/upssched.c
+@@ -794,7 +794,7 @@
+ }
+
+ if (!strcmp(cmd, "EXECUTE")) {
+- if (ca1 == '\0') {
++ if (ca1[0] == '\0') {
+ upslogx(LOG_ERR, "Empty EXECUTE command argument");
+ return;
+ }
+--- m4/nut_check_libopenssl.m4
++++ m4/nut_check_libopenssl.m4
+@@ -58,7 +58,7 @@
+
+ dnl check if openssl is usable
+ AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT])
+- AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no])
++ AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no])
+
+ if test "${nut_have_openssl}" = "yes"; then
+ nut_with_ssl="yes"
+--- server/netssl.c
++++ server/netssl.c
+@@ -274,7 +274,7 @@
+ {
+ case 1:
+ client->ssl_connected = 1;
+- upsdebugx(3, "SSL connected");
++ upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl));
+ break;
+
+ case 0:
+@@ -370,13 +370,7 @@
+ {
+ #ifdef WITH_NSS
+ SECStatus status;
+-#elif defined(WITH_OPENSSL)
+-#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+- const SSL_METHOD *ssl_method;
+-#else
+- SSL_METHOD *ssl_method;
+-#endif
+-#endif /* WITH_NSS|WITH_OPENSSL */
++#endif /* WITH_NSS */
+
+ if (!certfile) {
+ return;
+@@ -386,18 +380,29 @@
+
+ #ifdef WITH_OPENSSL
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ SSL_load_error_strings();
+ SSL_library_init();
+
+- if ((ssl_method = TLSv1_server_method()) == NULL) {
++ ssl_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++ ssl_ctx = SSL_CTX_new(TLS_server_method());
++#endif
++
++ if (!ssl_ctx) {
+ ssl_debug();
+- fatalx(EXIT_FAILURE, "TLSv1_server_method failed");
++ fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
+ }
+
+- if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ /* set minimum protocol TLSv1 */
++ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
++#else
++ if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) {
+ ssl_debug();
+- fatalx(EXIT_FAILURE, "SSL_CTX_new failed");
++ fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)");
+ }
++#endif
+
+ if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) {
+ ssl_debug();
+--- configure 2021-02-13 22:54:47.106372805 +0100
++++ - 2021-02-13 22:58:18.010481917 +0100
+@@ -10399,10 +10399,10 @@
+
+ done
+
+- for ac_func in SSL_library_init
++ for ac_func in SSL_CTX_new
+ do :
+- ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++ ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
+@@ -10510,10 +10510,10 @@
+
+ done
+
+- for ac_func in SSL_library_init
++ for ac_func in SSL_CTX_new
+ do :
+- ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init"
+-if test "x$ac_cv_func_SSL_library_init" = xyes; then :
++ ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new"
++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_SSL_LIBRARY_INIT 1
+ _ACEOF
diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template
index bf2e50a540e..0f4f1ce5a3b 100644
--- a/srcpkgs/network-ups-tools/template
+++ b/srcpkgs/network-ups-tools/template
@@ -1,7 +1,7 @@
# Template file for 'network-ups-tools'
pkgname=network-ups-tools
version=2.7.4
-revision=11
+revision=12
wrksrc="nut-${version}"
build_style=gnu-configure
configure_args="
@@ -11,7 +11,7 @@ configure_args="
--with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir
--with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups"
hostmakedepends="pkg-config"
-makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel
+makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel
net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel"
conf_files="
/etc/ups/ups.conf
From 8f50a446bcf4bd51a948b0798f074bc00f9e326b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 131/358] nextcloud-client: rebuild against OpenSSL
---
srcpkgs/nextcloud-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index cb674c0999d..2382d7d337f 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
# Template file for 'nextcloud-client'
pkgname=nextcloud-client
version=3.1.2
-revision=1
+revision=2
wrksrc="desktop-${version}"
build_style=cmake
configure_args="-Wno-dev -DNO_SHIBBOLETH=True"
From 283c1142341bf389e32d2fb481d8be30e02d6b15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 132/358] nginx: rebuild against OpenSSL
---
srcpkgs/nginx/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template
index 14dd2dec287..76d52cb3f22 100644
--- a/srcpkgs/nginx/template
+++ b/srcpkgs/nginx/template
@@ -1,9 +1,9 @@
# Template file for 'nginx'
pkgname=nginx
version=1.18.0
-revision=3
+revision=4
build_style=gnu-makefile
-hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)"
+hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)"
makedepends="${hostmakedepends}"
short_desc="High performance web and reverse proxy server"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7202916915ae396165aa0cc7b2f358ff5c53698c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:26 +0100
Subject: [PATCH 133/358] ngircd: rebuild against OpenSSL
---
srcpkgs/ngircd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template
index 1ed799b794f..7634efdfdc2 100644
--- a/srcpkgs/ngircd/template
+++ b/srcpkgs/ngircd/template
@@ -1,11 +1,11 @@
# Template file for 'ngircd'
pkgname=ngircd
version=26
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes"
hostmakedepends="pkg-config"
-makedepends="zlib-devel libressl-devel"
+makedepends="zlib-devel openssl-devel"
conf_files="/etc/ngircd.conf"
short_desc="Free, portable and lightweight Internet Relay Chat server"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9b18b075384396d8b0d2c2823c5279771501c737 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 134/358] nix: rebuild against OpenSSL
---
srcpkgs/nix/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 17648c62b2a..be65950c14a 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,13 +1,13 @@
# Template file for 'nix'
pkgname=nix
version=2.3.9
-revision=1
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
hostmakedepends="curl pkg-config flex tar xz"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
- liblzma-devel libressl-devel libsodium-devel sqlite-devel
+ liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel"
depends="curl tar xz"
short_desc="Purely functional package manager"
From f80f5d13396e27ff6a923130e8a74b80fc3b4938 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 135/358] nmap: rebuild against OpenSSL
---
srcpkgs/nmap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template
index 7429d64cf81..9b507d649fd 100644
--- a/srcpkgs/nmap/template
+++ b/srcpkgs/nmap/template
@@ -2,11 +2,11 @@
pkgname=nmap
reverts="7.90_1 7.91_1"
version=7.80
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)"
hostmakedepends="python"
-makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel
+makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel
$(vopt_if lua lua53-devel)"
short_desc="Utility for network discovery and security auditing"
maintainer="Piraty <piraty1@inbox.ru>"
From ee66e4aff9838a6574d6759d952e99c4a212241c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 136/358] nmh: rebuild against OpenSSL
---
srcpkgs/nmh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 070ea37e54c..0c234f74d82 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -1,10 +1,10 @@
# Template file for 'nmh'
pkgname=nmh
version=1.7.1
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--with-cyrus-sasl --with-tls"
-makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel"
+makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
checkdepends="groff lynx tzdata tar"
conf_files="/etc/nmh/*"
short_desc="Message Handling System (New RAND Mail Handler)"
From 0652814fee334feca4e4bf251b42e7d3421ef06f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:27 +0100
Subject: [PATCH 137/358] nrpe: rebuild against OpenSSL
---
srcpkgs/nrpe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template
index d466c7dc856..6a598b0909e 100644
--- a/srcpkgs/nrpe/template
+++ b/srcpkgs/nrpe/template
@@ -1,7 +1,7 @@
# Template file for 'nrpe'
pkgname=nrpe
version=4.0.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-pkgsysconfdir=/etc/nagios
--with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios
@@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios
--with-ssl-inc=${XBPS_CROSS_BASE}/usr/include"
make_build_args="nrpe"
make_install_args="install-daemon install-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="monitoring-plugins"
make_dirs="/etc/nagios 0775 _nagios _nagios"
conf_files="/etc/nagios/nrpe.cfg"
From 045dee5ab33067f14a1b838005920ce9bea9128a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 138/358] ntp: rebuild against OpenSSL
---
srcpkgs/ntp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index efdbe31c339..fa88f33f92b 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,12 +1,12 @@
# Template file for 'ntp'
pkgname=ntp
version=4.2.8p15
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
--enable-all-clocks ol_cv_pthread_select_yields=yes"
hostmakedepends="pkg-config bison perl"
-makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel"
+makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel"
short_desc="Network Time Protocol daemon and utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="NTP"
From 885d8e9a4724d7c7c73825653b6bc8b136675e62 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 139/358] nushell: rebuild against OpenSSL
---
srcpkgs/nushell/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template
index a2cda058b6c..bd1e069c4b7 100644
--- a/srcpkgs/nushell/template
+++ b/srcpkgs/nushell/template
@@ -1,11 +1,11 @@
# Template file for 'nushell'
pkgname=nushell
version=0.27.1
-revision=2
+revision=3
build_style=cargo
configure_args="--features=extra"
hostmakedepends="pkg-config python3 libgit2-devel"
-makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel"
+makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel"
short_desc="Modern shell for the GitHub era"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
From 4122218a15ba3af2176f4de6b2dbaa163fc4b1fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 140/358] nzbget: rebuild against OpenSSL
---
srcpkgs/nzbget/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template
index f40dbb60d8c..3dfdc9154f1 100644
--- a/srcpkgs/nzbget/template
+++ b/srcpkgs/nzbget/template
@@ -1,7 +1,7 @@
# Template file for 'nzbget'
pkgname=nzbget
version=21.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tlslib=OpenSSL
--with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include
@@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL
--with-zlib-includes=${XBPS_CROSS_BASE}/usr/include
--with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="pkg-config"
-makedepends="libxml2-devel ncurses-devel libressl-devel"
+makedepends="libxml2-devel ncurses-devel openssl-devel"
short_desc="Download from Usenet using .nzb files"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From 6419fe79147b89ba5d1898bd061d39c031cd49f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 141/358] open-iscsi: rebuild against OpenSSL
---
srcpkgs/open-iscsi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template
index b67ae2bb725..7cd8308b049 100644
--- a/srcpkgs/open-iscsi/template
+++ b/srcpkgs/open-iscsi/template
@@ -1,11 +1,11 @@
# Template file for 'open-iscsi'
pkgname=open-iscsi
version=2.1.3
-revision=1
+revision=2
conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi"
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
-makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel"
+makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel"
short_desc="Open-iSCSI userland tools"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From 98916c823e08ce87e5d3c17a39bb319bccf38d9a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:28 +0100
Subject: [PATCH 142/358] open-isns: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/open-isns/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b9ead4f1761..431ee310fc3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2819,7 +2819,7 @@ libKF5JsEmbed.so.5 kjsembed-5.26.0_1
libKF5KrossCore.so.5 kross-5.26.0_1
libKF5KrossUi.so.5 kross-5.36.0_1
liblmdb.so.0 lmdb-0.9.18_2
-libisns.so.0 libisns-0.96_1
+libisns.so.0 libisns-0.101_2
libz80ex.so.1 z80ex-1.1.21_1
libz80ex_dasm.so.1 z80ex-1.1.21_1
libqmmp.so.1 qmmp-1.1.4_1
diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template
index a92c52bfcf4..af670232cef 100644
--- a/srcpkgs/open-isns/template
+++ b/srcpkgs/open-isns/template
@@ -1,10 +1,10 @@
# Template file for 'open-isns'
pkgname=open-isns
version=0.101
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp"
conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf"
short_desc="Server and client for iSNS"
From 3b1f0fca8c00367181c1e7b626387b1af5f0ac8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 143/358] opendkim: rebuild against OpenSSL
---
common/shlibs | 2 +-
.../patches/openssl_1.1.0_compat.patch | 90 +++++++++++++++++++
srcpkgs/opendkim/template | 10 ++-
3 files changed, 98 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
diff --git a/common/shlibs b/common/shlibs
index 431ee310fc3..a6efeeaac91 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2693,7 +2693,7 @@ libgl2ps.so.1 gl2ps-1.3.9_1
libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1
librpmatch.so.0 musl-rpmatch-1.0_1
libmilter.so.1.0.2 libmilter-1.0.2_1
-libopendkim.so.10 opendkim-2.10.3_1
+libopendkim.so.10 opendkim-2.10.3_12
libtevent.so.0 tevent-0.9.28_1
libldb.so.2 ldb-2.2.0_1
libpyldb-util.so.2 libpyldb-util-2.2.0_1
diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
new file mode 100644
index 00000000000..3957bb12bcb
--- /dev/null
+++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch
@@ -0,0 +1,90 @@
+Description: Build and work with either openssl 1.0.2 or 1.1.0
+ * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466)
+ - Thanks to Sebastian Andrzej Siewior for the patch
+Author: Sebastian Andrzej Siewior
+Bug-Debian: http://bugs.debian.org/828466
+Origin: vendor
+Forwarded: no
+Reviewed-By: Scott Kitterman <scott@kitterman.com>
+Last-Update: <YYYY-MM-DD>
+
+--- configure.ac
++++ configure.ac
+@@ -864,26 +864,28 @@ then
+ AC_SEARCH_LIBS([ERR_peek_error], [crypto], ,
+ AC_MSG_ERROR([libcrypto not found]))
+
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- [
+- if test x"$enable_shared" = x"yes"
+- then
+- AC_MSG_ERROR([Cannot build shared opendkim
+- against static openssl libraries.
+- Configure with --disable-shared
+- to get this working or obtain a
+- shared libssl library for
+- opendkim to use.])
+- fi
+
+- # avoid caching issue - last result of SSL_library_init
+- # shouldn't be cached for this next check
+- unset ac_cv_search_SSL_library_init
+- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
+- AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
+- AC_MSG_ERROR([libssl not found]), [-ldl])
+- ]
+- )
++ AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [od_have_ossl="yes";],
++ [od_have_ossl="no";])
++ if test x"$od_have_ossl" = x"no"
++ then
++ if test x"$enable_shared" = x"yes"
++ then
++ AC_MSG_ERROR([Cannot build shared opendkim
++ against static openssl libraries.
++ Configure with --disable-shared
++ to get this working or obtain a
++ shared libssl library for
++ opendkim to use.])
++ fi
++
++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl"
++ AC_SEARCH_LIBS([SSL_library_init], [ssl], ,
++ AC_MSG_ERROR([libssl not found]), [-ldl])
++ fi
+
+ AC_CHECK_DECL([SHA256_DIGEST_LENGTH],
+ AC_DEFINE([HAVE_SHA256], 1,
+--- opendkim/opendkim-crypto.c
++++ opendkim/opendkim-crypto.c
+@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr)
+ {
+ assert(pthread_setspecific(id_key, ptr) == 0);
+
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ ERR_remove_state(0);
++#endif
+
+ free(ptr);
+
+@@ -392,11 +396,15 @@ dkimf_crypto_free(void)
+ {
+ if (crypto_init_done)
+ {
++#if OPENSSL_VERSION_NUMBER >= 0x10100000
++ OPENSSL_thread_stop();
++#else
+ CRYPTO_cleanup_all_ex_data();
+ CONF_modules_free();
+ EVP_cleanup();
+ ERR_free_strings();
+ ERR_remove_state(0);
++#endif
+
+ if (nmutexes > 0)
+ {
diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template
index 874a1aa3199..c9d0abfda66 100644
--- a/srcpkgs/opendkim/template
+++ b/srcpkgs/opendkim/template
@@ -1,11 +1,11 @@
# Template file for 'opendkim'
pkgname=opendkim
version=2.10.3
-revision=11
+revision=12
build_style=gnu-configure
configure_args="--with-milter=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config"
-makedepends="libbsd-devel libressl-devel libmilter-devel"
+hostmakedepends="pkg-config automake gettext libtool"
+makedepends="libbsd-devel openssl-devel libmilter-devel"
short_desc="DKIM library"
maintainer="John Regan <john@jrjrtech.com>"
license="BSD-3-Clause, Sendmail"
@@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b
python_version=2 #unverified
+pre_configure() {
+ autoreconf -fi
+}
+
post_install() {
vlicense LICENSE
vlicense LICENSE.Sendmail
From 7a93d5886f6a34d29a6935fb5fc858b08b871f0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 144/358] openfortivpn: rebuild against OpenSSL
---
srcpkgs/openfortivpn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template
index 846d7d72512..3ba99f7b266 100644
--- a/srcpkgs/openfortivpn/template
+++ b/srcpkgs/openfortivpn/template
@@ -1,7 +1,7 @@
# Template file for 'openfortivpn'
pkgname=openfortivpn
version=1.16.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--enable-proc
@@ -11,7 +11,7 @@ configure_args="
--with-resolvconf=/usr/bin/resolvconf
--with-rt_dst"
hostmakedepends="autoconf automake pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Client for PPP+SSL VPN tunnel services"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-3.0-or-later"
From 0d4f770eef1ff182a701855dcbd766bfa44944f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:29 +0100
Subject: [PATCH 145/358] opensc: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/opensc/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a6efeeaac91..7729deb2cef 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1742,7 +1742,7 @@ libLinearMath.so.2.89 bullet-2.89_1
libBulletSoftBody.so.2.89 bullet-2.89_1
libinotifytools.so.0 libinotify-tools-3.14_2
libfswatch.so.11 libfswatch-1.13.0_1
-libopensc.so.7 libopensc-0.21.0_1
+libopensc.so.7 libopensc-0.21.0_2
libSDL2_ttf-2.0.so.0 SDL2_ttf-2.0.12_1
librtlsdr.so.0 librtlsdr-0.5.3_1
libSDL2_mixer-2.0.so.0 SDL2_mixer-2.0.0_1
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index 84e085bd326..596cd849584 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -1,13 +1,13 @@
# Template file for 'opensc'
pkgname=opensc
version=0.21.0
-revision=1
+revision=2
wrksrc="OpenSC-${version}"
build_style=gnu-configure
configure_args="--enable-man --enable-sm --enable-static=no --enable-doc
--with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
-makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel"
+makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
short_desc="Tools and libraries for smart cards"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
From 09b2669dce1124c9439c09bdcb56d401299fb6f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 146/358] opensmtpd: rebuild against OpenSSL
---
srcpkgs/opensmtpd/template | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template
index 971f78680b5..10890fec2a4 100644
--- a/srcpkgs/opensmtpd/template
+++ b/srcpkgs/opensmtpd/template
@@ -1,7 +1,7 @@
# Template file for 'opensmtpd'
pkgname=opensmtpd
version=6.8.0p2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
--with-path-socket=/run --with-path-pidfile=/run
@@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin
--with-path-CAfile=/etc/ssl/certs/ca-certificates.crt
--with-maildir=/var/mail
--with-auth-pam=smtpd
- ac_cv_func_arc4random=yes
- ac_cv_func_arc4random_buf=yes
- ac_cv_func_arc4random_stir=no
- ac_cv_func_arc4random_uniform=yes
- ac_cv_search_arc4random=-lcrypto
ac_cv_func_explicit_bzero=no
ac_cv_func_reallocarray=no
ac_cv_func_strlcat=no
ac_cv_func_strlcpy=no"
hostmakedepends="automake libtool pkg-config bison"
-makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel"
+makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel"
depends="ca-certificates"
conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases"
short_desc="Free implementation of the server-side SMTP protocol"
From 68368befa39a269a3be7091c15aa9e62fef9044f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 147/358] openssh: rebuild against OpenSSL
---
srcpkgs/openssh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 119ba23a2a1..dfd8f659492 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
# Template file for 'openssh'
pkgname=openssh
version=8.4p1
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--datadir=/usr/share/openssh
--sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody
@@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh
hostmakedepends="automake"
makedepends="libedit-devel pam-devel zlib-devel
$(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel')
- $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')"
+ $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')"
short_desc="OpenSSH free Secure Shell (SSH) client and server implementation"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-2-Clause, ISC"
From 2bf1a48a374393d68be1ea61883d5f60502f8293 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 148/358] openvswitch: rebuild against OpenSSL
---
srcpkgs/openvswitch/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template
index e158dd8b0a5..145a0b52e8f 100644
--- a/srcpkgs/openvswitch/template
+++ b/srcpkgs/openvswitch/template
@@ -1,13 +1,13 @@
# Template file for 'openvswitch'
pkgname=openvswitch
version=2.14.2
-revision=1
+revision=2
archs="i686* x86_64* ppc64*"
build_style=gnu-configure
configure_args="--with-rundir=/run/openvswitch"
pycompile_dirs="usr/share/openvswitch/python"
hostmakedepends="pkg-config python3"
-makedepends="libressl-devel libcap-ng-devel"
+makedepends="openssl-devel libcap-ng-devel"
depends="python"
short_desc="Production quality, multilayer virtual switch"
maintainer="Renato Aguiar <renato@renatoaguiar.net>"
From f05f32e2bb568411b80d371b23adf8ed2bedcfb1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:30 +0100
Subject: [PATCH 149/358] opkg: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/opkg/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7729deb2cef..88eaeb938e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3539,7 +3539,7 @@ libvkd3d.so.1 vkd3d-1.1_1
libgaminggear.so.0 libgaminggear-0.15.1_1
libgaminggearfx.so.0 libgaminggear-0.15.1_1
libgaminggearwidget.so.0 libgaminggear-0.15.1_1
-libopkg.so.1 libopkg-0.4.0_1
+libopkg.so.1 libopkg-0.4.4_2
libkodiplatform.so.18.0 kodi-platform-17.1.0_1
libQMatrixClient.so.0.5.3 libqmatrixclient-0.5.3.2_1
libipset.so.13 libipset-7.9_1
diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template
index b46ee5dc5bb..a1c1c2a910e 100644
--- a/srcpkgs/opkg/template
+++ b/srcpkgs/opkg/template
@@ -1,7 +1,7 @@
# Template file for 'opkg'
pkgname=opkg
version=0.4.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-sha256 --without-libsolv --with-static-libopkg
$(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)"
From 7924ea6fd5d87ef261b0fa9a8738e2425f4c634b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 150/358] opmsg: rebuild against OpenSSL
---
srcpkgs/opmsg/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template
index 41c452b8e4b..eef0965e2d0 100644
--- a/srcpkgs/opmsg/template
+++ b/srcpkgs/opmsg/template
@@ -1,12 +1,12 @@
# Template file for 'opmsg'
pkgname=opmsg
version=1.78s
-revision=3
+revision=4
wrksrc="${pkgname}-rel-${version}"
build_wrksrc=src
build_style=gnu-makefile
make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Replacement for gpg which can encrypt/sign/verify your mails"
maintainer="travankor <travankor@tuta.io>"
license="GPL-3.0-or-later"
@@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da
do_configure() {
vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \
-e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \
- -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \
-e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \
-e "s|^CXX=c++$|CXX=${CXX}|" \
-e 's|^LD=c++$|LD=$(CXX)|' \
From cff35210a9f29866ff8969e346f4dfde677aae4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 151/358] opusfile: rebuild against OpenSSL
---
common/shlibs | 4 ++--
srcpkgs/opusfile/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 88eaeb938e4..5aba12346e4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1223,8 +1223,8 @@ libcprops.so.15 libcprops-0.1.12_1
libopus.so.0 opus-1.0.2_1
libconfig++.so.11 libconfig++-1.7.1_1
libconfig.so.11 libconfig-1.7.1_1
-libopusfile.so.0 opusfile-0.2_1
-libopusurl.so.0 opusfile-0.6_1
+libopusfile.so.0 opusfile-0.12_2
+libopusurl.so.0 opusfile-0.12_2
libopusenc.so.0 libopusenc-0.2_1
libgranite.so.5 granite-0.5.0_1
libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1
diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template
index 115f2ea9d36..2b2169eed3c 100644
--- a/srcpkgs/opusfile/template
+++ b/srcpkgs/opusfile/template
@@ -1,10 +1,10 @@
# Template file for 'opusfile'
pkgname=opusfile
version=0.12
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
-makedepends="libogg-devel opus-devel libressl-devel"
+makedepends="libogg-devel opus-devel openssl-devel"
short_desc="Library for opening, seeking, and decoding .opus files"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From a09600037902dfe2a3c7b0d754ce02cd1e893de2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 152/358] pacman: rebuild against OpenSSL
---
srcpkgs/pacman/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template
index 0ea2567b905..d23aba0468b 100644
--- a/srcpkgs/pacman/template
+++ b/srcpkgs/pacman/template
@@ -1,7 +1,7 @@
# Template file for 'pacman'
pkgname=pacman
version=5.2.2
-revision=1
+revision=2
make_dirs="/var/lib/pacman 0755 root root
/usr/var/cache/pacman/pkg 0755 root root
/usr/share/libalpm/hooks 0755 root root"
From 8dbcca8c0baae90ca6a8eff7b4378e0bae5ab2af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 153/358] pam-u2f: rebuild against OpenSSL
---
srcpkgs/pam-u2f/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template
index 285e1ae4229..7c1b5034a28 100644
--- a/srcpkgs/pam-u2f/template
+++ b/srcpkgs/pam-u2f/template
@@ -1,12 +1,12 @@
# Template file for 'pam-u2f'
pkgname=pam-u2f
version=1.1.0
-revision=1
+revision=2
wrksrc="${pkgname/-/_}-${version}"
build_style=gnu-configure
configure_args="--with-pam-dir=/usr/lib/security"
hostmakedepends="automake libtool pkg-config asciidoc"
-makedepends="libfido2-devel libressl-devel pam-devel"
+makedepends="libfido2-devel openssl-devel pam-devel"
short_desc="Pluggable Authentication Module (PAM) for U2F"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="BSD-2-Clause"
From 71c06e8ef47b9fd47829e4965429a6afa4f68081 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:31 +0100
Subject: [PATCH 154/358] pam_ssh: rebuild against OpenSSL
---
srcpkgs/pam_ssh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template
index f8a17f44cc9..eba01a0fa45 100644
--- a/srcpkgs/pam_ssh/template
+++ b/srcpkgs/pam_ssh/template
@@ -1,13 +1,13 @@
# Template file for 'pam_ssh'
pkgname=pam_ssh
version=2.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr
--includedir=${XBPS_CROSS_BASE}/usr/include
--libdir=${XBPS_CROSS_BASE}/usr/lib"
hostmakedepends="openssh"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
short_desc="PAM module providing single sign-on behavior for SSH"
maintainer="Alexander Gehrke <void@qwertyuiop.de>"
license="BSD-2-Clause"
From daef5a83c9fc819567f91d84d82deb09e0c6e136 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 155/358] pam_ssh_agent_auth: rebuild against OpenSSL
---
.../pam_ssh_agent_auth/patches/openssl.patch | 881 ++++++++++++++++++
srcpkgs/pam_ssh_agent_auth/template | 5 +-
2 files changed, 884 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
new file mode 100644
index 00000000000..bda9a37a5ff
--- /dev/null
+++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch
@@ -0,0 +1,881 @@
+From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001
+From: Guido Falsi <mad@madpilot.net>
+Date: Sat, 20 Oct 2018 14:29:43 +0200
+Subject: [PATCH] Adapt to OpenSSL 1.1.1.
+
+The FreeBSD operating system is migrating to OpenSSL 1.1.1 and I have created this set of patches to make pam_ssh_agent_auth compile with it.
+
+The patch comments out some parts of include files which are not actually used and reference now opaque OpenSSL internals.
+
+I also have migrated the source files to use accessors to use the OpenSSL objects.
+
+The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header-check argument is required in configure there.
+---
+ authfd.c | 50 ++++++++++++++++++++
+ bufbn.c | 4 ++
+ cipher.h | 6 ++-
+ kex.h | 9 +++-
+ key.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++--
+ ssh-dss.c | 51 ++++++++++++++++----
+ ssh-ecdsa.c | 40 ++++++++++++----
+ ssh-rsa.c | 22 +++++++--
+ 8 files changed, 287 insertions(+), 28 deletions(-)
+
+diff --git a/authfd.c b/authfd.c
+index 7b96921..35f8de1 100644
+--- authfd.c
++++ authfd.c
+@@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ case 1:
+ key = pamsshagentauth_key_new(KEY_RSA1);
+ bits = pamsshagentauth_buffer_get_int(&auth->identities);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->e);
+ pamsshagentauth_buffer_get_bignum(&auth->identities, key->rsa->n);
+ *comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
+@@ -379,6 +380,15 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio
+ if (keybits < 0 || bits != (u_int)keybits)
+ pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
+ BN_num_bits(key->rsa->n), bits);
++#else
++ pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_e(key->rsa));
++ pamsshagentauth_buffer_get_bignum(&auth->identities, RSA_get0_n(key->rsa));
++ *comment = pamsshagentauth_buffer_get_string(&auth->identities, NULL);
++ keybits = BN_num_bits(RSA_get0_n(key->rsa));
++ if (keybits < 0 || bits != (u_int)keybits)
++ pamsshagentauth_logit("Warning: identity keysize mismatch: actual %d, announced %u",
++ BN_num_bits(RSA_get0_n(key->rsa)), bits);
++#endif
+ break;
+ case 2:
+ blob = pamsshagentauth_buffer_get_string(&auth->identities, &blen);
+@@ -422,9 +432,15 @@ ssh_decrypt_challenge(AuthenticationConnection *auth,
+ }
+ pamsshagentauth_buffer_init(&buffer);
+ pamsshagentauth_buffer_put_char(&buffer, SSH_AGENTC_RSA_CHALLENGE);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(key->rsa->n));
+ pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->e);
+ pamsshagentauth_buffer_put_bignum(&buffer, key->rsa->n);
++#else
++ pamsshagentauth_buffer_put_int(&buffer, BN_num_bits(RSA_get0_n(key->rsa)));
++ pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_e(key->rsa));
++ pamsshagentauth_buffer_put_bignum(&buffer, RSA_get0_n(key->rsa));
++#endif
+ pamsshagentauth_buffer_put_bignum(&buffer, challenge);
+ pamsshagentauth_buffer_append(&buffer, session_id, 16);
+ pamsshagentauth_buffer_put_int(&buffer, response_type);
+@@ -501,6 +517,7 @@ ssh_agent_sign(AuthenticationConnection *auth,
+ static void
+ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ pamsshagentauth_buffer_put_int(b, BN_num_bits(key->n));
+ pamsshagentauth_buffer_put_bignum(b, key->n);
+ pamsshagentauth_buffer_put_bignum(b, key->e);
+@@ -509,6 +526,16 @@ ssh_encode_identity_rsa1(Buffer *b, RSA *key, const char *comment)
+ pamsshagentauth_buffer_put_bignum(b, key->iqmp); /* ssh key->u */
+ pamsshagentauth_buffer_put_bignum(b, key->q); /* ssh key->p, SSL key->q */
+ pamsshagentauth_buffer_put_bignum(b, key->p); /* ssh key->q, SSL key->p */
++#else
++ pamsshagentauth_buffer_put_int(b, BN_num_bits(RSA_get0_n(key)));
++ pamsshagentauth_buffer_put_bignum(b, RSA_get0_n(key));
++ pamsshagentauth_buffer_put_bignum(b, RSA_get0_e(key));
++ pamsshagentauth_buffer_put_bignum(b, RSA_get0_d(key));
++ /* To keep within the protocol: p < q for ssh. in SSL p > q */
++ pamsshagentauth_buffer_put_bignum(b, RSA_get0_iqmp(key)); /* ssh key->u */
++ pamsshagentauth_buffer_put_bignum(b, RSA_get0_q(key)); /* ssh key->p, SSL key->q */
++ pamsshagentauth_buffer_put_bignum(b, RSA_get0_p(key)); /* ssh key->q, SSL key->p */
++#endif
+ pamsshagentauth_buffer_put_cstring(b, comment);
+ }
+
+@@ -518,19 +545,36 @@ ssh_encode_identity_ssh2(Buffer *b, Key *key, const char *comment)
+ pamsshagentauth_buffer_put_cstring(b, key_ssh_name(key));
+ switch (key->type) {
+ case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ pamsshagentauth_buffer_put_bignum2(b, key->rsa->n);
+ pamsshagentauth_buffer_put_bignum2(b, key->rsa->e);
+ pamsshagentauth_buffer_put_bignum2(b, key->rsa->d);
+ pamsshagentauth_buffer_put_bignum2(b, key->rsa->iqmp);
+ pamsshagentauth_buffer_put_bignum2(b, key->rsa->p);
+ pamsshagentauth_buffer_put_bignum2(b, key->rsa->q);
++#else
++ pamsshagentauth_buffer_put_bignum2(b, RSA_get0_n(key->rsa));
++ pamsshagentauth_buffer_put_bignum2(b, RSA_get0_e(key->rsa));
++ pamsshagentauth_buffer_put_bignum2(b, RSA_get0_d(key->rsa));
++ pamsshagentauth_buffer_put_bignum2(b, RSA_get0_iqmp(key->rsa));
++ pamsshagentauth_buffer_put_bignum2(b, RSA_get0_p(key->rsa));
++ pamsshagentauth_buffer_put_bignum2(b, RSA_get0_q(key->rsa));
++#endif
+ break;
+ case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ pamsshagentauth_buffer_put_bignum2(b, key->dsa->p);
+ pamsshagentauth_buffer_put_bignum2(b, key->dsa->q);
+ pamsshagentauth_buffer_put_bignum2(b, key->dsa->g);
+ pamsshagentauth_buffer_put_bignum2(b, key->dsa->pub_key);
+ pamsshagentauth_buffer_put_bignum2(b, key->dsa->priv_key);
++#else
++ pamsshagentauth_buffer_put_bignum2(b, DSA_get0_p(key->dsa));
++ pamsshagentauth_buffer_put_bignum2(b, DSA_get0_q(key->dsa));
++ pamsshagentauth_buffer_put_bignum2(b, DSA_get0_g(key->dsa));
++ pamsshagentauth_buffer_put_bignum2(b, DSA_get0_pub_key(key->dsa));
++ pamsshagentauth_buffer_put_bignum2(b, DSA_get0_priv_key(key->dsa));
++#endif
+ break;
+ }
+ pamsshagentauth_buffer_put_cstring(b, comment);
+@@ -610,9 +654,15 @@ ssh_remove_identity(AuthenticationConnection *auth, Key *key)
+
+ if (key->type == KEY_RSA1) {
+ pamsshagentauth_buffer_put_char(&msg, SSH_AGENTC_REMOVE_RSA_IDENTITY);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ pamsshagentauth_buffer_put_int(&msg, BN_num_bits(key->rsa->n));
+ pamsshagentauth_buffer_put_bignum(&msg, key->rsa->e);
+ pamsshagentauth_buffer_put_bignum(&msg, key->rsa->n);
++#else
++ pamsshagentauth_buffer_put_int(&msg, BN_num_bits(RSA_get0_n(key->rsa)));
++ pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_e(key->rsa));
++ pamsshagentauth_buffer_put_bignum(&msg, RSA_get0_n(key->rsa));
++#endif
+ } else if (key->type == KEY_DSA || key->type == KEY_RSA) {
+ pamsshagentauth_key_to_blob(key, &blob, &blen);
+ pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY);
+diff --git a/bufbn.c b/bufbn.c
+index 6a49c73..4ecedc1 100644
+--- bufbn.c
++++ bufbn.c
+@@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value)
+ pamsshagentauth_buffer_put_int(buffer, 0);
+ return 0;
+ }
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (value->neg) {
++#else
++ if (BN_is_negative(value)) {
++#endif
+ pamsshagentauth_logerror("buffer_put_bignum2_ret: negative numbers not supported");
+ return (-1);
+ }
+diff --git a/cipher.h b/cipher.h
+index 49bbc16..64f59ca 100644
+--- cipher.h
++++ cipher.h
+@@ -59,15 +59,18 @@
+ #define CIPHER_DECRYPT 0
+
+ typedef struct Cipher Cipher;
+-typedef struct CipherContext CipherContext;
++// typedef struct CipherContext CipherContext;
+
+ struct Cipher;
++/*
+ struct CipherContext {
+ int plaintext;
+ EVP_CIPHER_CTX evp;
+ Cipher *cipher;
+ };
++*/
+
++/*
+ u_int cipher_mask_ssh1(int);
+ Cipher *cipher_by_name(const char *);
+ Cipher *cipher_by_number(int);
+@@ -88,4 +91,5 @@ void cipher_set_keyiv(CipherContext *, u_char *);
+ int cipher_get_keyiv_len(const CipherContext *);
+ int cipher_get_keycontext(const CipherContext *, u_char *);
+ void cipher_set_keycontext(CipherContext *, u_char *);
++*/
+ #endif /* CIPHER_H */
+diff --git a/kex.h b/kex.h
+index 8e29c90..81ca57d 100644
+--- kex.h
++++ kex.h
+@@ -70,7 +70,7 @@ enum kex_exchange {
+ #define KEX_INIT_SENT 0x0001
+
+ typedef struct Kex Kex;
+-typedef struct Mac Mac;
++// typedef struct Mac Mac;
+ typedef struct Comp Comp;
+ typedef struct Enc Enc;
+ typedef struct Newkeys Newkeys;
+@@ -84,6 +84,7 @@ struct Enc {
+ u_char *key;
+ u_char *iv;
+ };
++/*
+ struct Mac {
+ char *name;
+ int enabled;
+@@ -95,11 +96,13 @@ struct Mac {
+ HMAC_CTX evp_ctx;
+ struct umac_ctx *umac_ctx;
+ };
++*/
+ struct Comp {
+ int type;
+ int enabled;
+ char *name;
+ };
++/*
+ struct Newkeys {
+ Enc enc;
+ Mac mac;
+@@ -126,7 +129,9 @@ struct Kex {
+ int (*host_key_index)(Key *);
+ void (*kex[KEX_MAX])(Kex *);
+ };
++*/
+
++/*
+ Kex *kex_setup(char *[PROPOSAL_MAX]);
+ void kex_finish(Kex *);
+
+@@ -152,6 +157,8 @@ kexgex_hash(const EVP_MD *, char *, char *, char *, int, char *,
+ void
+ derive_ssh1_session_id(BIGNUM *, BIGNUM *, u_int8_t[8], u_int8_t[16]);
+
++*/
++
+ #if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+ void dump_digest(char *, u_char *, int);
+ #endif
+diff --git a/key.c b/key.c
+index 107a442..aedbbb5 100644
+--- key.c
++++ key.c
+@@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type)
+ case KEY_RSA:
+ if ((rsa = RSA_new()) == NULL)
+ pamsshagentauth_fatal("key_new: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((rsa->n = BN_new()) == NULL)
+ pamsshagentauth_fatal("key_new: BN_new failed");
+ if ((rsa->e = BN_new()) == NULL)
+ pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++ if (RSA_set0_key(rsa, BN_new(), BN_new(), NULL) != 1)
++ pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++#endif
+ k->rsa = rsa;
+ break;
+ case KEY_DSA:
+ if ((dsa = DSA_new()) == NULL)
+ pamsshagentauth_fatal("key_new: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((dsa->p = BN_new()) == NULL)
+ pamsshagentauth_fatal("key_new: BN_new failed");
+ if ((dsa->q = BN_new()) == NULL)
+@@ -94,6 +100,12 @@ pamsshagentauth_key_new(int type)
+ pamsshagentauth_fatal("key_new: BN_new failed");
+ if ((dsa->pub_key = BN_new()) == NULL)
+ pamsshagentauth_fatal("key_new: BN_new failed");
++#else
++ if (DSA_set0_pqg(dsa, BN_new(), BN_new(), BN_new()) != 1)
++ pamsshagentauth_fatal("key_new: DSA_set0_pqg failed");
++ if (DSA_set0_key(dsa, BN_new(), NULL) != 1)
++ pamsshagentauth_fatal("key_new: DSA_set0_key failed");
++#endif
+ k->dsa = dsa;
+ break;
+ case KEY_ECDSA:
+@@ -118,6 +130,7 @@ pamsshagentauth_key_new_private(int type)
+ switch (k->type) {
+ case KEY_RSA1:
+ case KEY_RSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((k->rsa->d = BN_new()) == NULL)
+ pamsshagentauth_fatal("key_new_private: BN_new failed");
+ if ((k->rsa->iqmp = BN_new()) == NULL)
+@@ -130,14 +143,30 @@ pamsshagentauth_key_new_private(int type)
+ pamsshagentauth_fatal("key_new_private: BN_new failed");
+ if ((k->rsa->dmp1 = BN_new()) == NULL)
+ pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++ if (RSA_set0_key(k->rsa, NULL, NULL, BN_new()) != 1)
++ pamsshagentauth_fatal("key_new: RSA_set0_key failed");
++ if (RSA_set0_crt_params(k->rsa, BN_new(), BN_new(), BN_new()) != 1)
++ pamsshagentauth_fatal("key_new: RSA_set0_crt_params failed");
++ if (RSA_set0_factors(k->rsa, BN_new(), BN_new()) != 1)
++ pamsshagentauth_fatal("key_new: RSA_set0_factors failed");
++#endif
+ break;
+ case KEY_DSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((k->dsa->priv_key = BN_new()) == NULL)
+ pamsshagentauth_fatal("key_new_private: BN_new failed");
++#else
++ if (DSA_set0_key(k->dsa, NULL, BN_new()) != 1)
++ pamsshagentauth_fatal("key_new_private: DSA_set0_key failed");
++#endif
+ break;
+ case KEY_ECDSA:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (EC_KEY_set_private_key(k->ecdsa, BN_new()) != 1)
+ pamsshagentauth_fatal("key_new_private: EC_KEY_set_private_key failed");
++#else
++#endif
+ break;
+ case KEY_ED25519:
+ RAND_bytes(k->ed25519->sk, sizeof(k->ed25519->sk));
+@@ -195,14 +224,26 @@ pamsshagentauth_key_equal(const Key *a, const Key *b)
+ case KEY_RSA1:
+ case KEY_RSA:
+ return a->rsa != NULL && b->rsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BN_cmp(a->rsa->e, b->rsa->e) == 0 &&
+ BN_cmp(a->rsa->n, b->rsa->n) == 0;
++#else
++ BN_cmp(RSA_get0_e(a->rsa), RSA_get0_e(b->rsa)) == 0 &&
++ BN_cmp(RSA_get0_n(a->rsa), RSA_get0_n(b->rsa)) == 0;
++#endif
+ case KEY_DSA:
+ return a->dsa != NULL && b->dsa != NULL &&
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BN_cmp(a->dsa->p, b->dsa->p) == 0 &&
+ BN_cmp(a->dsa->q, b->dsa->q) == 0 &&
+ BN_cmp(a->dsa->g, b->dsa->g) == 0 &&
+ BN_cmp(a->dsa->pub_key, b->dsa->pub_key) == 0;
++#else
++ BN_cmp(DSA_get0_p(a->dsa), DSA_get0_p(b->dsa)) == 0 &&
++ BN_cmp(DSA_get0_q(a->dsa), DSA_get0_q(b->dsa)) == 0 &&
++ BN_cmp(DSA_get0_g(a->dsa), DSA_get0_g(b->dsa)) == 0 &&
++ BN_cmp(DSA_get0_pub_key(a->dsa), DSA_get0_pub_key(b->dsa)) == 0;
++#endif
+ case KEY_ECDSA:
+ return a->ecdsa != NULL && b->ecdsa != NULL &&
+ EC_KEY_check_key(a->ecdsa) == 1 &&
+@@ -231,7 +272,7 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ u_int *dgst_raw_length)
+ {
+ const EVP_MD *md = NULL;
+- EVP_MD_CTX ctx;
++ EVP_MD_CTX *ctx;
+ u_char *blob = NULL;
+ u_char *retval = NULL;
+ u_int len = 0;
+@@ -252,12 +293,21 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ }
+ switch (k->type) {
+ case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ nlen = BN_num_bytes(k->rsa->n);
+ elen = BN_num_bytes(k->rsa->e);
+ len = nlen + elen;
+ blob = pamsshagentauth_xmalloc(len);
+ BN_bn2bin(k->rsa->n, blob);
+ BN_bn2bin(k->rsa->e, blob + nlen);
++#else
++ nlen = BN_num_bytes(RSA_get0_n(k->rsa));
++ elen = BN_num_bytes(RSA_get0_e(k->rsa));
++ len = nlen + elen;
++ blob = pamsshagentauth_xmalloc(len);
++ BN_bn2bin(RSA_get0_n(k->rsa), blob);
++ BN_bn2bin(RSA_get0_e(k->rsa), blob + nlen);
++#endif
+ break;
+ case KEY_DSA:
+ case KEY_ECDSA:
+@@ -273,11 +323,14 @@ pamsshagentauth_key_fingerprint_raw(const Key *k, enum fp_type dgst_type,
+ }
+ if (blob != NULL) {
+ retval = pamsshagentauth_xmalloc(EVP_MAX_MD_SIZE);
+- EVP_DigestInit(&ctx, md);
+- EVP_DigestUpdate(&ctx, blob, len);
+- EVP_DigestFinal(&ctx, retval, dgst_raw_length);
++ /* XXX Errors from EVP_* functions are not hadled */
++ ctx = EVP_MD_CTX_create();
++ EVP_DigestInit(ctx, md);
++ EVP_DigestUpdate(ctx, blob, len);
++ EVP_DigestFinal(ctx, retval, dgst_raw_length);
+ memset(blob, 0, len);
+ pamsshagentauth_xfree(blob);
++ EVP_MD_CTX_destroy(ctx);
+ } else {
+ pamsshagentauth_fatal("key_fingerprint_raw: blob is null");
+ }
+@@ -457,10 +510,17 @@ pamsshagentauth_key_read(Key *ret, char **cpp)
+ return -1;
+ *cpp = cp;
+ /* Get public exponent, public modulus. */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (!read_bignum(cpp, ret->rsa->e))
+ return -1;
+ if (!read_bignum(cpp, ret->rsa->n))
+ return -1;
++#else
++ if (!read_bignum(cpp, RSA_get0_e(ret->rsa)))
++ return -1;
++ if (!read_bignum(cpp, RSA_get0_n(ret->rsa)))
++ return -1;
++#endif
+ success = 1;
+ break;
+ case KEY_UNSPEC:
+@@ -583,10 +643,17 @@ pamsshagentauth_key_write(const Key *key, FILE *f)
+
+ if (key->type == KEY_RSA1 && key->rsa != NULL) {
+ /* size of modulus 'n' */
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ bits = BN_num_bits(key->rsa->n);
+ fprintf(f, "%u", bits);
+ if (write_bignum(f, key->rsa->e) &&
+ write_bignum(f, key->rsa->n)) {
++#else
++ bits = BN_num_bits(RSA_get0_n(key->rsa));
++ fprintf(f, "%u", bits);
++ if (write_bignum(f, RSA_get0_e(key->rsa)) &&
++ write_bignum(f, RSA_get0_n(key->rsa))) {
++#endif
+ success = 1;
+ } else {
+ pamsshagentauth_logerror("key_write: failed for RSA key");
+@@ -675,10 +742,17 @@ pamsshagentauth_key_size(const Key *k)
+ {
+ switch (k->type) {
+ case KEY_RSA1:
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ case KEY_RSA:
+ return BN_num_bits(k->rsa->n);
+ case KEY_DSA:
+ return BN_num_bits(k->dsa->p);
++#else
++ case KEY_RSA:
++ return BN_num_bits(RSA_get0_n(k->rsa));
++ case KEY_DSA:
++ return BN_num_bits(DSA_get0_p(k->dsa));
++#endif
+ case KEY_ECDSA:
+ {
+ int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(k->ecdsa));
+@@ -769,17 +843,29 @@ pamsshagentauth_key_from_private(const Key *k)
+ switch (k->type) {
+ case KEY_DSA:
+ n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((BN_copy(n->dsa->p, k->dsa->p) == NULL) ||
+ (BN_copy(n->dsa->q, k->dsa->q) == NULL) ||
+ (BN_copy(n->dsa->g, k->dsa->g) == NULL) ||
+ (BN_copy(n->dsa->pub_key, k->dsa->pub_key) == NULL))
++#else
++ if ((BN_copy(DSA_get0_p(n->dsa), DSA_get0_p(k->dsa)) == NULL) ||
++ (BN_copy(DSA_get0_q(n->dsa), DSA_get0_q(k->dsa)) == NULL) ||
++ (BN_copy(DSA_get0_g(n->dsa), DSA_get0_g(k->dsa)) == NULL) ||
++ (BN_copy(DSA_get0_pub_key(n->dsa), DSA_get0_pub_key(k->dsa)) == NULL))
++#endif
+ pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ break;
+ case KEY_RSA:
+ case KEY_RSA1:
+ n = pamsshagentauth_key_new(k->type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((BN_copy(n->rsa->n, k->rsa->n) == NULL) ||
+ (BN_copy(n->rsa->e, k->rsa->e) == NULL))
++#else
++ if ((BN_copy(RSA_get0_n(n->rsa), RSA_get0_n(k->rsa)) == NULL) ||
++ (BN_copy(RSA_get0_e(n->rsa), RSA_get0_e(k->rsa)) == NULL))
++#endif
+ pamsshagentauth_fatal("key_from_private: BN_copy failed");
+ break;
+ case KEY_ECDSA:
+@@ -881,8 +967,13 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ switch (type) {
+ case KEY_RSA:
+ key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->e) == -1 ||
+ pamsshagentauth_buffer_get_bignum2_ret(&b, key->rsa->n) == -1) {
++#else
++ if (pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_e(key->rsa)) == -1 ||
++ pamsshagentauth_buffer_get_bignum2_ret(&b, RSA_get0_n(key->rsa)) == -1) {
++#endif
+ pamsshagentauth_logerror("key_from_blob: can't read rsa key");
+ pamsshagentauth_key_free(key);
+ key = NULL;
+@@ -894,10 +985,17 @@ pamsshagentauth_key_from_blob(const u_char *blob, u_int blen)
+ break;
+ case KEY_DSA:
+ key = pamsshagentauth_key_new(type);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->p) == -1 ||
+ pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->q) == -1 ||
+ pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->g) == -1 ||
+ pamsshagentauth_buffer_get_bignum2_ret(&b, key->dsa->pub_key) == -1) {
++#else
++ if (pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_p(key->dsa)) == -1 ||
++ pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_q(key->dsa)) == -1 ||
++ pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_g(key->dsa)) == -1 ||
++ pamsshagentauth_buffer_get_bignum2_ret(&b, DSA_get0_pub_key(key->dsa)) == -1) {
++#endif
+ pamsshagentauth_logerror("key_from_blob: can't read dsa key");
+ pamsshagentauth_key_free(key);
+ key = NULL;
+@@ -1015,6 +1113,7 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ }
+ pamsshagentauth_buffer_init(&b);
+ switch (key->type) {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ case KEY_DSA:
+ pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
+ pamsshagentauth_buffer_put_bignum2(&b, key->dsa->p);
+@@ -1027,6 +1126,20 @@ pamsshagentauth_key_to_blob(const Key *key, u_char **blobp, u_int *lenp)
+ pamsshagentauth_buffer_put_bignum2(&b, key->rsa->e);
+ pamsshagentauth_buffer_put_bignum2(&b, key->rsa->n);
+ break;
++#else
++ case KEY_DSA:
++ pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++ pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_p(key->dsa));
++ pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_q(key->dsa));
++ pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_g(key->dsa));
++ pamsshagentauth_buffer_put_bignum2(&b, DSA_get0_pub_key(key->dsa));
++ break;
++ case KEY_RSA:
++ pamsshagentauth_buffer_put_cstring(&b, key_ssh_name(key));
++ pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_e(key->rsa));
++ pamsshagentauth_buffer_put_bignum2(&b, RSA_get0_n(key->rsa));
++ break;
++#endif
+ case KEY_ECDSA:
+ {
+ size_t l = 0;
+@@ -1138,14 +1251,20 @@ pamsshagentauth_key_demote(const Key *k)
+ case KEY_RSA:
+ if ((pk->rsa = RSA_new()) == NULL)
+ pamsshagentauth_fatal("key_demote: RSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((pk->rsa->e = BN_dup(k->rsa->e)) == NULL)
+ pamsshagentauth_fatal("key_demote: BN_dup failed");
+ if ((pk->rsa->n = BN_dup(k->rsa->n)) == NULL)
+ pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++ if (RSA_set0_key(pk->rsa, BN_dup(RSA_get0_n(k->rsa)), BN_dup(RSA_get0_e(k->rsa)), NULL) != 1)
++ pamsshagentauth_fatal("key_demote: RSA_set0_key failed");
++#endif
+ break;
+ case KEY_DSA:
+ if ((pk->dsa = DSA_new()) == NULL)
+ pamsshagentauth_fatal("key_demote: DSA_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((pk->dsa->p = BN_dup(k->dsa->p)) == NULL)
+ pamsshagentauth_fatal("key_demote: BN_dup failed");
+ if ((pk->dsa->q = BN_dup(k->dsa->q)) == NULL)
+@@ -1154,6 +1273,12 @@ pamsshagentauth_key_demote(const Key *k)
+ pamsshagentauth_fatal("key_demote: BN_dup failed");
+ if ((pk->dsa->pub_key = BN_dup(k->dsa->pub_key)) == NULL)
+ pamsshagentauth_fatal("key_demote: BN_dup failed");
++#else
++ if (DSA_set0_pqg(pk->dsa, BN_dup(DSA_get0_p(k->dsa)), BN_dup(DSA_get0_q(k->dsa)), BN_dup(DSA_get0_g(k->dsa))) != 1)
++ pamsshagentauth_fatal("key_demote: DSA_set0_pqg failed");
++ if (DSA_set0_key(pk->dsa, BN_dup(DSA_get0_pub_key(k->dsa)), NULL) != 1)
++ pamsshagentauth_fatal("key_demote: DSA_set0_key failed");
++#endif
+ break;
+ case KEY_ECDSA:
+ pamsshagentauth_fatal("key_demote: implement me");
+diff --git a/ssh-dss.c b/ssh-dss.c
+index 9fdaa5d..1051ae2 100644
+--- ssh-dss.c
++++ ssh-dss.c
+@@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ DSA_SIG *sig;
+ const EVP_MD *evp_md = EVP_sha1();
+- EVP_MD_CTX md;
++ EVP_MD_CTX *md;
+ u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+ u_int rlen, slen, len, dlen;
+ Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ const BIGNUM *r, *s;
++#endif
+
+ if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ pamsshagentauth_logerror("ssh_dss_sign: no DSA key");
+ return -1;
+ }
+- EVP_DigestInit(&md, evp_md);
+- EVP_DigestUpdate(&md, data, datalen);
+- EVP_DigestFinal(&md, digest, &dlen);
++ md = EVP_MD_CTX_create();
++ EVP_DigestInit(md, evp_md);
++ EVP_DigestUpdate(md, data, datalen);
++ EVP_DigestFinal(md, digest, &dlen);
+
+ sig = DSA_do_sign(digest, dlen, key->dsa);
+ memset(digest, 'd', sizeof(digest));
++ EVP_MD_CTX_destroy(md);
+
+ if (sig == NULL) {
+ pamsshagentauth_logerror("ssh_dss_sign: sign failed");
+ return -1;
+ }
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ rlen = BN_num_bytes(sig->r);
+ slen = BN_num_bytes(sig->s);
++#else
++ DSA_SIG_get0((const DSA_SIG *)sig, (const BIGNUM **)r, (const BIGNUM **)s);
++ rlen = BN_num_bytes(r);
++ slen = BN_num_bytes(s);
++#endif
+ if (rlen > INTBLOB_LEN || slen > INTBLOB_LEN) {
+ pamsshagentauth_logerror("bad sig size %u %u", rlen, slen);
+ DSA_SIG_free(sig);
+ return -1;
+ }
+ memset(sigblob, 0, SIGBLOB_LEN);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BN_bn2bin(sig->r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
+ BN_bn2bin(sig->s, sigblob+ SIGBLOB_LEN - slen);
++#else
++ BN_bn2bin(r, sigblob+ SIGBLOB_LEN - INTBLOB_LEN - rlen);
++ BN_bn2bin(s, sigblob+ SIGBLOB_LEN - slen);
++#endif
+ DSA_SIG_free(sig);
+
+ if (datafellows & SSH_BUG_SIGBLOB) {
+@@ -110,11 +126,14 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ DSA_SIG *sig;
+ const EVP_MD *evp_md = EVP_sha1();
+- EVP_MD_CTX md;
++ EVP_MD_CTX *md;
+ u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ u_int len, dlen;
+ int rlen, ret;
+ Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ BIGNUM *r, *s;
++#endif
+
+ if (key == NULL || key->type != KEY_DSA || key->dsa == NULL) {
+ pamsshagentauth_logerror("ssh_dss_verify: no DSA key");
+@@ -157,6 +176,7 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ /* parse signature */
+ if ((sig = DSA_SIG_new()) == NULL)
+ pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_new failed");
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((sig->r = BN_new()) == NULL)
+ pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
+ if ((sig->s = BN_new()) == NULL)
+@@ -164,18 +184,33 @@ ssh_dss_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ if ((BN_bin2bn(sigblob, INTBLOB_LEN, sig->r) == NULL) ||
+ (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, sig->s) == NULL))
+ pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++#else
++ if ((r = BN_new()) == NULL)
++ pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++ if ((s = BN_new()) == NULL)
++ pamsshagentauth_fatal("ssh_dss_verify: BN_new failed");
++ if (DSA_SIG_set0(sig, r, s) != 1)
++ pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++ if ((BN_bin2bn(sigblob, INTBLOB_LEN, r) == NULL) ||
++ (BN_bin2bn(sigblob+ INTBLOB_LEN, INTBLOB_LEN, s) == NULL))
++ pamsshagentauth_fatal("ssh_dss_verify: BN_bin2bn failed");
++ if (DSA_SIG_set0(sig, r, s) != 1)
++ pamsshagentauth_fatal("ssh_dss_verify: DSA_SIG_set0 failed");
++#endif
+
+ /* clean up */
+ memset(sigblob, 0, len);
+ pamsshagentauth_xfree(sigblob);
+
+ /* sha1 the data */
+- EVP_DigestInit(&md, evp_md);
+- EVP_DigestUpdate(&md, data, datalen);
+- EVP_DigestFinal(&md, digest, &dlen);
++ md = EVP_MD_CTX_create();
++ EVP_DigestInit(md, evp_md);
++ EVP_DigestUpdate(md, data, datalen);
++ EVP_DigestFinal(md, digest, &dlen);
+
+ ret = DSA_do_verify(digest, dlen, sig, key->dsa);
+ memset(digest, 'd', sizeof(digest));
++ EVP_MD_CTX_destroy(md);
+
+ DSA_SIG_free(sig);
+
+diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c
+index efa0f3d..c213959 100644
+--- ssh-ecdsa.c
++++ ssh-ecdsa.c
+@@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ {
+ ECDSA_SIG *sig;
+ const EVP_MD *evp_md = evp_from_key(key);
+- EVP_MD_CTX md;
++ EVP_MD_CTX *md;
+ u_char digest[EVP_MAX_MD_SIZE];
+ u_int len, dlen;
+ Buffer b, bb;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ BIGNUM *r, *s;
++#endif
+
+ if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+ pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+ return -1;
+ }
+
+- EVP_DigestInit(&md, evp_md);
+- EVP_DigestUpdate(&md, data, datalen);
+- EVP_DigestFinal(&md, digest, &dlen);
++ md = EVP_MD_CTX_create();
++ EVP_DigestInit(md, evp_md);
++ EVP_DigestUpdate(md, data, datalen);
++ EVP_DigestFinal(md, digest, &dlen);
+
+ sig = ECDSA_do_sign(digest, dlen, key->ecdsa);
+ memset(digest, 'd', sizeof(digest));
++ EVP_MD_CTX_destroy(md);
+
+ if (sig == NULL) {
+ pamsshagentauth_logerror("ssh_ecdsa_sign: sign failed");
+@@ -64,8 +69,14 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ }
+
+ pamsshagentauth_buffer_init(&bb);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->r) == -1 ||
+ pamsshagentauth_buffer_get_bignum2_ret(&bb, sig->s) == -1) {
++#else
++ DSA_SIG_get0(sig, &r, &s);
++ if (pamsshagentauth_buffer_get_bignum2_ret(&bb, r) == -1 ||
++ pamsshagentauth_buffer_get_bignum2_ret(&bb, s) == -1) {
++#endif
+ pamsshagentauth_logerror("couldn't serialize signature");
+ ECDSA_SIG_free(sig);
+ return -1;
+@@ -94,11 +105,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ ECDSA_SIG *sig;
+ const EVP_MD *evp_md = evp_from_key(key);
+- EVP_MD_CTX md;
++ EVP_MD_CTX *md;
+ u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ u_int len, dlen;
+ int rlen, ret;
+ Buffer b;
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++ BIGNUM *r, *s;
++#endif
+
+ if (key == NULL || key->type != KEY_ECDSA || key->ecdsa == NULL) {
+ pamsshagentauth_logerror("ssh_ecdsa_sign: no ECDSA key");
+@@ -127,8 +141,14 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+
+ pamsshagentauth_buffer_init(&b);
+ pamsshagentauth_buffer_append(&b, sigblob, len);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if ((pamsshagentauth_buffer_get_bignum2_ret(&b, sig->r) == -1) ||
+ (pamsshagentauth_buffer_get_bignum2_ret(&b, sig->s) == -1))
++#else
++ DSA_SIG_get0(sig, &r, &s);
++ if ((pamsshagentauth_buffer_get_bignum2_ret(&b, r) == -1) ||
++ (pamsshagentauth_buffer_get_bignum2_ret(&b, s) == -1))
++#endif
+ pamsshagentauth_fatal("ssh_ecdsa_verify:"
+ "pamsshagentauth_buffer_get_bignum2_ret failed");
+
+@@ -137,16 +157,18 @@ ssh_ecdsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ pamsshagentauth_xfree(sigblob);
+
+ /* sha256 the data */
+- EVP_DigestInit(&md, evp_md);
+- EVP_DigestUpdate(&md, data, datalen);
+- EVP_DigestFinal(&md, digest, &dlen);
++ md = EVP_MD_CTX_create();
++ EVP_DigestInit(md, evp_md);
++ EVP_DigestUpdate(md, data, datalen);
++ EVP_DigestFinal(md, digest, &dlen);
+
+ ret = ECDSA_do_verify(digest, dlen, sig, key->ecdsa);
+ memset(digest, 'd', sizeof(digest));
++ EVP_MD_CTX_destroy(md);
+
+ ECDSA_SIG_free(sig);
+
+ pamsshagentauth_verbose("ssh_ecdsa_verify: signature %s",
+ ret == 1 ? "correct" : ret == 0 ? "incorrect" : "error");
+ return ret;
+-}
+\ No newline at end of file
++}
+diff --git a/ssh-rsa.c b/ssh-rsa.c
+index d05844b..9d74eb6 100644
+--- ssh-rsa.c
++++ ssh-rsa.c
+@@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ const u_char *data, u_int datalen)
+ {
+ const EVP_MD *evp_md;
+- EVP_MD_CTX md;
++ EVP_MD_CTX *md;
+ u_char digest[EVP_MAX_MD_SIZE], *sig;
+ u_int slen, dlen, len;
+ int ok, nid;
+@@ -55,6 +55,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+ pamsshagentauth_logerror("ssh_rsa_sign: EVP_get_digestbynid %d failed", nid);
+ return -1;
+ }
++ md = EVP_MD_CTX_create();
+ EVP_DigestInit(&md, evp_md);
+ EVP_DigestUpdate(&md, data, datalen);
+ EVP_DigestFinal(&md, digest, &dlen);
+@@ -64,6 +65,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp,
+
+ ok = RSA_sign(nid, digest, dlen, sig, &len, key->rsa);
+ memset(digest, 'd', sizeof(digest));
++ EVP_MD_CTX_destroy(md);
+
+ if (ok != 1) {
+ int ecode = ERR_get_error();
+@@ -107,7 +109,7 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ {
+ Buffer b;
+ const EVP_MD *evp_md;
+- EVP_MD_CTX md;
++ EVP_MD_CTX *md;
+ char *ktype;
+ u_char digest[EVP_MAX_MD_SIZE], *sigblob;
+ u_int len, dlen, modlen;
+@@ -117,9 +119,17 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ pamsshagentauth_logerror("ssh_rsa_verify: no RSA key");
+ return -1;
+ }
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (BN_num_bits(key->rsa->n) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#else
++ if (BN_num_bits(RSA_get0_n(key->rsa)) < SSH_RSA_MINIMUM_MODULUS_SIZE) {
++#endif
+ pamsshagentauth_logerror("ssh_rsa_verify: RSA modulus too small: %d < minimum %d bits",
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ BN_num_bits(key->rsa->n), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#else
++ BN_num_bits(RSA_get0_n(key->rsa)), SSH_RSA_MINIMUM_MODULUS_SIZE);
++#endif
+ return -1;
+ }
+ pamsshagentauth_buffer_init(&b);
+@@ -161,12 +171,14 @@ ssh_rsa_verify(const Key *key, const u_char *signature, u_int signaturelen,
+ pamsshagentauth_xfree(sigblob);
+ return -1;
+ }
+- EVP_DigestInit(&md, evp_md);
+- EVP_DigestUpdate(&md, data, datalen);
+- EVP_DigestFinal(&md, digest, &dlen);
++ md = EVP_MD_CTX_create();
++ EVP_DigestInit(md, evp_md);
++ EVP_DigestUpdate(md, data, datalen);
++ EVP_DigestFinal(md, digest, &dlen);
+
+ ret = openssh_RSA_verify(nid, digest, dlen, sigblob, len, key->rsa);
+ memset(digest, 'd', sizeof(digest));
++ EVP_MD_CTX_destroy(md);
+ memset(sigblob, 's', len);
+ pamsshagentauth_xfree(sigblob);
+ pamsshagentauth_verbose("ssh_rsa_verify: signature %scorrect", (ret==0) ? "in" : "");
diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template
index 1400f104532..50744824510 100644
--- a/srcpkgs/pam_ssh_agent_auth/template
+++ b/srcpkgs/pam_ssh_agent_auth/template
@@ -1,10 +1,11 @@
# Template file for 'pam_ssh_agent_auth'
pkgname=pam_ssh_agent_auth
version=0.10.3
-revision=2
+revision=3
build_style=gnu-configure
+configure_args="--without-openssl-header-check"
hostmakedepends="perl"
-makedepends="libressl-devel pam-devel"
+makedepends="openssl-devel pam-devel"
short_desc="PAM module providing authentication through a ssh agent"
maintainer="Iskander Zemmouri <iskander.zemmouri@mailbox.org>"
license="MIT"
From 4ffeed94a8a5ec871671423a8a40210587a4d1ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 156/358] partclone: rebuild against OpenSSL
---
srcpkgs/partclone/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template
index 59c975d9354..4813a8a250d 100644
--- a/srcpkgs/partclone/template
+++ b/srcpkgs/partclone/template
@@ -1,14 +1,14 @@
# Template file for 'partclone'
pkgname=partclone
version=0.3.17
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-rpath --enable-ncursesw --enable-f2fs
--enable-extfs --enable-hfsp --enable-fat --enable-exfat
--enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2"
hostmakedepends="pkg-config automake autoconf libtool"
makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel
- nilfs-utils-devel libressl-devel"
+ nilfs-utils-devel openssl-devel"
short_desc="File system clone and restore utilities"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 32f36989b267f49870869301f948bf63fdcb7db9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 157/358] pen: rebuild against OpenSSL
---
srcpkgs/pen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template
index 574ae3c928a..d55a7f21272 100644
--- a/srcpkgs/pen/template
+++ b/srcpkgs/pen/template
@@ -1,9 +1,9 @@
# Template file for 'pen'
pkgname=pen
version=0.34.1
-revision=5
+revision=6
build_style=gnu-configure
-makedepends="geoip-devel libressl-devel"
+makedepends="geoip-devel openssl-devel"
configure_args="--with-docdir=/usr/share/doc/pen"
short_desc="Load balancer for simple TCP/UDP based protocols"
maintainer="Orphaned <orphan@voidlinux.org>"
From 5c6044124474207bc2262d16b3ffc5a00d67be44 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 158/358] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL
---
srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
index 5be6d0e1cea..0d6407501fb 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Crypt-OpenSSL-Bignum'
pkgname=perl-Crypt-OpenSSL-Bignum
version=0.09
-revision=11
+revision=12
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
depends="${hostmakedepends}"
short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2ce2fad2927a7334e277f8c9080e83971bbe2b8b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:32 +0100
Subject: [PATCH 159/358] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL
---
srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
index 2c004efbe61..ad093d06840 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Crypt-OpenSSL-RSA'
pkgname=perl-Crypt-OpenSSL-RSA
version=0.31
-revision=6
+revision=7
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
depends="perl"
checkdepends="perl-Crypt-OpenSSL-Random"
short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding"
From 8bb5269852363b5fc28375b6d50e74ae022e4734 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 160/358] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL
---
srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template
index fa24a5ff2e0..d81f4b99f7a 100644
--- a/srcpkgs/perl-Crypt-OpenSSL-Random/template
+++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Crypt-OpenSSL-Random'
pkgname=perl-Crypt-OpenSSL-Random
version=0.15
-revision=9
+revision=10
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl perl-Crypt-OpenSSL-Guess"
-makedepends="perl libressl-devel"
+makedepends="perl openssl-devel"
depends="perl"
short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG"
maintainer="Kevin Berry <kevin@opensourcealchemist.com>"
From 6e3ac395b89f5d541b1537236fba5ccdfcaed3e5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 161/358] perl-DBD-mysql: rebuild against OpenSSL
---
srcpkgs/perl-DBD-mysql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template
index a647f5bd13c..dab8099adcd 100644
--- a/srcpkgs/perl-DBD-mysql/template
+++ b/srcpkgs/perl-DBD-mysql/template
@@ -1,11 +1,11 @@
# Template file for 'perl-DBD-mysql'
pkgname=perl-DBD-mysql
version=4.050
-revision=6
+revision=7
wrksrc="DBD-mysql-${version}"
build_style=perl-module
hostmakedepends="perl perl-DBI perl-Devel-CheckLib"
-makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel"
+makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel"
depends="perl-DBI"
checkdepends="perl-Test-Deep"
short_desc="DBD::mysql - MySQL DBI driver"
From 6615a5108b80feef56989ce4026c393a1c51da35 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 162/358] perl-Net-SSH2: rebuild against OpenSSL
---
srcpkgs/perl-Net-SSH2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template
index a8bab131d2c..541ad9a6e03 100644
--- a/srcpkgs/perl-Net-SSH2/template
+++ b/srcpkgs/perl-Net-SSH2/template
@@ -1,7 +1,7 @@
# Template file for 'perl-Net-SSH2'
pkgname=perl-Net-SSH2
version=0.72
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib"
From 9dbf8ed9ab2cdf66ddb4fdd8d425d796c68cd957 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 163/358] perl-Net-SSLeay: rebuild against OpenSSL
---
srcpkgs/perl-Net-SSLeay/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template
index 1033a5ac930..e1d6500e207 100644
--- a/srcpkgs/perl-Net-SSLeay/template
+++ b/srcpkgs/perl-Net-SSLeay/template
@@ -1,11 +1,11 @@
# Template file for 'perl-Net-SSLeay'
pkgname=perl-Net-SSLeay
version=1.90
-revision=1
+revision=2
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
-hostmakedepends="perl libressl"
-makedepends="perl zlib-devel libressl-devel"
+hostmakedepends="perl openssl"
+makedepends="perl zlib-devel openssl-devel"
depends="perl"
checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod"
short_desc="Net::SSLeay - Perl extension for using OpenSSL"
From a0cc2d71ef28a9dd96009bcc326134932d3da5de Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:33 +0100
Subject: [PATCH 164/358] pev: rebuild against OpenSSL
---
srcpkgs/pev/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template
index 14c40aa13ed..4a55528f83b 100644
--- a/srcpkgs/pev/template
+++ b/srcpkgs/pev/template
@@ -1,11 +1,11 @@
# Template file for 'pev'
pkgname=pev
version=0.81
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="prefix=/usr sysconfdir=/etc"
make_install_args="prefix=/usr sysconfdir=/etc"
-makedepends="libressl-devel pcre-devel"
+makedepends="openssl-devel pcre-devel"
# We don't need python for check, only their PE binary is needed
checkdepends="which python3"
short_desc="PE file analysis toolkit"
From 8a8684dc0b20f443d159785d9ee9bf53d8e66242 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 165/358] pgadmin3: unbundle libssh2
---
.../patches/pgadmin3_unbundle-libssh.patch | 68 +++++++++++++++++++
srcpkgs/pgadmin3/template | 8 ++-
2 files changed, 73 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
new file mode 100644
index 00000000000..f3bcf852150
--- /dev/null
+++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch
@@ -0,0 +1,68 @@
+diff -rupN configure.ac.in configure.ac.in
+--- configure.ac.in 2020-03-24 05:15:11.000000000 +0100
++++ configure.ac.in 2020-04-09 14:54:07.189090418 +0200
+@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio.
+ AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h])
+ AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no])
+ AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes)
+-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h])
+
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk
+--- pgadmin/include/module.mk 2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/include/module.mk 2020-04-09 14:54:07.190090419 +0200
+@@ -36,5 +36,4 @@ include include/gqb/module.mk
+ include include/hotdraw/module.mk
+ include include/utils/module.mk
+ include include/ogl/module.mk
+-include include/libssh2/module.mk
+
+diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am
+--- pgadmin/Makefile.am 2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/Makefile.am 2020-04-09 14:54:09.880094260 +0200
+@@ -49,7 +49,6 @@ include gqb/module.mk
+ include hotdraw/module.mk
+ include ui/module.mk
+ include utils/module.mk
+-include libssh2/module.mk
+
+ if SUN_CC
+ __CFLAGS=""
+@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \
+ $(TMP_ui)
+ endif
+
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
++if BUILD_SSH_TUNNEL
++AM_LDFLAGS = -lssh2
+ endif
+
+ # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy
+@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \
+ $(TMP_ui)
+ endif
+
+-if BUILD_SSH_TUNNEL
+-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ)
+-else
+ AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ)
+-endif
+
+ install-exec-hook:
+ cd $(bindir) ;\
+diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp
+--- pgadmin/utils/sshTunnel.cpp 2020-03-24 05:15:11.000000000 +0100
++++ pgadmin/utils/sshTunnel.cpp 2020-04-09 14:54:07.191090420 +0200
+@@ -15,7 +15,7 @@
+
+ #undef ssize_t
+ #define ssize_t long
+-#include "libssh2/libssh2.h"
++#include <libssh2.h>
+ #include "utils/sshTunnel.h"
+ #include "frm/frmMain.h"
+
diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template
index 30c047edf7e..ad2465b3413 100644
--- a/srcpkgs/pgadmin3/template
+++ b/srcpkgs/pgadmin3/template
@@ -1,10 +1,11 @@
# Template file for 'pgadmin3'
pkgname=pgadmin3
version=1.22.2
-revision=13
+revision=14
build_style=gnu-configure
configure_args="ac_cv_path_WX_CONFIG=wx-config-gtk3 --with-wx-version=3.0"
-makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libressl-devel"
+hostmakedepends="automake libtool"
+makedepends="postgresql-libs-devel wxWidgets-gtk3-devel libxslt-devel libssh2-devel"
short_desc="Comprehensive design and management interface for PostgreSQL"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="0BSD"
@@ -15,7 +16,8 @@ nocross=yes
CXXFLAGS="-Wno-narrowing"
-post_extract() {
+pre_configure() {
+ autoreconf -fi
sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc
sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure
}
From d5b0795cc74448e2a785efeeabfdc2fd231185f3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:34 +0100
Subject: [PATCH 166/358] pgbackrest: rebuild against OpenSSL
---
srcpkgs/pgbackrest/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template
index 92d52abe21a..b501ed9385e 100644
--- a/srcpkgs/pgbackrest/template
+++ b/srcpkgs/pgbackrest/template
@@ -1,12 +1,12 @@
# Template file for 'pgbackrest'
pkgname=pgbackrest
version=2.26
-revision=2
+revision=3
wrksrc="${pkgname}-release-${version}"
build_wrksrc="src"
build_style=gnu-configure
hostmakedepends="perl pkg-config"
-makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
+makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel"
short_desc="Reliable PostgreSQL Backup & Restore"
maintainer="Anachron <gith@cron.world>"
license="MIT"
From 4a05ed6f653888c5baec3d49cb3788c8f6beaa6d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 167/358] pidgin-sipe: rebuild against OpenSSL
---
srcpkgs/pidgin-sipe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template
index a51d5b1035a..9ea248618f4 100644
--- a/srcpkgs/pidgin-sipe/template
+++ b/srcpkgs/pidgin-sipe/template
@@ -1,10 +1,10 @@
# Template file for 'pidgin-sipe'
pkgname=pidgin-sipe
version=1.25.0
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
-makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel
+makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel
libnice-devel gst-plugins-base1-devel farstream-devel"
depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1"
short_desc="SIP/SIMPLE plugin for Pidgin IM"
From 098f71d3bf358b1029ad2a86ca2775897d5b810c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 168/358] pijul: rebuild against OpenSSL
---
srcpkgs/pijul/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 2a750381983..40df186b938 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -1,11 +1,11 @@
# Template file for 'pijul'
pkgname=pijul
version=0.12.2
-revision=3
+revision=4
build_style=cargo
_sequoia_ver=0.9.0
hostmakedepends="pkg-config clang"
-makedepends="libsodium-devel libressl-devel nettle-devel"
+makedepends="libsodium-devel openssl-devel nettle-devel"
short_desc="Distributed version control system based on patches"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="GPL-2.0-only"
From 5aea2be11af00452adeb0876970e8564aa07ed0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 169/358] pjproject: rebuild against OpenSSL
---
common/shlibs | 28 ++++++++++++++--------------
srcpkgs/pjproject/template | 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5aba12346e4..fc5cf2ade7c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2494,20 +2494,20 @@ libKF5UnitConversion.so.5 kunitconversion-5.26.0_1
libfdk-aac.so.2 fdk-aac-2.0.0_1
libyubikey.so.0 libyubikey-1.13_1
libykpers-1.so.1 libykpers-1.17.2_1
-libg7221codec.so.2 pjproject-2.4.5_1
-libilbccodec.so.2 pjproject-2.4.5_1
-libpj.so.2 pjproject-2.4.5_1
-libpjlib-util.so.2 pjproject-2.4.5_1
-libpjmedia-audiodev.so.2 pjproject-2.4.5_1
-libpjmedia-codec.so.2 pjproject-2.4.5_1
-libpjmedia-videodev.so.2 pjproject-2.4.5_1
-libpjmedia.so.2 pjproject-2.4.5_1
-libpjnath.so.2 pjproject-2.4.5_1
-libpjsip-simple.so.2 pjproject-2.4.5_1
-libpjsip-ua.so.2 pjproject-2.4.5_1
-libpjsip.so.2 pjproject-2.4.5_1
-libpjsua.so.2 pjproject-2.4.5_1
-libpjsua2.so.2 pjproject-2.4.5_1
+libg7221codec.so.2 pjproject-2.8_5
+libilbccodec.so.2 pjproject-2.8_5
+libpj.so.2 pjproject-2.8_5
+libpjlib-util.so.2 pjproject-2.8_5
+libpjmedia-audiodev.so.2 pjproject-2.8_5
+libpjmedia-codec.so.2 pjproject-2.8_5
+libpjmedia-videodev.so.2 pjproject-2.8_5
+libpjmedia.so.2 pjproject-2.8_5
+libpjnath.so.2 pjproject-2.8_5
+libpjsip-simple.so.2 pjproject-2.8_5
+libpjsip-ua.so.2 pjproject-2.8_5
+libpjsip.so.2 pjproject-2.8_5
+libpjsua.so.2 pjproject-2.8_5
+libpjsua2.so.2 pjproject-2.8_5
libhdf5_hl.so.100 hdf5-1.10.1_2
libhdf5.so.103 hdf5-1.10.4_1
libhdf5_hl_cpp.so.100 hdf5-1.10.1_2
diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template
index 9915f8a0da6..c94ead90e9d 100644
--- a/srcpkgs/pjproject/template
+++ b/srcpkgs/pjproject/template
@@ -3,7 +3,7 @@
# and this template is heavily based on Alpine's APKBUILD.
pkgname=pjproject
version=2.8
-revision=4
+revision=5
disable_parallel_build=yes
build_style=gnu-configure
configure_args="--enable-shared \
@@ -16,7 +16,7 @@ configure_args="--enable-shared \
# libyuv packaged for Void. Thought I could be smart and use
# webrtc-audio-processing, but it doesn't have what I need. Using the
# bundled versions would also pollute build with libyuv and libwebrtc (yuck).
-makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
+makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel
libsrtp-devel libsamplerate-devel"
short_desc="Open source SIP and media stack"
maintainer="Christopher Brannon <chris@the-brannons.com>"
From 7e467925d3df3834429a6f29abdc1743d3f55ca8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 170/358] pkcs11-helper: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/pkcs11-helper/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fc5cf2ade7c..7e215d8141d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3116,7 +3116,7 @@ libkdeconnectpluginkcm.so.2 kdeconnect-20.12.2_1
libkdeconnectinterfaces.so.20 kdeconnect-20.12.2_1
libkdeconnectcore.so.20 kdeconnect-20.12.2_1
libkpmcore.so.10 kpmcore-4.2.0_1
-libpkcs11-helper.so.1 pkcs11-helper-1.22_1
+libpkcs11-helper.so.1 pkcs11-helper-1.25.1_6
libr_core.so.5.0.0 radare2-5.0.0_1
libr_config.so.5.0.0 radare2-5.0.0_1
libr_cons.so.5.0.0 radare2-5.0.0_1
diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template
index f7f2bf3730b..1be136f157a 100644
--- a/srcpkgs/pkcs11-helper/template
+++ b/srcpkgs/pkcs11-helper/template
@@ -1,12 +1,12 @@
# Template file for 'pkcs11-helper'
pkgname=pkcs11-helper
version=1.25.1
-revision=5
+revision=6
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)"
hostmakedepends="automake libtool pkg-config doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Library to help simplify interacting with PKCS#11 providers"
maintainer="Aloz1 <kno0001@gmail.com>"
license="GPL-2.0-only, BSD-3-Clause"
From 9411e70fdb2cad12e13dbe9425fd864472c96116 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:35 +0100
Subject: [PATCH 171/358] poco: rebuild against OpenSSL
---
common/shlibs | 26 +++++++++++++-------------
srcpkgs/poco/template | 6 +++---
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7e215d8141d..610a1f621ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2957,19 +2957,19 @@ libsigrok.so.4 libsigrok-0.5.0_1
libsigrokcxx.so.4 libsigrok-0.5.0_1
libsigrokdecode.so.4 libsigrokdecode-0.5.0_2
libglyr.so.1 glyr-1.0.8_1
-libPocoJSON.so.64 poco-1.9.4_1
-libPocoMongoDB.so.64 poco-1.9.4_1
-libPocoZip.so.64 poco-1.9.4_1
-libPocoData.so.64 poco-1.9.4_1
-libPocoNet.so.64 poco-1.9.4_1
-libPocoDataSQLite.so.64 poco-1.9.4_1
-libPocoFoundation.so.64 poco-1.9.4_1
-libPocoXML.so.64 poco-1.9.4_1
-libPocoUtil.so.64 poco-1.9.4_1
-libPocoRedis.so.64 poco-1.9.4_1
-libPocoEncodings.so.64 poco-1.9.4_1
-libPocoNetSSL.so.64 poco-1.9.4_1
-libPocoCrypto.so.64 poco-1.9.4_1
+libPocoJSON.so.64 poco-1.9.4_3
+libPocoMongoDB.so.64 poco-1.9.4_3
+libPocoZip.so.64 poco-1.9.4_3
+libPocoData.so.64 poco-1.9.4_3
+libPocoNet.so.64 poco-1.9.4_3
+libPocoDataSQLite.so.64 poco-1.9.4_3
+libPocoFoundation.so.64 poco-1.9.4_3
+libPocoXML.so.64 poco-1.9.4_3
+libPocoUtil.so.64 poco-1.9.4_3
+libPocoRedis.so.64 poco-1.9.4_3
+libPocoEncodings.so.64 poco-1.9.4_3
+libPocoNetSSL.so.64 poco-1.9.4_3
+libPocoCrypto.so.64 poco-1.9.4_3
libopenblas.so.0 openblas-0.2.19_1
librtaudio.so.6 rtaudio-5.1.0_1
librtmidi.so.5 rtmidi-4.0.0_1
diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template
index 99f8fe17780..9c157ba6d61 100644
--- a/srcpkgs/poco/template
+++ b/srcpkgs/poco/template
@@ -1,11 +1,11 @@
# Template file for 'poco'
pkgname=poco
version=1.9.4
-revision=2
+revision=3
wrksrc="${pkgname}-${version}-all"
build_style=cmake
configure_args="-DPOCO_UNBUNDLED=ON"
-makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
+makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel"
short_desc="C++ class libraries for building network-based applications"
maintainer="Julien Dehos <dehos@univ-littoral.fr>"
license="BSL-1.0"
@@ -18,7 +18,7 @@ post_install() {
}
poco-devel_package() {
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From b7416fafe720506ab07ec00e07626d082208e6c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 172/358] postgresql: rebuild against OpenSSL
---
srcpkgs/postgresql/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index e055ff9767c..e5eda8fb05c 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql'
pkgname=postgresql
version=9.6.20
-revision=1
+revision=2
build_style=gnu-configure
make_build_target=world
configure_args="--with-openssl --with-python
@@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python
--without-bonjour --with-libxml --with-libxslt --disable-rpath
--with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
hostmakedepends="docbook2x flex gettext openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
python-devel readline-devel tcl-devel"
checkdepends="tzdata"
short_desc="Sophisticated open-source Object-Relational DBMS"
From c670fd5aa280500fcba32d7d58fc907288d469e1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:36 +0100
Subject: [PATCH 173/358] postgresql12: rebuild against OpenSSL
---
srcpkgs/postgresql12/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template
index 0fe9056dc2a..4714ae62ed3 100644
--- a/srcpkgs/postgresql12/template
+++ b/srcpkgs/postgresql12/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql12'
pkgname=postgresql12
version=12.6
-revision=1
+revision=2
wrksrc="postgresql-${version}"
build_style=gnu-configure
make_build_target=world
@@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python
--without-bonjour --with-libxml --with-libxslt
--with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs"
hostmakedepends="docbook2x gettext flex openjade"
-makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl
+makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
python3-devel readline-devel tcl-devel"
checkdepends="tzdata"
short_desc="Sophisticated open-source Object-Relational DBMS"
From 8eda04462995bf076bba08374cc100785fda5d2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:37 +0100
Subject: [PATCH 174/358] prosody: rebuild against OpenSSL
---
srcpkgs/prosody/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template
index 22e88889d34..ce76d7c0c2e 100644
--- a/srcpkgs/prosody/template
+++ b/srcpkgs/prosody/template
@@ -1,7 +1,7 @@
# Template file for 'prosody'
pkgname=prosody
version=0.11.8
-revision=1
+revision=2
build_style=configure
configure_args="
--ostype=linux
@@ -19,7 +19,7 @@ conf_files="
/etc/prosody/certs/makefile
/etc/prosody/certs/GNUmakefile"
make_dirs="/var/lib/prosody 0755 prosody prosody"
-makedepends="lua51-devel libressl-devel libidn-devel"
+makedepends="lua51-devel openssl-devel libidn-devel"
depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec
lua51-BitOp"
short_desc="Lightweight and extensible Jabber/XMPP server written in Lua"
From e6cbdc6ba69e7d666d264110d36d0550d2e5950f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 175/358] python-cryptography: rebuild against OpenSSL
---
srcpkgs/python-cryptography/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template
index 2363ec3042d..0a0ccbefd5f 100644
--- a/srcpkgs/python-cryptography/template
+++ b/srcpkgs/python-cryptography/template
@@ -1,12 +1,12 @@
# Template file for 'python-cryptography'
pkgname=python-cryptography
version=3.3.2
-revision=1
+revision=2
wrksrc="cryptography-${version}"
build_style=python2-module
-hostmakedepends="python-setuptools libressl-devel python-enum34
+hostmakedepends="python-setuptools openssl-devel python-enum34
python-ipaddress python-six python-cffi python-idna"
-makedepends="libressl-devel python-devel"
+makedepends="openssl-devel python-devel"
depends="python-cffi python-six python-enum34 python-idna python-ipaddress"
checkdepends="python-cryptography_vectors python-hypothesis python-pretend
python-pytest python-pytz python-iso8601 ${depends}"
From 6b4ccc1f07cfa19440d6c3ae1192002c557a2ebb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:38 +0100
Subject: [PATCH 176/358] python3-curl: rebuild against OpenSSL
---
srcpkgs/python3-curl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template
index 8405b412383..e985ecf8534 100644
--- a/srcpkgs/python3-curl/template
+++ b/srcpkgs/python3-curl/template
@@ -1,11 +1,11 @@
# Template file for 'python3-curl'
pkgname=python3-curl
version=7.43.0.3
-revision=9
+revision=10
wrksrc="pycurl-${version}"
build_style=python3-module
hostmakedepends="python3-devel"
-makedepends="libressl-devel libcurl-devel ${hostmakedepends}"
+makedepends="openssl-devel libcurl-devel ${hostmakedepends}"
short_desc="Python3 interface to cURL library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later, MIT"
From c8e7a6d2f3d7f9dfc42e3e9edec244a1f91154fa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 177/358] python3-scrypt: rebuild against OpenSSL
---
srcpkgs/python3-scrypt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template
index 5008c8dfbb8..f73f4c55576 100644
--- a/srcpkgs/python3-scrypt/template
+++ b/srcpkgs/python3-scrypt/template
@@ -1,11 +1,11 @@
# Template file for 'python3-scrypt'
pkgname=python3-scrypt
version=0.8.17
-revision=2
+revision=3
wrksrc="scrypt-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
short_desc="Python 3 bindings for the scrypt key derivation function"
maintainer="projectmoon <projectmoon@agnos.is>"
license="BSD-2-Clause"
From 732abaa856ff77fcdd9c9e47578a6991a1a91f03 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 178/358] qca-qt5: rebuild against OpenSSL
---
common/shlibs | 10 ++++++++++
srcpkgs/qca-qt5/template | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 610a1f621ae..0e2d3cec3f9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2205,6 +2205,16 @@ libclamunrar.so.9 clamav-0.103.1_2
libclamunrar_iface.so.9 clamav-0.103.1_2
libfreshclam.so.2 clamav-0.103.1_2
libqca-qt5.so.2 qca-qt5-2.1.3_1
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
+libclamav.so.9 clamav-0.103.1_2
+libclamunrar.so.9 clamav-0.103.1_2
+libclamunrar_iface.so.9 clamav-0.103.1_2
+libfreshclam.so.2 clamav-0.103.1_2
+libqca-qt5.so.2 qca-qt5-2.3.1_2
libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
libphonon4qt5.so.4 phonon-qt5-4.8.3_1
libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index c255fca31b2..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,13 +1,13 @@
# Template file for 'qca-qt5'
pkgname=qca-qt5
version=2.3.1
-revision=1
+revision=2
wrksrc="${pkgname%-*}-${version}"
build_style=cmake
configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
-DUSE_RELATIVE_PATHS=true"
hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
depends="ca-certificates"
short_desc="Qt5 Cryptographic Architecture"
maintainer="John <me@johnnynator.dev>"
From 0925c153095ec27f661ee70b15915f4daf6743aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:39 +0100
Subject: [PATCH 179/358] qingy: switch to libgcrypt
---
srcpkgs/qingy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index c335bf971e8..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -1,13 +1,13 @@
# Template file for 'qingy'
pkgname=qingy
version=1.0.0
-revision=28
+revision=29
lib32disabled=yes
build_style=gnu-configure
-makedepends="ncurses-devel libressl-devel
+makedepends="ncurses-devel libgcrypt-devel
$(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')"
configure_args="--disable-optimizations --disable-static --disable-DirectFB-support
- $(vopt_enable pam) $(vopt_enable x11 x-support)"
+ --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)"
short_desc="Qingy Is Not Getty"
maintainer="Jens E. Becker <v2px@v2px.de>"
license="GPL-2"
From cc4eaccce89ee7dcbc2a6fa4d85db9e8e8a4478f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 180/358] rabbitmq-c: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/rabbitmq-c/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0e2d3cec3f9..4f6c3c47ad9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3666,7 +3666,7 @@ libluv.so.1 libluv-1.30.1.0_1
libarmadillo.so.9 armadillo-9.700.2_1
libvarnishapi.so.2 libvarnishapi-6.3.0_1
libicns.so.1 libicns-0.8.1_1
-librabbitmq.so.4 rabbitmq-c-0.9.0_1
+librabbitmq.so.4 rabbitmq-c-0.10.0_2
libuInputPlus.so.0 libuInputPlus-0.1.3_1
libevdevPlus.so.0 libevdevPlus-0.1.0_1
librte_lpm.so.2 dpdk-19.08_5
diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template
index 606905e2161..95ad7a33343 100644
--- a/srcpkgs/rabbitmq-c/template
+++ b/srcpkgs/rabbitmq-c/template
@@ -1,11 +1,11 @@
# Template file for 'rabbitmq-c'
pkgname=rabbitmq-c
version=0.10.0
-revision=1
+revision=2
build_style=cmake
make_check_target=test
hostmakedepends="popt xmlto doxygen"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="RabbitMQ C client"
maintainer="Hans-J. Schmid <knock@myopendoor.de>"
license="MIT"
From 0bb1df4bb0c36e7643db7de219871b75940aec67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:40 +0100
Subject: [PATCH 181/358] rdedup: rebuild against OpenSSL
---
srcpkgs/rdedup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template
index 9a1d9ffc944..c392e3c0e2f 100644
--- a/srcpkgs/rdedup/template
+++ b/srcpkgs/rdedup/template
@@ -1,11 +1,11 @@
# Template file for 'rdedup'
pkgname=rdedup
version=3.1.1
-revision=5
+revision=6
wrksrc=rdedup-rdedup-v${version}
build_style=cargo
hostmakedepends="pkg-config clang"
-makedepends="libressl-devel liblzma-devel libsodium-devel"
+makedepends="openssl-devel liblzma-devel libsodium-devel"
short_desc="Data deduplication engine"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0"
From 6a5ff5e15a8ac24cc02c3fb1940440937efbe996 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 182/358] rdis-git: rebuild against OpenSSL
---
srcpkgs/rdis-git/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template
index c1f4ef4128c..5aaa5d669b7 100644
--- a/srcpkgs/rdis-git/template
+++ b/srcpkgs/rdis-git/template
@@ -1,9 +1,9 @@
# Template file for 'rdis-git'
pkgname=rdis-git
version=20150722
-revision=11
+revision=12
hostmakedepends="pkg-config git"
-makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
+makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel"
short_desc="A binary analysis tool for Linux"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3"
From e2fbc9255501f5d69b65ba21557363742ede41b2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:41 +0100
Subject: [PATCH 183/358] remmina: rebuild against OpenSSL
---
srcpkgs/remmina/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template
index 5dbc85f433a..53043809e67 100644
--- a/srcpkgs/remmina/template
+++ b/srcpkgs/remmina/template
@@ -1,7 +1,7 @@
# Template file for 'remmina'
pkgname=remmina
version=1.4.10
-revision=1
+revision=2
wrksrc="Remmina-v${version}"
build_style=cmake
configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON"
From b5127dfc7a2dab8489a6292f4b511ef188c45e8f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 184/358] rooster: rebuild against OpenSSL
---
srcpkgs/rooster/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template
index a8a905fcb76..90b4f237bc8 100644
--- a/srcpkgs/rooster/template
+++ b/srcpkgs/rooster/template
@@ -1,10 +1,10 @@
# Template file for 'rooster'
pkgname=rooster
version=2.9.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config python3"
-makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel"
+makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel"
short_desc="Simple password manager for geeks"
maintainer="Ulf <void@uw.anonaddy.com>"
license="Apache-2.0"
From 42a9e339bf1076a5307799762e80b132128162f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 185/358] rpi-imager: rebuild against OpenSSL
---
srcpkgs/rpi-imager/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template
index 7d854e58d5f..b00e8ed63e9 100644
--- a/srcpkgs/rpi-imager/template
+++ b/srcpkgs/rpi-imager/template
@@ -1,7 +1,7 @@
# Template file for 'rpi-imager'
pkgname=rpi-imager
version=1.5
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake"
makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel
From 03dc48698703fed2059f39549123cbe4945d1bdd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:42 +0100
Subject: [PATCH 186/358] rspamd: rebuild against OpenSSL
---
srcpkgs/rspamd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 10a2681fc19..7398b753622 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
# Template file for 'rspamd'
pkgname=rspamd
version=1.9.4
-revision=4
+revision=5
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
From 07b97dab05553eec7725959474e504ee8a9dc29a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 187/358] rstudio: rebuild against OpenSSL
---
srcpkgs/rstudio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index 9c4f296dce8..904bec8ca96 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.3.1093
-revision=1
+revision=2
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
@@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
-DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which"
-makedepends="zlib-devel libuuid-devel libressl-devel pam-devel
+makedepends="zlib-devel libuuid-devel openssl-devel pam-devel
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel
From 5ce9135af8c426c92726df715aa0cf99e5e3de8e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 188/358] rsync: rebuild against OpenSSL
---
srcpkgs/rsync/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template
index 15815f9725d..a1df98d33f5 100644
--- a/srcpkgs/rsync/template
+++ b/srcpkgs/rsync/template
@@ -1,12 +1,12 @@
# Template file for 'rsync'
pkgname=rsync
version=3.2.3
-revision=2
+revision=3
build_style=gnu-configure
conf_files="/etc/rsyncd.conf"
hostmakedepends="perl"
makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel
- libressl-devel libzstd-devel"
+ openssl-devel libzstd-devel"
short_desc="Remote fast incremental file transfer tool"
maintainer="Lugubris <lugubris@disroot.org>"
license="GPL-3.0-only"
From 9e1c60a0cef510ca639fc1469560395ecd5f1186 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 189/358] rtmpdump: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/rtmpdump/template | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 4f6c3c47ad9..887fe21af8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1103,7 +1103,7 @@ libpwquality.so.1 libpwquality-1.1.1_1
libisl.so.10 isl-0.10_1
libisl.so.19 isl15-0.19_1
libcloog-isl.so.4 cloog-0.18.1_1
-librtmp.so.1 librtmp-2.4.20161210_1
+librtmp.so.1 librtmp-2.4.20161210_9
libORBit-2.so.0 libORBit2-2.14.19_1
libORBit-imodule-2.so.0 libORBit2-2.14.19_1
libORBitCosNaming-2.so.0 libORBit2-2.14.19_1
diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template
index f98160d7f18..911122cc807 100644
--- a/srcpkgs/rtmpdump/template
+++ b/srcpkgs/rtmpdump/template
@@ -1,10 +1,10 @@
# Template file for 'rtmpdump'
pkgname=rtmpdump
version=2.4.20161210
-revision=8
+revision=9
_patchlevel=${version##*.}
create_wrksrc=yes
-makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')"
+makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')"
short_desc="Toolkit for RTMP streams"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2, LGPL-2.1"
@@ -18,6 +18,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
build_options="gnutls"
+build_options_default="gnutls"
do_build() {
make CC="$CC" OPT="$CFLAGS" LDFLAGS="$LDFLAGS" "$(vopt_if gnutls 'CRYPTO=GNUTLS' 'CRYPTO=OPENSSL')" ${makejobs}
From e53be91d399bf71fed481ffd34257178a6eefa56 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:43 +0100
Subject: [PATCH 190/358] rust-cargo-audit: rebuild against OpenSSL
---
srcpkgs/rust-cargo-audit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template
index 68cafe5b71f..b733afa1a7b 100644
--- a/srcpkgs/rust-cargo-audit/template
+++ b/srcpkgs/rust-cargo-audit/template
@@ -1,11 +1,11 @@
# Template file for 'rust-cargo-audit'
pkgname=rust-cargo-audit
version=0.13.1
-revision=1
+revision=2
wrksrc="${pkgname/rust-/}-${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel libssh2-devel zlib-devel"
+makedepends="openssl-devel libssh2-devel zlib-devel"
short_desc="Audit Cargo.lock for crates with security vulnerabilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0, MIT"
From 27882159238d4b674c90eb8a5f27521b488ea251 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 191/358] rust-sccache: rebuild against OpenSSL
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index dda7b73393e..5d8f2bf185c 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,11 +1,11 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
version=0.2.13
-revision=2
+revision=3
wrksrc="${pkgname/rust-/}-${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Sccache is a ccache-like tool"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="Apache-2.0"
From 2c49405354d168805ae856964c301cae5935dbe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 192/358] rustup: rebuild against OpenSSL
---
srcpkgs/rustup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 5890c26c1f5..e4f985f74ec 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,14 +1,14 @@
# Template file for 'rustup'
pkgname=rustup
version=1.23.1
-revision=2
+revision=3
# rustup doesn't recognize this target
archs="~armv*-musl"
build_style=cargo
build_helper=qemu
configure_args="--features no-self-update --bin rustup-init"
hostmakedepends="pkg-config"
-makedepends="libressl-devel zlib-devel libcurl-devel"
+makedepends="openssl-devel zlib-devel libcurl-devel"
short_desc="Rust toolchain installer"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
From 9bea20d34c2798ee13b93999c23b768209c476a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 193/358] s-nail: rebuild against OpenSSL
---
srcpkgs/s-nail/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template
index 0497dac816b..cd63a895863 100644
--- a/srcpkgs/s-nail/template
+++ b/srcpkgs/s-nail/template
@@ -1,10 +1,10 @@
# Template file for 's-nail'
pkgname=s-nail
version=14.9.22
-revision=1
+revision=2
build_helper="qemu"
hostmakedepends="perl"
-makedepends="libidn2-devel libressl-devel ncurses-devel"
+makedepends="libidn2-devel openssl-devel ncurses-devel"
conf_files="/etc/s-nail.rc"
short_desc="Mail processing system with a command syntax reminiscent of ed"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From f59355ee510a42b7071d955883128f9664a23af4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 194/358] s3fs-fuse: rebuild against OpenSSL
---
srcpkgs/s3fs-fuse/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template
index d450104505b..7ccbf82bcdf 100644
--- a/srcpkgs/s3fs-fuse/template
+++ b/srcpkgs/s3fs-fuse/template
@@ -1,7 +1,7 @@
# Template file for 's3fs-fuse'
pkgname=s3fs-fuse
version=1.86
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--with-openssl ac_cv_file__git=no"
hostmakedepends="automake libtool pkg-config"
From f38831392674d37bd6f8d621ca2ddd01132fe966 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:44 +0100
Subject: [PATCH 195/358] sbsigntool: rebuild against OpenSSL
---
srcpkgs/sbsigntool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template
index 6ee86139b27..6e6c32ddf3e 100644
--- a/srcpkgs/sbsigntool/template
+++ b/srcpkgs/sbsigntool/template
@@ -1,12 +1,12 @@
# Template file for 'sbsigntool'
pkgname=sbsigntool
version=0.9.4
-revision=3
+revision=4
archs="x86_64* i686* aarch64* arm*"
wrksrc=sbsigntools-$version
build_style=gnu-configure
hostmakedepends="autoconf automake pkg-config help2man"
-makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs"
+makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs"
short_desc="Signing utility for UEFI secure boot"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-3.0-or-later"
From ce780f0fce218214aaff11af81cd01fecfba1e64 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 196/358] scrypt: rebuild against OpenSSL
---
srcpkgs/scrypt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template
index 63e77c1e72a..8d313c2fff1 100644
--- a/srcpkgs/scrypt/template
+++ b/srcpkgs/scrypt/template
@@ -1,9 +1,9 @@
# Template file for 'scrypt'
pkgname=scrypt
version=1.3.1
-revision=1
+revision=2
build_style=gnu-configure
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Scrypt key derivation function"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 2acae323e449b7b67d98f97c129f51e25496018f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 197/358] seafile-libclient: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/seafile-libclient/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 887fe21af8f..7a0feed6d8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2555,7 +2555,7 @@ libm.so android-studio-3.0.1_1
libdl.so android-studio-3.0.1_1
libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
libsearpc.so.1 libsearpc-3.0.7_1
-libseafile.so.0 seafile-libclient-5.0.4_1
+libseafile.so.0 seafile-libclient-7.0.10_2
libpodofo.so.0.9.7 libpodofo-0.9.7_2
libIrcUtil.so.3 libcommuni-3.4.0_1
libIrcCore.so.3 libcommuni-3.4.0_1
diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template
index 622189d447f..db394362f18 100644
--- a/srcpkgs/seafile-libclient/template
+++ b/srcpkgs/seafile-libclient/template
@@ -2,7 +2,7 @@
# WARNING: upstream sometimes retag source. Wait for official announcement
pkgname=seafile-libclient
version=7.0.10
-revision=1
+revision=2
_distname="${pkgname/-libclient/}"
wrksrc="${_distname}-${version}"
build_style=gnu-configure
From 4efa4463269b787c42ae75002a5a52f8b33139ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 198/358] serf: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/serf/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7a0feed6d8f..87bc4497ad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1436,7 +1436,7 @@ libphorward.so.0 libphorward-0.17_1
libusbip.so.0 libusbip-3.10_1
libcpupower.so.0 libcpupower-3.10_1
librsync.so.2 librsync-1.0.0_1
-libserf-1.so.1 serf-1.3.6_1
+libserf-1.so.1 serf-1.3.9_13
libmpdclient.so.2 libmpdclient-0.28_1
libmcrypt.so.4 libmcrypt-2.5.8_1
libgraphite2.so.3 graphite-1.2.3_1
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index e340a6b013c..a9ac8a6d35e 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,11 +1,11 @@
# Template file for 'serf'
pkgname=serf
version=1.3.9
-revision=12
+revision=13
build_style=scons
make_build_args="PREFIX=/usr"
-hostmakedepends="libressl-devel"
-makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel"
+hostmakedepends="openssl-devel"
+makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel"
short_desc="High-performance asynchronous HTTP client library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From 4bc6aea87f072097f89a05dbc210fc85e082d3bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:45 +0100
Subject: [PATCH 199/358] sgfutils: rebuild against OpenSSL
---
srcpkgs/sgfutils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template
index 23494b6ef56..95e84d22279 100644
--- a/srcpkgs/sgfutils/template
+++ b/srcpkgs/sgfutils/template
@@ -1,7 +1,7 @@
# Template file for 'sgfutils'
pkgname=sgfutils
version=0.25
-revision=6
+revision=7
build_style=gnu-makefile
short_desc="Collection of utilities to handle SGF files"
maintainer='Brandon Wilson <x@wilsonb.com>'
@@ -9,5 +9,5 @@ license="GPL-2"
homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/"
distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz"
checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="ImageMagick"
From 7791ae686b56453547f4f1ff2edca7249fdb9237 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 200/358] signal-backup-decode: rebuild against OpenSSL
---
srcpkgs/signal-backup-decode/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template
index 3b5cfb2f526..119546b61ea 100644
--- a/srcpkgs/signal-backup-decode/template
+++ b/srcpkgs/signal-backup-decode/template
@@ -1,10 +1,10 @@
# Template file for 'signal-backup-decode'
pkgname=signal-backup-decode
version=0.2.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel sqlite-devel"
+makedepends="openssl-devel sqlite-devel"
short_desc="Decode Signal Android Backups"
maintainer="Spencer Burris <sburris@posteo.net>"
license="GPL-3.0-or-later"
From 51ba274b54405fd00b58e769ed68d55cc7bb0418 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 201/358] slrn: rebuild against OpenSSL
---
srcpkgs/slrn/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template
index 916aa0d013a..95d39885983 100644
--- a/srcpkgs/slrn/template
+++ b/srcpkgs/slrn/template
@@ -1,14 +1,14 @@
# Template file for 'slrn'
pkgname=slrn
version=1.0.3a
-revision=7
+revision=8
wrksrc="${pkgname}-${version%a}"
build_style=gnu-configure
configure_args="--with-slrnpull --with-ssl
--with-slanginc=${XBPS_CROSS_BASE}/usr/include
--with-slanglib=${XBPS_CROSS_BASE}/usr/lib
slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes"
-makedepends="libressl-devel slang-devel"
+makedepends="openssl-devel slang-devel"
short_desc="Text mode Usenet news reader"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2"
From 67f6414ef2629733fbe57d82bb48b1ca36d408a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 202/358] so: rebuild against OpenSSL
---
srcpkgs/so/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/so/template b/srcpkgs/so/template
index ecdbb5331ee..b46c4846b91 100644
--- a/srcpkgs/so/template
+++ b/srcpkgs/so/template
@@ -1,10 +1,10 @@
# Template file for 'so'
pkgname=so
version=0.4.3
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Terminal interface for Stack Overflow"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
From d9858aab3926a1fc590d920d4aeda9daf06676a1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:46 +0100
Subject: [PATCH 203/358] socat: rebuild against OpenSSL
---
srcpkgs/socat/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template
index 6c3d342b9e2..d4e0f0a9bbd 100644
--- a/srcpkgs/socat/template
+++ b/srcpkgs/socat/template
@@ -1,11 +1,11 @@
# Template file for 'socat'
pkgname=socat
version=1.7.4.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-libwrap --enable-fips
ac_cv_have_z_modifier=yes"
-makedepends="readline-devel libressl-devel"
+makedepends="readline-devel openssl-devel"
short_desc="Relay for bidirectional data transfer between two independent channels"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
From 7bb1cf60b150135e8d3b11c5537d3ffb47d0e2ae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 204/358] spice: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/spice/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 87bc4497ad1..d203a8a6c5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -805,7 +805,7 @@ libgtk-3.so.0 gtk+3-3.0.0_1
libgailutil-3.so.0 gtk+3-3.0.0_1
liblightdm-gobject-1.so.0 liblightdm-gobject-1.2.2_1
libcelt0.so.2 celt-0.11.1_1
-libspice-server.so.1 spice-0.6.4_1
+libspice-server.so.1 spice-0.14.3_3
libbrasero-burn3.so.1 brasero-2.91.90_1
libbrasero-media3.so.1 brasero-2.91.90_1
libbrasero-utils3.so.1 brasero-2.91.90_1
diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template
index 5a2b3b95560..98559c4a507 100644
--- a/srcpkgs/spice/template
+++ b/srcpkgs/spice/template
@@ -1,13 +1,13 @@
# Template file for 'spice'
pkgname=spice
version=0.14.3
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-tunnel --disable-opengl --enable-smartcard
--with-sasl --disable-static --enable-xinerama --disable-celt051"
hostmakedepends="pkg-config python"
makedepends="spice-protocol libjpeg-turbo-devel pixman-devel
- libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
+ openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel
libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel
nss-devel"
short_desc="Implements the SPICE protocol"
From 68e3d8d94edde10024bb9ef9033ac121cd7466b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 205/358] spice-gtk: rebuild against OpenSSL
---
common/shlibs | 6 +++---
srcpkgs/spice-gtk/template | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index d203a8a6c5b..024a5c1d704 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1189,9 +1189,9 @@ libharfbuzz-icu.so.0 libharfbuzz-0.9.19_1
libharfbuzz-subset.so.0 libharfbuzz-1.7.6_1
libharfbuzz-gobject.so.0 libharfbuzz-2.7.2_2
libosinfo-1.0.so.0 libosinfo-0.2.0_1
-libspice-client-gtk-3.0.so.5 spice-gtk-0.33_1
-libspice-client-glib-2.0.so.8 spice-gtk-0.14_1
-libspice-controller.so.0 spice-gtk-0.14_1
+libspice-client-gtk-3.0.so.5 spice-gtk-0.37_6
+libspice-client-glib-2.0.so.8 spice-gtk-0.37_6
+libspice-controller.so.0 spice-gtk-0.37_6
libvirt-gconfig-1.0.so.0 libvirt-glib-0.1.2_1
libvirt-gobject-1.0.so.0 libvirt-glib-0.1.2_1
libvirt-glib-1.0.so.0 libvirt-glib-0.1.2_1
diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 59fa5da8e8b..b61e4e8d096 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'spice-gtk'
pkgname=spice-gtk
version=0.37
-revision=5
+revision=6
build_style=meson
build_helper="gir"
configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
-Dpulse=disabled -Dgtk_doc=disabled"
hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
spice-protocol python3-six python3-parsing perl"
-makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel
+makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel
usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel
phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel"
@@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in
esac
spice-gtk-devel_package() {
- depends="gtk+3-devel pixman-devel libressl-devel opus-devel
+ depends="gtk+3-devel pixman-devel openssl-devel opus-devel
libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel
json-glib-devel gstreamer1-devel gst-plugins-base1-devel
spice-protocol $(vopt_if gir libgirepository-devel)
From 7c5916103313afc61468ab09b153af7f4e9e513a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 206/358] spiped: rebuild against OpenSSL
---
srcpkgs/spiped/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template
index eeb9ac5b011..765b0b00959 100644
--- a/srcpkgs/spiped/template
+++ b/srcpkgs/spiped/template
@@ -1,9 +1,9 @@
# Template file for 'spiped'
pkgname=spiped
version=1.6.1
-revision=1
+revision=2
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Spiped secure pipe daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
From 744abdd17c35e286eb28986964eb19d6683596bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 207/358] spotify-tui: rebuild against OpenSSL
---
srcpkgs/spotify-tui/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template
index 1c027e542e2..19593004ef0 100644
--- a/srcpkgs/spotify-tui/template
+++ b/srcpkgs/spotify-tui/template
@@ -1,10 +1,10 @@
# Template file for 'spotify-tui'
pkgname=spotify-tui
version=0.23.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config python3"
-makedepends="libressl-devel python3-devel libxcb-devel"
+makedepends="openssl-devel python3-devel libxcb-devel"
short_desc="Spotify for the terminal"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="MIT"
From 20d38a9809dbb707501239e81daafd1b9ca2ac14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:47 +0100
Subject: [PATCH 208/358] spotifyd: rebuild against OpenSSL
---
srcpkgs/spotifyd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template
index d805510b9af..8dd5947d269 100644
--- a/srcpkgs/spotifyd/template
+++ b/srcpkgs/spotifyd/template
@@ -1,11 +1,11 @@
# Template file for 'spotifyd'
pkgname=spotifyd
version=0.3.0
-revision=2
+revision=3
build_style=cargo
configure_args="--no-default-features"
hostmakedepends="pkg-config"
-makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel)
+makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel)
$(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel)
$(vopt_if dbus dbus-devel)"
short_desc="Spotify client running as a UNIX daemon"
From f44a1fc1d90fffcd281bc291dd452d66a6f7b358 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 209/358] sqlcipher: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/sqlcipher/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 024a5c1d704..03214aae585 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2460,7 +2460,7 @@ libhidapi-hidraw.so.0 hidapi-0.8.0rc1_1
libhidapi-libusb.so.0 hidapi-0.8.0rc1_1
libu2f-host.so.0 libu2f-host-1.1.10_5
libu2f-server.so.0 libu2f-server-1.1.0_9
-libsqlcipher.so.0 sqlcipher-3.3.1_1
+libsqlcipher.so.0 sqlcipher-4.3.0_3
libgta.so.1 libgta-1.2.0_1
libgdal.so.26 libgdal-3.0.0_1
libosgViewer.so.131 osg-3.4.1_1
diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template
index eea7cc60f56..74c98205efa 100644
--- a/srcpkgs/sqlcipher/template
+++ b/srcpkgs/sqlcipher/template
@@ -1,11 +1,11 @@
# Template file for 'sqlcipher'
pkgname=sqlcipher
version=4.3.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-tempstore=yes"
hostmakedepends="tcl"
-makedepends="libressl-devel readline-devel"
+makedepends="openssl-devel readline-devel"
short_desc="SQLite extension that provides transparent 256-bit AES encryption"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="BSD-3-Clause"
From a16cc17c3f88716ef1916a13dab921c3ea8f5d48 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 210/358] sqmail: rebuild against OpenSSL
---
srcpkgs/sqmail/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template
index 39d4211762d..95b7c46373c 100644
--- a/srcpkgs/sqmail/template
+++ b/srcpkgs/sqmail/template
@@ -1,7 +1,7 @@
# Template file for 'sqmail'
pkgname=sqmail
version=4.0.10
-revision=1
+revision=2
create_wrksrc=yes
build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src"
makedepends="fehQlibs libidn2-devel ucspi-ssl-devel"
From 4de63acb643cfa7a29a4f9ee019b6fa54b8c1308 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:48 +0100
Subject: [PATCH 211/358] srain: rebuild against OpenSSL
---
srcpkgs/srain/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template
index 7a28616db50..abf70431e84 100644
--- a/srcpkgs/srain/template
+++ b/srcpkgs/srain/template
@@ -1,12 +1,12 @@
# Template file for 'srain'
pkgname=srain
version=1.1.3
-revision=1
+revision=2
build_style=configure
build_helper=gir
configure_args="--prefix=/usr --sysconfdir=/etc"
hostmakedepends="pkg-config gettext glib-devel"
-makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel
+makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel
libsecret-devel libsoup-devel"
short_desc="Modern IRC client written in GTK"
maintainer="avoidr <avoidr@posteo.de>"
From 3dcedeb937d474775143ade0a2e0be4cfb00bed1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 212/358] stremio-shell: rebuild against OpenSSL
---
srcpkgs/stremio-shell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 100543c5f4f..e26d066c062 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -1,7 +1,7 @@
# Template file for 'stremio-shell'
pkgname=stremio-shell
version=4.4.120
-revision=1
+revision=2
_singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce
_libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be
build_style=qmake
From 5ede4fe5281d3cf56079888bf46fcd123bb13890 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 213/358] stunnel: rebuild against OpenSSL
---
srcpkgs/stunnel/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template
index e3f5a07353d..54ecff002a0 100644
--- a/srcpkgs/stunnel/template
+++ b/srcpkgs/stunnel/template
@@ -1,11 +1,11 @@
# Template file for 'stunnel'
pkgname=stunnel
version=5.46
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr"
hostmakedepends="perl"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
checkdepends="nmap procps-ng"
short_desc="SSL encryption wrapper"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
@@ -34,7 +34,7 @@ post_install() {
# One thing OpenBSD does that we don't do here is add a _stunnel user/group and
# modify the configuration samples to chroot and use this by default.
# As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to
-# be out of line with what libressl provides.
+# be out of line with what openssl provides.
# LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)'
# This is probably not a security problem. EDIT: Well, it would break. Badly.
# --
From 01f38986ee580b661a7ace29fca4227af80b5630 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:49 +0100
Subject: [PATCH 214/358] supertuxkart: rebuild against OpenSSL
---
srcpkgs/supertuxkart/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template
index fdacba9b730..519bc615782 100644
--- a/srcpkgs/supertuxkart/template
+++ b/srcpkgs/supertuxkart/template
@@ -1,7 +1,7 @@
# Template file for 'supertuxkart'
pkgname=supertuxkart
version=1.2
-revision=2
+revision=3
wrksrc="SuperTuxKart-${version}-src"
build_style=cmake
hostmakedepends="pkg-config"
@@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel
libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel
libopenal-devel fribidi-devel libcurl-devel freetype-devel
libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel
- libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel"
+ libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel"
depends="desktop-file-utils hicolor-icon-theme supertuxkart-data"
short_desc="Kart racing game featuring Tux and his friends"
maintainer="Orphaned <orphan@voidlinux.org>"
From 3a21634e52afa1ed30a176721b356af0de07db81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 215/358] swi-prolog: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/swi-prolog/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 03214aae585..9483655df5e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2847,7 +2847,7 @@ libKPropertyWidgets3.so.4 kproperty-3.1.0_1
libKPropertyCore3.so.4 kproperty-3.1.0_1
libKReport3.so.4 kreport-3.1.0_1
libbotan-2.so.16 botan-2.16.0_3
-libswipl.so.8 swi-prolog-8.0.0_1
+libswipl.so.8 swi-prolog-8.2.4_2
libpcre2-16.so.0 libpcre2-10.22_1
libpcre2-32.so.0 libpcre2-10.22_1
libpcre2-8.so.0 libpcre2-10.22_1
diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template
index ce5d45085d8..ed76890c057 100644
--- a/srcpkgs/swi-prolog/template
+++ b/srcpkgs/swi-prolog/template
@@ -1,14 +1,14 @@
# Template file for 'swi-prolog'
pkgname=swi-prolog
version=8.2.4
-revision=1
+revision=2
wrksrc="swipl-${version}"
build_style=cmake
build_helper="qemu"
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="pkg-config"
makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel
- libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel
+ libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel
unixodbc-devel zlib-devel pcre-devel libyaml-devel"
short_desc="Comprehensive free Prolog environment"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From 9ac6d9aba243c89bb47d946536bb98b7209af82b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 216/358] swiften: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/swiften/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 9483655df5e..587fa08583c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2573,7 +2573,7 @@ libtommath.so.1 libtommath-1.0_1
libKF5ItemViews.so.5 kitemviews-5.26.0_1
libunicorn.so.1 unicorn-1.0_1
libglyphy.so.0 glyphy-0.0.20160104_1
-libSwiften.so.0 swiften-2.0_1
+libSwiften.so.0 swiften-4.0.3_2
libfreehand-0.1.so.1 libfreehand-0.1.1_1
libe-book-0.1.so.1 libe-book-0.1.2_1
libOsi.so.1 CoinMP-1.8.3_1
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 45118dea56c..969ef1eb5d7 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,10 +1,10 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=1
+revision=2
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
-makedepends="boost-devel libressl-devel libxml2-devel libidn-devel
+makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
lua51-devel miniupnpc-devel sqlite-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
From 166174c435f5d949065e72b35548e22f306d68fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 217/358] swirc: rebuild against OpenSSL
---
srcpkgs/swirc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 6470d870df6..8cb273d927d 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,11 @@
# Template file for 'swirc'
pkgname=swirc
version=3.2.6
-revision=1
+revision=2
build_style=configure
make_install_args="PREFIX=/usr"
hostmakedepends="pkg-config which"
-makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
From e65e030af20e2e244cecc662c08f2cd209cea0bb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 218/358] sylpheed: rebuild against OpenSSL
---
srcpkgs/sylpheed/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template
index 1e01726ef40..5df8312b53d 100644
--- a/srcpkgs/sylpheed/template
+++ b/srcpkgs/sylpheed/template
@@ -1,11 +1,11 @@
# Template file for 'sylpheed'
pkgname=sylpheed
version=3.7.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel"
-makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel"
+makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel"
short_desc="GTK+ Lightweight and user-friendly e-mail client"
maintainer="Orphaned <orphan@voidlinux.org>"
license=" GPL-2.0-or-later, LGPL-2.1-or-later"
From 2a43e96749288ff614d98c37a5103b24279b4de0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:50 +0100
Subject: [PATCH 219/358] synergy: rebuild against OpenSSL
---
srcpkgs/synergy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template
index b329e4d5921..0c4f3b4f130 100644
--- a/srcpkgs/synergy/template
+++ b/srcpkgs/synergy/template
@@ -1,7 +1,7 @@
# Template file for 'synergy'
pkgname=synergy
version=1.13.0
-revision=1
+revision=2
wrksrc="${pkgname}-core-${version}-stable"
build_style=cmake
configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON"
From 9ba2de6b7b60faf7b8a0992806acb2e3fdadc6d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 220/358] sysdig: rebuild against OpenSSL
---
srcpkgs/sysdig/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index f7938db8c2e..f3600394d40 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.27.1
-revision=7
+revision=8
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
-DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
@@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
make_cmd=make
hostmakedepends="wget pkg-config protobuf"
makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel
- libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel
+ libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel
tbb-devel zlib-devel"
depends="dkms"
short_desc="Open source system-level exploration and troubleshooting tool"
From 676cfde27f3960a9b51fd87e521bc40b1a305668 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 221/358] taisei: rebuild against OpenSSL
---
srcpkgs/taisei/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template
index 5a34fe9f6e6..b47f44502eb 100644
--- a/srcpkgs/taisei/template
+++ b/srcpkgs/taisei/template
@@ -1,7 +1,7 @@
# Template file for 'taisei'
pkgname=taisei
version=1.3.1
-revision=3
+revision=4
wrksrc="taisei-v${version}"
build_style=meson
hostmakedepends="pkg-config python3-docutils"
From 24f3b3c17c495b72341513263d464821ea2695af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 222/358] tarpaulin: rebuild against OpenSSL
---
srcpkgs/tarpaulin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template
index c4015a5eebc..56fceeb4c43 100644
--- a/srcpkgs/tarpaulin/template
+++ b/srcpkgs/tarpaulin/template
@@ -1,11 +1,11 @@
# Template file for 'tarpaulin'
pkgname=tarpaulin
version=0.14.3
-revision=1
+revision=2
archs="x86_64*"
build_style=cargo
hostmakedepends="pkg-config cmake"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
short_desc="Code coverage tool for Rust/Cargo projects"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
From e890e3abb2f2ff741eba89571353932f96ca24be Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:51 +0100
Subject: [PATCH 223/358] tcpdump: rebuild against OpenSSL
---
srcpkgs/tcpdump/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index aea1e1a91e5..1b55d262a2f 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -1,9 +1,9 @@
# Template file for 'tcpdump'
pkgname=tcpdump
version=4.99.0
-revision=1
+revision=2
build_style=gnu-configure
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
checkdepends="perl"
short_desc="A tool for network monitoring and data acquisition"
maintainer="Orphaned <orphan@voidlinux.org>"
From b88b8907427cf050b375a9f18d615cac46da37ff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 224/358] tcpflow: rebuild against OpenSSL
---
srcpkgs/tcpflow/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index 727795843c7..decc27a0a27 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -1,11 +1,11 @@
# Template file for 'tcpflow'
pkgname=tcpflow
version=1.5.2
-revision=2
+revision=3
wrksrc="$pkgname-$pkgname-$version"
build_style=gnu-configure
hostmakedepends="automake"
-makedepends="libpcap-devel zlib-devel libressl-devel boost-devel"
+makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
short_desc="Captures data transmitted as part of TCP connections"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
From 2a1927460e6ceb55ff87542b65b205cd7a76b194 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 225/358] tealdeer: rebuild against OpenSSL
---
srcpkgs/tealdeer/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template
index 88121c7d2b4..72b8a1117c2 100644
--- a/srcpkgs/tealdeer/template
+++ b/srcpkgs/tealdeer/template
@@ -1,11 +1,11 @@
# Template file for 'tealdeer'
pkgname=tealdeer
version=1.4.1
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
-depends="libressl"
+makedepends="openssl-devel"
+depends="openssl"
short_desc="Very fast implementation of tldr in Rust"
maintainer="jcgruenhage <jan.christian@gruenhage.xyz>"
license="MIT, Apache-2.0"
From 745a7ce652c57d76396e776efe0e2e563ee1eaef Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 226/358] tectonic: rebuild against OpenSSL
---
srcpkgs/tectonic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 709c265d4aa..b339ce146d7 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,11 +1,11 @@
# Template file for 'tectonic'
pkgname=tectonic
version=0.3.3
-revision=1
+revision=2
wrksrc="tectonic-tectonic-${version}"
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="harfbuzz-devel libressl-devel"
+makedepends="harfbuzz-devel openssl-devel"
short_desc="Modernized, complete, self-contained TeX/LaTeX engine"
maintainer="Chinmay Pai <chinmaydpai@gmail.com>"
license="MIT"
From 44641597313244bff72904560825a988e3a8b6a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 227/358] telegram-desktop: rebuild against OpenSSL
---
srcpkgs/telegram-desktop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 04aa1ec98a6..5778f4c2d76 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -1,7 +1,7 @@
# Template file for 'telegram-desktop'
pkgname=telegram-desktop
version=2.5.1
-revision=1
+revision=2
wrksrc="tdesktop-${version}-full"
build_style=cmake
build_helper="qemu"
From c300345a78e5f1e3492b7d1d690b6c71c60d1a0f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:52 +0100
Subject: [PATCH 228/358] telepathy-salut: switch to GnuTLS
---
srcpkgs/telepathy-salut/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index e5cf92d2d0c..8c3d2dace29 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,14 +1,14 @@
# Template file for 'telepathy-salut'
pkgname=telepathy-salut
version=0.8.1
-revision=19
+revision=20
lib32disabled=yes
build_style=gnu-configure
-configure_args="--disable-tests --disable-plugins --with-tls=openssl
---disable-avahi-tests --disable-static"
+configure_args="--disable-tests --disable-plugins --with-tls=gnutls
+ --disable-avahi-tests --disable-static"
hostmakedepends="pkg-config python xmldiff glib-devel"
makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
- libressl-devel libuuid-devel sqlite-devel"
+ gnutls-devel libuuid-devel sqlite-devel"
depends="avahi"
short_desc="Link-local XMPP connection manager for Telepathy"
maintainer="Orphaned <orphan@voidlinux.org>"
From 33a61625181608d80104ed67cfb7daab76464dff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 229/358] thc-hydra: rebuild against OpenSSL
---
srcpkgs/thc-hydra/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template
index 19a37248d13..1d457533617 100644
--- a/srcpkgs/thc-hydra/template
+++ b/srcpkgs/thc-hydra/template
@@ -1,10 +1,10 @@
# Template file for 'thc-hydra'
pkgname=thc-hydra
version=9.1
-revision=1
+revision=2
build_style=gnu-configure
make_install_args="MANDIR=/share/man/man1"
-makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel
+makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel
postgresql-libs-devel libmariadbclient-devel libssh-devel"
short_desc="Tool to guess/crack valid login/password pairs"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
From 1d4ed73a75740479cece3b5e4c82c44d999a7e3c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 230/358] thrift: rebuild against OpenSSL
---
srcpkgs/thrift/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template
index 0630ef06a52..9ac4bb481c3 100644
--- a/srcpkgs/thrift/template
+++ b/srcpkgs/thrift/template
@@ -1,10 +1,10 @@
# Template file for 'thrift'
pkgname=thrift
version=0.13.0
-revision=5
+revision=6
build_style=gnu-configure
configure_args="--without-python"
-makedepends="boost-devel libressl-devel"
+makedepends="boost-devel openssl-devel"
checkdepends="zlib-devel libevent-devel"
short_desc="Apache Thrift compiler"
maintainer="Orphaned <orphan@voidlinux.org>"
From 02a645482c19f8be0b54b50abcc6136b4d15ef67 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 231/358] tinc: rebuild against OpenSSL
---
srcpkgs/tinc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 19fd8755e14..1252d5a1734 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -1,9 +1,9 @@
# Template file for 'tinc'
pkgname=tinc
version=1.0.36
-revision=2
+revision=3
build_style=gnu-configure
-makedepends="zlib-devel lzo-devel libressl-devel"
+makedepends="zlib-devel lzo-devel openssl-devel"
short_desc="VPN (Virtual Private Network) daemon"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 36b87f10d029e41f54f229da7b744ab3ae1f054b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:53 +0100
Subject: [PATCH 232/358] tmplgen: rebuild against OpenSSL
---
srcpkgs/tmplgen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template
index 1025bb7adcd..f352a5f3fd6 100644
--- a/srcpkgs/tmplgen/template
+++ b/srcpkgs/tmplgen/template
@@ -1,10 +1,10 @@
# Template file for 'tmplgen'
pkgname=tmplgen
version=1.3.1
-revision=3
+revision=4
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Void Linux template generator for language-specific package managers"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
From 58b4f896a6bf132741fd81707e958958390252f0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 233/358] tnftp: rebuild against OpenSSL
---
srcpkgs/tnftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template
index 90ac354163c..c0b75c164f2 100644
--- a/srcpkgs/tnftp/template
+++ b/srcpkgs/tnftp/template
@@ -1,10 +1,10 @@
# Template file for 'tnftp'
pkgname=tnftp
version=20200705
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool"
-makedepends="libressl-devel ncurses-devel"
+makedepends="openssl-devel ncurses-devel"
short_desc="NetBSD enhanced ftp client"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD"
From bd1a967186c75798b093c0f373ab8e13de15affc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 234/358] tor: rebuild against OpenSSL
---
srcpkgs/tor/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index ab802a5d377..3c3dffc6338 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -1,7 +1,7 @@
# Template file for 'tor'
pkgname=tor
version=0.4.4.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-zstd"
hostmakedepends="pkg-config"
From 05e314974392c06ae3b8c26d1708f896aec8a5f9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 235/358] tpm-tools: rebuild against OpenSSL
---
srcpkgs/tpm-tools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template
index 61caecd515d..c581d165345 100644
--- a/srcpkgs/tpm-tools/template
+++ b/srcpkgs/tpm-tools/template
@@ -1,11 +1,11 @@
# Template file for 'tpm-tools'
pkgname=tpm-tools
version=1.3.9.1
-revision=6
+revision=7
create_wrksrc=yes
build_style=gnu-configure
hostmakedepends="perl" # wants pod2man
-makedepends="libressl-devel trousers-devel"
+makedepends="openssl-devel trousers-devel"
short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CPL"
From 110d0a5cfd1844ffbbeed4850fe426809705d5cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:54 +0100
Subject: [PATCH 236/358] transmission: rebuild against OpenSSL
---
srcpkgs/transmission/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 7249c93b03a..5a61a0a2bdd 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,7 +1,7 @@
# Template file for 'transmission'
pkgname=transmission
version=3.00
-revision=4
+revision=5
build_style=cmake
configure_args="-DENABLE_CLI=ON"
hostmakedepends="autoconf automake intltool glib-devel
From 619c07091535f5361a3202a53bd5218339e35ea7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 237/358] trousers: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/trousers/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 587fa08583c..8ddee828fe0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2528,7 +2528,7 @@ libcryptmount.so.0 libpam-mount-2.15_1
libglob.so.0 libglob-1.0_1
libepub.so.0 ebook-tools-0.2.2_1
libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1
-libtspi.so.1 trousers-0.3.13_1
+libtspi.so.1 trousers-0.3.14_11
libflickcurl.so.0 flickcurl-1.26_1
libpsiconv.so.6 psiconv-0.9.9_1
libshout.so.3 libshout-2.4.1_1
diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template
index 59aa7ec6d10..5d962adec91 100644
--- a/srcpkgs/trousers/template
+++ b/srcpkgs/trousers/template
@@ -1,11 +1,11 @@
# Template file for 'trousers'
pkgname=trousers
version=0.3.14
-revision=10
+revision=11
create_wrksrc=yes
build_style=gnu-configure
conf_files="/etc/tcsd.conf"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
system_accounts=tss
tss_homedir=/var/lib/tpm
short_desc="Trusted Computing Software Stack for the TPM"
From 75c47f92b11f8de55abebceb19f9667716ff04c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 238/358] ttyd: rebuild against OpenSSL
---
srcpkgs/ttyd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template
index 85bee66710e..e870724e1d9 100644
--- a/srcpkgs/ttyd/template
+++ b/srcpkgs/ttyd/template
@@ -1,10 +1,10 @@
# Template file for 'ttyd'
pkgname=ttyd
version=1.6.0
-revision=4
+revision=5
build_style=cmake
hostmakedepends="pkg-config xxd"
-makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel
+makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel
libuv-devel"
short_desc="Share your terminal over the web"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From 768b20cb778b42515fb770d12d44cd3e0ec2cd5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 239/358] tvheadend: rebuild against OpenSSL
---
srcpkgs/tvheadend/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template
index e32d30f917f..230ecb59257 100644
--- a/srcpkgs/tvheadend/template
+++ b/srcpkgs/tvheadend/template
@@ -1,7 +1,7 @@
# Template file for 'tvheadend'
pkgname=tvheadend
version=4.2.8
-revision=4
+revision=5
wrksrc=tvheadend-${version}
build_style=gnu-configure
configure_args="--enable-dvbscan --disable-ffmpeg_static
@@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static
--disable-libx265_static --disable-libvpx_static --disable-libtheora_static
--disable-libvorbis_static --disable-libfdkaac_static"
hostmakedepends="gettext pkg-config python git which"
-makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel"
+makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel"
short_desc="TV streaming server"
maintainer="lemmi <lemmi@nerd2nerd.org>"
license="GPL-3.0-only"
From 3ad73210c8402f550870013cc91e8548dfb91e15 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:55 +0100
Subject: [PATCH 240/358] ucspi-ssl: rebuild against OpenSSL
---
srcpkgs/ucspi-ssl/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template
index 0fa5f09c9d2..1f2c6c36793 100644
--- a/srcpkgs/ucspi-ssl/template
+++ b/srcpkgs/ucspi-ssl/template
@@ -2,12 +2,12 @@
pkgname=ucspi-ssl
reverts="0.99e_3 0.99e_2 0.99e_1"
version=0.11.6a
-revision=2
+revision=3
create_wrksrc=yes
build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src"
build_style=gnu-makefile
-hostmakedepends="fehQlibs libressl-devel perl"
-makedepends="fehQlibs libressl-devel perl"
+hostmakedepends="fehQlibs openssl-devel perl"
+makedepends="fehQlibs openssl-devel perl"
depends="ucspi-tcp6"
short_desc="Command-line tools for building SSL client-server applications"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -70,7 +70,7 @@ do_install() {
ucspi-ssl-devel_package() {
short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision} libressl-devel"
+ depends="${sourcepkg}>=${version}_${revision} openssl-devel"
pkg_install() {
vinstall ucspissl.a 0644 usr/lib
vinstall ucspissl.h 0644 usr/include
From eeb82f35aeb6caa37766255336596e2be96663c4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 241/358] uftp: rebuild against OpenSSL
---
srcpkgs/uftp/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template
index 59b29b58648..f0c6347e26e 100644
--- a/srcpkgs/uftp/template
+++ b/srcpkgs/uftp/template
@@ -1,9 +1,9 @@
# Template file for 'uftp'
pkgname=uftp
version=5.0
-revision=1
+revision=2
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Encrypted multicast file transfer program"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 9c93c5d12e945a409ef4c57dbaa02033d70f3bab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 242/358] umurmur: rebuild against OpenSSL
---
srcpkgs/umurmur/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template
index 276bdd8302c..e3046ab968e 100644
--- a/srcpkgs/umurmur/template
+++ b/srcpkgs/umurmur/template
@@ -1,12 +1,12 @@
# Template file for 'umurmur'
pkgname=umurmur
version=0.2.19
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shmapi --with-ssl=openssl"
conf_files="/etc/umurmur/umurmur.conf"
hostmakedepends="automake libtool"
-makedepends="libconfig-devel libressl-devel protobuf-c-devel"
+makedepends="libconfig-devel openssl-devel protobuf-c-devel"
short_desc="Minimalistic Mumble server"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-clause"
From c4afdea73738fd889e181340f35d846d3b0ee744 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 243/358] unbound: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/unbound/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8ddee828fe0..10a944c2670 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3073,7 +3073,7 @@ libdockapp.so.3 libdockapp-0.7.2_1
libkrdccore.so.5 krdc-17.04.3_1
libArcus.so.3 libArcus-3.1.0_1
libgutenprint.so.9 gutenprint-5.3.3_1
-libunbound.so.8 libunbound-1.10.0_2
+libunbound.so.8 libunbound-1.13.1_2
libmirage.so.11 libmirage-3.1.0_1
libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
libsysprof-4.so sysprof-3.37.90_1
diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template
index 69ee650fbf3..8cf9156a3c8 100644
--- a/srcpkgs/unbound/template
+++ b/srcpkgs/unbound/template
@@ -1,7 +1,7 @@
# Template file for 'unbound'
pkgname=unbound
version=1.13.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-libevent --with-conf-file=/etc/unbound/unbound.conf
--with-pidfile=/run/unbound.pid --with-ssl=${XBPS_CROSS_BASE}/usr
@@ -34,7 +34,7 @@ libunbound_package() {
}
unbound-devel_package() {
- depends="libunbound>=${version}_${revision} libressl-devel libevent-devel"
+ depends="libunbound>=${version}_${revision} openssl-devel libevent-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 0c615f7e91fc1f39a9544e9f0842659f64a4b58d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:56 +0100
Subject: [PATCH 244/358] vanitygen: rebuild against OpenSSL
---
srcpkgs/vanitygen/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template
index 21cdeac96a9..8fb4fa5ca44 100644
--- a/srcpkgs/vanitygen/template
+++ b/srcpkgs/vanitygen/template
@@ -1,9 +1,9 @@
# Template file for 'vanitygen'
pkgname=vanitygen
version=1.53
-revision=1
+revision=2
wrksrc="vanitygen-plus-PLUS${version}"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
short_desc="Bitcoin vanity address generator"
maintainer="Orphaned <orphan@voidlinux.org>"
license="AGPL-3.0-or-later"
From 7b75626de98383e24684e577aa732a8541cd3773 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 245/358] vboot-utils: rebuild against OpenSSL
---
srcpkgs/vboot-utils/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template
index dd93cb9151a..591697d20cf 100644
--- a/srcpkgs/vboot-utils/template
+++ b/srcpkgs/vboot-utils/template
@@ -1,14 +1,14 @@
# Template file for 'vboot-utils'
pkgname=vboot-utils
version=89.13729
-revision=1
+revision=2
_version=${version/./-}
archs="x86_64* i686* aarch64* arm*"
create_wrksrc=yes
build_style=gnu-makefile
make_use_env=yes
hostmakedepends="pkg-config"
-makedepends="libressl-devel libuuid-devel zlib-devel"
+makedepends="openssl-devel libuuid-devel zlib-devel"
short_desc="Verified boot kernel utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="BSD-3-Clause"
From 90e58f6c6ffddd48548d94a155433dd3f814bf0d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 246/358] vde2: rebuild against OpenSSL
---
common/shlibs | 8 ++++----
srcpkgs/vde2/template | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 10a944c2670..539f77e5ba5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1111,10 +1111,10 @@ libminiupnpc.so.17 miniupnpc-2.1_1
libxbps.so.5 libxbps-0.59.1_4
libatf-c.so.1 atf-libs-0.21_1
libatf-c++.so.2 atf-libs-0.21_1
-libvdeplug.so.3 libvde2-2.3.2_1
-libvdemgmt.so.0 libvde2-2.3.2_1
-libvdehist.so.0 libvde2-2.3.2_1
-libvdesnmp.so.0 libvde2-2.3.2_1
+libvdeplug.so.3 libvde2-2.3.2_23
+libvdemgmt.so.0 libvde2-2.3.2_23
+libvdehist.so.0 libvde2-2.3.2_23
+libvdesnmp.so.0 libvde2-2.3.2_23
libsbc.so.1 sbc-1.0_1
libecryptfs.so.1 libecryptfs-111_9
libnuma.so.1 libnuma-2.0.7_1
diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template
index 044f465e70a..5d0efce366a 100644
--- a/srcpkgs/vde2/template
+++ b/srcpkgs/vde2/template
@@ -1,12 +1,12 @@
# Template file for 'vde2'
pkgname=vde2
version=2.3.2
-revision=22
+revision=23
build_style=gnu-configure
configure_args="--disable-static --enable-experimental
--disable-python --enable-kernel-switch"
hostmakedepends="automake libtool"
-makedepends="libpcap-devel libressl-devel"
+makedepends="libpcap-devel openssl-devel"
conf_files="
/etc/vde2/vdecmd
/etc/vde2/libvdemgmt/asyncrecv.rc
From 39c575345a24c3f2e1d6ad9e8d9d5484a57d8bb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:57 +0100
Subject: [PATCH 247/358] virtuoso: rebuild against OpenSSL
---
srcpkgs/virtuoso/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template
index 7650d871fcd..77ea433a107 100644
--- a/srcpkgs/virtuoso/template
+++ b/srcpkgs/virtuoso/template
@@ -1,13 +1,13 @@
# Template file for 'virtuoso'
pkgname=virtuoso
version=7.2.5.1
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64le*"
wrksrc="${pkgname}-opensource-${version}"
build_style=gnu-configure
configure_args="--enable-static"
hostmakedepends="automake libtool flex gperf net-tools"
-makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
+makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel"
short_desc="Scalable cross-platform server of virtuoso"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2"
From e4b734ac45f4739e3bb513d9d4395ab62deaa3a6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 248/358] volta: rebuild against OpenSSL
---
srcpkgs/volta/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template
index 3b24894707d..d6b4f67774a 100644
--- a/srcpkgs/volta/template
+++ b/srcpkgs/volta/template
@@ -1,11 +1,11 @@
# Template file for 'volta'
pkgname=volta
version=1.0.2
-revision=1
+revision=2
archs="x86_64" # Due to volta pulling pre-built binaries later. Evil.
build_style="cargo"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="JavaScript tool version sync helper"
maintainer="Alex Lohr <alex.lohr@logmein.com>"
license="BSD-2-Clause"
From be33d4d06fcb549fdcc6d715619020de2e808990 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 249/358] vpn-ws: rebuild against OpenSSL
---
srcpkgs/vpn-ws/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template
index bfa1bcc9f34..498ca5775a8 100644
--- a/srcpkgs/vpn-ws/template
+++ b/srcpkgs/vpn-ws/template
@@ -1,10 +1,10 @@
# Template file for 'vpn-ws'
pkgname=vpn-ws
version=0.2
-revision=6
+revision=7
build_style=gnu-makefile
make_use_env=yes
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="VPN system over webhooks"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="MIT"
From 93d00519eb7b56601dc40f612d74a877f4b8f83c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 250/358] vsftpd: rebuild against OpenSSL
---
srcpkgs/vsftpd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template
index 58c56630007..866fa5db305 100644
--- a/srcpkgs/vsftpd/template
+++ b/srcpkgs/vsftpd/template
@@ -1,9 +1,9 @@
# Template file for 'vsftpd'
pkgname=vsftpd
version=3.0.3
-revision=13
+revision=14
build_style=gnu-makefile
-makedepends="pam-devel libcap-devel libnsl-devel libressl-devel"
+makedepends="pam-devel libcap-devel libnsl-devel openssl-devel"
short_desc="FTP daemon with focus on security"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
From a83ab28414e3c236025603a3fbebcdc5c7edfa90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 251/358] w3m: rebuild against OpenSSL
---
srcpkgs/w3m/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template
index 6c42a09ff1f..8befde6048b 100644
--- a/srcpkgs/w3m/template
+++ b/srcpkgs/w3m/template
@@ -1,14 +1,14 @@
# Template file for 'w3m'
pkgname=w3m
version=0.5.3+git20210102
-revision=1
+revision=2
wrksrc="${pkgname}-${version/+/-}"
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --enable-image=x11,fb
--with-nkf=/usr/bin/nkf
--with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer"
hostmakedepends="pkg-config gc-devel perl gettext nkf"
-makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel
+makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel
libX11-devel"
short_desc="Text-based Web browser and pager (with Debian patches)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
From 0c4707e9f1ef2497e3ddcd07c0a45ba967c13b4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:58 +0100
Subject: [PATCH 252/358] watchman: rebuild against OpenSSL
---
srcpkgs/watchman/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template
index be338d5ce96..a7effa00bcb 100644
--- a/srcpkgs/watchman/template
+++ b/srcpkgs/watchman/template
@@ -1,11 +1,11 @@
# Template file for 'watchman'
pkgname=watchman
version=4.9.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--disable-statedir --enable-lenient"
hostmakedepends="pkg-config automake libtool"
-makedepends="pcre-devel libressl-devel"
+makedepends="pcre-devel openssl-devel"
short_desc="Watches files and records, or triggers actions, when they change"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
From 0bcbb35bc4e12f88fff3f526eb57114f8da23932 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 253/358] wesnoth: rebuild against OpenSSL
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 19ccacf3e55..7b9b5bd64a0 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,13 +1,13 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.13
-revision=2
+revision=3
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel
SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel
- zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel"
+ zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel"
depends="desktop-file-utils"
short_desc="Turn-based fantasy strategy game"
maintainer="Philipp Hirsch <itself@hanspolo.net>"
From d316d5f4609ea1f17fae910c835ec20bfb0079ea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 254/358] wget: rebuild against OpenSSL
---
srcpkgs/wget/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template
index 49fb40112f1..346f8a41174 100644
--- a/srcpkgs/wget/template
+++ b/srcpkgs/wget/template
@@ -1,13 +1,13 @@
# Template file for 'wget'
pkgname=wget
version=1.21.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl=gnutls')"
conf_files="/etc/wgetrc"
hostmakedepends="perl pkg-config"
makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel
- $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')"
+ $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')"
depends="ca-certificates"
checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL"
short_desc="GNU wget download utility"
From 7574362a3c2eeb491660f84f224d0324e9cafa1f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 255/358] wpa_supplicant: rebuild against OpenSSL
---
srcpkgs/wpa_supplicant/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template
index cee5bf9b3f1..064fd6f71f5 100644
--- a/srcpkgs/wpa_supplicant/template
+++ b/srcpkgs/wpa_supplicant/template
@@ -1,7 +1,7 @@
# Template file for 'wpa_supplicant'
pkgname=wpa_supplicant
version=2.9
-revision=4
+revision=5
build_wrksrc="$pkgname"
short_desc="WPA/WPA2/IEEE 802.1X Supplicant"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17
patch_args="-Np1"
hostmakedepends="pkg-config"
-makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
+makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)"
build_options="dbus readline"
build_options_default="dbus readline"
conf_files="/etc/${pkgname}/${pkgname}.conf"
From 801bd1d751a58a672bc81a31aec7e9c292a5afac Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:59 +0100
Subject: [PATCH 256/358] wrk: rebuild against OpenSSL
---
srcpkgs/wrk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template
index 66aac0f34b5..b2deb5e0ffb 100644
--- a/srcpkgs/wrk/template
+++ b/srcpkgs/wrk/template
@@ -1,11 +1,11 @@
# Template file for 'wrk'
pkgname=wrk
version=4.1.0
-revision=5
+revision=6
build_style=gnu-makefile
make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr"
hostmakedepends="LuaJIT"
-makedepends="LuaJIT-devel libressl-devel"
+makedepends="LuaJIT-devel openssl-devel"
short_desc="Modern HTTP benchmarking tool"
maintainer="Noel Cower <ncower@nil.dev>"
license="Apache-2.0"
From 59f1cd4c82c6840e8d5a9964006728a98bf8d6b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 257/358] wvstreams: rebuild against OpenSSL
---
common/shlibs | 8 ++++----
srcpkgs/wvstreams/template | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 539f77e5ba5..258f0d8f87c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2105,10 +2105,10 @@ libopencv_stereo.so.4.3 libopencv4-4.3.0_1
libopencv_rapid.so.4.3 libopencv4-4.3.0_1
libopencv_intensity_transform.so.4.3 libopencv4-4.3.0_1
libopencv_alphamat.so.4.3 libopencv4-4.3.0_1
-libuniconf.so.4.6 wvstreams-4.6.1_2
-libwvbase.so.4.6 wvstreams-4.6.1_1
-libwvutils.so.4.6 wvstreams-4.6.1_1
-libwvstreams.so.4.6 wvstreams-4.6.1_1
+libuniconf.so.4.6 wvstreams-4.6.1_20
+libwvbase.so.4.6 wvstreams-4.6.1_20
+libwvutils.so.4.6 wvstreams-4.6.1_20
+libwvstreams.so.4.6 wvstreams-4.6.1_20
libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 57426742a2d..068c2194427 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,14 +1,14 @@
# Template file for 'wvstreams'
pkgname=wvstreams
version=4.6.1
-revision=19
+revision=20
build_style=gnu-configure
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2"
short_desc="Library for doing network in C++"
homepage="https://code.google.com/p/wvstreams"
distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
-makedepends="libressl-devel zlib-devel"
+makedepends="openssl-devel zlib-devel"
checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"
conf_files="/etc/uniconf.conf"
From c01728ff0fd9f33069d0e81d6f6500e6e862680d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 258/358] x11vnc: rebuild against OpenSSL
---
srcpkgs/x11vnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template
index 361c6916436..4b8ff04a9eb 100644
--- a/srcpkgs/x11vnc/template
+++ b/srcpkgs/x11vnc/template
@@ -1,11 +1,11 @@
# Template file for 'x11vnc'
pkgname=x11vnc
version=0.9.16
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel
-libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel"
+libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel"
short_desc="VNC server for real X displays"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="GPL-2.0-or-later"
From 08c50ce1fea46d8b5f218511b002f6b61a37575b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 259/358] xar: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/xar/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 258f0d8f87c..463ede7bb6a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1118,7 +1118,7 @@ libvdesnmp.so.0 libvde2-2.3.2_23
libsbc.so.1 sbc-1.0_1
libecryptfs.so.1 libecryptfs-111_9
libnuma.so.1 libnuma-2.0.7_1
-libxar.so.1 xar-1.5.2_1
+libxar.so.1 xar-1.6.1_9
libmikmod.so.3 libmikmod-3.1.12_1
libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1
libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1
diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template
index 6cb55b95fb7..79117d197a9 100644
--- a/srcpkgs/xar/template
+++ b/srcpkgs/xar/template
@@ -1,10 +1,10 @@
# Template file for 'xar'
pkgname=xar
version=1.6.1
-revision=8
+revision=9
build_style=gnu-configure
configure_args="ac_cv_sizeof_uid_t=4"
-makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel"
+makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel"
short_desc="Archiver for the eXtensible ARchiver format"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
From 05c6723a4f75c2468e4174e9c641f6680e2a6bfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:00 +0100
Subject: [PATCH 260/358] xarcan: rebuild against OpenSSL
---
srcpkgs/xarcan/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template
index 1c182c12d60..222f434d0bc 100644
--- a/srcpkgs/xarcan/template
+++ b/srcpkgs/xarcan/template
@@ -1,13 +1,13 @@
# Template file for 'xarcan'
pkgname=xarcan
version=0.6.0
-revision=1
+revision=2
build_style=meson
configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false
-Ddefault_font_path=/usr/share/fonts/X11"
hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans"
makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel
- libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel
+ libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel
xorgproto"
short_desc="Patched Xserver that bridges connections to Arcan"
maintainer="Piraty <piraty1@inbox.ru>"
From 62c739eba88b1f371b0b46625ba23f42c5691c6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 261/358] xca: rebuild against OpenSSL
---
srcpkgs/xca/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template
index b6f6f33c421..e4ee1de4687 100644
--- a/srcpkgs/xca/template
+++ b/srcpkgs/xca/template
@@ -1,10 +1,10 @@
# Template file for 'xca'
pkgname=xca
version=2.1.2
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar"
-makedepends="qt5-devel libressl-devel libltdl-devel"
+makedepends="qt5-devel openssl-devel libltdl-devel"
depends="qt5-plugin-sqlite"
short_desc="X Certificate and Key Management"
maintainer="Denis Revin <denis.revin@gmail.com>"
From 46b7d0e415517ec285348659a7db84f40778ddb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 262/358] xmlsec1: rebuild against OpenSSL
---
common/shlibs | 10 +++++-----
srcpkgs/xmlsec1/template | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 463ede7bb6a..a2434b0ea26 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1557,9 +1557,9 @@ libaqhbci.so.24 aqbanking-5.7.8_1
libaqofxconnect.so.7 aqbanking-5.0.25_1
libaqebics.so.0 aqbanking-5.0.25_1
libaqbankingpp.so.0 aqbanking-5.0.25_1
-libxmlsec1.so.1 xmlsec1-1.2.19_1
-libxmlsec1-nss.so.1 xmlsec1-1.2.28_2
-libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1
+libxmlsec1.so.1 xmlsec1-1.2.31_2
+libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
+libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
libcheck.so.0 check-0.9.12_1
liblxc.so.1 liblxc-1.0.0_1
libtcmalloc.so.4 gperftools-2.1_1
@@ -1755,8 +1755,8 @@ libMrm.so.4 motif-2.3.8_1
libUil.so.4 motif-2.3.8_1
libgtest.so gtest-1.7.0_1
libgtest_main.so gtest-1.7.0_1
-libxmlsec1-gcrypt.so.1 xmlsec1-1.2.20_2
-libxmlsec1-gnutls.so.1 xmlsec1-1.2.20_2
+libxmlsec1-gcrypt.so.1 xmlsec1-1.2.31_2
+libxmlsec1-gnutls.so.1 xmlsec1-1.2.31_2
libefivar.so.1 libefivar-31_1
libefiboot.so.1 libefivar-31_1
libportaudio.so.2 portaudio-19.20140130_1
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 6eb0a22e27f..d564b5142ca 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
# Template file for 'xmlsec1'
pkgname=xmlsec1
version=1.2.31
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gnutls-devel"
makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel
From ad730c5833f955b819100d261704fff3e281211f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 263/358] yara: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/yara/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a2434b0ea26..e82f49d9c10 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2999,7 +2999,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1
libortp.so.15 ortp-4.4.0_1
libsuperlu.so.5 superlu-5.2.1_1
libgosu.so.0 gosu-0.12.0_1
-libyara.so.4 libyara-4.0.0_1
+libyara.so.4 libyara-4.0.5_2
libyaz_icu.so.5 yaz-5.23.1_1
libyaz.so.5 yaz-5.23.1_1
libyaz_server.so.5 yaz-5.23.1_1
diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template
index 72e285db6f8..668ab97b1a7 100644
--- a/srcpkgs/yara/template
+++ b/srcpkgs/yara/template
@@ -1,11 +1,11 @@
# Template file for 'yara'
pkgname=yara
version=4.0.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-magic --enable-cuckoo"
hostmakedepends="automake libtool pkg-config"
-makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel"
+makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel"
short_desc="Pattern matching swiss knife for malware researchers"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
From 56f6683cd56516fe4540f7a7d6aaa55bf9a9d61f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:01 +0100
Subject: [PATCH 264/358] ympd: rebuild against OpenSSL
---
srcpkgs/ympd/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template
index c848f47dea2..14437beb538 100644
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@@ -1,10 +1,10 @@
# Template file for 'ympd'
pkgname=ympd
version=1.3.0
-revision=6
+revision=7
build_style=cmake
hostmakedepends="perl pkg-config"
-makedepends="libmpdclient-devel libressl-devel"
+makedepends="libmpdclient-devel openssl-devel"
short_desc="Standalone MPD Web GUI written in C"
maintainer="John <me@johnnynator.dev>"
license="GPL-2.0-only"
From 6bbfdff85986875d22994f58eca53c2f50e3d31b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 265/358] yubico-piv-tool: rebuild against OpenSSL
---
common/shlibs | 4 ++--
srcpkgs/yubico-piv-tool/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e82f49d9c10..fe62aa41359 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3149,8 +3149,8 @@ libr_crypto.so.5.0.0 radare2-5.0.0_1
libr_fs.so.5.0.0 radare2-5.0.0_1
libr_magic.so.5.0.0 radare2-5.0.0_1
libr_reg.so.5.0.0 radare2-5.0.0_1
-libykpiv.so.1 libykpiv-1.5.0_1
-libykcs11.so.1 libykcs11-1.5.0_1
+libykpiv.so.1 libykpiv-2.1.1_2
+libykcs11.so.1 libykcs11-2.1.1_2
libKF5KExiv2.so.15.0.0 libkexiv25-17.04.3_1
libqmobipocket.so.2 libqmobipocket-17.04.3_1
libgloox.so.17 gloox-1.0.20_1
diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template
index cdb948f8b36..c660d62461a 100644
--- a/srcpkgs/yubico-piv-tool/template
+++ b/srcpkgs/yubico-piv-tool/template
@@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library"
pkgname=yubico-piv-tool
version=2.1.1
-revision=1
+revision=2
build_style=cmake
hostmakedepends="automake libtool gengetopt pkg-config help2man perl"
-makedepends="libressl-devel check-devel pcsclite-devel"
+makedepends="openssl-devel check-devel pcsclite-devel"
short_desc="Yubikey PIV management tool"
maintainer="Aloz1 <kno0001@gmail.com>"
license="BSD-2-Clause"
From 1afbdc5234d39fc35f73bb66d37837842dce3ebf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 266/358] zbackup: rebuild against OpenSSL
---
srcpkgs/zbackup/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template
index a8573d40b77..ce1190b62f0 100644
--- a/srcpkgs/zbackup/template
+++ b/srcpkgs/zbackup/template
@@ -1,10 +1,10 @@
# Template file for 'zbackup'
pkgname=zbackup
version=1.4.4
-revision=21
+revision=22
build_style=cmake
hostmakedepends="protobuf"
-makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel"
+makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel"
short_desc="Versatile deduplicating backup tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 14503aacf7fc417d3f742e00ecf7e16fff142c40 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 267/358] zchunk: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/zchunk/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index fe62aa41359..a32c9d1569f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3525,7 +3525,7 @@ libgetdns.so.10 getdns-1.5.1_7
libgetdns_ext_event.so.10 getdns-1.5.1_7
libgetdns_ext_ev.so.10 getdns-1.5.1_7
libgetdns_ext_uv.so.10 getdns-1.5.1_7
-libzck.so.1 zchunk-1.0.2_2
+libzck.so.1 zchunk-1.1.9_3
librec.so.1 librec1-1.8_1
libfixposix.so.3 libfixposix-0.4.3_1
libgerv.so.1 gerbv-2.6.2_1
diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template
index 876a896bbef..b56a3aba18b 100644
--- a/srcpkgs/zchunk/template
+++ b/srcpkgs/zchunk/template
@@ -1,7 +1,7 @@
# Template file for 'zchunk'
pkgname=zchunk
version=1.1.9
-revision=2
+revision=3
build_style=meson
hostmakedepends="pkg-config"
makedepends="libcurl-devel libzstd-devel"
@@ -24,7 +24,7 @@ post_install() {
zchunk-devel_package() {
short_desc+=" - development files"
- depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel"
+ depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.so"
From 35497a2d8224b71e8b6a1a9e7fd8256edfa93de9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:02 +0100
Subject: [PATCH 268/358] zeek: rebuild against OpenSSL
---
common/shlibs | 10 +++++-----
srcpkgs/zeek/template | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index a32c9d1569f..2ba3301b12e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3533,11 +3533,11 @@ libtexpdf.so.0 libtexpdf-0.9.5_1
libupstart.so.1 libupstart-1.13.3_1
librtas.so.2 librtas-2.0.2_1
librtasevent.so.2 librtas-2.0.2_1
-libbroker.so.2 zeek-3.1.1_1
-libcaf_core.so.0.17.6 zeek-3.2.0_1
-libcaf_io.so.0.17.6 zeek-3.2.0_1
-libcaf_openssl.so.0.17.6 zeek-3.2.0_1
-libbinpac.so.0 zeek-3.1.1_1
+libbroker.so.2 zeek-3.2.4_2
+libcaf_core.so.0.17.6 zeek-3.2.4_2
+libcaf_io.so.0.17.6 zeek-3.2.4_2
+libcaf_openssl.so.0.17.6 zeek-3.2.4_2
+libbinpac.so.0 zeek-3.2.4_2
libllhttp.so.1 llhttp-1.0.1_1
libpinyin.so.13 libpinyin-2.2.1_1
libuhd.so.4.0.0 uhd-4.0.0.0_1
diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template
index 5212bb2dc4b..408b3fe1140 100644
--- a/srcpkgs/zeek/template
+++ b/srcpkgs/zeek/template
@@ -1,12 +1,12 @@
# Template file for 'zeek'
pkgname=zeek
version=3.2.4
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
build_style=cmake
-hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel
+hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel
bind-devel zlib-devel"
-makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel"
+makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel"
short_desc="Advanced framework for network traffic analysis"
maintainer="Andrew Benson <abenson+void@gmail.com>"
license="BSD-3-Clause"
From bfedac574a8c3181ab57e87747de0143d6c64165 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:19:03 +0100
Subject: [PATCH 269/358] znc: rebuild against OpenSSL
---
srcpkgs/znc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index e2f396cb8e0..02ca0634bb2 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
# Template file for 'znc'
pkgname=znc
version=1.8.2
-revision=3
+revision=4
build_style=gnu-configure
configure_args="
--enable-python
@@ -10,7 +10,7 @@ configure_args="
--enable-cyrus
--with-tcl=$XBPS_CROSS_BASE/usr/lib"
hostmakedepends="pkg-config perl tar"
-makedepends="libressl-devel python3-devel tcl-devel libsasl-devel
+makedepends="openssl-devel python3-devel tcl-devel libsasl-devel
icu-devel zlib-devel perl"
short_desc="Advanced IRC Bouncer"
maintainer="Duncaen <duncaen@voidlinux.org>"
From f8ec145b1d144d1fca4ed0bff2f5e011cc709c0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:01 +0100
Subject: [PATCH 270/358] dovecot-plugin-pigeonhole: rebuild against OpenSSL
---
srcpkgs/dovecot-plugin-pigeonhole/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template
index 778c0f16f2a..74822242909 100644
--- a/srcpkgs/dovecot-plugin-pigeonhole/template
+++ b/srcpkgs/dovecot-plugin-pigeonhole/template
@@ -13,7 +13,7 @@ configure_args="--prefix=/usr
make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot
LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot"
hostmakedepends="libldap-devel"
-makedepends="dovecot-devel libressl-devel libldap-devel"
+makedepends="dovecot-devel openssl-devel libldap-devel"
short_desc="Sieve implementation for Dovecot"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="LGPL-2.1-or-later"
From aea99f302687866f815377abebd6fb3aeba45759 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 271/358] easyrsa: rebuild against OpenSSL
---
srcpkgs/easyrsa/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template
index 5fb47055643..b4145ca7dba 100644
--- a/srcpkgs/easyrsa/template
+++ b/srcpkgs/easyrsa/template
@@ -1,9 +1,9 @@
# Template file for 'easyrsa'
pkgname=easyrsa
version=3.0.8
-revision=1
+revision=2
wrksrc="EasyRSA-${version}"
-depends="libressl"
+depends="openssl"
short_desc="Simple shell based CA utility"
maintainer="Adam Gausmann <agausmann@fastmail.com>"
license="GPL-2.0-only"
From 6ea4009bbb55d7f2cc98bf3ea41dadd409e5be2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:04 +0100
Subject: [PATCH 272/358] fbpdf: rebuild against OpenSSL
---
srcpkgs/fbpdf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template
index f97f4e2b65e..167c74c6ba3 100644
--- a/srcpkgs/fbpdf/template
+++ b/srcpkgs/fbpdf/template
@@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e
_gitshort="${_githash:0:7}"
wrksrc="fbpdf-${_gitshort}"
build_style=gnu-makefile
-makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel
+makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel
gumbo-parser-devel mupdf-devel"
short_desc="Small framebuffer PDF/DJVU viewer"
maintainer="Leah Neukirchen <leah@vuxu.org>"
From ff77b4d96c19bf38a65d0504101355853230bfaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:07 +0100
Subject: [PATCH 273/358] godot: rebuild against OpenSSL
---
srcpkgs/godot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 5b17ece10d0..84bab43bb5b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no
hostmakedepends="pkg-config clang"
makedepends="
alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel
- libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel
+ libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel
bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel
opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel
miniupnpc-devel pcre2-devel"
From 8d1fbe8c538ef3284c650da4da5791d4044df8ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:10 +0100
Subject: [PATCH 274/358] gtklp: rebuild against OpenSSL
---
srcpkgs/gtklp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template
index 4887b446460..ab34cc264ff 100644
--- a/srcpkgs/gtklp/template
+++ b/srcpkgs/gtklp/template
@@ -5,7 +5,7 @@ revision=1
build_style="gnu-configure"
configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config"
hostmakedepends="automake libtool pkg-config gettext"
-makedepends="libressl-devel gtk+-devel cups-devel"
+makedepends="openssl-devel gtk+-devel cups-devel"
short_desc="Gtk frontend to cups - IPP support"
maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
license="GPL-2.0-or-later"
From b62873f47e51fe253e3140ff43b97be54c97d3fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:13 +0100
Subject: [PATCH 275/358] hcxdumptool: rebuild against OpenSSL
---
srcpkgs/hcxdumptool/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template
index f07ba897c95..e7835044f91 100644
--- a/srcpkgs/hcxdumptool/template
+++ b/srcpkgs/hcxdumptool/template
@@ -1,9 +1,9 @@
# Template file for 'hcxdumptool'
pkgname=hcxdumptool
version=6.1.1
-revision=1
+revision=2
build_style=gnu-makefile
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Small tool to capture packets from wlan devices"
maintainer="Felix Hanley <felix@userspace.com.au>"
license="MIT"
From fa4d0c1e34301545f567103e0e971243b2ac9ac9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:16 +0100
Subject: [PATCH 276/358] hcxtools: rebuild against OpenSSL
---
srcpkgs/hcxtools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template
index 4ff580c68f7..eac1ad48c1e 100644
--- a/srcpkgs/hcxtools/template
+++ b/srcpkgs/hcxtools/template
@@ -1,9 +1,9 @@
# Template file for 'hcxtools'
pkgname=hcxtools
version=6.1.1
-revision=1
+revision=2
build_style=gnu-makefile
-makedepends="libressl-devel libcurl-devel zlib-devel"
+makedepends="openssl-devel libcurl-devel zlib-devel"
short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files"
maintainer="Felix Hanley <felix@userspace.com.au>"
license="MIT"
From e6f080faf20efbb114bd79b03a64ac3209fca461 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:18 +0100
Subject: [PATCH 277/358] kodi-addon-inputstream-rtmp: rebuild against OpenSSL
---
srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template
index dc5b7f15d68..bee02ae906e 100644
--- a/srcpkgs/kodi-addon-inputstream-rtmp/template
+++ b/srcpkgs/kodi-addon-inputstream-rtmp/template
@@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel
- libressl-devel zlib-devel librtmp-devel"
+ openssl-devel zlib-devel librtmp-devel"
short_desc="RTMP input stream add-on for Kodi"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 101784c5d7b655470d547427c04fd3264efb0aa6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:26 +0100
Subject: [PATCH 278/358] kodi-addon-vfs-sftp: rebuild against OpenSSL
---
srcpkgs/kodi-addon-vfs-sftp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template
index 0a974c1c350..5ba4d6a33c3 100644
--- a/srcpkgs/kodi-addon-vfs-sftp/template
+++ b/srcpkgs/kodi-addon-vfs-sftp/template
@@ -6,7 +6,7 @@ _kodi_release=Leia
wrksrc="vfs.sftp-${version}-${_kodi_release}"
build_style=cmake
hostmakedepends="pkg-config"
-makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel"
+makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel"
short_desc="VFS SFTP addon for Kodi"
maintainer="Foxlet <foxlet@furcode.co>"
license="GPL-2.0-or-later"
From dc9b3eb70080011bd1d9e930fe73728d042f360f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:56:28 +0100
Subject: [PATCH 279/358] kodi-rpi: rebuild against OpenSSL
---
srcpkgs/kodi-rpi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index d69ef928f5b..0b50f0f9f04 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi-rpi'
pkgname=kodi-rpi
version=18.8
-revision=4
+revision=5
_codename="Leia"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
@@ -27,7 +27,7 @@ makedepends="
libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel
libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel
fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel
- faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel
+ faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel
fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel
enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel
librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel
From d687b77d6d1e7bf6c2c8efd1743cf1b07c98764c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:06 +0100
Subject: [PATCH 280/358] libevhtp: rebuild against OpenSSL
---
srcpkgs/libevhtp/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template
index bf8ac0a25e8..098a6daa050 100644
--- a/srcpkgs/libevhtp/template
+++ b/srcpkgs/libevhtp/template
@@ -1,9 +1,10 @@
# Template file for 'libevhtp'
pkgname=libevhtp
version=1.2.18
-revision=1
+revision=2
build_style=cmake
-makedepends="libevent-devel libressl-devel oniguruma-devel"
+makedepends="libevent-devel openssl-devel oniguruma-devel"
+depends="${makedepends}"
short_desc="Create extremely-fast and secure embedded HTTP servers with ease"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="BSD-3-Clause"
From ebd80d560de3f4e03fd98f726c88111de8fcd805 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:13 +0100
Subject: [PATCH 281/358] libsignal-protocol-c: OpenSSL is only a checkdepends
---
srcpkgs/libsignal-protocol-c/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template
index 9fa03bf6054..20eb3cd373c 100644
--- a/srcpkgs/libsignal-protocol-c/template
+++ b/srcpkgs/libsignal-protocol-c/template
@@ -4,8 +4,7 @@ version=2.3.3
revision=2
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
-makedepends="libressl-devel"
-checkdepends="pkg-config check-devel"
+checkdepends="openssl-devel pkg-config check-devel"
short_desc="Signal Protocol C Library"
maintainer="teldra <teldra@rotce.de>"
license="GPL-3.0-or-later"
From 85122f77ab0d4149a5bad7844a093f9aba1acc86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:14 +0100
Subject: [PATCH 282/358] libvncserver: rebuild against OpenSSL
---
common/shlibs | 4 ++--
srcpkgs/libvncserver/template | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 2ba3301b12e..aed3202ad18 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1403,8 +1403,8 @@ libqoauth.so.2 qoauth-qt5-2.0.0_1
libIrrlicht.so.1.8 irrlicht-1.8_1
libsnappy.so.1 snappy-1.1.0_1
libKF5Torrent.so.6 libktorrent-2.1_1
-libvncserver.so.1 libvncserver-0.9.11_1
-libvncclient.so.1 libvncserver-0.9.11_1
+libvncserver.so.1 libvncserver-0.9.13_2
+libvncclient.so.1 libvncserver-0.9.13_2
libotr.so.5 libotr-4.0.0_1
liballeg.so.4.4 allegro4-4.4.2_1
liballeggl.so.4.4 allegro4-4.4.2_1
diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template
index cac51f79d51..dd43945c15e 100644
--- a/srcpkgs/libvncserver/template
+++ b/srcpkgs/libvncserver/template
@@ -1,11 +1,12 @@
# Template file for 'libvncserver'
pkgname=libvncserver
version=0.9.13
-revision=1
+revision=2
wrksrc="libvncserver-LibVNCServer-${version}"
build_style=cmake
+confiugre_args="-DWITH_OPENSSL=ON -DWITH_GNUTLS=OF"
hostmakedepends="pkg-config"
-makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel"
+makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel"
short_desc="C libraries to easily implement VNC server or client functionality"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
From 39bc674d775a20a7c9e114e80021f52ba885c640 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:15 +0100
Subject: [PATCH 283/358] linux-tools: rebuild against OpenSSL
---
srcpkgs/linux-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template
index 8c46de1e1ea..a3760e4965b 100644
--- a/srcpkgs/linux-tools/template
+++ b/srcpkgs/linux-tools/template
@@ -7,7 +7,7 @@ build_style=meta
hostmakedepends="asciidoc automake flex gettext libtool perl python3
python3-docutils xmlto"
makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel
- libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel
+ libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel
libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel
slang-devel"
depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}"
From 2ca33827bd9a77802e091bf6e030842cf27023f1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:20 +0100
Subject: [PATCH 284/358] miniupnpd: rebuild against OpenSSL
---
srcpkgs/miniupnpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template
index a406253f2ec..430fb02e6cf 100644
--- a/srcpkgs/miniupnpd/template
+++ b/srcpkgs/miniupnpd/template
@@ -15,7 +15,7 @@ conf_files="
/etc/miniupnpd/*.conf
/etc/miniupnpd/*.sh"
hostmakedepends="pkg-config"
-makedepends="libnfnetlink-devel iptables-devel libressl-devel"
+makedepends="libnfnetlink-devel iptables-devel openssl-devel"
short_desc="Lightweight UPnP IGD daemon"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
From 0d1b0a155d65839e1fa0a30a8d7228b6b9c9efd0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:46 +0100
Subject: [PATCH 285/358] mktorrent: rebuild against OpenSSL
---
srcpkgs/mktorrent/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template
index 51de7921fb6..d0707326324 100644
--- a/srcpkgs/mktorrent/template
+++ b/srcpkgs/mktorrent/template
@@ -1,10 +1,11 @@
# Template file for 'mktorrent'
pkgname=mktorrent
version=1.1
-revision=2
+revision=3
build_style=gnu-makefile
make_build_args="USE_OPENSSL=1"
-makedepends="libressl-devel"
+make_install_args="USE_OPENSSL=1"
+makedepends="openssl-devel"
short_desc="Simple command line utility to create BitTorrent metainfo files"
maintainer="Georg Schabel <gescha@posteo.de>"
license="GPL-2.0-or-later"
From 93c98551ef8dab840e2060aec8ddfbc5904ab800 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH 286/358] musikcube: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
srcpkgs/musikcube/template | 4 ++--
3 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch
diff --git a/common/shlibs b/common/shlibs
index aed3202ad18..669b7e91b66 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -593,7 +593,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
libgtop-2.0.so.11 libgtop-2.38.0_1
librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
libgnome-menu-3.so.0 gnome-menus-2.91.6_1
libart_lgpl_2.so.2 libart-2.3.20_1
libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+
+--- src/plugins/server/HttpServer.h.orig 2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.93.1
-revision=2
+revision=3
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
hostmakedepends="pkg-config"
makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
sndio-devel"
short_desc="Terminal-based music player in c++"
From db8ce1d610677762c9dcfff178bde5305b02a3f5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:50 +0100
Subject: [PATCH 287/358] next: rebuild against OpenSSL
---
srcpkgs/next/patches/sbcl-2.1.0.patch | 31 +++++++++++++++++++++++++++
srcpkgs/next/template | 6 +++---
2 files changed, 34 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/next/patches/sbcl-2.1.0.patch
diff --git a/srcpkgs/next/patches/sbcl-2.1.0.patch b/srcpkgs/next/patches/sbcl-2.1.0.patch
new file mode 100644
index 00000000000..44c2059d21d
--- /dev/null
+++ b/srcpkgs/next/patches/sbcl-2.1.0.patch
@@ -0,0 +1,31 @@
+commit 8350ff933c37faa15101662516d8614a9c301a36
+Author: Pierre Neidhardt <mail@ambrevar.xyz>
+Date: Thu Mar 5 16:43:55 2020 +0100
+
+ Work around Guix compilation error of define-key.
+
+ Error happens in search-buffer's search-over-buffers which calls define-key.
+
+ ; in: DEFUN SEARCH-OVER-BUFFERS => DEFINE-KEY "C-s"
+ ; (NEXT:DEFINE-KEY "C-s"
+ ; #'(LAMBDA () (NEXT::UPDATE-SELECTION-HIGHLIGHT-HINT :FOLLOW T :SCROLL T))
+ ; :KEYMAP NEXT::KEYMAP)
+ ;
+ ; caught WARNING:
+ ; The first argument of type (SIMPLE-ARRAY CHARACTER (3)) cannot be used as a keyword.
+
+ Maybe the type is wrong. But our define-key lambdalist is weird anyways.
+
+diff --git a/source/keymap.lisp b/source/keymap.lisp
+index bbcb9d21..e29bdf3a 100644
+--- source/keymap.lisp
++++ source/keymap.lisp
+@@ -144,7 +144,7 @@
+ (setf (key-chord-stack *browser*) nil))
+ (t (setf (key-chord-stack *browser*) nil))))))
+
+-(declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key))
++;; (declaim (ftype (function (&rest t &key (:scheme list) (:keymap keymap) &allow-other-keys)) define-key)) ; TODO: This fails with Guix.
+ @export
+ (defun define-key (&rest key-command-pairs
+ &key keymap
diff --git a/srcpkgs/next/template b/srcpkgs/next/template
index d6e20377f46..fd5b877ecd2 100644
--- a/srcpkgs/next/template
+++ b/srcpkgs/next/template
@@ -1,12 +1,12 @@
# Template file for 'next'
pkgname=next
version=1.5.0
-revision=1
+revision=2
wrksrc=nyxt-${version}
build_style=gnu-makefile
hostmakedepends="sbcl curl pkg-config"
-makedepends="webkit2gtk-devel libfixposix-devel libressl-devel"
-depends="sqlite xclip libfixposix-devel libressl-devel"
+makedepends="webkit2gtk-devel libfixposix-devel openssl-devel"
+depends="dbus sqlite xclip libfixposix-devel openssl-devel"
short_desc="Keyboard-oriented, extensible web-browser"
maintainer="0x0f0f0f <sudo-woodo3@protonmail.com>"
license="BSD-3-Clause"
From 6a768f4304b91ee017caf095c77c0465e75b9858 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:08 +0100
Subject: [PATCH 288/358] ngrep: rebuild against OpenSSL
---
srcpkgs/ngrep/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template
index bc30aa05a2c..02a301eb639 100644
--- a/srcpkgs/ngrep/template
+++ b/srcpkgs/ngrep/template
@@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}"
build_style=gnu-configure
configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre"
hostmakedepends="pkg-config"
-makedepends="pcre-devel libpcap-devel libressl-devel"
+makedepends="pcre-devel libpcap-devel openssl-devel"
short_desc="Like GNU grep applied to the network layer"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
From c57185d63aec10abffbb051e9170827e14f1ad3d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:10 +0100
Subject: [PATCH 289/358] nodejs-lts-10: change openssl buildoption to OpenSSL
---
srcpkgs/nodejs-lts-10/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 773b0dcf1a0..0d28125a75f 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -4,11 +4,11 @@ version=10.23.1
revision=1
wrksrc="node-v${version}"
hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel)"
makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel)"
short_desc="Evented I/O for V8 javascript (Dubnium)"
@@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
python_version=2 #unverified
build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
desc_option_libuv="Enable shared libuv"
desc_option_http_parser="Enable shared http-parser"
desc_option_icu="Enable shared icu"
From a9c4b7c7ee1c814f8b49572d6c5fe2e95a97bb4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:11 +0100
Subject: [PATCH 290/358] nodejs-lts: change openssl build-option to OpenSSL
---
srcpkgs/nodejs-lts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index c19a4b0198e..edb108631ae 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -5,11 +5,11 @@ revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
desc_option_libuv="Enable shared libuv"
desc_option_http_parser="Enable shared http-parser and llhttp"
desc_option_icu="Enable shared icu"
From 66443b7f8702df9dbd407048db83ce34518c8628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:12 +0100
Subject: [PATCH 291/358] nodejs: change openssl build-option to OpenSSL
---
srcpkgs/nodejs/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 3d84f1c0de6..e89a169ad61 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -5,11 +5,11 @@ revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel)
- $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
+ $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
$(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
$(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
short_desc="Evented I/O for V8 javascript"
@@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared libressl"
+desc_option_ssl="Enable shared openssl"
desc_option_libuv="Enable shared libuv"
desc_option_http_parser="Enable shared http-parser and llhttp"
desc_option_icu="Enable shared icu"
From 2ebe88db5c84f60fe0e4c4f715f0efed61ba4581 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:34 +0100
Subject: [PATCH 292/358] tree-wide: rebuild against OpenSSL
---
srcpkgs/odroid-u2-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template
index 2ff1a86c6de..748f904ee1d 100644
--- a/srcpkgs/odroid-u2-kernel/template
+++ b/srcpkgs/odroid-u2-kernel/template
@@ -22,7 +22,7 @@ _kernver="${version}_${revision}"
nostrip=yes
noverifyrdeps=yes
archs="armv7l"
-hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc"
makedepends="ncurses-devel"
depends="kmod>=11_2"
triggers="kernel-hooks"
From 11d42b317e6a4d941a1100f36ea92d24ea4fb186 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:38 +0100
Subject: [PATCH 293/358] open-vm-tools: rebuild against OpenSSL
---
srcpkgs/open-vm-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template
index 91f592220c4..b751d6d89f8 100644
--- a/srcpkgs/open-vm-tools/template
+++ b/srcpkgs/open-vm-tools/template
@@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d
--without-xmlsecurity --without-kernel-modules
$(vopt_with x11 x) $(vopt_with pam)"
hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto"
-makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel
+makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel
libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel')
$(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')"
short_desc="Open source implementation of VMware Tools"
From 37453a62d7e5f68186479b06814e7f9395da922a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:58:45 +0100
Subject: [PATCH 294/358] openjdk11: rebuild against OpenSSL
---
srcpkgs/openjdk11/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template
index df3cf793ae5..7e7177eff69 100644
--- a/srcpkgs/openjdk11/template
+++ b/srcpkgs/openjdk11/template
@@ -29,7 +29,7 @@ configure_args="
make_build_args="images $(vopt_if docs docs)"
make_check_target="test-hotspot-gtest"
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
- libressl zlib-devel which make-ca"
+ openssl zlib-devel which make-ca"
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
fontconfig-devel zlib-devel lcms2-devel"
From 9a75612c32be36b262daa292355c2e5cc910d00e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:01 +0100
Subject: [PATCH 295/358] opensmtpd-extras: rebuild against OpenSSL
---
srcpkgs/opensmtpd-extras/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template
index 164eaf6dfc5..ab11b171f8c 100644
--- a/srcpkgs/opensmtpd-extras/template
+++ b/srcpkgs/opensmtpd-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-configure
configure_args="--with-table-passwd --with-table-ldap --with-table-mysql
--with-table-postgres --with-table-socketmap --with-table-sqlite"
hostmakedepends="automake libtool"
-makedepends="libressl-devel libevent-devel postgresql-libs-devel
+makedepends="openssl-devel libevent-devel postgresql-libs-devel
libmariadbclient-devel sqlite-devel"
depends="opensmtpd"
short_desc="Free implementation of the server-side SMTP protocol - extras"
From a1bbf52998cf6c82a140897926d2b5ac82084915 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:04 +0100
Subject: [PATCH 296/358] openvpn: build against OpenSSL, re-enable pcks11
---
srcpkgs/openvpn/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template
index f6ebdbb57d6..29c0f10ddea 100644
--- a/srcpkgs/openvpn/template
+++ b/srcpkgs/openvpn/template
@@ -1,12 +1,12 @@
# Template file for 'openvpn'
pkgname=openvpn
version=2.5.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="$(vopt_enable pkcs11) --disable-systemd
$(vopt_if mbedtls --with-crypto-library=mbedtls)"
hostmakedepends="pkg-config"
-makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel
+makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel
$(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel"
short_desc="Easy-to-use, robust, and highly configurable VPN"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,7 +16,7 @@ distfiles="http://build.openvpn.net/downloads/releases/${pkgname}-${version}.tar
checksum=029a426e44d656cb4e1189319c95fe6fc9864247724f5599d99df9c4c3478fbd
build_options="mbedtls pkcs11"
-build_options_default="mbedtls"
+build_options_default="pkcs11"
desc_option_mbedtls="Build with mbedtls support"
desc_option_pkcs11="Enable support for PKCS#11"
vopt_conflict mbedtls pkcs11
From ffeb2ee060bc17c75039e267ca3a41a374596fd9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:05 +0100
Subject: [PATCH 297/358] passwordsafe: rebuild against OpenSSL
---
srcpkgs/passwordsafe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template
index 2cd6ee12a11..c4eab0c120e 100644
--- a/srcpkgs/passwordsafe/template
+++ b/srcpkgs/passwordsafe/template
@@ -1,14 +1,14 @@
# Template file for 'passwordsafe'
pkgname=passwordsafe
version=1.13.0
-revision=1
+revision=2
wrksrc="pwsafe-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
# build process uses perl to generate core_st.cpp and zip to generate help files
hostmakedepends="perl zip pkg-config gettext"
makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel
- libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel"
+ libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel"
checkdepends="gtest-devel"
short_desc="Simple & Secure Password Management"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
From 1d816363a8356ed82bb9bdfba64c1858449d0797 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:14 +0100
Subject: [PATCH 298/358] pmbootstrap: rebuild against OpenSSL
---
srcpkgs/pmbootstrap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template
index 0f486a2dd23..d1660a8a59d 100644
--- a/srcpkgs/pmbootstrap/template
+++ b/srcpkgs/pmbootstrap/template
@@ -1,10 +1,10 @@
# Template file for 'pmbootstrap'
pkgname=pmbootstrap
version=1.29.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools"
-depends="python3-setuptools coreutils procps-ng libressl git"
+depends="python3-setuptools coreutils procps-ng openssl git"
short_desc="PostmarketOS's chroot, build and flash tool"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
license="GPL-3.0-or-later"
From b5a2375a8e176c1842d9dcb2c09848f5b32585ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:15 +0100
Subject: [PATCH 299/358] python-tkinter: rebuild against OpenSSL
---
srcpkgs/python-tkinter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index 85e80035fa1..7063efc5575 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -12,7 +12,7 @@ revision=2
wrksrc="Python-${version}"
pycompile_dirs="usr/lib/python2.7/lib-tk"
hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel
sqlite-devel bzip2-devel zlib-devel tk-devel"
short_desc="${_desc} - GUI toolkit for Python2"
maintainer="Orphaned <orphan@voidlinux.org>"
From 2c0ceec362dd678866a172cdd1c9ddb8d52f69fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:17 +0100
Subject: [PATCH 300/358] python3-grpcio: rebuild against OpenSSL
---
srcpkgs/python3-grpcio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template
index f286217b246..38515f13aae 100644
--- a/srcpkgs/python3-grpcio/template
+++ b/srcpkgs/python3-grpcio/template
@@ -1,12 +1,12 @@
# Template file for 'python3-grpcio'
pkgname=python3-grpcio
version=1.36.0
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv[67]* ppc64le*"
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-six"
-makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel"
+makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel"
depends="python3-six"
short_desc="HTTP/2-based gRPC framework for Python"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From 9b2aec2f1562840c602d35f8068b346a369136a5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:22 +0100
Subject: [PATCH 301/358] python3-mysqlclient: rebuild against OpenSSL
---
srcpkgs/python3-mysqlclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template
index efbda51472b..af49371f230 100644
--- a/srcpkgs/python3-mysqlclient/template
+++ b/srcpkgs/python3-mysqlclient/template
@@ -5,7 +5,7 @@ revision=4
wrksrc="mysqlclient-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
-makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel"
+makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel"
short_desc="Python3 interface to MySQL/MariaDB"
maintainer="Alin Dobre <alin.dobre@outlook.com>"
license="GPL-2.0-or-later"
From 511bdc37e54b5745cbc66c4581e252992974a433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:24 +0100
Subject: [PATCH 302/358] python3-tkinter: rebuild against OpenSSL
---
srcpkgs/python3-tkinter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template
index 47824807034..626392bc88f 100644
--- a/srcpkgs/python3-tkinter/template
+++ b/srcpkgs/python3-tkinter/template
@@ -16,7 +16,7 @@ pycompile_dirs="
usr/lib/python${version%.*}/turtledemo
usr/lib/python${version%.*}/turtle.py"
hostmakedepends="pkg-config"
-makedepends="libffi-devel readline-devel gdbm-devel libressl-devel
+makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel"
short_desc="${_desc} - GUI toolkit for Python3"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From fe697484e99d67803b156af902e540e539c4b434 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:49 +0100
Subject: [PATCH 303/358] remwharead: cleanup makedepends
remwharead no rebuild needed for OpenSSL, the package only had
the dependencies listed, because poco didn't specify them for itself
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index ebb6eb27ff8..03ac932eac0 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -4,7 +4,7 @@ version=0.10.0
revision=1
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
-makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel"
+makedepends="poco-devel boost-devel"
short_desc="Saves URIs of things you want to remember in a database"
maintainer="teldra <teldra@rotce.de>"
license="GPL-3.0-only"
From fbb75a02df5353b3e333d63040abc656a80826e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:10 +0100
Subject: [PATCH 304/358] rmilter: change to OpenSSL
openssl just gets checked by cmake, but never actually used,
so no rebuild needed
---
srcpkgs/rmilter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template
index a1c14a2b038..a131af6c7f0 100644
--- a/srcpkgs/rmilter/template
+++ b/srcpkgs/rmilter/template
@@ -5,7 +5,7 @@ revision=1
build_style=cmake
configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin"
hostmakedepends="pkg-config bison flex"
-makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
+makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel"
short_desc="Postfix/sendmail integration for rspamd"
maintainer="John Regan <john@jrjrtech.com>"
license="BSD"
From 0ae090448e3ae3b04c2cef989863704319e9503e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:20 +0100
Subject: [PATCH 305/358] rtags: rebuild against OpenSSL
---
srcpkgs/rtags/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index d718e6c3090..baf721c4160 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -6,7 +6,7 @@ build_style=cmake
# Don't run tests in do_install, please.
configure_args="-DSKIP_CTEST=TRUE"
hostmakedepends="pkg-config clang"
-makedepends="llvm libressl-devel zlib-devel"
+makedepends="llvm openssl-devel zlib-devel"
checkdepends="perl python3-PyHamcrest python3-nose"
short_desc="C/C++ indexer with integration for Emacs based on clang"
maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"
From 1ff62d59f9b9a1bf7389f42fdb1a61bd92271bc6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:26 +0100
Subject: [PATCH 306/358] sane: rebuild against OpenSSL
---
srcpkgs/sane/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index aaaf65d5d2d..f75ea181344 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread
$(vopt_with snmp)"
hostmakedepends="pkg-config"
makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel
- v4l-utils-devel libusb-devel libressl-devel libxml2-devel
+ v4l-utils-devel libusb-devel openssl-devel libxml2-devel
$(vopt_if snmp net-snmp-devel)"
depends="$(vopt_if snmp net-snmp)"
conf_files="/etc/sane.d/*.conf"
From 8a047d2d5434f218ebb2b9587cb29f38d83ecc98 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:33 +0100
Subject: [PATCH 307/358] slurm-wlm: rebuild against OpenSSL
---
srcpkgs/slurm-wlm/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template
index 4d19c3ff527..46fc8773520 100644
--- a/srcpkgs/slurm-wlm/template
+++ b/srcpkgs/slurm-wlm/template
@@ -8,7 +8,7 @@ build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="perl cgit python pkg-config"
# XXX: ofed, DataWarp, netloc, blcr
-makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel
+makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel
ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel
freeipmi-devel"
short_desc="Workload manager for Linux clusters of all sizes"
From 999cdd6759eb26f3ff12bab9cc782ed4e8e2e563 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:02:06 +0100
Subject: [PATCH 308/358] sysbench: rebuild against OpenSSL
---
srcpkgs/sysbench/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template
index 1cfb63d7caa..032f10234ea 100644
--- a/srcpkgs/sysbench/template
+++ b/srcpkgs/sysbench/template
@@ -9,7 +9,7 @@ configure_args="
--with-system-ck
--with-system-luajit"
hostmakedepends="automake libtool pkg-config"
-makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel
+makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel
postgresql-libs-devel zlib-devel"
short_desc="Scriptable database and system performance benchmark"
maintainer="Duncaen <duncaen@voidlinux.org>"
From 83e84c22530438eebcbdbefa9c7ecac90f36da9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:21 +0100
Subject: [PATCH 309/358] tarsnap: rebuild against OpenSSL
---
srcpkgs/tarsnap/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template
index d0cd51a5425..7b64c4ccb1f 100644
--- a/srcpkgs/tarsnap/template
+++ b/srcpkgs/tarsnap/template
@@ -1,11 +1,11 @@
# Template file for 'tarsnap'
pkgname=tarsnap
version=1.0.39
-revision=1
+revision=2
wrksrc=${pkgname}-autoconf-${version}
build_style=gnu-configure
configure_args="--sysconfdir=/etc/${pkgname}"
-makedepends="e2fsprogs-devel libressl-devel"
+makedepends="e2fsprogs-devel openssl-devel"
depends="bzip2 xz"
conf_files="/etc/tarsnap/tarsnap.conf"
short_desc="An online encrypted backup service (client)"
From f6f7f3f708d63bfcb2ab41117a793de4e9f30745 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:24 +0100
Subject: [PATCH 310/358] testssl.sh: rebuild against OpenSSL
---
srcpkgs/testssl.sh/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template
index 317c175a2b1..84b5510f598 100644
--- a/srcpkgs/testssl.sh/template
+++ b/srcpkgs/testssl.sh/template
@@ -1,8 +1,8 @@
# Template file for 'testssl.sh'
pkgname=testssl.sh
version=3.0.2
-revision=2
-depends="libressl bind-utils"
+revision=3
+depends="openssl bind-utils"
short_desc="Command line tool which checks a server for the support of TLS/SSL"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-only"
From 7174fcd2486395c42d301b4685870661e0e79aa4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:26 +0100
Subject: [PATCH 311/358] tg_owt: rebuild against OpenSSL
---
srcpkgs/tg_owt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 27a211f2382..fa0d55fc4ae 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -1,7 +1,7 @@
# Template file for 'tg_owt'
pkgname=tg_owt
version=0.0.0.1
-revision=1
+revision=2
_commit=756fd0fb5f40ffb4244c675208e84de781f766f3
_libvpx_commit=5b63f0f821e94f8072eb483014cfc33b05978bb9
_libyuv_commit=ad890067f661dc747a975bc55ba3767fe30d4452
@@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit"
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=OFF"
hostmakedepends="pkg-config yasm protobuf"
-makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel
+makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel
libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel"
depends="$makedepends"
short_desc="WebRTC library for Telegram-desktop"
From 90cb551ad8f334de0a8d8e3e8c5ac48abbf7c03c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:39 +0100
Subject: [PATCH 312/358] turbovnc: rebuild against OpenSSL
---
srcpkgs/turbovnc/patches/fix-libressl.patch | 13 -------------
srcpkgs/turbovnc/template | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
delete mode 100644 srcpkgs/turbovnc/patches/fix-libressl.patch
diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch
deleted file mode 100644
index f63c1a82c6e..00000000000
--- a/srcpkgs/turbovnc/patches/fix-libressl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig 2019-06-04 18:00:21.482107165 +0200
-+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h 2019-06-04 18:00:37.826303493 +0200
-@@ -29,6 +29,10 @@
- #ifndef __RFB_H__
- #define __RFB_H__
-
-+/* Fix for libressl */
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#define OPENSSL_INIT_SETTINGS void
-+#endif
-
- #ifdef HAVE_DIX_CONFIG_H
- #include <dix-config.h>
diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template
index a48723aca0b..12db4b8c9c5 100644
--- a/srcpkgs/turbovnc/template
+++ b/srcpkgs/turbovnc/template
@@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0
-DTVNC_SYSTEMLIBS=ON"
hostmakedepends="rsync"
makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel
- zlib-devel freetype-devel bzip2-devel libressl-devel"
+ zlib-devel freetype-devel bzip2-devel openssl-devel"
depends="perl"
short_desc="Optimized version of TightVNC VNC client and server"
maintainer="Orphaned <orphan@voidlinux.org>"
From 1cd4afdcb53af1e70b2149a8636e51a884134c50 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:44 +0100
Subject: [PATCH 313/358] websocat: rebuild against OpenSSL
and actually enable ssl support
---
srcpkgs/websocat/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template
index eb781dbc641..12003971405 100644
--- a/srcpkgs/websocat/template
+++ b/srcpkgs/websocat/template
@@ -1,10 +1,11 @@
# Template file for 'websocat'
pkgname=websocat
version=1.6.0
-revision=1
+revision=2
build_style=cargo
+configure_args="--features=ssl"
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="Netcat, curl and socat for WebSockets"
maintainer="Zach Dykstra <dykstra.zachary@gmail.com>"
license="MIT"
From 8a7c25d329c4c8c8d90570652c5286d02d9ae220 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:47 +0100
Subject: [PATCH 314/358] xen: change to OpenSSL
---
srcpkgs/xen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..092460ea73e 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd
hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git
ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget"
makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel
- libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel
+ libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel
netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel"
depends="bridge-utils perl xen-hypervisor"
short_desc="Xen hypervisor utilities"
From ae26d5e0de60fe94aeb881f2caa05be4369f2098 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:03:48 +0100
Subject: [PATCH 315/358] srcpkgs: rebuild against OpenSSL
---
srcpkgs/xorg-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index 06f51d611e8..5accaf6523d 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true
hostmakedepends="pkg-config wayland-devel xkbcomp flex"
makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel
libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel
- libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel
+ libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel
libxkbui-devel pixman-devel wayland-devel wayland-protocols
xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel
xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')"
From 3b16cabecb77a671ccb08b4baf6269611ac9dc6f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:04:00 +0100
Subject: [PATCH 316/358] zeroinstall: rebuild against OpenSSL
---
srcpkgs/zeroinstall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
index 580b0c5c74e..514e22f7655 100644
--- a/srcpkgs/zeroinstall/template
+++ b/srcpkgs/zeroinstall/template
@@ -6,7 +6,7 @@ wrksrc="0install-v${version}"
build_style=gnu-makefile
make_install_target="install_system"
hostmakedepends="gettext ocaml opam m4 tar pkg-config which"
-makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
short_desc="Cross-distribution software installation system"
maintainer="mobinmob <mobinmob@disroot.org>"
From a7d94fe746f8ab8c2e0df4b1fcc2a9252631c286 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:22 +0100
Subject: [PATCH 317/358] gitui: rebuild against OpenSSL
---
srcpkgs/gitui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gitui/template b/srcpkgs/gitui/template
index e43f46d2668..41ebe9dd564 100644
--- a/srcpkgs/gitui/template
+++ b/srcpkgs/gitui/template
@@ -1,7 +1,7 @@
# Template file for 'gitui'
pkgname=gitui
version=0.11.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config python3"
makedepends="libxcb-devel libgit2-devel"
From 703f36ec79fec61ede63b0fb3f8cf2e08951d14e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 318/358] kristall: rebuild against OpenSSL
---
srcpkgs/kristall/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kristall/template b/srcpkgs/kristall/template
index b5d6dbfb12c..1455af6d35b 100644
--- a/srcpkgs/kristall/template
+++ b/srcpkgs/kristall/template
@@ -1,7 +1,7 @@
# Template file for 'kristall'
pkgname=kristall
version=0.3
-revision=1
+revision=2
build_wrksrc=src
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools qt5-multimedia-devel qt5-svg-devel"
From 610d0976f9d0d9c98e11c03ec583900da3ac3865 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:23 +0100
Subject: [PATCH 319/358] libgdal: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/libgdal/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 669b7e91b66..5f898cc2f84 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2462,7 +2462,7 @@ libu2f-host.so.0 libu2f-host-1.1.10_5
libu2f-server.so.0 libu2f-server-1.1.0_9
libsqlcipher.so.0 sqlcipher-4.3.0_3
libgta.so.1 libgta-1.2.0_1
-libgdal.so.26 libgdal-3.0.0_1
+libgdal.so.26 libgdal-3.0.4_9
libosgViewer.so.131 osg-3.4.1_1
libosgShadow.so.131 osg-3.4.1_1
libosgParticle.so.131 osg-3.4.1_1
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 7175f0caf63..f921ca3fffc 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
version=3.0.4
-revision=8
+revision=9
wrksrc="gdal-${version}"
build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
From d8f2c7781fd9d1536ce222d94b89a4a7bc720c66 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 320/358] lxc: rebuild against OpenSSL
---
common/shlibs | 2 +-
srcpkgs/lxc/template | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5f898cc2f84..0c075fbd210 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1561,7 +1561,7 @@ libxmlsec1.so.1 xmlsec1-1.2.31_2
libxmlsec1-nss.so.1 xmlsec1-1.2.31_2
libxmlsec1-openssl.so.1 xmlsec1-1.2.31_2
libcheck.so.0 check-0.9.12_1
-liblxc.so.1 liblxc-1.0.0_1
+liblxc.so.1 liblxc-4.0.6_2
libtcmalloc.so.4 gperftools-2.1_1
libaio.so.1 libaio-0.3.109_1
libofx.so.7 libofx-0.9.11_1
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 4e74c364b8d..5a3458eb4eb 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,7 +1,7 @@
# Template file for 'lxc'
pkgname=lxc
version=4.0.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-doc --enable-seccomp
--enable-capabilities --enable-apparmor --with-distro=none
From d3f5e5ff798c7f48280f68ad28eb1a3d78433f21 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 321/358] mixxx: rebuild against OpenSSL
---
srcpkgs/mixxx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 18cf683fcf5..4de620fd603 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,7 +1,7 @@
# Template file for 'mixxx'
pkgname=mixxx
version=2.2.4
-revision=7
+revision=8
wrksrc="mixxx-release-${version}"
build_style=scons
hostmakedepends="pkg-config protobuf"
From 5afe8650bd5711b2f1e9d9a2b2aae04a554931ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 322/358] monero-gui: rebuild against OpenSSL
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 6689e0dee3b..40ee7f6bce1 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.1.9
-revision=1
+revision=2
_monero_version=0.17.1.9
_randomx_version="1.1.8"
# the revision monero uses as a submodule for the specific version
From 8529375d7ff71a1f3814efa59151fc738b3c8410 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:24 +0100
Subject: [PATCH 323/358] monitoring-plugins: rebuild against OpenSSL
---
srcpkgs/monitoring-plugins/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monitoring-plugins/template b/srcpkgs/monitoring-plugins/template
index 403fb939bda..48fbd4045ea 100644
--- a/srcpkgs/monitoring-plugins/template
+++ b/srcpkgs/monitoring-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'monitoring-plugins'
pkgname=monitoring-plugins
version=2.2
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib/monitoring-plugins"
hostmakedepends="fping openssh postfix procps-ng smbclient"
From b08fdbc7485611baa0a54bc9e2697fcb1c62cdc2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 324/358] nsd: rebuild against OpenSSL
---
srcpkgs/nsd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nsd/template b/srcpkgs/nsd/template
index 98fe1d14f6c..4c7cf99afea 100644
--- a/srcpkgs/nsd/template
+++ b/srcpkgs/nsd/template
@@ -1,7 +1,7 @@
# Template file for 'nsd'
pkgname=nsd
version=4.3.5
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-ratelimit --enable-ratelimit-default-is-off
--with-libevent=${XBPS_CROSS_BASE}/usr --with-ssl=${XBPS_CROSS_BASE}/usr"
From b74779a5b64d4468e0aca840dae8ecfe5d1a4315 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:25 +0100
Subject: [PATCH 325/358] pgbouncer: rebuild against OpenSSL
---
srcpkgs/pgbouncer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pgbouncer/template b/srcpkgs/pgbouncer/template
index 6ea13d31c9c..1049a1594d0 100644
--- a/srcpkgs/pgbouncer/template
+++ b/srcpkgs/pgbouncer/template
@@ -1,7 +1,7 @@
# Template file for 'pgbouncer'
pkgname=pgbouncer
version=1.15.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libevent-devel"
From 0d04ea1ca128c1bbcc5ac016a46aa525d2d8dbba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 326/358] php: rebuild against OpenSSL
---
srcpkgs/php/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 3b0789d3560..bdc35ee2d84 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
version=7.4.14
-revision=2
+revision=3
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
From c79b6bed2792f333d4a077fafe355744c52a61e7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 327/358] postfix: rebuild against OpenSSL
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 6ea99b0c26c..ea2df744979 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.5.9
-revision=2
+revision=3
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
postgresql-libs-devel sqlite-devel"
From 4c476a1750fc042db43f6b49ae55e2b2cabd9ebc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:26 +0100
Subject: [PATCH 328/358] qbittorrent: rebuild against OpenSSL
---
srcpkgs/qbittorrent/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qbittorrent/template b/srcpkgs/qbittorrent/template
index 4fade2ab233..b3a5b7fb58a 100644
--- a/srcpkgs/qbittorrent/template
+++ b/srcpkgs/qbittorrent/template
@@ -1,7 +1,7 @@
# Template file for 'qbittorrent'
pkgname=qbittorrent
version=4.3.3
-revision=1
+revision=2
create_wrksrc=yes
build_style=qmake
hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-qmake qt5-tools"
From 74e61a3f19404a3ef0168f05837e45f35c9eb25c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 329/358] retroshare: rebuild against OpenSSL
---
srcpkgs/retroshare/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index 8b92dd990f1..9e1084749f4 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,7 +1,7 @@
# Template file for 'retroshare'
pkgname=retroshare
version=0.6.5
-revision=4
+revision=5
wrksrc="RetroShare-${version}"
build_style=qmake
configure_args="RS_UPNP_LIB=miniupnpc"
From 25be5d11307f56d7fe623a3af80a977f1ca7bc7e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 330/358] rng-tools: rebuild against OpenSSL
---
srcpkgs/rng-tools/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template
index 4279e97ad64..bfc01d1b220 100644
--- a/srcpkgs/rng-tools/template
+++ b/srcpkgs/rng-tools/template
@@ -1,7 +1,7 @@
# Template file for 'rng-tools'
pkgname=rng-tools
version=6.11
-revision=2
+revision=3
wrksrc=${pkgname}-${version}
build_style=gnu-configure
configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr"
From 9676e96292524e488418e9adaa556a09e1cc368c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 331/358] squid: rebuild against OpenSSL
---
srcpkgs/squid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/squid/template b/srcpkgs/squid/template
index 24a9833cc44..deeed973659 100644
--- a/srcpkgs/squid/template
+++ b/srcpkgs/squid/template
@@ -1,7 +1,7 @@
# Template file for 'squid'
pkgname=squid
version=4.14
-revision=1
+revision=2
build_style=gnu-configure
configure_args="
--sbindir=/usr/bin
From 610de769efc3b3a269499cf92838a4889cfe78f8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:27 +0100
Subject: [PATCH 332/358] sssd: rebuild against OpenSSL
---
common/shlibs | 18 +++++++++---------
srcpkgs/sssd/template | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 0c075fbd210..e2678506a33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2713,15 +2713,15 @@ libcollection.so.4 ding-libs-0.5.0_1
libref_array.so.1 ding-libs-0.5.0_1
libbasicobjects.so.0 ding-libs-0.5.0_1
libini_config.so.5 ding-libs-0.5.0_1
-libipa_hbac.so.0 sssd-1.13.4_1
-libsss_idmap.so.0 sssd-1.13.4_1
-libnss_sss.so.2 sssd-1.13.4_1
-libsss_nss_idmap.so.0 sssd-1.13.4_1
-libsss_simpleifp.so.0 sssd-1.13.4_1
-libsss_certmap.so.0 sssd-2.2.3_1
-libsss_util.so sssd-2.0.0_1
-libsss_crypt.so sssd-2.0.0_1
-libsss_debug.so sssd-2.0.0_1
+libipa_hbac.so.0 sssd-2.4.0_3
+libsss_idmap.so.0 sssd-2.4.0_3
+libnss_sss.so.2 sssd-2.4.0_3
+libsss_nss_idmap.so.0 sssd-2.4.0_3
+libsss_simpleifp.so.0 sssd-2.4.0_3
+libsss_certmap.so.0 sssd-2.4.0_3
+libsss_util.so sssd-2.4.0_3
+libsss_crypt.so sssd-2.4.0_3
+libsss_debug.so sssd-2.4.0_3
libforms.so.2 xforms-1.2.4_2
libflimage.so.2 xforms-1.2.4_2
libutilspp.so.0 curlpp-0.7.3_2
diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template
index e3d2114fdd0..61ead1c9e44 100644
--- a/srcpkgs/sssd/template
+++ b/srcpkgs/sssd/template
@@ -1,7 +1,7 @@
# Template file for 'sssd'
pkgname=sssd
version=2.4.0
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--without-selinux --without-semanage --without-libwbclient
--disable-cifs-idmap-plugin --without-samba --with-os=fedora
From b43bb274f40a2a1a72b23d40c93716248d185a97 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:28 +0100
Subject: [PATCH 333/358] uget: rebuild against OpenSSL
---
srcpkgs/uget/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index e82aa99ea34..33907bbd054 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
# Template file for 'uget'
pkgname=uget
version=2.2.2
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config intltool"
makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
From 53001765e4f574ab5257425dc491ba2b32a389fc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 334/358] xmlrpc-c: rebuild against OpenSSL
---
common/shlibs | 32 ++++++++++++++++----------------
srcpkgs/xmlrpc-c/template | 2 +-
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index e2678506a33..814ca4c886c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1767,22 +1767,22 @@ libpython3.so python3-3.9.2_2
libpython3.9.so.1.0 python3-3.9.2_2
libbrscandec2.so.1 brother-brscan3-0.2.11_2
libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11
-libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_packetsocket.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util.so.4 xmlrpc-c-1.51.06_1
-libxmlrpc_abyss.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_cpp.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.39.07_1
-libxmlrpc_client.so.3 xmlrpc-c-1.25.28_1
-libxmlrpc_util++.so.8 xmlrpc-c-1.39.11_1
-libxmlrpc_abyss++.so.8 xmlrpc-c-1.39.11_1
+libxmlrpc_server_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_packetsocket.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util.so.4 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_server_abyss++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_cpp.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_cgi++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_server_pstream++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_client.so.3 xmlrpc-c-1.51.06_2
+libxmlrpc_util++.so.8 xmlrpc-c-1.51.06_2
+libxmlrpc_abyss++.so.8 xmlrpc-c-1.51.06_2
libtelepathy-farstream.so.3 telepathy-farstream-0.6.0_6
libnetpbm.so.11 libnetpbm-10.66.03_2
libid3.so id3lib-3.8.3_1
diff --git a/srcpkgs/xmlrpc-c/template b/srcpkgs/xmlrpc-c/template
index eab75c686ec..91107208759 100644
--- a/srcpkgs/xmlrpc-c/template
+++ b/srcpkgs/xmlrpc-c/template
@@ -1,7 +1,7 @@
# Template file for 'xmlrpc-c'
pkgname=xmlrpc-c
version=1.51.06
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-libxml2-backend --enable-cplusplus --disable-cgi-server
--disable-libwww-client --disable-wininet-client"
From 7479968edbaec85855e5e7f80ae5f58b50e18ff8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 21 Feb 2021 21:53:29 +0100
Subject: [PATCH 335/358] zfs: rebuild against OpenSSL
---
common/shlibs | 12 ++++++------
srcpkgs/zfs/template | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 814ca4c886c..6579ea69486 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3816,12 +3816,12 @@ libtss2-tcti-device.so.0 tpm2-tss-2.3.1_1
libtss2-rc.so.0 tpm2-tss-2.3.1_1
libtss2-tcti-mssim.so.0 tpm2-tss-2.3.1_1
libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
-libzfsbootenv.so.1 zfs-2.0.0_1
-libzfs.so.4 zfs-2.0.0_1
-libuutil.so.3 zfs-2.0.0_1
-libzpool.so.4 zfs-2.0.0_1
-libzfs_core.so.3 zfs-2.0.0_1
-libnvpair.so.3 zfs-2.0.0_1
+libzfsbootenv.so.1 zfs-2.0.3_2
+libzfs.so.4 zfs-2.0.3_2
+libuutil.so.3 zfs-2.0.3_2
+libzpool.so.4 zfs-2.0.3_2
+libzfs_core.so.3 zfs-2.0.3_2
+libnvpair.so.3 zfs-2.0.3_2
libgmio.so gmio-0.4.1_1
libjsonnet.so.0 jsonnet-0.14.0_2
libjsonnet++.so.0 jsonnet-0.14.0_2
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index fd1f66f8bd1..1f5c4809fce 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
# Template file for 'zfs'
pkgname=zfs
version=2.0.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
From f703736603bb93fd0ee3878786373d033cd3b83f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:55:55 +0100
Subject: [PATCH 336/358] vpnc: switch to OpenSSL
---
srcpkgs/vpnc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template
index 84f434690cd..80d9edd464b 100644
--- a/srcpkgs/vpnc/template
+++ b/srcpkgs/vpnc/template
@@ -1,7 +1,7 @@
# Template file for 'vpnc'
pkgname=vpnc
version=0.5.3
-revision=8
+revision=9
_githash=43780cecd7a61668002f73b6f8b9f9ba61af74ad
wrksrc="vpnc-$_githash"
build_style=gnu-makefile
@@ -9,7 +9,7 @@ make_use_env=yes
make_build_args="SBINDIR=/usr/bin"
make_check_target=test
hostmakedepends="perl"
-makedepends="libgcrypt-devel libressl-devel"
+makedepends="libgcrypt-devel openssl-devel"
depends="net-tools vpnc-scripts"
short_desc="Client for cisco vpn concentrator"
maintainer="Enno Boland <gottox@voidlinux.org>"
From dd6a7057cc96602f055165e98e220239e6378e5d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 21:56:09 +0100
Subject: [PATCH 337/358] libsasl: remove libressl patch
---
srcpkgs/libsasl/patches/libressl.patch | 61 --------------------------
1 file changed, 61 deletions(-)
delete mode 100644 srcpkgs/libsasl/patches/libressl.patch
diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch
deleted file mode 100644
index b82503636b5..00000000000
--- a/srcpkgs/libsasl/patches/libressl.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c
-Upstream: No
-Reason: LibreSSL compatibility
-
-$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $
-
-64-bit time_t
-
-Fix for LibreSSL
-
-Index: saslauthd/lak.c
---- a/saslauthd/lak.c.orig
-+++ b/saslauthd/lak.c
-@@ -841,12 +841,12 @@ static int lak_connect(
-
- rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout));
- if (rc != LDAP_OPT_SUCCESS) {
-- syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+ syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- }
-
- rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout));
- if (rc != LDAP_OPT_SUCCESS) {
-- syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
-+ syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec);
- }
-
- rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit));
-@@ -1749,28 +1749,28 @@ static int lak_base64_decode(
-
- int rc, i, tlen = 0;
- char *text;
-- EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new();
-+ EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX));
-
- if (enc_ctx == NULL)
- return LAK_NOMEM;
-
- text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1);
- if (text == NULL) {
-- EVP_ENCODE_CTX_free(enc_ctx);
-+ free(enc_ctx);
- return LAK_NOMEM;
- }
-
- EVP_DecodeInit(enc_ctx);
- rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src));
- if (rc < 0) {
-- EVP_ENCODE_CTX_free(enc_ctx);
-+ free(enc_ctx);
- free(text);
- return LAK_FAIL;
- }
- tlen += i;
- EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i);
-
-- EVP_ENCODE_CTX_free(enc_ctx);
-+ free(enc_ctx);
-
- *ret = text;
- if (rlen != NULL)
From ac241fb813033d62446eced1f3335d02cc1bddff Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 6 Feb 2021 22:18:29 +0100
Subject: [PATCH 338/358] starship: switch to OpenSSL
---
srcpkgs/starship/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template
index 08d0c71e41d..9362f5664cb 100644
--- a/srcpkgs/starship/template
+++ b/srcpkgs/starship/template
@@ -1,11 +1,11 @@
# Template file for 'starship'
pkgname=starship
version=0.50.0
-revision=1
+revision=2
build_style=cargo
build_helper=qemu
hostmakedepends="pkg-config libgit2-devel"
-makedepends="libressl-devel libgit2-devel"
+makedepends="openssl-devel libgit2-devel"
checkdepends="git fish-shell"
short_desc="Minimal, fast and customizable cross-shell prompt"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
From 6f7f9f72c1473d9c2541d806f836aaeb24444ef8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:57:38 +0100
Subject: [PATCH 339/358] maturin: switch to OpenSSL
---
srcpkgs/maturin/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 25b1a8da540..e97ae1cf099 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -1,13 +1,13 @@
# Template file for 'maturin'
pkgname=maturin
version=0.9.4
-revision=1
+revision=2
build_style=cargo
# Disable the 'rustls' feature, which leads to bad platform compatibility
# The list of enabled features should be reconciled with each new release
configure_args="--no-default-features --features auditwheel,log,upload,human-panic"
hostmakedepends="python3-setuptools python3-toml"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
depends="python3-toml"
short_desc="Build and publish crates as python packages"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
From d36b29253cfe6e41e196c527852ed7734b4f8eae Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:02 +0100
Subject: [PATCH 340/358] python3-adblock: switch to OpenSSL
---
srcpkgs/python3-adblock/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template
index c1200f89027..91ffd881105 100644
--- a/srcpkgs/python3-adblock/template
+++ b/srcpkgs/python3-adblock/template
@@ -1,12 +1,13 @@
# Template file for 'python3-adblock'
pkgname=python3-adblock
version=0.4.2
-revision=1
+revision=2
wrksrc="${pkgname/python3/python}-${version}"
build_style=python3-pep517
build_helper="rust"
-hostmakedepends="maturin pkg-config cargo libressl-devel"
-makedepends="libressl-devel python3-devel"
+#XXX: Does statically link against openssl
+hostmakedepends="maturin pkg-config cargo openssl-devel"
+makedepends="openssl-devel python3-devel"
depends="python3"
checkdepends="python3-pytest"
short_desc="Brave's adblock library in Python"
From 9d72f1bf9e7f894df059a4ef12b6e3d88b5ef451 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 11 Feb 2021 18:59:38 +0100
Subject: [PATCH 341/358] python3-cryptography: switch to OpenSSL
---
srcpkgs/python3-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index af9674c186e..27fbe57203a 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,12 +1,12 @@
# Template file for 'python3-cryptography'
pkgname=python3-cryptography
version=3.4.6
-revision=1
+revision=2
wrksrc="${pkgname#python3-}-${version}"
build_style=python3-module
build_helper="rust"
hostmakedepends="python3-setuptools-rust python3-cffi cargo"
-makedepends="python3-devel libressl-devel"
+makedepends="python3-devel openssl-devel"
depends="python3-cffi"
checkdepends="python3-pytest-subtests python3-pytz python3-iso8601
python3-cryptography_vectors python3-pretend python3-hypothesis $depends"
From 27f5c4db8b697f2f702c2f35ef5feea914bbe5a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:17 +0100
Subject: [PATCH 342/358] *-luasec: update to 1.0
unify into a single template and add lua54 support
---
srcpkgs/lua51-luasec | 1 +
srcpkgs/lua51-luasec/patches/libressl.patch | 36 ---------
srcpkgs/lua51-luasec/template | 29 -------
srcpkgs/lua52-luasec | 1 +
srcpkgs/lua52-luasec/template | 28 -------
srcpkgs/lua53-luasec | 1 +
srcpkgs/lua53-luasec/template | 34 --------
srcpkgs/lua54-luasec/template | 87 +++++++++++++++++++++
8 files changed, 90 insertions(+), 127 deletions(-)
create mode 120000 srcpkgs/lua51-luasec
delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch
delete mode 100644 srcpkgs/lua51-luasec/template
create mode 120000 srcpkgs/lua52-luasec
delete mode 100644 srcpkgs/lua52-luasec/template
create mode 120000 srcpkgs/lua53-luasec
delete mode 100644 srcpkgs/lua53-luasec/template
create mode 100644 srcpkgs/lua54-luasec/template
diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua51-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch
deleted file mode 100644
index 531278fa148..00000000000
--- a/srcpkgs/lua51-luasec/patches/libressl.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git src/ssl.c src/ssl.c
-index 2fa6ede..bd8a744 100644
---- src/ssl.c
-+++ src/ssl.c
-@@ -395,24 +395,30 @@ static int meth_want(lua_State *L)
- }
- return 1;
- }
--
-+
- /**
- * Return the compression method used.
- */
- static int meth_compression(lua_State *L)
- {
-+#if !defined(OPENSSL_NO_COMP)
- const COMP_METHOD *comp;
-+#endif
- p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection");
- if (ssl->state != LSEC_STATE_CONNECTED) {
- lua_pushnil(L);
- lua_pushstring(L, "closed");
- return 2;
- }
-+#if !defined(OPENSSL_NO_COMP)
- comp = SSL_get_current_compression(ssl->ssl);
- if (comp)
- lua_pushstring(L, SSL_COMP_get_name(comp));
- else
- lua_pushnil(L);
-+#else
-+ lua_pushnil(L);
-+#endif
- return 1;
- }
-
diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template
deleted file mode 100644
index c02e45e994d..00000000000
--- a/srcpkgs/lua51-luasec/template
+++ /dev/null
@@ -1,29 +0,0 @@
-# Template file for 'lua51-luasec'
-pkgname=lua51-luasec
-reverts=0.6_1
-version=0.5.1
-revision=11
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua51"
-makedepends="lua51-devel libressl-devel"
-depends="lua51"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406
-
-replaces="luasec<=0.5.1_1"
-
-do_build() {
- lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
- make linux CC=$CC LD=$CC \
- INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \
- LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-post_install() {
- vlicense LICENSE
-}
diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua52-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template
deleted file mode 100644
index 6267ba4997a..00000000000
--- a/srcpkgs/lua52-luasec/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'lua52-luasec'
-pkgname=lua52-luasec
-version=0.6
-revision=10
-wrksrc=${pkgname#*-}-${pkgname#*-}-${version}
-build_style=gnu-makefile
-hostmakedepends="lua52"
-makedepends="lua52-devel libressl-devel"
-depends="lua52"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz"
-checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d
-
-do_build() {
- lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
- make linux CC=$CC LD=$CC \
- INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \
- LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
- export LUAPATH=${DESTDIR}/usr/share/lua/5.2
- export LUACPATH=${DESTDIR}/usr/lib/lua/5.2
- vlicense LICENSE
-}
diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec
new file mode 120000
index 00000000000..2326404994a
--- /dev/null
+++ b/srcpkgs/lua53-luasec
@@ -0,0 +1 @@
+lua54-luasec
\ No newline at end of file
diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template
deleted file mode 100644
index 16e685daf5a..00000000000
--- a/srcpkgs/lua53-luasec/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'lua53-luasec'
-pkgname=lua53-luasec
-version=0.8.1
-revision=4
-wrksrc="luasec-luasec-${version}"
-build_style=gnu-makefile
-make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3"
-make_install_args="${make_build_args}"
-hostmakedepends="lua53"
-makedepends="lua53-devel libressl-devel"
-depends="lua53"
-short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
-maintainer="Duncaen <duncaen@voidlinux.org>"
-license="MIT"
-homepage="https://github.com/brunoos/luasec"
-distfiles="https://github.com/brunoos/luasec/archive/luasec-${version}.tar.gz"
-checksum=cc9fc92df3be56add5c9687319951f457c31f5d12ac19cfc09d53056dc24f04e
-
-do_build() {
- lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h
- make linux CC=$CC LD=$CC \
- INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.3" \
- LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
-}
-
-pre_install() {
- vlicense LICENSE
-}
-
-luasec_package() {
- depends="lua53-luasec>=${version}_${revision}"
- short_desc+=" (transitional dummy package)"
- build_style=meta
-}
diff --git a/srcpkgs/lua54-luasec/template b/srcpkgs/lua54-luasec/template
new file mode 100644
index 00000000000..b6740ad44e1
--- /dev/null
+++ b/srcpkgs/lua54-luasec/template
@@ -0,0 +1,87 @@
+# Template file for 'lua54-luasec'
+pkgname=lua54-luasec
+version=1.0
+revision=1
+wrksrc="luasec-${version}"
+build_style=gnu-makefile
+hostmakedepends="lua51 lua52 lua53 lua54"
+makedepends="lua51-devel lua52-devel lua53-devel lua54-devel openssl-devel"
+depends="lua54"
+_desc="Lua binding for OpenSSL library to provide TLS/SSL communication"
+short_desc="${_desc} (5.4.x)"
+maintainer="Duncaen <duncaen@voidlinux.org>"
+license="MIT"
+homepage="https://github.com/brunoos/luasec"
+distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz"
+checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932
+
+post_extract() {
+ mkdir -p lua5.1
+ mv * lua5.1 || true
+ cp -a lua5.1 lua5.2
+ cp -a lua5.1 lua5.3
+ cp -a lua5.1 lua5.4
+}
+
+do_configure() {
+ for luaver in 5.1 5.2 5.3 5.4; do
+ pushd lua${luaver}
+ lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c
+ popd
+ done
+}
+
+do_build() {
+ for luaver in 5.1 5.2 5.3 5.4; do
+ pushd lua${luaver}
+ make linux CC=$CC LD=$CC \
+ INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \
+ LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib
+ popd
+ done
+}
+
+do_install() {
+ for luaver in 5.1 5.2 5.3 5.4; do
+ pushd lua${luaver}
+ make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install
+ popd
+ done
+ vlicense lua5.4/LICENSE
+}
+
+lua51-luasec_package() {
+ depends="lua51"
+ short_desc="${_desc} (5.1.x)"
+ pkg_install() {
+ vlicense "${wrksrc}/lua5.1/LICENSE"
+ vmove usr/lib/lua/5.1
+ vmove usr/share/lua/5.1
+ }
+}
+
+lua52-luasec_package() {
+ depends="lua52"
+ short_desc="${_desc} (5.2.x)"
+ pkg_install() {
+ vlicense "${wrksrc}/lua5.2/LICENSE"
+ vmove usr/lib/lua/5.2
+ vmove usr/share/lua/5.2
+ }
+}
+
+lua53-luasec_package() {
+ depends="lua53"
+ short_desc="${_desc} (5.3.x)"
+ pkg_install() {
+ vlicense "${wrksrc}/lua5.3/LICENSE"
+ vmove usr/lib/lua/5.3
+ vmove usr/share/lua/5.3
+ }
+}
+
+luasec_package() {
+ depends="lua53-luasec>=${version}_${revision}"
+ short_desc+=" (transitional dummy package)"
+ build_style=meta
+}
From 313e38cff2896432706ce6fe273768b0c3cf4818 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 22 Feb 2021 22:40:36 +0100
Subject: [PATCH 343/358] git-series: rebuild against OpenSSL
---
srcpkgs/git-series/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/git-series/template b/srcpkgs/git-series/template
index 8898e0621db..53795ed697e 100644
--- a/srcpkgs/git-series/template
+++ b/srcpkgs/git-series/template
@@ -1,7 +1,7 @@
# Template file for 'git-series'
pkgname=git-series
version=0.9.1
-revision=12
+revision=13
build_style=cargo
hostmakedepends="cmake pkg-config perl"
makedepends="libgit2-devel libcurl-devel"
@@ -14,9 +14,9 @@ distfiles="https://github.com/git-series/git-series/archive/${version}.tar.gz"
checksum=c0362e19d3fa168a7cb0e260fcdecfe070853b163c9f2dfd2ad8213289bc7e5f
post_extract() {
- sed -i '/^git2 =/s/=.*/= "0.5"/' Cargo.toml
cargo update --package libc --precise 0.2.55
cargo update --package url --precise 1.7.2
+ cargo update --package openssl-sys --precise 0.9.60
}
pre_build() {
export LIBGIT2_SYS_USE_PKG_CONFIG=yes
From f3f4d69e727a9ef5d82240d8aee7bebaa6dae0b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 23 Feb 2021 23:17:30 +0100
Subject: [PATCH 344/358] gip: rebuild against OpenSSL
---
srcpkgs/gip/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gip/template b/srcpkgs/gip/template
index 7416e81016d..83ebc476bc8 100644
--- a/srcpkgs/gip/template
+++ b/srcpkgs/gip/template
@@ -1,10 +1,10 @@
# Template file for 'gip'
pkgname=gip
version=0.7.0
-revision=1
+revision=2
build_style=cargo
hostmakedepends="pkg-config"
-makedepends="libressl-devel"
+makedepends="openssl-devel"
short_desc="CLI tool to get global IP address"
maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="MIT"
From 14500819f4098e0e9709003c955656dfab1a2db3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 26 Feb 2021 22:29:35 +0100
Subject: [PATCH 345/358] virtualbox-ose: rebuild against OpenSSL
---
srcpkgs/virtualbox-ose/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template
index d1efe1931d5..c56c5dc9ff1 100644
--- a/srcpkgs/virtualbox-ose/template
+++ b/srcpkgs/virtualbox-ose/template
@@ -1,7 +1,7 @@
# Template file for 'virtualbox-ose'
pkgname=virtualbox-ose
version=6.1.18
-revision=2
+revision=3
wrksrc="VirtualBox-${version}"
short_desc="General-purpose full virtualizer for x86 hardware"
maintainer="Orphaned <orphan@voidlinux.org>"
From c22ce3f6574feae229393e4b4e764b6ae21b78e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:10 +0100
Subject: [PATCH 346/358] beaglebone-kernel: rebuild against OpenSSL
---
srcpkgs/beaglebone-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template
index 1616a8572cb..b36c9b36eb5 100644
--- a/srcpkgs/beaglebone-kernel/template
+++ b/srcpkgs/beaglebone-kernel/template
@@ -23,7 +23,7 @@ _kernver="${version}_${revision}"
nostrip=yes
noverifyrdeps=yes
archs="armv7l*"
-hostmakedepends="git perl kmod uboot-mkimage libressl bc"
+hostmakedepends="git perl kmod uboot-mkimage openssl bc"
makedepends="ncurses-devel"
triggers="kernel-hooks"
# These files could be modified when an external module is built.
From d197cb165304357f0e4388c422c32989b2f68649 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:17 +0100
Subject: [PATCH 347/358] rpi-kernel: rebuild against OpenSSL
---
srcpkgs/rpi-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template
index f9f170aedc0..1fe4e2477e1 100644
--- a/srcpkgs/rpi-kernel/template
+++ b/srcpkgs/rpi-kernel/template
@@ -29,7 +29,7 @@ noshlibprovides=yes
# RPi, RPi2, RPi3
archs="armv6l* armv7l* aarch64*"
-hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex"
+hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex"
makedepends="ncurses-devel"
triggers="kernel-hooks"
# These files could be modified when an external module is built.
From 7015454de732d36344d4acc469dcb871dcf39f27 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Thu, 7 Jan 2021 00:01:52 +0100
Subject: [PATCH 348/358] sun7i-kernel: rebuild against OpenSSL
---
srcpkgs/sun7i-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template
index e8d90d53015..3d7ae095687 100644
--- a/srcpkgs/sun7i-kernel/template
+++ b/srcpkgs/sun7i-kernel/template
@@ -29,7 +29,7 @@ skip_extraction="
nostrip=yes
noverifyrdeps=yes
archs="armv7l*"
-hostmakedepends="perl python kmod uboot-mkimage libressl bc"
+hostmakedepends="perl python kmod uboot-mkimage openssl bc"
makedepends="ncurses-devel"
triggers="kernel-hooks"
patch_args=-Np1
From 6d6f7bae97dfc8d9fc39642101006c6b3bf4a2b0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:55:35 +0100
Subject: [PATCH 349/358] ci20-kernel: rebuild against OpenSSL
---
srcpkgs/ci20-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template
index 88fccd11847..da1685b6600 100644
--- a/srcpkgs/ci20-kernel/template
+++ b/srcpkgs/ci20-kernel/template
@@ -22,7 +22,7 @@ noverifyrdeps=yes
noshlibprovides=yes
archs="mispel*"
-hostmakedepends="perl kmod uboot-mkimage libressl bc"
+hostmakedepends="perl kmod uboot-mkimage openssl bc"
makedepends="ncurses-devel"
triggers="kernel-hooks"
# These files could be modified when an external module is built.
From 128849dc61e969e86760992f5b1258105ad7838f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:07 +0100
Subject: [PATCH 350/358] pinebookpro-kernel: rebuild against OpenSSL
---
srcpkgs/pinebookpro-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template
index 0d0c0e66604..dfdf391d0ae 100644
--- a/srcpkgs/pinebookpro-kernel/template
+++ b/srcpkgs/pinebookpro-kernel/template
@@ -20,7 +20,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio python3"
+ openssl-devel perl uboot-mkimage cpio python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From 76b220d07e2b27cbfbd4272b794ad4831670a7cd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:59:13 +0100
Subject: [PATCH 351/358] pinephone-kernel: rebuild against OpenSSL
---
srcpkgs/pinephone-kernel/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template
index b201e6b993c..73631552a9b 100644
--- a/srcpkgs/pinephone-kernel/template
+++ b/srcpkgs/pinephone-kernel/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From 7e3dae5b3658884f8925b13d319dcf81c159cfb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:16 +0100
Subject: [PATCH 352/358] linux4.4: rebuild against OpenSSL
---
srcpkgs/linux4.4/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template
index d85511fe55d..5b4d2e213bd 100644
--- a/srcpkgs/linux4.4/template
+++ b/srcpkgs/linux4.4/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
case "$XBPS_TARGET_MACHINE" in
ppc64le*) broken="No ppc64le support";;
From 3bb2322e4d623d688f6b23703b3841eaf59cdca2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:18 +0100
Subject: [PATCH 353/358] linux4.9: rebuild against OpenSSL
---
srcpkgs/linux4.9/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template
index e4dbd5a06a2..c1bd5787246 100644
--- a/srcpkgs/linux4.9/template
+++ b/srcpkgs/linux4.9/template
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* aarch64* ppc*"
-hostmakedepends="bc perl kmod uboot-mkimage libressl-devel xz"
+hostmakedepends="bc perl kmod uboot-mkimage openssl-devel xz"
case "$XBPS_TARGET_MACHINE" in
ppc64le*) broken="No ppc64le support";;
From d01bd2715268e1805d77d7df7641dda85d5bd239 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 354/358] linux4.14: rebuild against OpenSSL
---
srcpkgs/linux4.14/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template
index 808bc434360..a8cad70c771 100644
--- a/srcpkgs/linux4.14/template
+++ b/srcpkgs/linux4.14/template
@@ -1,7 +1,7 @@
# Template file for 'linux4.14'
pkgname=linux4.14
version=4.14.222
-revision=1
+revision=2
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
archs="i686* x86_64* armv5tel* aarch64* ppc*"
-hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage
+hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage
gmp-devel libmpc-devel xz"
case "$XBPS_TARGET_MACHINE" in
From 3a227995f1988f61182e7098eed6acb2974571c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 355/358] linux4.19: rebuild against OpenSSL
---
srcpkgs/linux4.19/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template
index 7a5d82851bc..fbf723826ac 100644
--- a/srcpkgs/linux4.19/template
+++ b/srcpkgs/linux4.19/template
@@ -1,7 +1,7 @@
# Template file for 'linux4.19'
pkgname=linux4.19
version=4.19.178
-revision=1
+revision=2
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
archs="i686* x86_64* arm* aarch64* ppc*"
hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage tar xz"
+ openssl-devel perl uboot-mkimage tar xz"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From 4a621ce8636966626b268e0f5ab758f82867417c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:15 +0100
Subject: [PATCH 356/358] linux5.10: rebuild against OpenSSL
---
srcpkgs/linux5.10/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 57f51c95aca..6ae77aee534 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.10'
pkgname=linux5.10
version=5.10.20
-revision=1
+revision=2
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -22,7 +22,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From 45eecc75c3277ff14685ab1a865e4bfe97fce35a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 18:18:16 +0100
Subject: [PATCH 357/358] linux5.4: rebuild against OpenSSL
---
srcpkgs/linux5.4/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template
index 5defb48639d..8944092048b 100644
--- a/srcpkgs/linux5.4/template
+++ b/srcpkgs/linux5.4/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.4'
pkgname=linux5.4
version=5.4.102
-revision=1
+revision=2
wrksrc="linux-${version}"
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
@@ -20,7 +20,7 @@ preserve=yes
archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*"
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio"
+ openssl-devel perl uboot-mkimage cpio"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
From f9b0c079dd78dd3801143712e2d6cbbdd115e83a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 28 Feb 2021 21:48:47 +0100
Subject: [PATCH 358/358] linux5.11: rebuild against OpenSSL
---
srcpkgs/linux5.11/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux5.11/template b/srcpkgs/linux5.11/template
index 0c01d11ba9e..1b513406214 100644
--- a/srcpkgs/linux5.11/template
+++ b/srcpkgs/linux5.11/template
@@ -1,7 +1,7 @@
# Template file for 'linux5.11'
pkgname=linux5.11
version=5.11.3
-revision=1
+revision=2
wrksrc="linux-${version%.*}"
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Érico Nogueira <ericonr@disroot.org>"
@@ -25,7 +25,7 @@ noshlibprovides=yes
preserve=yes
hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel
- libressl-devel perl uboot-mkimage cpio pahole python3"
+ openssl-devel perl uboot-mkimage cpio pahole python3"
_kernver="${version}_${revision}"
triggers="kernel-hooks"
next prev parent reply other threads:[~2021-03-05 18:21 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-16 13:51 [PR PATCH] New package: openssl-1.1.1f Johnnynator
2020-04-18 7:13 ` agausmann
2020-04-18 7:13 ` agausmann
2020-04-18 7:44 ` flexibeast
2020-04-18 7:55 ` agausmann
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
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 [this message]
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=20210305182158.AnEfixcxUrP1OF70YNEdqKJRaf4NG9xGv0r1NYIdC7A@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).