From 5d453e3cbc415b4175849c35d1aa28cca4417a1b Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 13 Feb 2021 15:24:17 +0100 Subject: [PATCH 001/447] New package: libtls-3.2.4 Move libressl-nc to this package. --- common/shlibs | 2 +- srcpkgs/libressl-netcat | 2 +- srcpkgs/libressl/template | 13 +-- srcpkgs/libtls-devel | 1 + .../fail-instead-of-trying-fallback.patch | 21 ++++ srcpkgs/libtls/template | 98 +++++++++++++++++++ srcpkgs/libtls/update | 1 + 7 files changed, 124 insertions(+), 14 deletions(-) create mode 120000 srcpkgs/libtls-devel create mode 100644 srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch create mode 100644 srcpkgs/libtls/template create mode 100644 srcpkgs/libtls/update diff --git a/common/shlibs b/common/shlibs index 8d32c3af15c..099944ba555 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3442,7 +3442,7 @@ libfmt.so.7 fmt-7.0.3_1 libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1 libolm.so.3 olm-3.0.0_1 libcrypto.so.46 libcrypto46-3.1.1_1 -libtls.so.20 libtls20-3.1.1_1 +libtls.so.20 libtls-3.2.4_1 libssl.so.48 libssl48-3.1.1_1 libxmlb.so.2 libxmlb-0.2.1_1 libvoikko.so.1 libvoikko-4.2_1 diff --git a/srcpkgs/libressl-netcat b/srcpkgs/libressl-netcat index cab5b6fcb51..fc098467c59 120000 --- a/srcpkgs/libressl-netcat +++ b/srcpkgs/libressl-netcat @@ -1 +1 @@ -libressl \ No newline at end of file +libtls \ No newline at end of file diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index c9266796f7d..731168709b8 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -1,7 +1,7 @@ # Template file for 'libressl' pkgname=libressl version=3.1.5 -revision=2 +revision=3 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable asm)" @@ -107,14 +107,3 @@ libressl-devel_package() { vmove usr/share/man/man3 } } - -libressl-netcat_package() { - short_desc="TCP/IP swiss army knife (LibreSSL variant)" - alternatives=" - nc:nc:/usr/bin/libressl-nc - nc:nc.1:/usr/share/man/man1/libressl-nc.1" - pkg_install() { - vbin apps/nc/.libs/nc libressl-nc - vman apps/nc/nc.1 libressl-nc.1 - } -} diff --git a/srcpkgs/libtls-devel b/srcpkgs/libtls-devel new file mode 120000 index 00000000000..fc098467c59 --- /dev/null +++ b/srcpkgs/libtls-devel @@ -0,0 +1 @@ +libtls \ No newline at end of file diff --git a/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch new file mode 100644 index 00000000000..9df423ed7a2 --- /dev/null +++ b/srcpkgs/libtls/patches/fail-instead-of-trying-fallback.patch @@ -0,0 +1,21 @@ + so, current flow for getentropy is + 1) use SYS_getrandom if it exists (true on glibc and musl) + 2) use /dev/urandom + 3) use sysctl (glibc only) + 4) use terrible fallback + and with a one-line patch it can instead kill itself after 3 + so that should only affect processes running without /dev/urandom on old kernels + probably no harm else + +1 + +--- crypto/compat/getentropy_linux.c.orig ++++ crypto/compat/getentropy_linux.c +@@ -162,7 +162,7 @@ + * sysctl ABI, or consider providing a new failsafe API which + * works in a chroot or when file descriptors are exhausted. + */ +-#undef FAIL_INSTEAD_OF_TRYING_FALLBACK ++#define FAIL_INSTEAD_OF_TRYING_FALLBACK + #ifdef FAIL_INSTEAD_OF_TRYING_FALLBACK + raise(SIGKILL); + #endif diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template new file mode 100644 index 00000000000..db8d04f9549 --- /dev/null +++ b/srcpkgs/libtls/template @@ -0,0 +1,98 @@ +# Template file for 'libtls' +pkgname=libtls +version=3.2.4 +revision=1 +wrksrc="libressl-${version}" +build_style=gnu-configure +#configure_args="$(vopt_enable asm)" +short_desc="Version of the TLS/crypto stack forked from OpenSSL" +maintainer="Leah Neukirchen " +license="OpenSSL, ISC" +changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog" +homepage="http://www.libressl.org/" +distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz" +checksum=ac1dbb9e05a64910856599b1ac61118fdec1b3d0c700e42444d81c0d5f507a5a +_lssl_asm_ver="1.1.0" + +build_options="asm" +desc_option_asm="Use platform assembly for faster crypto" + +if [ "$build_option_asm" ]; then + distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz" + checksum+=" 7d92bf898c3a526cfdd804ea2e6ba1c89bd5a95589092e3ea585ef7c4818d789" +fi + +# only enable asm for full chroots by default +# otherwise we'd be introducing an autotools dependency on the host +if [ "$CHROOT_READY" ]; then + build_options_default="asm" +fi + +case "$XBPS_TARGET_MACHINE" in + # disable ssp + i686-musl) configure_args+=" --disable-hardening";; + # on armv5 always disable asm as it's not supported + armv5*) configure_args+=" --disable-asm";; +esac + +if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then + _regen_build=yes +fi + +if [ -n "$_regen_build" ]; then + hostmakedepends=" automake libtool" +fi + +post_extract() { + [ -z "$build_option_asm" ] && return 0 + mv ../libressl-portable-asm-${_lssl_asm_ver} . +} + +pre_configure() { + [ -z "$_regen_build" ] && return 0 + if [ "$build_option_asm" ]; then + : # ./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh . + fi + autoreconf -if +} + +do_install() { + make -C tls install DESTDIR="$DESTDIR" + make -C apps/nc install DESTDIR="$DESTDIR" +} + +post_install() { + # Use CA file from ca-certificates instead. + #rm -f ${DESTDIR}/etc/ssl/cert.pem + #ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem + + vlicense COPYING + if [ "$build_option_asm" ]; then + vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams + vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.openssl + fi + #find ${DESTDIR}/usr/share/man/man1 -type f ! -name openssl.1 -delete +} + +libtls-devel_package() { + short_desc+=" - development files" + depends="libtls-${version}_${revision}" + pkg_install() { + vinstall include/tls.h 644 usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vinstall libtls.pc 644 usr/lib/pkgconfig + for m in man/tls_*; do vman $m; done + } +} + +libressl-netcat_package() { + short_desc="TCP/IP swiss army knife (LibreSSL variant)" + alternatives=" + nc:nc:/usr/bin/libressl-nc + nc:nc.1:/usr/share/man/man1/libressl-nc.1" + pkg_install() { + vbin apps/nc/.libs/nc libressl-nc + vman apps/nc/nc.1 libressl-nc.1 + } +} diff --git a/srcpkgs/libtls/update b/srcpkgs/libtls/update new file mode 100644 index 00000000000..a5d5038a832 --- /dev/null +++ b/srcpkgs/libtls/update @@ -0,0 +1 @@ +ignore="*.0 *.1" From 9da0aeefab395c0e8c925ef774508124c19e81eb Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 13 Feb 2021 15:25:13 +0100 Subject: [PATCH 002/447] catgirl: rebuild for libtls-3.2.4. --- srcpkgs/catgirl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/catgirl/template b/srcpkgs/catgirl/template index 4a93282dc54..6ddf5e3bb62 100644 --- a/srcpkgs/catgirl/template +++ b/srcpkgs/catgirl/template @@ -1,11 +1,11 @@ # Template file for 'catgirl' pkgname=catgirl version=1.6 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" -makedepends="libressl-devel ncurses-devel" +makedepends="libtls-devel ncurses-devel" short_desc="TLS-only terminal IRC client" maintainer="Paper " license="GPL-3.0-or-later" From d0de40fe47b63aabb600056927d4deb9c1735170 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 13 Feb 2021 15:25:16 +0100 Subject: [PATCH 003/447] litterbox: rebuild for libtls-3.2.4. --- srcpkgs/litterbox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/litterbox/template b/srcpkgs/litterbox/template index ace7ae0b5df..ac855d9474b 100644 --- a/srcpkgs/litterbox/template +++ b/srcpkgs/litterbox/template @@ -1,11 +1,11 @@ # Template file for 'litterbox' pkgname=litterbox version=1.7 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" -makedepends="sqlite-devel libressl-devel" +makedepends="sqlite-devel libtls-devel" short_desc="IRC logger" maintainer="Allen Sobot " license="GPL-3.0-or-later" From 1a521d756b01c51532411f57bba31b89124d8635 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 13 Feb 2021 15:25:22 +0100 Subject: [PATCH 004/447] pounce: rebuild for libtls-3.2.4. --- srcpkgs/pounce/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pounce/template b/srcpkgs/pounce/template index 63b55178a17..4e33113d349 100644 --- a/srcpkgs/pounce/template +++ b/srcpkgs/pounce/template @@ -1,11 +1,11 @@ # Template file for 'pounce' pkgname=pounce version=2.3 -revision=1 +revision=2 build_style=gnu-configure make_build_target="all" hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="libtls-devel" short_desc="Multi-client, TLS-only IRC bouncer" maintainer="Paper " license="GPL-3.0-or-later" From 74c45a8429023b03b02f66302b6996061a3e10c5 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 13 Feb 2021 15:25:30 +0100 Subject: [PATCH 005/447] openntpd: rebuild for libtls-3.2.4. --- srcpkgs/openntpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index e7b1e2877ac..b7e7db5c41f 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,11 +1,11 @@ # Template file for 'openntpd' pkgname=openntpd version=6.2p3 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem" hostmakedepends="automake libtool" -makedepends="libressl-devel" +makedepends="libtls-devel" depends="ca-certificates" short_desc="FREE, easy to use implementation of the Network Time Protocol" maintainer="Orphaned " From c48516a0b444b99c6d9a074c93c4ba42b945076e Mon Sep 17 00:00:00 2001 From: John Zimmermann Date: Sat, 12 Jan 2019 02:02:23 +0000 Subject: [PATCH 006/447] New package: openssl-1.1.1j --- common/shlibs | 5 ++ srcpkgs/libcrypto1.1 | 1 + srcpkgs/libssl1.1 | 1 + srcpkgs/openssl-c_rehash | 1 + srcpkgs/openssl-devel | 1 + srcpkgs/openssl/patches/ppc-auxv.patch | 17 +++++ srcpkgs/openssl/patches/ppc64.patch | 96 ++++++++++++++++++++++++++ srcpkgs/openssl/template | 87 +++++++++++++++++++++++ 8 files changed, 209 insertions(+) create mode 120000 srcpkgs/libcrypto1.1 create mode 120000 srcpkgs/libssl1.1 create mode 120000 srcpkgs/openssl-c_rehash create mode 120000 srcpkgs/openssl-devel create mode 100644 srcpkgs/openssl/patches/ppc-auxv.patch create mode 100644 srcpkgs/openssl/patches/ppc64.patch create mode 100644 srcpkgs/openssl/template diff --git a/common/shlibs b/common/shlibs index 099944ba555..3b84249d9c1 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1756,6 +1756,11 @@ libid3.so id3lib-3.8.3_1 libid3-3.8.so.3 id3lib-3.8.3_1 libgirara-gtk3.so.3 girara-0.2.8_1 libjq.so.1 jq-devel-1.4_1 +libcrypto.so.43 libcrypto43-2.7.2_1 +libssl.so.45 libssl45-2.7.2_1 +libtls.so.17 libtls17-2.7.2_1 +libcrypto.so.1.1 libcrypto1.1-1.1.1f_1 +libssl.so.1.1 libssl1.1-1.1.1f_1 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 libportmidi.so portmidi-217_1 libWildMidi.so.2 libwildmidi-0.4.3_1 diff --git a/srcpkgs/libcrypto1.1 b/srcpkgs/libcrypto1.1 new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/srcpkgs/libcrypto1.1 @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/srcpkgs/libssl1.1 b/srcpkgs/libssl1.1 new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/srcpkgs/libssl1.1 @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/srcpkgs/openssl-c_rehash b/srcpkgs/openssl-c_rehash new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/srcpkgs/openssl-c_rehash @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/srcpkgs/openssl-devel b/srcpkgs/openssl-devel new file mode 120000 index 00000000000..fc538edfef4 --- /dev/null +++ b/srcpkgs/openssl-devel @@ -0,0 +1 @@ +openssl \ No newline at end of file diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch new file mode 100644 index 00000000000..b1e1d627c8a --- /dev/null +++ b/srcpkgs/openssl/patches/ppc-auxv.patch @@ -0,0 +1,17 @@ +--- crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000 ++++ crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000 +@@ -207,11 +207,9 @@ + return 0; + } + +-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) +-# if __GLIBC_PREREQ(2, 16) +-# include +-# define OSSL_IMPLEMENT_GETAUXVAL +-# endif ++#if defined(__linux__) ++# include ++# define OSSL_IMPLEMENT_GETAUXVAL + #endif + + /* I wish was universally available */ diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch new file mode 100644 index 00000000000..bbb4a6f464f --- /dev/null +++ b/srcpkgs/openssl/patches/ppc64.patch @@ -0,0 +1,96 @@ +From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001 +From: Andy Polyakov +Date: Sun, 5 May 2019 18:25:50 +0200 +Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is a big endian ELFv2 configuration. ELFv2 was already being +used for little endian, and big endian was traditionally ELFv1 +but there are practical configurations that use ELFv2 with big +endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.) + +Reviewed-by: Paul Dale +Reviewed-by: Richard Levitte +(Merged from https://github.com/openssl/openssl/pull/8883) +--- + crypto/perlasm/ppc-xlate.pl | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl +index e52f2f6ea62..5fcd0526dff 100755 +--- crypto/perlasm/ppc-xlate.pl ++++ crypto/perlasm/ppc-xlate.pl +@@ -49,7 +49,7 @@ + /osx/ && do { $name = "_$name"; + last; + }; +- /linux.*(32|64le)/ ++ /linux.*(32|64(le|v2))/ + && do { $ret .= ".globl $name"; + if (!$$type) { + $ret .= "\n.type $name,\@function"; +@@ -80,7 +80,7 @@ + }; + my $text = sub { + my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text"; +- $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/); ++ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64(le|v2)/); + $ret; + }; + my $machine = sub { +@@ -186,7 +186,7 @@ + + # Some ABIs specify vrsave, special-purpose register #256, as reserved + # for system use. +-my $no_vrsave = ($flavour =~ /aix|linux64le/); ++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/); + my $mtspr = sub { + my ($f,$idx,$ra) = @_; + if ($idx == 256 && $no_vrsave) { +@@ -318,7 +318,7 @@ sub vfour { + if ($label) { + my $xlated = ($GLOBALS{$label} or $label); + print "$xlated:"; +- if ($flavour =~ /linux.*64le/) { ++ if ($flavour =~ /linux.*64(le|v2)/) { + if ($TYPES{$label} =~ /function/) { + printf "\n.localentry %s,0\n",$xlated; + } + +From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001 +From: Andy Polyakov +Date: Sun, 5 May 2019 18:30:55 +0200 +Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems + +If _CALL_ELF is defined to be 2, it's an ELFv2 system. +Conditionally switch to the v2 perlasm scheme. + +Reviewed-by: Paul Dale +Reviewed-by: Richard Levitte +(Merged from https://github.com/openssl/openssl/pull/8883) +--- + Configure | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/Configure b/Configure +index 22082deb4c7..e303d98deb3 100755 +--- Configure ++++ Configure +@@ -1402,8 +1402,15 @@ + my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC}); + my %predefined_CXX = $config{CXX} + ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) + : (); + ++unless ($disabled{asm}) { ++ # big endian systems can use ELFv2 ABI ++ if ($target eq "linux-ppc64") { ++ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2); ++ } ++} ++ + # Check for makedepend capabilities. + if (!$disabled{makedepend}) { + if ($config{target} =~ /^(VC|vms)-/) { diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template new file mode 100644 index 00000000000..87442ef8d1f --- /dev/null +++ b/srcpkgs/openssl/template @@ -0,0 +1,87 @@ +# Template file for 'openssl' +pkgname=openssl +version=1.1.1j +revision=1 +bootstrap=yes +build_style=configure +configure_script="./Configure" +configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib + shared no-ssl3-method $(vopt_if asm ' ' 'no-asm') + -Wa,--noexecstack" +make_cmd=make +make_build_args='MAKEDEPPROG="$(CC)' +make_check_target=test +make_install_args="MANSUFFIX=ssl" +short_desc="Toolkit for Secure Sockets Layer and Transport Layer Security" +maintainer="John " +license="OpenSSL-License" +homepage="https://www.openssl.org" +distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz" +checksum=aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf +conf_files="/etc/ssl/openssl.cnf" +conflicts="openssl<=3.0.2_2" + +build_options=asm + +if [ "$CHROOT_READY" ]; then + hostmakedepends="perl" + build_options_default="asm" +fi + +case $XBPS_TARGET_MACHINE in + x86_64*) configure_args+=" enable-ec_nistp_64_gcc_128 linux-x86_64";; + i686*) configure_args+=" linux-elf";; + aarch64*) configure_args+=" linux-aarch64";; + ppc64le*) configure_args+=" linux-ppc64le";; + ppc64*) configure_args+=" linux-ppc64";; + ppc*) configure_args+=" linux-ppc";; + arm*) configure_args+=" linux-armv4";; + mips*) configure_args+=" linux-mips32 -mips32";; + *) broken="$XBPS_TARGET_MACHINE";; +esac + +pre_configure() { + configure_args+=" ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" +} + +pre_build() { + make ${makejobs} depend +} + +libcrypto1.1_package() { + short_desc+=" - crypto library" + pkg_install() { + vmove "usr/lib/libcrypto.so.*" + vmove usr/lib/engines-1.1 + } +} + +libssl1.1_package() { + short_desc+=" - SSL/TLS library" + pkg_install() { + vmove "usr/lib/libssl.so.*" + } +} + +openssl-c_rehash_package() { + short_desc+=" - c_rehash utility" + depends="openssl perl" + pkg_install() { + vmove usr/bin/c_rehash + } +} + +openssl-devel_package() { + depends="${sourcepkg}>=${version}_${revision} libssl1.1>=${version}_${revision} libcrypto1.1>=${version}_${revision}" + conflicts="openssl-devel>=0" + replaces="openssl-devel>=0" + short_desc+=" - development files" + pkg_install() { + vmove usr/share/man/man3 + vmove usr/share/doc + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +} From 3c981dcdb444245267c4e597e101f10f16c795d0 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 7 Apr 2020 23:18:09 +0200 Subject: [PATCH 007/447] libressl: don't provide OpenSSL anymore --- srcpkgs/libressl/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libressl/template b/srcpkgs/libressl/template index 731168709b8..11d10e5d745 100644 --- a/srcpkgs/libressl/template +++ b/srcpkgs/libressl/template @@ -4,7 +4,7 @@ version=3.1.5 revision=3 bootstrap=yes build_style=gnu-configure -configure_args="$(vopt_enable asm)" +configure_args="$(vopt_enable asm) --program-prefix=libressl-" short_desc="Version of the TLS/crypto stack forked from OpenSSL" maintainer="Juan RP " license="OpenSSL, ISC" @@ -17,6 +17,7 @@ replaces="openssl>=0" conf_files="/etc/ssl/openssl.cnf /etc/ssl/x509v3.cnf" _lssl_asm_ver="1.1.0" +broken=true build_options="asm" desc_option_asm="Use platform assembly for faster crypto" @@ -64,6 +65,9 @@ post_install() { rm -f ${DESTDIR}/etc/ssl/cert.pem ln -s certs.pem ${DESTDIR}/etc/ssl/cert.pem + # Provided by OpenSSL + rm -f ${DESTDIR}/etc/ssl/openssl.cnf + vlicense COPYING if [ "$build_option_asm" ]; then vlicense libressl-portable-asm-${_lssl_asm_ver}/LICENSE.cryptogams @@ -99,6 +103,7 @@ libressl-devel_package() { libcrypto46-${version}_${revision} libssl48-${version}_${revision} libtls20-${version}_${revision}" + conflicts="openssl-devel>=0" pkg_install() { vmove usr/include vmove "usr/lib/*.a" From 204ff4e97ed8eb677e0cb114f7fe4c9b45e56b63 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 9 Apr 2020 22:04:35 +0200 Subject: [PATCH 008/447] ca-certificates: rebuild for openssl --- srcpkgs/ca-certificates/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 5d3d01d7fa0..85e539ff9c2 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -5,8 +5,8 @@ revision=1 bootstrap=yes conf_files="/etc/ca-certificates.conf" wrksrc="work" -hostmakedepends="libressl" -depends="libressl>=2.2.4_2 run-parts" +hostmakedepends="openssl" +depends="openssl run-parts" short_desc="Common CA certificates for SSL/TLS" maintainer="Orphaned " license="GPL-2.0-or-later, MPL-2.0" @@ -37,7 +37,6 @@ do_install() { ${DESTDIR}/usr/share/man/man8/update-ca-certificates.8 cd ${DESTDIR}/usr/share/ca-certificates find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf - vsed -i 's,openssl rehash,openssl certhash,g' ${DESTDIR}/usr/sbin/update-ca-certificates mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin ln -s /etc/ssl/certs/ca-certificates.crt ${DESTDIR}/etc/ssl/certs.pem } From 2a85f1f260f883766712f6365e9241f31d267593 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:42 +0100 Subject: [PATCH 009/447] FreeRADIUS: rebuild against OpenSSL --- srcpkgs/FreeRADIUS/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/FreeRADIUS/template b/srcpkgs/FreeRADIUS/template index 74fca94bbed..9aacb4ecc35 100644 --- a/srcpkgs/FreeRADIUS/template +++ b/srcpkgs/FreeRADIUS/template @@ -1,10 +1,10 @@ # Template file for 'FreeRADIUS' pkgname=FreeRADIUS version=3.0.20 -revision=3 +revision=4 wrksrc=freeradius-server-release_${version//./_} build_style=gnu-configure -makedepends="talloc-devel libressl-devel mit-krb5-devel pam-devel \ +makedepends="talloc-devel openssl-devel mit-krb5-devel pam-devel \ libmariadbclient-devel postgresql-libs-devel json-c-devel" short_desc="World's most popular RADIUS Server" maintainer="Michael Aldridge " From 49b98d89fb159445be0e469bc6b46a038883e686 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:42 +0100 Subject: [PATCH 010/447] LGOGDownloader: rebuild against OpenSSL --- srcpkgs/LGOGDownloader/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index 6ff1447bb3e..a17a764df38 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,12 +1,12 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader version=3.7 -revision=4 +revision=5 wrksrc="lgogdownloader-${version}" build_style=cmake hostmakedepends="pkg-config" makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel - jsoncpp-devel boost-devel libressl-devel zlib-devel" + jsoncpp-devel boost-devel openssl-devel zlib-devel" short_desc="Open source downloader for GOG.com games that uses the GOG.com API" maintainer="RunningDroid " license="WTFPL" From 49efd1aeb7ed006119780cf3eac3754fd15ee705 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:42 +0100 Subject: [PATCH 011/447] MEGAsdk: rebuild against OpenSSL --- srcpkgs/MEGAsdk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index 0cb3b292064..e9cbeb70f5d 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,13 +1,13 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk version=3.7.3c -revision=1 +revision=2 wrksrc="sdk-${version}" build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" make_build_args='LIBTOOLFLAGS="--tag=CXX"' hostmakedepends="autogen doxygen autoconf automake gettext libtool" -makedepends="libcurl-devel c-ares-devel libressl-devel crypto++-devel +makedepends="libcurl-devel c-ares-devel openssl-devel crypto++-devel zlib-devel sqlite-devel freeimage-devel libsodium-devel fuse-devel libuv-devel $(vopt_if mediainfo libmediainfo-devel)" checkdepends="gtest-devel" From ca5ff0d231b8b3690be08252fe019172f602e520 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:42 +0100 Subject: [PATCH 012/447] NetworkManager-l2tp: rebuild against OpenSSL --- srcpkgs/NetworkManager-l2tp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template index 1769dc9d267..51e24d1465e 100644 --- a/srcpkgs/NetworkManager-l2tp/template +++ b/srcpkgs/NetworkManager-l2tp/template @@ -1,11 +1,11 @@ # Template file for 'NetworkManager-l2tp' pkgname=NetworkManager-l2tp version=1.8.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--runstatedir=/run" hostmakedepends="pkg-config intltool glib-devel" -makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel libressl-devel +makedepends="glib-devel gtk+3-devel libglib-devel libnma-devel openssl-devel libsecret-devel nss-devel ppp-devel" depends="strongswan xl2tpd ppp" short_desc="NetworkManager VPN plugin for L2TP/IPsec" From 79f7b8b56f5cd38314efcfa08ea9e5f6972bb400 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:43 +0100 Subject: [PATCH 013/447] OpenRCT2: rebuild against OpenSSL --- srcpkgs/OpenRCT2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index c99234aaa55..2e369d91b30 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -16,7 +16,7 @@ configure_args=" hostmakedepends="pkg-config unzip" makedepends="SDL2-devel fontconfig-devel freetype-devel libzip-devel libpng-devel speexdsp-devel jansson-devel icu-devel zlib-devel json-c++ - $(vopt_if multiplayer 'libcurl-devel libressl-devel') + $(vopt_if multiplayer 'libcurl-devel openssl-devel') $(vopt_if scripting duktape-devel)" short_desc="Open source re-implementation of RollerCoaster Tycoon 2" maintainer="klardotsh " From 7daecf1f352820dd63fd8988aee82755ddbd1826 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:43 +0100 Subject: [PATCH 014/447] VirtualGL: rebuild against OpenSSL --- srcpkgs/VirtualGL/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template index 1a4c708af37..bf25920d2cb 100644 --- a/srcpkgs/VirtualGL/template +++ b/srcpkgs/VirtualGL/template @@ -1,13 +1,13 @@ # Template file for 'VirtualGL' pkgname=VirtualGL version=2.6.2 -revision=2 +revision=3 build_style=cmake configure_args="-DTJPEG_INCLUDE_DIR=/usr/include -DVGL_SYSTEMGLX=ON -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DCMAKE_INSTALL_LIBDIR=/usr/lib -DVGL_SYSTEMFLTK=ON -DVGL_USESSL=ON" makedepends="libXv-devel glu-devel libjpeg-turbo-devel MesaLib-devel - libXtst-devel fltk-devel libressl-devel" + libXtst-devel fltk-devel openssl-devel" short_desc="Run remote OpenGL applications with full acceleration" maintainer="Orphaned " license="LGPL-2.1-or-later" From 8a0d7c21128e4ad642614e1daad83b65ae92ebf7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:43 +0100 Subject: [PATCH 015/447] aircrack-ng: rebuild against OpenSSL --- srcpkgs/aircrack-ng/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aircrack-ng/template b/srcpkgs/aircrack-ng/template index f711b89509e..604bcefb5a3 100644 --- a/srcpkgs/aircrack-ng/template +++ b/srcpkgs/aircrack-ng/template @@ -1,10 +1,10 @@ # Template file for 'aircrack-ng' pkgname=aircrack-ng version=1.6 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" -makedepends="libnl3-devel libressl-devel sqlite-devel zlib-devel" +makedepends="libnl3-devel openssl-devel sqlite-devel zlib-devel" short_desc="Complete suite of tools to assess WiFi network security" maintainer="Orphaned " license="GPL-2.0-or-later, BSD-3-Clause, OpenSSL" From 020f028931eafb48c04ed32bfe8c82b9fbe2b525 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:43 +0100 Subject: [PATCH 016/447] alpine: rebuild against OpenSSL --- srcpkgs/alpine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/alpine/template b/srcpkgs/alpine/template index 108c99547bb..8721a772a33 100644 --- a/srcpkgs/alpine/template +++ b/srcpkgs/alpine/template @@ -1,7 +1,7 @@ # Template file for 'alpine' pkgname=alpine version=2.24 -revision=1 +revision=2 _githash=3165f59b344fb4d56d161541f294754d56bcb372 _gitshort="${_githash:0:7}" wrksrc="${pkgname}-${_gitshort}" From 031b551ed6ebe3e94ae6e72b89b8f7e0c577ef72 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:44 +0100 Subject: [PATCH 017/447] android-file-transfer-linux: rebuild against OpenSSL --- srcpkgs/android-file-transfer-linux/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/android-file-transfer-linux/template b/srcpkgs/android-file-transfer-linux/template index e2d884d4b83..86cd86a99af 100644 --- a/srcpkgs/android-file-transfer-linux/template +++ b/srcpkgs/android-file-transfer-linux/template @@ -1,7 +1,7 @@ # Template file for 'android-file-transfer-linux' pkgname=android-file-transfer-linux version=4.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_SHARED_LIB=1" hostmakedepends="qt5-qmake qt5-host-tools ninja pkg-config" From 46cf6227aa561290dd72f787c904837c4f9bd80c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:44 +0100 Subject: [PATCH 018/447] apache: rebuild against OpenSSL --- srcpkgs/apache/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 23619224f90..54d12f3a57b 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -1,7 +1,7 @@ # Template file for 'apache' pkgname=apache version=2.4.46 -revision=1 +revision=2 wrksrc="httpd-${version}" build_style=gnu-configure configure_args="--prefix= --sbindir=/usr/bin --enable-pie --enable-modules=all @@ -28,7 +28,7 @@ conf_files=" /etc/${pkgname}/mime.types" hostmakedepends="pkg-config perl apr-util-devel" makedepends="zlib-devel libuuid-devel pcre-devel nghttp2-devel - libressl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel" + openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel" depends="apache-htpasswd" short_desc="Apache http server" maintainer="Orphaned " From e68ea2d7fab8300900c8400c86e392b4c1cb56e8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:44 +0100 Subject: [PATCH 019/447] apk-tools: rebuild against OpenSSL --- srcpkgs/apk-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apk-tools/template b/srcpkgs/apk-tools/template index 633ac417326..48f3ac3ab6f 100644 --- a/srcpkgs/apk-tools/template +++ b/srcpkgs/apk-tools/template @@ -6,7 +6,7 @@ build_style=gnu-makefile # Link libapk statically make_build_args="LUAAPK=no LDFLAGS_apk.static= static" hostmakedepends="pkg-config lua53 lua53-zlib" -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" short_desc="Alpine Package Keeper (Alpine package manager)" maintainer="Leah Neukirchen " license="GPL-2.0-only" From cbeb331c4de81ce5d01b27623fb93a329f1f0ca1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:45 +0100 Subject: [PATCH 020/447] apr-util: rebuild against OpenSSL --- srcpkgs/apr-util/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index db439b515e4..4c1215a8906 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -10,7 +10,7 @@ configure_args=" --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso" hostmakedepends="libtool apr-devel" -makedepends="zlib-devel libressl-devel apr-devel db-devel expat-devel +makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel postgresql-libs-devel sqlite-devel" short_desc="Apache Portable Runtime Utility Library" From d2d73bd399b011a0011aa6127dfd1bc0beeb4eb2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:45 +0100 Subject: [PATCH 021/447] argyllcms: rebuild against OpenSSL --- srcpkgs/argyllcms/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/argyllcms/template b/srcpkgs/argyllcms/template index dd10c965b47..5fb8294254f 100644 --- a/srcpkgs/argyllcms/template +++ b/srcpkgs/argyllcms/template @@ -1,10 +1,10 @@ # Template file for 'argyllcms' pkgname=argyllcms version=2.1.2 -revision=2 +revision=3 wrksrc="Argyll_V${version}" hostmakedepends="ftjam zip unzip" -makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel libressl-devel +makedepends="zlib-devel libjpeg-turbo-devel libXinerama-devel openssl-devel libXScrnSaver-devel libXxf86vm-devel libXrandr-devel tiff-devel libpng-devel" short_desc="ICC compatible color management system" maintainer="Orphaned " From 37c92abb8e179ac343c034b291ecbd2a57b3110e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:45 +0100 Subject: [PATCH 022/447] aria2: rebuild against OpenSSL --- srcpkgs/aria2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index f88cb53e958..bacfa29e25e 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -1,14 +1,14 @@ # Template file for 'aria2' pkgname=aria2 version=1.35.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-openssl --with-libexpat --without-gnutls --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-bashcompletiondir=/usr/share/bash-completion/completions --enable-libaria2" hostmakedepends="pkg-config" -makedepends="c-ares-devel expat-devel gmp-devel libressl-devel sqlite-devel +makedepends="c-ares-devel expat-devel gmp-devel openssl-devel sqlite-devel zlib-devel" depends="ca-certificates" checkdepends="libcppunit-devel" From 85aa40b6bdcd2cdb5dfebc94eb80fe8c1eddd907 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:45 +0100 Subject: [PATCH 023/447] attic: rebuild against OpenSSL --- srcpkgs/attic/patches/openssl.diff | 59 ++++++++++++++++++++++++++++++ srcpkgs/attic/template | 4 +- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/attic/patches/openssl.diff diff --git a/srcpkgs/attic/patches/openssl.diff b/srcpkgs/attic/patches/openssl.diff new file mode 100644 index 00000000000..c289a1dc267 --- /dev/null +++ b/srcpkgs/attic/patches/openssl.diff @@ -0,0 +1,59 @@ +--- attic/crypto.pyx ++++ attic/crypto.pyx +@@ -23,8 +23,9 @@ cdef extern from "openssl/evp.h": + pass + const EVP_MD *EVP_sha256() + const EVP_CIPHER *EVP_aes_256_ctr() +- void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a) +- void EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a) ++ EVP_CIPHER_CTX *EVP_CIPHER_CTX_new() ++ const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *a) ++ void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a) + + int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx,const EVP_CIPHER *cipher, ENGINE *impl, + const unsigned char *key, const unsigned char *iv) +@@ -84,16 +85,16 @@ def get_random_bytes(n): + cdef class AES: + """A thin wrapper around the OpenSSL EVP cipher API + """ +- cdef EVP_CIPHER_CTX ctx ++ cdef EVP_CIPHER_CTX * ctx + + def __cinit__(self, key, iv=None): +- EVP_CIPHER_CTX_init(&self.ctx) +- if not EVP_EncryptInit_ex(&self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL): ++ self.ctx = EVP_CIPHER_CTX_new(); ++ if not EVP_EncryptInit_ex(self.ctx, EVP_aes_256_ctr(), NULL, NULL, NULL): + raise Exception('EVP_EncryptInit_ex failed') + self.reset(key, iv) + + def __dealloc__(self): +- EVP_CIPHER_CTX_cleanup(&self.ctx) ++ EVP_CIPHER_CTX_free(self.ctx) + + def reset(self, key=None, iv=None): + cdef const unsigned char *key2 = NULL +@@ -102,12 +103,12 @@ cdef class AES: + key2 = key + if iv: + iv2 = iv +- if not EVP_EncryptInit_ex(&self.ctx, NULL, NULL, key2, iv2): ++ if not EVP_EncryptInit_ex(self.ctx, NULL, NULL, key2, iv2): + raise Exception('EVP_EncryptInit_ex failed') + + @property + def iv(self): +- return self.ctx.iv[:16] ++ return EVP_CIPHER_CTX_iv(self.ctx)[:16] + + def encrypt(self, data): + cdef int inl = len(data) +@@ -116,7 +117,7 @@ cdef class AES: + if not out: + raise MemoryError + try: +- if not EVP_EncryptUpdate(&self.ctx, out, &outl, data, inl): ++ if not EVP_EncryptUpdate(self.ctx, out, &outl, data, inl): + raise Exception('EVP_EncryptUpdate failed') + return out[:inl] + finally: diff --git a/srcpkgs/attic/template b/srcpkgs/attic/template index 1b08972b359..153c0341edc 100644 --- a/srcpkgs/attic/template +++ b/srcpkgs/attic/template @@ -1,11 +1,11 @@ # Template file for 'attic' pkgname=attic version=0.16 -revision=19 +revision=20 wrksrc="Attic-$version" build_style=python3-module hostmakedepends="python3-setuptools python3-Cython python3-Sphinx" -makedepends="python3-devel libressl-devel acl-devel" +makedepends="python3-devel openssl-devel acl-devel" depends="python3-msgpack python3-llfuse" short_desc="Deduplicating backup program for efficient and secure backups" maintainer="Leah Neukirchen " From fe5099250b733246c244fc83c9b6b080c7ce59cb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:45 +0100 Subject: [PATCH 024/447] axel: rebuild against OpenSSL --- srcpkgs/axel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/axel/template b/srcpkgs/axel/template index b934278782a..9fbfb8237b6 100644 --- a/srcpkgs/axel/template +++ b/srcpkgs/axel/template @@ -1,11 +1,11 @@ # Template file for 'axel' pkgname=axel version=2.17.10 -revision=1 +revision=2 build_style=gnu-configure conf_files="/etc/axelrc" hostmakedepends="gettext-devel pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Download accelerator for FTP and HTTP" maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" From 8c01c8b5325af405818c77707cadd33dffde3081 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:46 +0100 Subject: [PATCH 025/447] bacula-common: rebuild against OpenSSL --- srcpkgs/bacula-common/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index d78eeb3cda3..9a787a24777 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -1,14 +1,14 @@ # Template file for 'bacula-common' pkgname=bacula-common version=9.4.2 -revision=3 +revision=4 wrksrc="${pkgname%-*}-${version}" build_style=gnu-configure configure_args="--with-openssl --with-sqlite3 --with-mysql --with-postgresql --enable-smartalloc --sysconfdir=/etc/bacula --with-scriptdir=/etc/bacula/scripts --with-working-dir=/run/bacula" makedepends="sqlite-devel libmariadbclient-devel postgresql-libs-devel - libressl-devel ncurses-devel zlib-devel acl-devel" + openssl-devel ncurses-devel zlib-devel acl-devel" short_desc="Bacula - A Network Backup Tool (common libs)" maintainer="Matthias Fulz " license="AGPL-3.0-only, BSD-2-Clause, BSD-3-Clause" From 728a4f57790c1dd108327da5b6e8ddc9c9c9724f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:46 +0100 Subject: [PATCH 026/447] badvpn: rebuild against OpenSSL --- srcpkgs/badvpn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/badvpn/template b/srcpkgs/badvpn/template index 360dc5a9140..3b35580d8b3 100644 --- a/srcpkgs/badvpn/template +++ b/srcpkgs/badvpn/template @@ -1,10 +1,10 @@ # Template file for 'badvpn' pkgname=badvpn version=1.999.130 -revision=12 +revision=13 build_style=cmake hostmakedepends="pkg-config" -makedepends="libressl-devel nspr-devel nss-devel" +makedepends="openssl-devel nspr-devel nss-devel" short_desc="Peer-to-peer VPN system" maintainer="Enno Boland " license="BSD" From 801aacbd28b7e82527a1261f956919d1b8fdabf3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:46 +0100 Subject: [PATCH 027/447] baresip: rebuild against OpenSSL --- srcpkgs/baresip/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index d6020b6dfcc..d3907ccc1ec 100644 --- a/srcpkgs/baresip/template +++ b/srcpkgs/baresip/template @@ -13,7 +13,7 @@ make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk PREFIX=/usr make_install_args="$make_build_args" make_use_env=1 hostmakedepends="pkg-config" -makedepends="libgsm-devel libpng-devel libressl-devel libsndfile-devel +makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel tiff-devel twolame-devel $(vopt_if video 'SDL2-devel ffmpeg-devel libvpx-devel libX11-devel From f671c93364c6dddfba9237b08910f4c0c0af167e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:46 +0100 Subject: [PATCH 028/447] barrier: rebuild against OpenSSL --- srcpkgs/barrier/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/barrier/template b/srcpkgs/barrier/template index 0fbbee53ab5..f36a9914585 100644 --- a/srcpkgs/barrier/template +++ b/srcpkgs/barrier/template @@ -1,7 +1,7 @@ # Template file for 'barrier' pkgname=barrier version=2.3.3 -revision=1 +revision=2 build_style=cmake configure_args="-DBARRIER_REVISION=00000000 -DBARRIER_VERSION_STAGE=RELEASE" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" From 4d3bf4b374346e9c087882bccdfc8854b1308149 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:46 +0100 Subject: [PATCH 029/447] bind: rebuild against OpenSSL --- srcpkgs/bind/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 57243a23f4f..9885f3bb0ec 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -14,7 +14,7 @@ configure_args="--disable-static --enable-threads --enable-largefile --with-libidn2 $(vopt_if geoip "--with-geoip=${XBPS_CROSS_BASE}/usr" "--without-geoip")" hostmakedepends="automake libtool perl pkg-config" -makedepends="libressl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel +makedepends="openssl-devel libxml2-devel libcap-devel readline-devel mit-krb5-devel libatomic-devel libidn2-devel libuv-devel $(vopt_if geoip geoip-devel)" short_desc="Berkeley Internet Name Domain server" maintainer="Randy McCaskill " From 21492f8fc1624785882aee74b7a26ce66d0aa727 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:47 +0100 Subject: [PATCH 030/447] bitchx: rebuild against OpenSSL --- srcpkgs/bitchx/patches/openssl-1.1.patch | 91 ++++++++++++++++++++++++ srcpkgs/bitchx/template | 6 +- 2 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/bitchx/patches/openssl-1.1.patch diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch new file mode 100644 index 00000000000..f062675dc67 --- /dev/null +++ b/srcpkgs/bitchx/patches/openssl-1.1.patch @@ -0,0 +1,91 @@ +commit 184af728c73c379d1eee57a387b6012572794fa8 +Author: Kevin Easton +Date: Fri Mar 17 00:38:46 2017 +1100 + + Add support for OpenSSL 1.1.0 to configure script + + OpenSSL 1.1.0 removed the SSLeay() function and replaced it with a macro, that AC_CHECK_LIB can't see. + + Search for ERR_get_error() instead. + +diff --git configure configure +index d435491..f4af7bb 100755 +--- configure ++++ configure +@@ -10630,9 +10630,9 @@ esac + case "$with_ssl" in + yes|check) + +-echo "$as_me:$LINENO: checking for SSLeay in -lcrypto" >&5 +-echo $ECHO_N "checking for SSLeay in -lcrypto... $ECHO_C" >&6 +-if test "${ac_cv_lib_crypto_SSLeay+set}" = set; then ++echo "$as_me:$LINENO: checking for ERR_get_error in -lcrypto" >&5 ++echo $ECHO_N "checking for ERR_get_error in -lcrypto... $ECHO_C" >&6 ++if test "${ac_cv_lib_crypto_ERR_get_error+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -10650,11 +10650,11 @@ extern "C" + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char SSLeay (); ++char ERR_get_error (); + int + main () + { +-SSLeay (); ++ERR_get_error (); + ; + return 0; + } +@@ -10681,20 +10681,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then +- ac_cv_lib_crypto_SSLeay=yes ++ ac_cv_lib_crypto_ERR_get_error=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +-ac_cv_lib_crypto_SSLeay=no ++ac_cv_lib_crypto_ERR_get_error=no + fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SSLeay" >&5 +-echo "${ECHO_T}$ac_cv_lib_crypto_SSLeay" >&6 +-if test $ac_cv_lib_crypto_SSLeay = yes; then ++echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_ERR_get_error" >&5 ++echo "${ECHO_T}$ac_cv_lib_crypto_ERR_get_error" >&6 ++if test $ac_cv_lib_crypto_ERR_get_error = yes; then + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBCRYPTO 1 + _ACEOF +@@ -10703,7 +10703,7 @@ _ACEOF + + fi + +- if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then ++ if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then + + echo "$as_me:$LINENO: checking for SSL_accept in -lssl" >&5 + echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6 +diff --git configure.in configure.in +index 63d133f..3694a7f 100644 +--- configure.in ++++ configure.in +@@ -562,8 +562,8 @@ case "$with_ssl" in + esac + case "$with_ssl" in + yes|check) +- AC_CHECK_LIB([crypto], [SSLeay], [], [], []) +- if test x"$ac_cv_lib_crypto_SSLeay" = x"yes"; then ++ AC_CHECK_LIB([crypto], [ERR_get_error], [], [], []) ++ if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then + AC_CHECK_LIB([ssl], [SSL_accept], [], [], []) + fi + if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template index 55ca42d63d4..f4746e263f8 100644 --- a/srcpkgs/bitchx/template +++ b/srcpkgs/bitchx/template @@ -1,14 +1,14 @@ # Template file for 'bitchx' pkgname=bitchx version=1.2.1 -revision=15 +revision=16 build_style=gnu-configure configure_args="--with-ssl --with-ipv6 --with-plugins" -makedepends="libressl-devel ncurses-devel" +makedepends="openssl-devel ncurses-devel" short_desc="A simple IRC client (Internet Relay Chat)" maintainer="Orphaned " license="3-clause-BSD" -homepage="http://bitchx.com" +homepage="http://bitchx.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2 From 4ce81bac6c4155389fcb12c710c185b60f43b232 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:47 +0100 Subject: [PATCH 031/447] bitcoin: rebuild against OpenSSL --- srcpkgs/bitcoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 4eca088632a..3506a68aaeb 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -1,7 +1,7 @@ # Template file for 'bitcoin' pkgname=bitcoin version=0.19.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr" From 5c8ba6308896ae2d595063fa7640481f4b04fbf0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:47 +0100 Subject: [PATCH 032/447] blindfold: rebuild against OpenSSL --- srcpkgs/blindfold/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/blindfold/template b/srcpkgs/blindfold/template index 99ebec46adb..ee605e76710 100644 --- a/srcpkgs/blindfold/template +++ b/srcpkgs/blindfold/template @@ -1,10 +1,10 @@ # Template file for 'blindfold' pkgname=blindfold version=1.0.6 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="CLI gitignore file generator" maintainer="Jan Christian Grünhage " license="MIT" From c46cabae12239ed57b39de5c661f1b37d6e6fd44 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:47 +0100 Subject: [PATCH 033/447] borg: rebuild against OpenSSL --- srcpkgs/borg/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/borg/template b/srcpkgs/borg/template index cd8d3d79055..157b87f7486 100644 --- a/srcpkgs/borg/template +++ b/srcpkgs/borg/template @@ -1,10 +1,10 @@ # Template file for 'borg' pkgname=borg version=1.1.15 -revision=1 +revision=2 wrksrc="borgbackup-${version}" build_style=python3-module -hostmakedepends="python3-setuptools python3-devel libressl-devel" +hostmakedepends="python3-setuptools python3-devel openssl-devel" makedepends="${hostmakedepends/python3-setuptools/} acl-devel liblz4-devel libzstd-devel" depends="python3-llfuse python3-setuptools" short_desc="Deduplicating backup program with compression and encryption" From eca98dd5d8ca33a690c78d8e7e1d485c7b342936 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:48 +0100 Subject: [PATCH 034/447] botan: rebuild against OpenSSL --- srcpkgs/botan/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/botan/template b/srcpkgs/botan/template index 9c25da59ab8..ee196bbe4ee 100644 --- a/srcpkgs/botan/template +++ b/srcpkgs/botan/template @@ -1,12 +1,12 @@ # Template file for 'botan' pkgname=botan version=2.16.0 -revision=2 +revision=3 wrksrc="${pkgname^}-${version}" build_style=gnu-makefile pycompile_module="botan.py" hostmakedepends="doxygen python3" -makedepends="libressl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel" +makedepends="openssl-devel bzip2-devel liblzma-devel sqlite-devel zlib-devel" short_desc="Crypto library written in C++" maintainer="Jürgen Buchmüller " license="BSD-2-Clause" From 2d52ca70d29e9e70d0c2298a62c88e10e428ccb5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:48 +0100 Subject: [PATCH 035/447] burp2-server: rebuild against OpenSSL --- srcpkgs/burp2-server/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/burp2-server/template b/srcpkgs/burp2-server/template index edda1f11f7e..237555ce0e5 100644 --- a/srcpkgs/burp2-server/template +++ b/srcpkgs/burp2-server/template @@ -3,13 +3,13 @@ _desc="Network-based backup and restore program" pkgname=burp2-server version=2.2.18 -revision=4 +revision=5 wrksrc="burp-${version}" build_style=gnu-configure make_install_target=install-all configure_args="--sysconfdir=/etc/burp" hostmakedepends="automake libtool pkg-config" -makedepends="acl-devel libressl-devel librsync-devel ncurses-devel uthash +makedepends="acl-devel openssl-devel librsync-devel ncurses-devel uthash yajl-devel zlib-devel" # unique binary for both client and server: server depends on client package. depends="burp2-client" @@ -59,7 +59,7 @@ post_install() { burp2-client_package() { short_desc="${_desc} - Client" # openssl binary needed by burp_ca script - depends="libressl" + depends="openssl" conf_files="/etc/burp/burp.conf" # burp2-client (v2.x) does not work with burp-server (v1.x): # give a chance to no break everything by refusing upgrade From 17158189f542159b38af63373dfd4b7454290836 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:48 +0100 Subject: [PATCH 036/447] butt: rebuild against OpenSSL --- srcpkgs/butt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/butt/template b/srcpkgs/butt/template index d78e567f0aa..754b60787f3 100644 --- a/srcpkgs/butt/template +++ b/srcpkgs/butt/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="fltk-devel portaudio-devel lame-devel libvorbis-devel libogg-devel - libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel libressl-devel" + libflac-devel opus-devel libsamplerate-devel fdk-aac-devel dbus-devel openssl-devel" short_desc="Cross platform, Easy to use SHOUTcast and Icecast streaming tool" maintainer="1is7ac3 " license="GPL-2.0-or-later" From 3412ef359111f5f5add867176607b7d10e6192fb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:49 +0100 Subject: [PATCH 037/447] cargo: rebuild against OpenSSL --- srcpkgs/cargo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 9da9aa4a85c..9c9781d1fc4 100644 --- a/srcpkgs/cargo/template +++ b/srcpkgs/cargo/template @@ -1,7 +1,7 @@ # Template file for 'cargo' pkgname=cargo version=0.49.0 -revision=1 +revision=2 wrksrc="cargo-${version}" build_helper=rust hostmakedepends="rust python3 curl cmake pkg-config zlib-devel" From f42df0c247b39bd8cb2459ac60994b4a7eca6b0d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:49 +0100 Subject: [PATCH 038/447] cargo-aoc: rebuild against OpenSSL --- srcpkgs/cargo-aoc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-aoc/template b/srcpkgs/cargo-aoc/template index d8ecf5e2ee8..023401daa9e 100644 --- a/srcpkgs/cargo-aoc/template +++ b/srcpkgs/cargo-aoc/template @@ -1,11 +1,11 @@ # Template file for 'cargo-aoc' pkgname=cargo-aoc version=0.3.2 -revision=2 +revision=3 build_wrksrc=cargo-aoc build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="CLI helper tool for advent of code in rust" maintainer="Jan Christian Grünhage " license="MIT, Apache-2.0" From 05072fd771c081fcefcc58a301e69a4434695f0f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:49 +0100 Subject: [PATCH 039/447] cargo-crev: rebuild against OpenSSL --- srcpkgs/cargo-crev/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-crev/template b/srcpkgs/cargo-crev/template index 24b6442facd..cd177eac290 100644 --- a/srcpkgs/cargo-crev/template +++ b/srcpkgs/cargo-crev/template @@ -1,11 +1,11 @@ # Template file for 'cargo-crev' pkgname=cargo-crev version=0.18.0 -revision=1 +revision=2 build_style=cargo make_install_args="--path ./cargo-crev" hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Cryptographically verifiable code review system for cargo" maintainer="Jan Christian Grünhage " license="MPL-2.0, MIT, Apache-2.0" From 6d004b067a82db15e839019e3875c65dabbbe7c8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:49 +0100 Subject: [PATCH 040/447] cargo-deny: rebuild against OpenSSL --- srcpkgs/cargo-deny/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-deny/template b/srcpkgs/cargo-deny/template index c3bfe81bc64..56fbd4eba25 100644 --- a/srcpkgs/cargo-deny/template +++ b/srcpkgs/cargo-deny/template @@ -1,11 +1,11 @@ # Template file for 'cargo-deny' pkgname=cargo-deny version=0.8.2 -revision=1 +revision=2 build_style=cargo configure_args="--no-default-features" hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Cargo plugin to help you manage large dependency graphs" maintainer="Jan Christian Grünhage " license="MIT, Apache-2.0" From a57397940ef863f812832fbd848f99fe6d8a933f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:49 +0100 Subject: [PATCH 041/447] cargo-edit: rebuild against OpenSSL --- srcpkgs/cargo-edit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-edit/template b/srcpkgs/cargo-edit/template index 6e746c880c7..90e5b108429 100644 --- a/srcpkgs/cargo-edit/template +++ b/srcpkgs/cargo-edit/template @@ -1,10 +1,10 @@ # Template file for 'cargo-edit' pkgname=cargo-edit version=0.7.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Utility for managing cargo dependencies from the command line" maintainer="Jan Christian Grünhage " license="MIT" From ca12228f649d0be38103dfedc38ae77f10685c69 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:50 +0100 Subject: [PATCH 042/447] cargo-geiger: rebuild against OpenSSL --- srcpkgs/cargo-geiger/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-geiger/template b/srcpkgs/cargo-geiger/template index c3fb5386ff5..24a3e3a35e5 100644 --- a/srcpkgs/cargo-geiger/template +++ b/srcpkgs/cargo-geiger/template @@ -1,12 +1,12 @@ # Template file for 'cargo-geiger' pkgname=cargo-geiger version=0.10.2 -revision=1 +revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_wrksrc="${pkgname}" build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Detects usage of unsafe Rust in a Rust crate and its dependencies" maintainer="Jan Christian Grünhage " license="MIT, Apache-2.0" From d0bd4e4bfdc9745c14699f6fd15ee0a6bccf08c6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:50 +0100 Subject: [PATCH 043/447] cargo-outdated: rebuild against OpenSSL --- srcpkgs/cargo-outdated/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cargo-outdated/template b/srcpkgs/cargo-outdated/template index 7e159bb6f5a..5105eb05af5 100644 --- a/srcpkgs/cargo-outdated/template +++ b/srcpkgs/cargo-outdated/template @@ -1,10 +1,10 @@ # Template file for 'cargo-outdated' pkgname=cargo-outdated version=0.9.9 -revision=2 +revision=3 build_style=cargo hostmakedepends="pkg-config" -makedepends="libgit2-devel libressl-devel" +makedepends="libgit2-devel openssl-devel" short_desc="Cargo subcommand for displaying when dependencies are out of date" maintainer="Enno Boland " license="MIT" From 356d9a062a3726c6c0b2ac037744c6034879cbc2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:50 +0100 Subject: [PATCH 044/447] castor: rebuild against OpenSSL --- srcpkgs/castor/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/castor/template b/srcpkgs/castor/template index d3e05c6a435..6c6c5b1dc8e 100644 --- a/srcpkgs/castor/template +++ b/srcpkgs/castor/template @@ -1,10 +1,10 @@ # Template file for 'castor' pkgname=castor version=0.8.16 -revision=2 +revision=3 build_style=cargo hostmakedepends="pkg-config" -makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel libressl-devel" +makedepends="atk-devel pango-devel gdk-pixbuf-devel gtk+3-devel cairo-devel openssl-devel" short_desc="Graphical client for plain-text protocols written in Rust with GTK" maintainer="Zach Dykstra " license="MIT" From a005e5163e701943fa181e7bcc5f9693dc68eb93 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:50 +0100 Subject: [PATCH 045/447] cbang: rebuild against OpenSSL --- srcpkgs/cbang/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template index 85b7d29d543..c4b45f44f2e 100644 --- a/srcpkgs/cbang/template +++ b/srcpkgs/cbang/template @@ -1,13 +1,13 @@ # Template file for 'cbang' pkgname=cbang version=1.6.0 -revision=2 +revision=3 build_style=scons make_build_args="sharedlib=1 staticlib=1" make_install_args="${make_build_args}" hostmakedepends="pkg-config" makedepends="boost-devel bzip2-devel expat-devel leveldb-devel libevent-devel -libressl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel" +openssl-devel libyaml-devel re2-devel snappy-devel sqlite-devel zlib-devel" short_desc="C! (a.k.a. C-Bang) collection of C++ utility libraries" maintainer="Jürgen Buchmüller " license="LGPL-2.1-only" From c14461661f6be9c0c94a9fd4cef3cc407940be59 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:51 +0100 Subject: [PATCH 046/447] chatterino2: rebuild against OpenSSL --- srcpkgs/chatterino2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index cef062ad146..7aec8859d72 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -1,7 +1,7 @@ # Template file for 'chatterino2' pkgname=chatterino2 version=2.2.2 -revision=1 +revision=2 _signals_commit=6665ccad90461c01b7fe704a98a835953d644156 _settings_commit=a5040463c01e6b0e562eab82e0decb29cab9b450 _humanize_commit=4e00a03623966723f23ca3034c1ad944009cd7be From fd7bbb61662abcf07783e41ef1a0d2c9cabaf4cf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:51 +0100 Subject: [PATCH 047/447] cloudfuse: rebuild against OpenSSL --- srcpkgs/cloudfuse/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cloudfuse/template b/srcpkgs/cloudfuse/template index bcba5bba859..3a354656e3c 100644 --- a/srcpkgs/cloudfuse/template +++ b/srcpkgs/cloudfuse/template @@ -1,7 +1,7 @@ # Template file for 'cloudfuse' pkgname=cloudfuse version=1.0 -revision=4 +revision=5 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libxml2-devel libcurl-devel fuse-devel" From 937d7f3dcab251667fb0b4dbdc22889105ff85f9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:51 +0100 Subject: [PATCH 048/447] cmusfm: rebuild against OpenSSL --- srcpkgs/cmusfm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cmusfm/template b/srcpkgs/cmusfm/template index 6b5ac2bbee1..6361f832d74 100644 --- a/srcpkgs/cmusfm/template +++ b/srcpkgs/cmusfm/template @@ -1,7 +1,7 @@ # Template file for 'cmusfm' pkgname=cmusfm version=0.3.3 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-libnotify" hostmakedepends="automake pkg-config" From f9496bd7b00a02b8f3034582e36e98530bcdc6ba Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:52 +0100 Subject: [PATCH 049/447] coWPAtty: rebuild against OpenSSL --- srcpkgs/coWPAtty/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/coWPAtty/template b/srcpkgs/coWPAtty/template index 97f085ee607..2bcf90c8457 100644 --- a/srcpkgs/coWPAtty/template +++ b/srcpkgs/coWPAtty/template @@ -2,12 +2,12 @@ pkgname=coWPAtty _pkgname=cowpatty version=4.8 -revision=3 +revision=4 wrksrc="${_pkgname}-${version}" build_style=gnu-makefile make_use_env=1 make_install_args="BINDIR=/usr/bin" -makedepends="libpcap-devel libressl-devel" +makedepends="libpcap-devel openssl-devel" short_desc="WPA-PSK dictionary attack" maintainer="nexolight " license="GPL-2.0-only" From 625bfce9ff8024ca8277a1f3257156f1fb7cd35e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:52 +0100 Subject: [PATCH 050/447] collectd: rebuild against OpenSSL --- srcpkgs/collectd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index 531f2e3a72f..431c257bbcb 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -11,7 +11,7 @@ configure_args="$(vopt_enable rrdtool rrdtool) $(vopt_enable perl perl) $(vopt_enable prometheus write_prometheus)" conf_files="/etc/collectd.conf" hostmakedepends="automake pkg-config libtool libltdl-devel glib-devel" -makedepends="libcurl-devel iptables-devel libressl-devel libsensors-devel +makedepends="libcurl-devel iptables-devel openssl-devel libsensors-devel libesmtp-devel zlib-devel yajl-devel python3-devel libxml2-devel net-snmp-devel libgcrypt-devel libmariadbclient-devel libltdl-devel libvirt-devel $(vopt_if notify libnotify-devel) $(vopt_if rrdtool rrdtool-devel) From 4900b0621a3a53f6056e15bed95041331fa05c66 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:52 +0100 Subject: [PATCH 051/447] coturn: rebuild against OpenSSL --- srcpkgs/coturn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index 412a1269db5..99e37c16ecd 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -1,10 +1,10 @@ # Template file for 'coturn' pkgname=coturn version=4.5.1.3 -revision=1 +revision=2 build_style=gnu-configure conf_files="/etc/turnserver.conf" -makedepends="libressl-devel libevent-devel hiredis-devel sqlite-devel +makedepends="openssl-devel libevent-devel hiredis-devel sqlite-devel postgresql-libs-devel libmariadbclient-devel" short_desc="Server Implementation of TURN and STUN" maintainer="Toyam Cox " From 45e124e60f3a2ec2797f462de6c22e814fe9deaf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:52 +0100 Subject: [PATCH 052/447] cryptsetup: rebuild against OpenSSL --- srcpkgs/cryptsetup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index 898e37a0c40..a852d5ce618 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -1,13 +1,13 @@ # Template file for 'cryptsetup' pkgname=cryptsetup version=2.3.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-crypto_backend=openssl $(vopt_enable pwquality) --enable-cryptsetup-reencrypt --enable-libargon2" make_check_args="-C tests" hostmakedepends="pkg-config" -makedepends="device-mapper-devel json-c-devel libressl-devel popt-devel +makedepends="device-mapper-devel json-c-devel openssl-devel popt-devel libargon2-devel $(vopt_if pwquality 'libpwquality-devel')" checkdepends="procps-ng which jq tar xz xxd" short_desc="Setup virtual encryption devices under Linux dm-crypt" From 16e11fdf335bb5d3b47280b83507ce1f15ea98d4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:52 +0100 Subject: [PATCH 053/447] curl: rebuild against OpenSSL --- srcpkgs/curl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 6533875c734..ea10772f054 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -11,7 +11,7 @@ hostmakedepends="groff perl pkg-config" makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel') $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel') $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel') - $(vopt_if ssl 'libressl-devel') $(vopt_if zstd 'libzstd-devel')" + $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')" depends="ca-certificates" # openssh isn't in checkdepends, because test 581 locks up checkdepends="perl python3 stunnel nghttp2 groff" From cf558f79efe0a01b12d0490502ae18c1a4748776 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:53 +0100 Subject: [PATCH 054/447] cyrus-sasl: rebuild against OpenSSL --- srcpkgs/cyrus-sasl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index 48221b0789f..2d8f5ffe22a 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -12,7 +12,7 @@ configure_args="--disable-static --enable-shared --enable-checkapop --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 --with-mysql=${XBPS_CROSS_BASE}/usr" hostmakedepends="automake libtool groff pkg-config" -makedepends="libsasl-devel libressl-devel db-devel libldap-devel +makedepends="libsasl-devel openssl-devel db-devel libldap-devel mit-krb5-devel pam-devel sqlite-devel postgresql-libs-devel libmariadbclient-devel" depends="libsasl>=${version}" From c9b2a25cb426790ee526a8f0eabdcd5880f13610 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:53 +0100 Subject: [PATCH 055/447] dillo: rebuild against OpenSSL --- srcpkgs/dillo/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template index 126f0b411c8..3ef02e2ddc7 100644 --- a/srcpkgs/dillo/template +++ b/srcpkgs/dillo/template @@ -1,14 +1,14 @@ # Template file for 'dillo' pkgname=dillo version=3.0.5 -revision=12 +revision=13 build_style=gnu-configure configure_args="--enable-ssl --enable-ipv6 --enable-threaded-dns" conf_files="/etc/dillo/dillorc /etc/dillo/domainrc /etc/dillo/dpidrc /etc/dillo/keysrc" -makedepends="fltk-devel libressl-devel" +makedepends="fltk-devel openssl-devel" short_desc="Small and light graphical web browser" maintainer="Leah Neukirchen " license="GPL-3.0-or-later" From 758945176545ecfb2a744947773d2db54975330f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:53 +0100 Subject: [PATCH 056/447] dma: rebuild against OpenSSL --- srcpkgs/dma/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template index 91fa000a9bc..71892496013 100644 --- a/srcpkgs/dma/template +++ b/srcpkgs/dma/template @@ -1,11 +1,11 @@ # Template file for 'dma' pkgname=dma version=0.13 -revision=2 +revision=3 conf_files="/etc/dma/*.conf" make_dirs="/var/spool/dma 2775 root mail" hostmakedepends="flex" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Small Mail Transport Agent (MTA), designed for home and office use" maintainer="Enno Boland " license="BSD-3-Clause" From 93641aa867ead9719b0d4d297a727e01c10ccd3d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:53 +0100 Subject: [PATCH 057/447] dmg2img: rebuild against OpenSSL --- .../0001-openssl-1.1-compatibility.patch | 219 ++++++++++++++++++ srcpkgs/dmg2img/template | 4 +- 2 files changed, 221 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch new file mode 100644 index 00000000000..c5769dfc12f --- /dev/null +++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch @@ -0,0 +1,219 @@ +From f16f247d30f868e84f31e24792b4464488f1c009 Mon Sep 17 00:00:00 2001 +From: Peter Wu +Date: Tue, 2 May 2017 15:53:38 +0200 +Subject: [PATCH] vfdecrypt: OpenSSL 1.1 compatibility + +Allocate contexts from the heap on all OpenSSL versions, this is needed +since OpenSSL 1.1.0. No attempt is done at addressing issues like global +variables and fixing potential memleaks on error paths. + +Compile-tested only with OpenSSL 1.1.0e (Arch Linux) and OpenSSL 1.0.2g +(Ubuntu 16.04), I have no test file. + +Fixes https://github.com/Lekensteyn/dmg2img/issues/4 +--- + vfdecrypt.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 80 insertions(+), 23 deletions(-) + +diff --git a/vfdecrypt.c b/vfdecrypt.c +index 56d3530..b1a36d3 100644 +--- vfdecrypt.c ++++ vfdecrypt.c +@@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) { + pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size); + } + +-HMAC_CTX hmacsha1_ctx; ++HMAC_CTX *hmacsha1_ctx; + AES_KEY aes_decrypt_key; + int CHUNK_SIZE=4096; // default + +@@ -196,9 +196,9 @@ void compute_iv(uint32_t chunk_no, uint8_t *iv) { + unsigned int mdLen; + + chunk_no = OSSwapHostToBigInt32(chunk_no); +- HMAC_Init_ex(&hmacsha1_ctx, NULL, 0, NULL, NULL); +- HMAC_Update(&hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); +- HMAC_Final(&hmacsha1_ctx, mdResult, &mdLen); ++ HMAC_Init_ex(hmacsha1_ctx, NULL, 0, NULL, NULL); ++ HMAC_Update(hmacsha1_ctx, (void *) &chunk_no, sizeof(uint32_t)); ++ HMAC_Final(hmacsha1_ctx, mdResult, &mdLen); + memcpy(iv, mdResult, CIPHER_BLOCKSIZE); + } + +@@ -212,52 +212,75 @@ void decrypt_chunk(uint8_t *ctext, uint8_t *ptext, uint32_t chunk_no) { + /* DES3-EDE unwrap operation loosely based on to RFC 2630, section 12.6 + * wrapped_key has to be 40 bytes in length. */ + int apple_des3_ede_unwrap_key(uint8_t *wrapped_key, int wrapped_key_len, uint8_t *decryptKey, uint8_t *unwrapped_key) { +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + uint8_t *TEMP1, *TEMP2, *CEKICV; + uint8_t IV[8] = { 0x4a, 0xdd, 0xa2, 0x2c, 0x79, 0xe8, 0x21, 0x05 }; + int outlen, tmplen, i; + +- EVP_CIPHER_CTX_init(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ ctx = EVP_CIPHER_CTX_new(); ++#else ++ ctx = malloc(sizeof(*ctx)); ++#endif ++ if (!ctx) { ++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); ++ return(-1); ++ } ++ ++ EVP_CIPHER_CTX_init(ctx); + /* result of the decryption operation shouldn't be bigger than ciphertext */ + TEMP1 = malloc(wrapped_key_len); + TEMP2 = malloc(wrapped_key_len); + CEKICV = malloc(wrapped_key_len); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, IV); + +- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { ++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, wrapped_key, wrapped_key_len)) { + fprintf(stderr, "internal error (1) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { + fprintf(stderr, "internal error (2) during key unwrap operation!\n"); + return(-1); + } + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_reset(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++#endif + + /* reverse order of TEMP3 */ + for(i = 0; i < outlen; i++) TEMP2[i] = TEMP1[outlen - i - 1]; + +- EVP_CIPHER_CTX_init(&ctx); ++ EVP_CIPHER_CTX_init(ctx); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); +- if(!EVP_DecryptUpdate(&ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, decryptKey, TEMP2); ++ if(!EVP_DecryptUpdate(ctx, CEKICV, &outlen, TEMP2+8, outlen-8)) { + fprintf(stderr, "internal error (3) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, CEKICV + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, CEKICV + outlen, &tmplen)) { + fprintf(stderr, "internal error (4) during key unwrap operation!\n"); + return(-1); + } + + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_reset(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++#endif + + memcpy(unwrapped_key, CEKICV+4, outlen-4); + free(TEMP1); + free(TEMP2); + free(CEKICV); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ free(ctx); ++#endif + return(0); + } + +@@ -279,31 +302,46 @@ int unwrap_v1_header(char *passphrase, cencrypted_v1_header *header, uint8_t *ae + int unwrap_v2_header(char *passphrase, cencrypted_v2_pwheader *header, uint8_t *aes_key, uint8_t *hmacsha1_key) { + /* derived key is a 3DES-EDE key */ + uint8_t derived_key[192/8]; +- EVP_CIPHER_CTX ctx; ++ EVP_CIPHER_CTX *ctx; + uint8_t *TEMP1; + int outlen, tmplen; + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ ctx = EVP_CIPHER_CTX_new(); ++#else ++ ctx = malloc(sizeof(*ctx)); ++#endif ++ if (!ctx) { ++ fprintf(stderr, "Out of memory: EVP_CIPHER_CTX!\n"); ++ return(-1); ++ } ++ + PKCS5_PBKDF2_HMAC_SHA1(passphrase, strlen(passphrase), (unsigned char*)header->kdf_salt, 20, + PBKDF2_ITERATION_COUNT, sizeof(derived_key), derived_key); + + print_hex(derived_key, 192/8); + +- EVP_CIPHER_CTX_init(&ctx); ++ EVP_CIPHER_CTX_init(ctx); + /* result of the decryption operation shouldn't be bigger than ciphertext */ + TEMP1 = malloc(header->encrypted_keyblob_size); + /* uses PKCS#7 padding for symmetric key operations by default */ +- EVP_DecryptInit_ex(&ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); ++ EVP_DecryptInit_ex(ctx, EVP_des_ede3_cbc(), NULL, derived_key, header->blob_enc_iv); + +- if(!EVP_DecryptUpdate(&ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { ++ if(!EVP_DecryptUpdate(ctx, TEMP1, &outlen, header->encrypted_keyblob, header->encrypted_keyblob_size)) { + fprintf(stderr, "internal error (1) during key unwrap operation!\n"); + return(-1); + } +- if(!EVP_DecryptFinal_ex(&ctx, TEMP1 + outlen, &tmplen)) { ++ if(!EVP_DecryptFinal_ex(ctx, TEMP1 + outlen, &tmplen)) { + fprintf(stderr, "internal error (2) during key unwrap operation!\n"); + return(-1); + } + outlen += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ EVP_CIPHER_CTX_free(ctx); ++#else ++ EVP_CIPHER_CTX_cleanup(ctx); ++ free(ctx); ++#endif + memcpy(aes_key, TEMP1, 16); + memcpy(hmacsha1_key, TEMP1, 20); + +@@ -446,8 +484,21 @@ int main(int argc, char *argv[]) { + CHUNK_SIZE = v2header.blocksize; + } + +- HMAC_CTX_init(&hmacsha1_ctx); +- HMAC_Init_ex(&hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ hmacsha1_ctx = HMAC_CTX_new(); ++#else ++ hmacsha1_ctx = malloc(sizeof(*hmacsha1_ctx)); ++#endif ++ if (!hmacsha1_ctx) { ++ fprintf(stderr, "Out of memory: HMAC CTX!\n"); ++ exit(1); ++ } ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ HMAC_CTX_reset(hmacsha1_ctx); ++#else ++ HMAC_CTX_init(hmacsha1_ctx); ++#endif ++ HMAC_Init_ex(hmacsha1_ctx, hmacsha1_key, sizeof(hmacsha1_key), EVP_sha1(), NULL); + AES_set_decrypt_key(aes_key, CIPHER_KEY_LENGTH * 8, &aes_decrypt_key); + + if (verbose >= 1) { +@@ -472,5 +523,11 @@ int main(int argc, char *argv[]) { + } + + if (verbose) fprintf(stderr, "%"PRIX32" chunks written\n", chunk_no); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ HMAC_CTX_free(hmacsha1_ctx); ++#else ++ HMAC_CTX_cleanup(hmacsha1_ctx); ++ free(hmacsha1_ctx); ++#endif + return(0); + } diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template index 72918f9e428..a14781b0c3b 100644 --- a/srcpkgs/dmg2img/template +++ b/srcpkgs/dmg2img/template @@ -1,9 +1,9 @@ # Template file for 'dmg2img' pkgname=dmg2img version=1.6.7 -revision=4 +revision=5 build_style=gnu-makefile -makedepends="zlib-devel bzip2-devel libressl-devel" +makedepends="zlib-devel bzip2-devel openssl-devel" short_desc="Convert Apple's compressed dmg to standard image disks" maintainer="Andrew Benson " license="GPL-2.0-or-later" From b05c287666b308c1fa1b3b971c1e9d32d98aedf8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:53 +0100 Subject: [PATCH 058/447] dovecot: rebuild against OpenSSL --- srcpkgs/dovecot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 815ef8f2546..643807a1bd8 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -10,7 +10,7 @@ configure_args="--with-moduledir=/usr/lib/dovecot/modules --with-sql=plugin --with-gssapi --with-ldap=plugin --with-zlib --with-bzlib --with-lzma --with-lz4 --with-libcap --with-solr --with-docs --sbindir=/usr/bin" hostmakedepends="pkg-config perl" -makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel libressl-devel +makedepends=" liblz4-devel zlib-devel bzip2-devel liblzma-devel openssl-devel mit-krb5-devel libmariadbclient-devel postgresql-libs-devel sqlite-devel clucene-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel libsodium-devel" From aebd04597ef26c2f108655638d5817e3a2b70a84 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:54 +0100 Subject: [PATCH 059/447] dpdk: rebuild against OpenSSL --- srcpkgs/dpdk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template index 69867609507..9a2ca615b25 100644 --- a/srcpkgs/dpdk/template +++ b/srcpkgs/dpdk/template @@ -1,14 +1,14 @@ # Template file for 'dpdk' pkgname=dpdk version=19.08 -revision=4 +revision=5 # no musl - uses error.h, execinfo.h and argp.h archs="x86_64 aarch64 ppc64le i686 armv7l" build_style=meson configure_args="-Denable_kmods=false -Denable_docs=true -Db_lto=false" hostmakedepends="doxygen python3-Sphinx pkg-config elfutils" makedepends="libnuma-devel linux-headers jansson-devel libpcap-devel - zlib-devel libressl-devel libbsd-devel libelf libmnl" + zlib-devel openssl-devel libbsd-devel libelf libmnl" depends="python3-pyelftools" short_desc="Data Plane Development Kit" maintainer="Hans-J. Schmid " @@ -45,7 +45,7 @@ do_check() { } dpdk-devel_package() { - depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel libressl-devel" + depends="${sourcepkg}>=${version}_${revision} jansson-devel zlib-devel libbsd-devel openssl-devel" short_desc+=" - development files" pkg_install() { vmove usr/bin/dpdk-pdump From d1c2abc11a5fbbc397bdfe914aa5667ec8ea6967 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:54 +0100 Subject: [PATCH 060/447] ecryptfs-utils: rebuild against OpenSSL --- .../patches/openssl-1.1.x.patch | 76 +++++++++++++++++++ srcpkgs/ecryptfs-utils/template | 4 +- 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch diff --git a/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch new file mode 100644 index 00000000000..5c3e419a91d --- /dev/null +++ b/srcpkgs/ecryptfs-utils/patches/openssl-1.1.x.patch @@ -0,0 +1,76 @@ +=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c' +--- src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000 ++++ src/key_mod/ecryptfs_key_mod_openssl.c 2017-03-13 20:34:27 +0000 +@@ -50,6 +50,20 @@ + #include "../include/ecryptfs.h" + #include "../include/decision_graph.h" + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++void RSA_get0_key(const RSA *r, ++ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) ++{ ++ if (n != NULL) ++ *n = r->n; ++ if (e != NULL) ++ *e = r->e; ++ if (d != NULL) ++ *d = r->d; ++} ++#endif ++ ++ + struct openssl_data { + char *path; + char *passphrase; +@@ -142,6 +156,7 @@ + { + int len, nbits, ebits, i; + int nbytes, ebytes; ++ const BIGNUM *key_n, *key_e; + unsigned char *hash; + unsigned char *data = NULL; + int rc = 0; +@@ -152,11 +167,13 @@ + rc = -ENOMEM; + goto out; + } +- nbits = BN_num_bits(key->n); ++ RSA_get0_key(key, &key_n, NULL, NULL); ++ nbits = BN_num_bits(key_n); + nbytes = nbits / 8; + if (nbits % 8) + nbytes++; +- ebits = BN_num_bits(key->e); ++ RSA_get0_key(key, NULL, &key_e, NULL); ++ ebits = BN_num_bits(key_e); + ebytes = ebits / 8; + if (ebits % 8) + ebytes++; +@@ -179,11 +196,13 @@ + data[i++] = '\02'; + data[i++] = (nbits >> 8); + data[i++] = nbits; +- BN_bn2bin(key->n, &(data[i])); ++ RSA_get0_key(key, &key_n, NULL, NULL); ++ BN_bn2bin(key_n, &(data[i])); + i += nbytes; + data[i++] = (ebits >> 8); + data[i++] = ebits; +- BN_bn2bin(key->e, &(data[i])); ++ RSA_get0_key(key, NULL, &key_e, NULL); ++ BN_bn2bin(key_e, &(data[i])); + i += ebytes; + SHA1(data, len + 3, hash); + to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE); +@@ -278,7 +297,9 @@ + BIO *in = NULL; + int rc; + ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L + CRYPTO_malloc_init(); ++ #endif + ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ENGINE_load_builtin_engines(); + + diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template index 8f80772d00f..3d25252fffe 100644 --- a/srcpkgs/ecryptfs-utils/template +++ b/srcpkgs/ecryptfs-utils/template @@ -1,14 +1,14 @@ # Template file for 'ecryptfs-utils' pkgname=ecryptfs-utils version=111 -revision=8 +revision=9 lib32disabled=yes build_style=gnu-configure configure_args="--sbindir=/usr/bin --with-pamdir=/usr/lib/security --enable-gpg --enable-gui --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" hostmakedepends="automake gettext-devel glib-devel libtool pkg-config intltool swig python" -makedepends="python-devel pam-devel nss-devel libressl-devel keyutils-devel gpgme-devel gtk+-devel" +makedepends="python-devel pam-devel nss-devel openssl-devel keyutils-devel gpgme-devel gtk+-devel" depends="gettext" _desc="Ecryptfs cryptographic filesystem" short_desc="${_desc} - utilities" From d3a5a84c622b71e6974ee66e1dfd9b88dbf29063 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:54 +0100 Subject: [PATCH 061/447] efitools: rebuild against OpenSSL --- srcpkgs/efitools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/efitools/template b/srcpkgs/efitools/template index f125ae41053..83dc738ccbe 100644 --- a/srcpkgs/efitools/template +++ b/srcpkgs/efitools/template @@ -1,11 +1,11 @@ # Template file for 'efitools' pkgname=efitools version=1.9.2 -revision=4 +revision=5 archs="x86_64* i686* arm* aarch64*" build_style=gnu-makefile hostmakedepends="perl-File-Slurp" -makedepends="gnu-efi-libs libressl-devel" +makedepends="gnu-efi-libs openssl-devel" short_desc="Tools to manipulate EFI secure boot platforms" maintainer="Doan Tran Cong Danh " license="GPL-2.0-only" From caf2ea5c7d3b41b7936212e0a22f3b7add2a1857 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:54 +0100 Subject: [PATCH 062/447] efl: rebuild against OpenSSL --- srcpkgs/efl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index da39b6a38bb..df35ce7a1ac 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -27,7 +27,7 @@ configure_args=" $(vopt_bool glib glib)" hostmakedepends="pkg-config gettext" makedepends=" - gettext-devel libressl-devel liblz4-devel glib-devel ibus-devel + gettext-devel openssl-devel liblz4-devel glib-devel ibus-devel fontconfig-devel fribidi-devel $(vopt_if harfbuzz harfbuzz-devel) libjpeg-turbo-devel libpng-devel giflib-devel tiff-devel libwebp-devel avahi-libs-devel eudev-libudev-devel bullet-devel From 82491e539e36a79e80d025852c4500c80a42201a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:54 +0100 Subject: [PATCH 063/447] eggdrop: rebuild against OpenSSL --- srcpkgs/eggdrop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eggdrop/template b/srcpkgs/eggdrop/template index 107bf00e429..7790a5d6daf 100644 --- a/srcpkgs/eggdrop/template +++ b/srcpkgs/eggdrop/template @@ -1,10 +1,10 @@ # Template file for 'eggdrop' pkgname=eggdrop version=1.8.4 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="tcl-devel" -makedepends="tcl-devel libressl-devel zlib-devel" +makedepends="tcl-devel openssl-devel zlib-devel" short_desc="Internet relay chat (IRC) bot" maintainer="Andrew Benson " license="GPL-2.0-or-later" From eb13dec6c4c4debd514562b9a080b29328382008 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:55 +0100 Subject: [PATCH 064/447] eid-mw: rebuild against OpenSSL --- srcpkgs/eid-mw/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eid-mw/template b/srcpkgs/eid-mw/template index 6e36044d10b..0734bdb1301 100644 --- a/srcpkgs/eid-mw/template +++ b/srcpkgs/eid-mw/template @@ -1,11 +1,11 @@ # Template file for 'eid-mw' pkgname=eid-mw version=4.4.16 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config automake gettext gettext-devel libtool glib-devel gdk-pixbuf-devel" -makedepends="gtk+3-devel libcurl-devel libressl-devel libproxy-devel pcsclite-devel" +makedepends="gtk+3-devel libcurl-devel openssl-devel libproxy-devel pcsclite-devel" depends="pcsc-acsccid pcsc-ccid pcsc-tools" short_desc="Middleware for Belgian eID" maintainer="Andrew Benson " From 6aaf7fe91393bad79f7ad18d6fd99361faa83631 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:55 +0100 Subject: [PATCH 065/447] eiskaltdcpp-qt: rebuild against OpenSSL --- srcpkgs/eiskaltdcpp-qt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template index 12b4a9aa465..1718c65780c 100644 --- a/srcpkgs/eiskaltdcpp-qt/template +++ b/srcpkgs/eiskaltdcpp-qt/template @@ -6,7 +6,7 @@ wrksrc="eiskaltdcpp-${version}" build_style=cmake configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC" hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake" -makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-devel +makedepends="bzip2-devel zlib-devel openssl-devel libidn-devel lua52-devel miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds" short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols" From 5e2c343069337c63aeafd94d718a43984b61350d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:55 +0100 Subject: [PATCH 066/447] ejabberd: rebuild against OpenSSL --- srcpkgs/ejabberd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ejabberd/template b/srcpkgs/ejabberd/template index 8423e0942fc..be10fd98a2e 100644 --- a/srcpkgs/ejabberd/template +++ b/srcpkgs/ejabberd/template @@ -1,13 +1,13 @@ # Template file for 'ejabberd' pkgname=ejabberd version=20.07 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-odbc --enable-mysql --enable-pgsql --enable-pam --enable-redis --enable-elixir $(vopt_enable sqlite)" conf_files="/etc/ejabberd/*" hostmakedepends="automake erlang git elixir" -makedepends="libressl-devel libyaml-devel expat-devel zlib-devel pam-devel +makedepends="openssl-devel libyaml-devel expat-devel zlib-devel pam-devel $(vopt_if sqlite sqlite-devel) gd-devel" depends="erlang" short_desc="Robust and massively scalable XMPP platform" From 98dfd94b14a5e64dd9e20f65e9391f654a1420e8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:55 +0100 Subject: [PATCH 067/447] elinks: rebuild against OpenSSL --- srcpkgs/elinks/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template index 4e2047cc8a8..ec37f315d05 100644 --- a/srcpkgs/elinks/template +++ b/srcpkgs/elinks/template @@ -1,12 +1,12 @@ # Template file for 'elinks' pkgname=elinks version=0.14.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-true-color --enable-fastmem --without-spidermonkey" hostmakedepends="automake libtool pkg-config gettext" makedepends="gpm-devel zlib-devel bzip2-devel libidn-devel tre-devel - ncurses-devel libressl-devel" + ncurses-devel openssl-devel" short_desc="Full-Featured Text WWW Browser" maintainer="Orphaned " license="GPL-2.0-only" From e28baf4f63d5dce607cb0b7818d538ab9509b72a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:55 +0100 Subject: [PATCH 068/447] elog: rebuild against OpenSSL --- srcpkgs/elog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/elog/template b/srcpkgs/elog/template index de0a8161992..b22afbbe9b1 100644 --- a/srcpkgs/elog/template +++ b/srcpkgs/elog/template @@ -1,7 +1,7 @@ # Template file for 'elog' pkgname=elog version=3.1.4.1 -revision=3 +revision=4 _distver="${version:0:-2}-${version:(-1)}" wrksrc="$pkgname-${version%.*}" build_style=gnu-makefile @@ -11,7 +11,7 @@ conf_files="/etc/elog/elogd.cfg" system_accounts="elog" short_desc="Logbook system to manage notes through a Web interface" maintainer="Christian Poulwey " -makedepends="libressl-devel" +makedepends="openssl-devel" license="GPL-3.0-or-later" homepage="https://elog.psi.ch/elog/" distfiles="https://elog.psi.ch/elog/download/tar/$pkgname-$_distver.tar.gz" From fdc968296b0b93cfaaa29732cfaab1046a4e4302 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:56 +0100 Subject: [PATCH 069/447] encfs: rebuild against OpenSSL --- srcpkgs/encfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index 36a4613197c..d041dace80d 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -1,10 +1,10 @@ # Template file for 'encfs' pkgname=encfs version=1.9.5 -revision=4 +revision=5 build_style=cmake hostmakedepends="gettext pkg-config perl" -makedepends="fuse-devel libressl-devel gettext-devel" +makedepends="fuse-devel openssl-devel gettext-devel" depends="perl" # for encfssh short_desc="Encrypted filesystem in user-space" maintainer="Orphaned " From 93595eecad59c8c7788b3c66c962084fd6b5c184 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:56 +0100 Subject: [PATCH 070/447] erlang: rebuild against OpenSSL --- srcpkgs/erlang/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/erlang/template b/srcpkgs/erlang/template index 2b02c000c7d..50c29dfb814 100644 --- a/srcpkgs/erlang/template +++ b/srcpkgs/erlang/template @@ -7,7 +7,7 @@ build_wrksrc="otp-OTP-${version}" build_style=gnu-configure make_install_target="install install-docs" hostmakedepends="autoconf libxslt perl tar" -makedepends="libressl-devel ncurses-devel unixodbc-devel zlib-devel" +makedepends="openssl-devel ncurses-devel unixodbc-devel zlib-devel" short_desc="Concurrent functional programming language developed by Ericsson" maintainer="Leah Neukirchen " license="Apache-2.0" From 0ed236bfda2216a9353c8d2a3813eb2de7005901 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:56 +0100 Subject: [PATCH 071/447] ettercap: rebuild against OpenSSL --- srcpkgs/ettercap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template index 0a096f4ad57..7fe4c340a07 100644 --- a/srcpkgs/ettercap/template +++ b/srcpkgs/ettercap/template @@ -1,11 +1,11 @@ # Template file for 'ettercap' pkgname=ettercap version=0.8.3.1 -revision=1 +revision=2 build_style=cmake configure_args="-DENABLE_GTK=OFF" hostmakedepends="flex" -makedepends="geoip-devel ncurses-devel libressl-devel libcurl-devel +makedepends="geoip-devel ncurses-devel openssl-devel libcurl-devel libltdl-devel libnet-devel libpcap-devel pcre-devel" conf_files="/etc/${pkgname}/etter.conf" short_desc="Network sniffer/interceptor/logger for ethernet LANs" From 15779e12e527ef7febcec0959747b5a75b253558 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:56 +0100 Subject: [PATCH 072/447] facter: rebuild against OpenSSL --- srcpkgs/facter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 0bb54b7d36d..d70d66e4b14 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.14.11 -revision=5 +revision=6 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DENABLE_CXX_WERROR=OFF" From 3795afd7513acaccac0ab8b41a88a47c8be521dc Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:56 +0100 Subject: [PATCH 073/447] falkon: rebuild against OpenSSL --- srcpkgs/falkon/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 70d3df9a9c0..1a5eb3cd60b 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -1,7 +1,7 @@ # Template file for 'falkon' pkgname=falkon version=3.1.0 -revision=4 +revision=5 build_style=cmake hostmakedepends="extra-cmake-modules gettext pkg-config qt5-qmake qt5-host-tools python3 $(vopt_if kde kcoreaddons)" From 14c56b39580210d9142e9f0ebaed8071da07ae8e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:57 +0100 Subject: [PATCH 074/447] fdm: rebuild against OpenSSL --- srcpkgs/fdm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fdm/template b/srcpkgs/fdm/template index 9523085603b..561f7f0b1cd 100644 --- a/srcpkgs/fdm/template +++ b/srcpkgs/fdm/template @@ -1,11 +1,11 @@ # Template file for 'fdm' pkgname=fdm version=2.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="ac_cv_func_strlcpy=no ac_cv_func_strlcat=no --enable-pcre" hostmakedepends="automake bison" -makedepends="zlib-devel libressl-devel tdb-devel pcre-devel" +makedepends="zlib-devel openssl-devel tdb-devel pcre-devel" short_desc="Program to fetch and deliver mail" maintainer="Leah Neukirchen " license="ISC" From 781e675a6fd09095ee88477aad377585ed528226 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:57 +0100 Subject: [PATCH 075/447] fetchmail: rebuild against OpenSSL --- srcpkgs/fetchmail/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template index a6362c04e12..a5afbb3c3b4 100644 --- a/srcpkgs/fetchmail/template +++ b/srcpkgs/fetchmail/template @@ -1,11 +1,11 @@ # Template file for 'fetchmail' pkgname=fetchmail version=6.4.16 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="python3" -makedepends="libressl-devel" +makedepends="openssl-devel" depends="fetchmailconf" short_desc="Remote-mail retrieval utility" maintainer="Piotr Wójcik " From bfc2eaf9e0457921783a529a8ade1020527197ce Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:57 +0100 Subject: [PATCH 076/447] ffsend: rebuild against OpenSSL --- srcpkgs/ffsend/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ffsend/template b/srcpkgs/ffsend/template index ef0c63b83f1..ea63f719284 100644 --- a/srcpkgs/ffsend/template +++ b/srcpkgs/ffsend/template @@ -1,10 +1,10 @@ # Template file for 'ffsend' pkgname=ffsend version=0.2.68 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Fully featured Firefox Send client" maintainer="Jasper Chan " license="GPL-3.0-or-later" From 785714d57f0d78b4ad3ed18281ac37e507ca6b4b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:57 +0100 Subject: [PATCH 077/447] fossil: rebuild against OpenSSL --- srcpkgs/fossil/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template index df8d4cb415c..f96574daca1 100644 --- a/srcpkgs/fossil/template +++ b/srcpkgs/fossil/template @@ -5,7 +5,7 @@ revision=1 build_style=configure configure_args="--disable-internal-sqlite --prefix=/usr" hostmakedepends="tcl" -makedepends="zlib-devel libressl-devel readline-devel sqlite-devel" +makedepends="zlib-devel openssl-devel readline-devel sqlite-devel" short_desc="Simple, high-reliability, distributed software configuration management" maintainer="Orphaned " license="BSD-2-Clause" From e39643ae23a89a001d566820978855ebe3a872aa Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:57 +0100 Subject: [PATCH 078/447] fractal: rebuild against OpenSSL --- srcpkgs/fractal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fractal/template b/srcpkgs/fractal/template index a5a31a33ccd..115057b6d42 100644 --- a/srcpkgs/fractal/template +++ b/srcpkgs/fractal/template @@ -1,11 +1,11 @@ # Template file for 'fractal' pkgname=fractal version=4.2.2 -revision=2 +revision=3 build_style=meson build_helper="rust" hostmakedepends="cargo pkg-config glib-devel gettext" -makedepends="gtk+3-devel libglib-devel libressl-devel gstreamer1-devel +makedepends="gtk+3-devel libglib-devel openssl-devel gstreamer1-devel cairo-devel gettext-devel gst-plugins-base1-devel gst-plugins-bad1-devel gst1-editing-services-devel gtksourceview4-devel pango-devel gspell-devel gmp-devel libsecret-devel libhandy-devel rust-std" From 74dcad4fdfb9674e57b568ac397172d10c1c69fc Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:58 +0100 Subject: [PATCH 079/447] freerdp: rebuild against OpenSSL --- srcpkgs/freerdp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index bb1214e9c3f..07e4f232101 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -1,7 +1,7 @@ # Template file for 'freerdp' pkgname=freerdp version=2.2.0 -revision=2 +revision=3 wrksrc="FreeRDP-${version}" build_style=cmake configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON @@ -13,7 +13,7 @@ configure_args="-DWITH_ALSA=ON -DWITH_CUPS=OFF -DWITH_FFMPEG=ON hostmakedepends="pkg-config xmlto wayland-devel" makedepends="alsa-lib-devel ffmpeg-devel glib-devel libusb-devel libXcursor-devel libXinerama-devel libXrandr-devel libXv-devel - libjpeg-turbo-devel libressl-devel libxkbfile-devel pulseaudio-devel + libjpeg-turbo-devel openssl-devel libxkbfile-devel pulseaudio-devel libxkbcommon-devel wayland-devel cairo-devel" short_desc="Free RDP (Remote Desktop Protocol) client" maintainer="Orphaned " @@ -38,7 +38,7 @@ libfreerdp_package() { freerdp-devel_package() { short_desc+=" - development files" - depends="libressl-devel lib${sourcepkg}>=${version}_${revision}" + depends="openssl-devel lib${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/cmake From 8098aa687064239f58431c13c2cc925276d83d02 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:58 +0100 Subject: [PATCH 080/447] freshplayerplugin: rebuild against OpenSSL --- srcpkgs/freshplayerplugin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index 516778fecca..a6205c0ba98 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -1,7 +1,7 @@ # Template file for 'freshplayerplugin' pkgname=freshplayerplugin version=0.3.9 -revision=6 +revision=7 build_style=cmake hostmakedepends="pkg-config ragel" makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel From 8b7acb524b0fb3439e266c8fb737ec4930ce9fbd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:58 +0100 Subject: [PATCH 081/447] gambit: rebuild against OpenSSL --- srcpkgs/gambit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gambit/template b/srcpkgs/gambit/template index 39c040ea37a..3f7ec840d26 100644 --- a/srcpkgs/gambit/template +++ b/srcpkgs/gambit/template @@ -1,14 +1,14 @@ # Template file for 'gambit' pkgname=gambit version=4.9.3 -revision=5 +revision=6 build_style=gnu-configure configure_args=" --libdir=/usr/lib/gambit --docdir=/usr/share/doc/gambit --enable-compiler-name=gambit-gsc --enable-shared --disable-absolute-shared-libs --enable-versioned-shared-libs --enable-single-host --enable-gcc-opts --enable-openssl --enable-poll" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Complete, portable, efficient and reliable implementation of Scheme" maintainer="Leah Neukirchen " license="LGPL-2.1-only, Apache-2.0" From 0f72cbad1a3c583fb9cf92c069b8f879e79358b1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:58 +0100 Subject: [PATCH 082/447] gatling: rebuild against OpenSSL --- srcpkgs/gatling/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template index 653c93c5ca7..d1d83c20226 100644 --- a/srcpkgs/gatling/template +++ b/srcpkgs/gatling/template @@ -1,9 +1,9 @@ # Template file for 'gatling' pkgname=gatling version=0.15 -revision=9 +revision=10 build_style=gnu-makefile -makedepends="libowfat libressl-devel zlib-devel" +makedepends="libowfat openssl-devel zlib-devel" short_desc="High performance web server" maintainer="Enno Boland " license="GPL-2" From 04284b3a7079255ca2e9120abb8897632d90ebc4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:59 +0100 Subject: [PATCH 083/447] gcsf: rebuild against OpenSSL --- srcpkgs/gcsf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gcsf/template b/srcpkgs/gcsf/template index 7863437b8ef..7d4cc54bb19 100644 --- a/srcpkgs/gcsf/template +++ b/srcpkgs/gcsf/template @@ -1,10 +1,10 @@ # Template file for 'gcsf' pkgname=gcsf version=0.1.25 -revision=3 +revision=4 build_style=cargo hostmakedepends="pkg-config" -makedepends="fuse-devel libressl-devel" +makedepends="fuse-devel openssl-devel" short_desc="FUSE file system based on Google Drive" maintainer="Benjamín Albiñana " license="MIT" From 75b22cd80715f70037a84744f6fb94485f5bf9b8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:59 +0100 Subject: [PATCH 084/447] gemserv: rebuild against OpenSSL --- srcpkgs/gemserv/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gemserv/template b/srcpkgs/gemserv/template index d779f17886e..c1dfb792740 100644 --- a/srcpkgs/gemserv/template +++ b/srcpkgs/gemserv/template @@ -1,11 +1,11 @@ # Template file for 'gemserv' pkgname=gemserv version=0.4.5 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Gemini server written in rust" maintainer="Andrew Benson " license="MIT" From 00375d60e6a882bc61f4f5de28ce35396d0fa320 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:59 +0100 Subject: [PATCH 085/447] gerbil: rebuild against OpenSSL --- srcpkgs/gerbil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gerbil/template b/srcpkgs/gerbil/template index d5377b6b030..3d141bee627 100644 --- a/srcpkgs/gerbil/template +++ b/srcpkgs/gerbil/template @@ -1,9 +1,9 @@ # Template file for 'gerbil' pkgname=gerbil version=0.16 -revision=2 +revision=3 hostmakedepends="gambit rsync" -makedepends="libressl-devel sqlite-devel zlib-devel" +makedepends="openssl-devel sqlite-devel zlib-devel" short_desc="Opinionated dialect of Scheme designed for Systems Programming" maintainer="Leah Neukirchen " license="LGPL-2.1-or-later, Apache-2.0" From 9b3abf92fb26b7340541ebe59baae74e4c8ae515 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:59 +0100 Subject: [PATCH 086/447] getdns: rebuild against OpenSSL --- srcpkgs/getdns/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/getdns/template b/srcpkgs/getdns/template index b0bb313b3af..c2ddfde9fbc 100644 --- a/srcpkgs/getdns/template +++ b/srcpkgs/getdns/template @@ -1,7 +1,7 @@ # Template file for 'getdns' pkgname=getdns version=1.5.1 -revision=6 +revision=7 build_style=gnu-configure configure_args="--with-libev --with-libevent --with-libuv --with-ssl=${XBPS_CROSS_BASE}/usr" From 220a23ce8c0cff2ba282edc4b00372f5d407fa6e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:59 +0100 Subject: [PATCH 087/447] gftp: rebuild against OpenSSL --- srcpkgs/gftp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template index 1ba37c8e51d..bdbad8e9c2b 100644 --- a/srcpkgs/gftp/template +++ b/srcpkgs/gftp/template @@ -1,10 +1,10 @@ # Template file for 'gftp' pkgname=gftp version=2.0.19 -revision=7 +revision=8 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="gtk+-devel libressl-devel" +makedepends="gtk+-devel openssl-devel" short_desc="Graphical file transfer client" maintainer="psylence " license="GPL-2" From 99dbdfbd448ab4581b39c6620746d544ef6a2b3a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:00 +0100 Subject: [PATCH 088/447] git-brws: rebuild against OpenSSL --- srcpkgs/git-brws/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git-brws/template b/srcpkgs/git-brws/template index ea7e571e6d2..bb301c16020 100644 --- a/srcpkgs/git-brws/template +++ b/srcpkgs/git-brws/template @@ -1,10 +1,10 @@ # Template file for 'git-brws' pkgname=git-brws version=0.11.12 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="CLI tool for opening web page of the hoster for a git remote" maintainer="Jan Christian Grünhage " license="MIT" From 8bc9327185e9a86a172dd3032fe225c285b3c62a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:00 +0100 Subject: [PATCH 089/447] git-crypt: rebuild against OpenSSL --- srcpkgs/git-crypt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/git-crypt/template b/srcpkgs/git-crypt/template index 1c642ee7d45..0f81c8dc313 100644 --- a/srcpkgs/git-crypt/template +++ b/srcpkgs/git-crypt/template @@ -1,10 +1,10 @@ # Template file for 'git-crypt' pkgname=git-crypt version=0.6.0 -revision=6 +revision=7 build_style=gnu-makefile make_use_env=yes -makedepends="libressl-devel" +makedepends="openssl-devel" hostmakedepends="libxslt docbook-xsl" make_build_args="ENABLE_MAN=yes" make_install_args="ENABLE_MAN=yes" From 03a33bce0e219eb7b66d0f37c8ac0878ed1c58be Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:00 +0100 Subject: [PATCH 090/447] gkrellm: rebuild against OpenSSL --- srcpkgs/gkrellm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index b7fef8fea9d..f2c1721ac5e 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -1,10 +1,10 @@ # Template file for 'gkrellm' pkgname=gkrellm version=2.3.11 -revision=2 +revision=3 build_style=gnu-makefile hostmakedepends="pkg-config gettext which" -makedepends="libressl-devel libSM-devel gtk+-devel libsensors-devel" +makedepends="openssl-devel libSM-devel gtk+-devel libsensors-devel" short_desc="GTK2 based system monitor" maintainer="Orphaned " license="GPL-3.0.or-later" From 852ebeb684686506e422895f919ab623665b34b8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:00 +0100 Subject: [PATCH 091/447] glusterfs: rebuild against OpenSSL --- srcpkgs/glusterfs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 97cf36dd9e1..158a5c5b795 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -1,14 +1,14 @@ # Template file for 'glusterfs' pkgname=glusterfs version=8.3 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-mountutildir=/usr/bin ac_cv_file__etc_debian_version=no ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_redhat_release=no ac_cv_file__etc_centos_release=no" pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon" hostmakedepends="automake flex libtool pkg-config python3 rpcsvc-proto" -makedepends="acl-devel libaio-devel libtirpc-devel libressl-devel +makedepends="acl-devel libaio-devel libtirpc-devel openssl-devel liburcu-devel libxml2-devel rdma-core-devel sqlite-devel" # python is required by gsyncd. depends="python3" From de6255676d8e3cb069ad66d94961dd99eefd2d06 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:01 +0100 Subject: [PATCH 092/447] gnome-podcasts: rebuild against OpenSSL --- srcpkgs/gnome-podcasts/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template index aa8fe3d2f5b..8f104462ae5 100644 --- a/srcpkgs/gnome-podcasts/template +++ b/srcpkgs/gnome-podcasts/template @@ -1,13 +1,13 @@ # Template file for 'gnome-podcasts' pkgname=gnome-podcasts version=0.4.8 -revision=1 +revision=2 wrksrc="podcasts-${version}" build_style=meson build_helper="rust" hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel" makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel - gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo rust-std" + gtk+3-devel libhandy-devel openssl-devel sqlite-devel texinfo rust-std" short_desc="Listen to your favorite podcasts" maintainer="Enno Boland " license="GPL-3.0-or-later" From 76480d26e31d627d57e874bec39de7505b7fa8d6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:01 +0100 Subject: [PATCH 093/447] gogglesmm: rebuild against OpenSSL --- srcpkgs/gogglesmm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template index 3bb2961c891..29579786726 100644 --- a/srcpkgs/gogglesmm/template +++ b/srcpkgs/gogglesmm/template @@ -1,12 +1,12 @@ # Template file for 'gogglesmm' pkgname=gogglesmm version=1.2.1 -revision=4 +revision=5 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=cmake hostmakedepends="pkg-config desktop-file-utils" makedepends="libepoxy-devel glu-devel libSM-devel libXcursor-devel libXrandr-devel libXi-devel libXft-devel - libwebp-devel libjpeg-turbo-devel libpng-devel libressl-devel libvorbis-devel libogg-devel libflac-devel + libwebp-devel libjpeg-turbo-devel libpng-devel openssl-devel libvorbis-devel libogg-devel libflac-devel faad2-devel opus-devel taglib-devel sqlite-devel dbus-devel alsa-lib-devel pulseaudio-devel" depends="hicolor-icon-theme" short_desc="Music Manager and Player" From 2ed7fbfad0423133777ebab8994d6ab6ab9014a4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:01 +0100 Subject: [PATCH 094/447] grpc: rebuild against OpenSSL --- srcpkgs/grpc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index db501ccc3c3..9f095fca581 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -10,7 +10,7 @@ configure_args="-DBUILD_SHARED_LIBS=ON -D_gRPC_RE2_LIBRARIES=${XBPS_CROSS_BASE}/usr/lib/libre2.so -D_gRPC_RE2_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include" hostmakedepends="which protobuf" -makedepends="zlib-devel c-ares-devel libressl-devel +makedepends="zlib-devel c-ares-devel openssl-devel libprotoc-devel protobuf-devel gperftools-devel re2-devel" short_desc="High performance, open source, general RPC framework" maintainer="Andrew J. Hesford " From e49e5e7672046324ddf34d3fc506ee7d0cbc63d6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:01 +0100 Subject: [PATCH 095/447] grub-customizer: rebuild against OpenSSL --- srcpkgs/grub-customizer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template index 1fa8ee27d6e..37a8467653f 100644 --- a/srcpkgs/grub-customizer/template +++ b/srcpkgs/grub-customizer/template @@ -1,10 +1,10 @@ # Template file for 'grub-customizer' pkgname=grub-customizer version=5.1.0 -revision=4 +revision=5 build_style=cmake hostmakedepends="pkg-config" -makedepends="gtkmm-devel libressl-devel libarchive-devel" +makedepends="gtkmm-devel openssl-devel libarchive-devel" depends="hicolor-icon-theme grub-utils" conf_files="/etc/grub-customizer/grub.cfg" archs="i686* x86_64*" From 7fc4873b617b6040b13f81112f628d64884653b9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:01 +0100 Subject: [PATCH 096/447] gsoap: rebuild against OpenSSL --- srcpkgs/gsoap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index 481f099805e..c0cf0340566 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -1,12 +1,12 @@ # Template file for 'gsoap' pkgname=gsoap version=2.8.91 -revision=2 +revision=3 wrksrc="gsoap-${version%.*}" build_style=gnu-configure configure_args="--enable-ipv6" hostmakedepends="unzip flex autoconf" -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" short_desc="Toolkit for SOAP and REST Web Services and XML-Based Applications" maintainer="Enno Boland " license="gSOAP-1.3b, GPL-2.0-only" From 55cb2518f8170085e2d93d1eaeb1187057b758bd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:02 +0100 Subject: [PATCH 097/447] gst-plugins-bad1: rebuild against OpenSSL --- srcpkgs/gst-plugins-bad1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index e94d8095e0b..df632b3c1c4 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -17,7 +17,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled" hostmakedepends="automake gettext libtool pkg-config python3 glib-devel orc wayland-devel" -makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel +makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel gst-plugins-base1-devel libdca-devel orc-devel libmms-devel libexif-devel libmpcdec-devel faac-devel SDL-devel libpng-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel From 9bd8954301dbf021a81ff363c712d56bd6451e3e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:02 +0100 Subject: [PATCH 098/447] gwenhywfar: rebuild against OpenSSL --- srcpkgs/gwenhywfar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template index f2287e9706a..89adfe05124 100644 --- a/srcpkgs/gwenhywfar/template +++ b/srcpkgs/gwenhywfar/template @@ -1,7 +1,7 @@ # Template file for 'gwenhywfar' pkgname=gwenhywfar version=5.4.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-visibility --disable-binreloc --with-qt5-moc=/usr/lib/qt5/bin/moc --with-qt5-uic=/usr/lib/qt5/bin/uic" From 38f752031b8a4d443f3fdaf8d17ace8282c2cb0d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:02 +0100 Subject: [PATCH 099/447] h2o: rebuild against OpenSSL --- srcpkgs/h2o/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template index 4610bac2840..3b300024f05 100644 --- a/srcpkgs/h2o/template +++ b/srcpkgs/h2o/template @@ -1,11 +1,11 @@ # Template file for 'h2o' pkgname=h2o version=2.2.6 -revision=2 +revision=3 build_style=cmake conf_files="/etc/h2o.conf" hostmakedepends="pkg-config" -makedepends="libressl-devel libuv-devel zlib-devel" +makedepends="openssl-devel libuv-devel zlib-devel" depends="perl" short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2" maintainer="Orphaned " From 5f40f6737dcadc375fed6da16b0507cf5a9f91a2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:02 +0100 Subject: [PATCH 100/447] haproxy: rebuild against OpenSSL --- srcpkgs/haproxy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template index 0baba697f26..d2722bc5abd 100644 --- a/srcpkgs/haproxy/template +++ b/srcpkgs/haproxy/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-makefile make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}" hostmakedepends="lua53-devel" -makedepends="libatomic-devel libressl-devel lua53-devel pcre-devel" +makedepends="libatomic-devel openssl-devel lua53-devel pcre-devel" checkdepends="varnish" short_desc="Reliable, high performance TCP/HTTP load balancer" maintainer="Zach Dykstra " From 3377da53769c87265c2ba31a83832477c8344716 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:02 +0100 Subject: [PATCH 101/447] hexchat: rebuild against OpenSSL --- srcpkgs/hexchat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hexchat/template b/srcpkgs/hexchat/template index b0dd3fbbf17..1e16bd34c13 100644 --- a/srcpkgs/hexchat/template +++ b/srcpkgs/hexchat/template @@ -7,7 +7,7 @@ configure_args="-Dwith-dbus=true -Dwith-ssl=true -Dwith-text=false -Dwith-perl=/usr/bin/perl -Dwith-python=python3 -Dwith-lua=$(vopt_if LuaJIT luajit lua)" hostmakedepends="gettext pkg-config glib-devel" -makedepends="gtk+-devel libressl-devel dbus-glib-devel perl libnotify-devel +makedepends="gtk+-devel openssl-devel dbus-glib-devel perl libnotify-devel libcanberra-devel libxml2-devel pciutils-devel libproxy-devel iso-codes python3-devel $(vopt_if LuaJIT LuaJIT-devel lua53-devel)" depends="desktop-file-utils enchant2" From 2d8f5b05c08861e90a46a3cec94a2d44c3732748 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:03 +0100 Subject: [PATCH 102/447] hfsprogs: rebuild against OpenSSL --- srcpkgs/hfsprogs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hfsprogs/template b/srcpkgs/hfsprogs/template index 5a17b5e22cc..41bd475db09 100644 --- a/srcpkgs/hfsprogs/template +++ b/srcpkgs/hfsprogs/template @@ -3,10 +3,10 @@ pkgname=hfsprogs _distver=540.1 _patchver=3 version="${_distver}.linux${_patchver}" -revision=7 +revision=8 wrksrc="diskdev_cmds-${version}" hostmakedepends="clang" -makedepends="libressl-devel libuuid-devel" +makedepends="openssl-devel libuuid-devel" short_desc="Apple's mkfs and fsck for HFS and HFS+ file systems" maintainer="Orphaned " license="APSL-2.0" From 930c670f5ce9b6a2c9c1ea08cf65113d39cd696d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:03 +0100 Subject: [PATCH 103/447] hitch: rebuild against OpenSSL --- srcpkgs/hitch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hitch/template b/srcpkgs/hitch/template index 37207973dca..2ccae03e306 100644 --- a/srcpkgs/hitch/template +++ b/srcpkgs/hitch/template @@ -1,11 +1,11 @@ # Template file for 'hitch' pkgname=hitch version=1.5.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="ac_cv_so_reuseport_works=yes ac_cv_so_tfo=yes" hostmakedepends="pkg-config automake" -makedepends="libev-devel libressl-devel" +makedepends="libev-devel openssl-devel" checkdepends="lsof curl" short_desc="Libev-based high performance SSL/TLS proxy" maintainer="Jannis Christ " From 6f072cbd57cc5f49b16f3d9fbeed48a432fa9799 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:03 +0100 Subject: [PATCH 104/447] hostapd: rebuild against OpenSSL --- srcpkgs/hostapd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index b8de7c3c9ce..20e16a32fc0 100644 --- a/srcpkgs/hostapd/template +++ b/srcpkgs/hostapd/template @@ -1,11 +1,11 @@ # Template file for 'hostapd' pkgname=hostapd version=2.9 -revision=2 +revision=3 build_wrksrc="$pkgname" conf_files="/etc/hostapd/hostapd.conf" hostmakedepends="pkg-config" -makedepends="libnl3-devel libressl-devel" +makedepends="libnl3-devel openssl-devel" short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" maintainer="Orphaned " license="BSD-3-Clause" From c3ed3173e119d84904f55c92c21376f737071653 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:03 +0100 Subject: [PATCH 105/447] hplip: rebuild against OpenSSL --- srcpkgs/hplip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 8ebc49b7a8f..397508c55a3 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -1,7 +1,7 @@ # Template file for 'hplip' pkgname=hplip version=3.20.9 -revision=4 +revision=5 build_style=gnu-configure pycompile_dirs="usr/share/hplip" configure_args=" @@ -21,7 +21,7 @@ configure_args=" conf_files="/etc/hp/hplip.conf" make_dirs="/var/lib/hp 0755 root root" hostmakedepends="pkg-config automake libtool python3" -makedepends="libressl-devel python3-devel libxml2-python3 cups-devel sane-devel +makedepends="openssl-devel python3-devel libxml2-python3 cups-devel sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel dbus-devel avahi-libs-devel" depends="python3-gobject python3-dbus desktop-file-utils From 3ba3bf9d4e796b5c1df930dc15be645b2cdf99cf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:04 +0100 Subject: [PATCH 106/447] httpdirfs: rebuild against OpenSSL --- srcpkgs/httpdirfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template index 9ec780456ec..cbff9e7ae25 100644 --- a/srcpkgs/httpdirfs/template +++ b/srcpkgs/httpdirfs/template @@ -1,7 +1,7 @@ # Template file for 'httpdirfs' pkgname=httpdirfs version=1.2.0 -revision=2 +revision=3 build_style=gnu-makefile make_install_args="prefix=/usr" makedepends="libcurl-devel fuse-devel gumbo-parser-devel From 42dc93c82a1b702510c8a652205b3647f932d9ab Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:04 +0100 Subject: [PATCH 107/447] httrack: rebuild against OpenSSL --- srcpkgs/httrack/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/httrack/template b/srcpkgs/httrack/template index 4550f0df36c..090ec56ca85 100644 --- a/srcpkgs/httrack/template +++ b/srcpkgs/httrack/template @@ -1,7 +1,7 @@ # Template file for 'httrack' pkgname=httrack version=3.49.2 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-static --with-zlib=${XBPS_CROSS_BASE}/usr" short_desc="A free and easy-to-use offline browser utility" @@ -10,7 +10,7 @@ license="GPL-3" homepage="http://www.httrack.com" distfiles="http://mirror.httrack.com/httrack-${version}.tar.gz" checksum=3477a0e5568e241c63c9899accbfcdb6aadef2812fcce0173688567b4c7d4025 -makedepends="zlib-devel libressl-devel" +makedepends="zlib-devel openssl-devel" httrack-devel_package() { short_desc+=" - development files" From 71a713c686a48bbc24708a0e5ed0904916115ac2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:04 +0100 Subject: [PATCH 108/447] i2pd: rebuild against OpenSSL --- srcpkgs/i2pd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template index 6a93f6f94c5..de188117e81 100644 --- a/srcpkgs/i2pd/template +++ b/srcpkgs/i2pd/template @@ -1,10 +1,10 @@ # Template file for 'i2pd' pkgname=i2pd version=2.33.0 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="USE_UPNP=yes" -makedepends="zlib-devel boost-devel libressl-devel miniupnpc-devel +makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel libatomic-devel" short_desc="Full-featured C++ implementation of I2P client" maintainer="Obosob " From 31c022eeb13b62c143e87772df6c6b49828905b5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:04 +0100 Subject: [PATCH 109/447] icecast: rebuild against OpenSSL --- srcpkgs/icecast/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template index 39108b0f40d..920d6ffe9d3 100644 --- a/srcpkgs/icecast/template +++ b/srcpkgs/icecast/template @@ -1,10 +1,10 @@ # Template file for 'icecast' pkgname=icecast version=2.4.4 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config libxml2-devel" -makedepends="libressl-devel libcurl-devel speex-devel +makedepends="openssl-devel libcurl-devel speex-devel libtheora-devel libvorbis-devel libxslt-devel" short_desc="Free server software for streaming multimedia" maintainer="Orphaned " From 88a3ff88ae25e647e8f430fbf030f9128dcfaa0a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:04 +0100 Subject: [PATCH 110/447] icinga2: rebuild against OpenSSL --- srcpkgs/icinga2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template index 20fe23ad04d..4baa1447caf 100644 --- a/srcpkgs/icinga2/template +++ b/srcpkgs/icinga2/template @@ -8,7 +8,7 @@ configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_RUNDIR=/run -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins/" hostmakedepends="flex git" -makedepends="libressl-devel boost-devel libmariadbclient-devel libedit-devel +makedepends="openssl-devel boost-devel libmariadbclient-devel libedit-devel yajl-devel postgresql-libs-devel" depends="monitoring-plugins" conf_files="/etc/${pkgname}/*.conf From 286bf04d33ba297435224afa02a3a79ecfebd1d1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:05 +0100 Subject: [PATCH 111/447] imapfilter: rebuild against OpenSSL --- srcpkgs/imapfilter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/imapfilter/template b/srcpkgs/imapfilter/template index 77e36d4d1e5..8f516f768c9 100644 --- a/srcpkgs/imapfilter/template +++ b/srcpkgs/imapfilter/template @@ -1,11 +1,11 @@ # Template file for 'imapfilter' pkgname=imapfilter version=2.6.12 -revision=5 +revision=6 build_style=gnu-makefile make_build_args="DESTIDIR=${DESTDIR} PREFIX=/usr LIBLUA=-llua5.3" hostmakedepends="lua53-devel" -makedepends="pcre-devel lua53-devel libressl-devel" +makedepends="pcre-devel lua53-devel openssl-devel" short_desc="Mail filtering utility" maintainer="lemmi " license="MIT" From 9927c270c609ee188e90c13ef205fceab0474abe Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:05 +0100 Subject: [PATCH 112/447] inadyn: rebuild against OpenSSL --- srcpkgs/inadyn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/inadyn/template b/srcpkgs/inadyn/template index 1dfb82c0be6..3b9c64b00e4 100644 --- a/srcpkgs/inadyn/template +++ b/srcpkgs/inadyn/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-openssl" hostmakedepends="automake libtool pkg-config" -makedepends="confuse-devel libressl-devel" +makedepends="confuse-devel openssl-devel" short_desc="Small DynDNS client with SSL/TLS support" maintainer="Duncaen " license="GPL-2.0-or-later" From 7308efc7d80858e0ac0e9ae65d8b4e5394c1fbe2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:05 +0100 Subject: [PATCH 113/447] inspircd: rebuild against OpenSSL --- srcpkgs/inspircd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/inspircd/template b/srcpkgs/inspircd/template index 27c8eae0722..7a1f1477a97 100644 --- a/srcpkgs/inspircd/template +++ b/srcpkgs/inspircd/template @@ -1,10 +1,10 @@ # Template file for 'inspircd' pkgname=inspircd version=3.8.1 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="perl pkg-config" -makedepends="geoip-devel libressl-devel sqlite-devel gnutls-devel" +makedepends="geoip-devel openssl-devel sqlite-devel gnutls-devel" short_desc="Modular Internet Relay Chat server" maintainer="Alexander Gehrke " license="GPL-2.0-only" From 2bccb74d587bd266efd08d794d2c3af47950e61e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:05 +0100 Subject: [PATCH 114/447] ipmitool: rebuild against OpenSSL --- .../patches/ipmitool-openssl-1.1.patch | 89 +++++++++++++++++++ srcpkgs/ipmitool/template | 4 +- 2 files changed, 91 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch new file mode 100644 index 00000000000..18dd076cbd9 --- /dev/null +++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch @@ -0,0 +1,89 @@ +diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c +--- src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200 ++++ src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100 +@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); + + + *bytes_written = 0; +@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + *bytes_written = 0; +@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + { + uint32_t tmplen; + +- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { + *bytes_written = 0; + return; /* Error */ +@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); + } + } + } +@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); + + + if (verbose >= 5) +@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); +@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + { + uint32_t tmplen; + +- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { + char buffer[1000]; + ERR_error_string(ERR_get_error(), buffer); +@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); + } + } + diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index f70f335b4d0..eab8e525c87 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -1,9 +1,9 @@ # Template file for 'ipmitool' pkgname=ipmitool version=1.8.18 -revision=7 +revision=8 build_style=gnu-configure -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Command-line interface to IPMI-enabled devices" maintainer="Frank Steinborn " license="BSD" From 617e9a86d6d2978b7ba634424f2b91941f044f77 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:05 +0100 Subject: [PATCH 115/447] ipmiutil: rebuild against OpenSSL --- srcpkgs/ipmiutil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ipmiutil/template b/srcpkgs/ipmiutil/template index 0508008d9ba..6662a7f65d5 100644 --- a/srcpkgs/ipmiutil/template +++ b/srcpkgs/ipmiutil/template @@ -1,11 +1,11 @@ # Template file for 'ipmiutil' pkgname=ipmiutil version=3.1.3 -revision=3 +revision=4 archs="i686* x86_64* ppc*" build_style=gnu-configure configure_args="--disable-systemd --libdir=/usr/lib" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Series of utilities that perform common IPMI management functions" maintainer="Toyam Cox " license="BSD-2-Clause, BSD-3-Clause" From de081f11f2f707a6fdb4d25f15f3c1110c64a38c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:06 +0100 Subject: [PATCH 116/447] iputils: rebuild against OpenSSL --- srcpkgs/iputils/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index d0a6a92f358..a65a49c48e6 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -6,7 +6,7 @@ build_style=meson configure_args="-DNO_SETCAP_OR_SUID=true -DUSE_IDN=false -DBUILD_TFTPD=false -DBUILD_NINFOD=false" hostmakedepends="pkg-config docbook2x docbook-xsl-ns" -makedepends="libcap-devel libressl-devel" +makedepends="libcap-devel openssl-devel" depends="libcap-progs" short_desc="Useful utilities for Linux networking (including ping)" maintainer="Enno Boland " From b8f2073f8348587e0a21b9206f592177b0419a73 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:06 +0100 Subject: [PATCH 117/447] irssi: rebuild against OpenSSL --- srcpkgs/irssi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index 0e4d21205a8..4d8df6bfd24 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,12 +1,12 @@ # Template file for 'irssi' pkgname=irssi version=1.2.2 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-static --with-proxy --enable-true-color --with-otr --with-perl=module" hostmakedepends="pkg-config perl" -makedepends="libglib-devel libressl-devel ncurses-devel libgcrypt-devel +makedepends="libglib-devel openssl-devel ncurses-devel libgcrypt-devel libotr-devel perl" depends="ca-certificates" conf_files="/etc/irssi.conf" From c2f98106676471d9fa1ec8d29cedc102cbef10e6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:06 +0100 Subject: [PATCH 118/447] isync: rebuild against OpenSSL --- srcpkgs/isync/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/isync/template b/srcpkgs/isync/template index 90bcda4d6c9..a12f57b58c0 100644 --- a/srcpkgs/isync/template +++ b/srcpkgs/isync/template @@ -4,7 +4,7 @@ version=1.3.4 revision=1 build_style=gnu-configure hostmakedepends="perl pkg-config" -makedepends="libressl-devel libsasl-devel db-devel zlib-devel" +makedepends="openssl-devel libsasl-devel db-devel zlib-devel" depends="ca-certificates" short_desc="IMAP and MailDir mailbox synchronizer" maintainer="Leah Neukirchen " From 45e77c3467caf297198fe95593f62e1ef2ab3fef Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:06 +0100 Subject: [PATCH 119/447] john: rebuild against OpenSSL --- srcpkgs/john/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/john/template b/srcpkgs/john/template index a4994b7b4cc..fc807f4e7c8 100644 --- a/srcpkgs/john/template +++ b/srcpkgs/john/template @@ -1,13 +1,13 @@ # Template file for 'john' pkgname=john version=1.9.0 -revision=3 +revision=4 _jumbover=1 wrksrc="${pkgname}-${version}-jumbo-${_jumbover}" build_wrksrc="src" build_style=gnu-configure configure_args="--with-systemwide $(vopt_enable simd)" -makedepends="libressl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel" +makedepends="openssl-devel gmp-devel libgomp-devel libpcap-devel bzip2-devel zlib-devel" short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)" maintainer="Piraty " license="GPL-2.0-or-later with OpenSSL-exception" From 028ba8265fac03bc0ba0f146df0458e08578634c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:06 +0100 Subject: [PATCH 120/447] kea: rebuild against OpenSSL --- srcpkgs/kea/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template index 0a9c0b03ea2..3b78d0be6c0 100644 --- a/srcpkgs/kea/template +++ b/srcpkgs/kea/template @@ -9,7 +9,7 @@ configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr hostmakedepends="flex bison perl pkg-config automake libtool doxygen elinks libxslt docbook-xsl python3-Sphinx python3-sphinx_rtd_theme" makedepends="boost-devel log4cplus-devel python3-devel - $(vopt_if botan botan-devel libressl-devel) + $(vopt_if botan botan-devel openssl-devel) $(vopt_if mysql libmariadbclient-devel) $(vopt_if pgsql postgresql-libs-devel)" depends="libkea>=0" From 6589f09cc8eda9a2d81acb72a6aaf5d7b7fe0f05 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:07 +0100 Subject: [PATCH 121/447] keepalived: rebuild against OpenSSL --- srcpkgs/keepalived/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/keepalived/template b/srcpkgs/keepalived/template index 0b1b73f19e1..7fd6b2b118e 100644 --- a/srcpkgs/keepalived/template +++ b/srcpkgs/keepalived/template @@ -1,11 +1,11 @@ # Template file for 'keepalived' pkgname=keepalived version=2.1.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-sha1" hostmakedepends="pkg-config" -makedepends="libressl-devel libnl3-devel popt-devel libnfnetlink-devel" +makedepends="openssl-devel libnl3-devel popt-devel libnfnetlink-devel" short_desc="Failover and monitoring daemon for LVS clusters" maintainer="Orphaned " license="GPL-2.0-or-later" From a8d87de281995051b4136e2db6e1acc1d604b20d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:07 +0100 Subject: [PATCH 122/447] kicad: rebuild against OpenSSL --- srcpkgs/kicad/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template index 22e74879754..0ef99db2b48 100644 --- a/srcpkgs/kicad/template +++ b/srcpkgs/kicad/template @@ -11,7 +11,7 @@ configure_args="-DKICAD_BUILD_VERSION=${version} -DKICAD_SCRIPTING=ON -DKICAD_USE_OCC=$(vopt_if occt ON OFF) -DKICAD_SPICE=$(vopt_if spice ON OFF)" hostmakedepends="pkg-config swig wxWidgets-gtk3-devel python3" makedepends="wxWidgets-gtk3-devel wxPython4 python3-devel glew-devel cairo-devel - libressl-devel boost-devel libcurl-devel glm libgomp-devel + openssl-devel boost-devel libcurl-devel glm libgomp-devel $(vopt_if occt occt-devel) $(vopt_if spice ngspice-devel)" depends="wxPython4" short_desc="Electronic schematic and PCB design software" From d5ee9e44c548b5f3943bd6e94149a6a6ecaee499 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:07 +0100 Subject: [PATCH 123/447] kodi: rebuild against OpenSSL --- srcpkgs/kodi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index f82aa332575..b845f0792ae 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -29,7 +29,7 @@ makedepends=" libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel - jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel + jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel openssl-devel libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel From f190ef7eada74845ca2980230d1e811b3541261f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:07 +0100 Subject: [PATCH 124/447] kore: rebuild against OpenSSL --- srcpkgs/kore/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template index d2394349639..b05f8f294f2 100644 --- a/srcpkgs/kore/template +++ b/srcpkgs/kore/template @@ -8,7 +8,7 @@ build_style=gnu-makefile make_use_env=yes make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1" hostmakedepends="postgresql-libs-devel" -makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel" +makedepends="openssl-devel libcurl-devel postgresql-libs-devel yajl-devel" short_desc="Easy to use web platform for writing scalable web APIs in C" maintainer="Helmut Pozimski " license="ISC" From d4fd4bb1ffded7f9b07e4d987ac265a644d023b7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:08 +0100 Subject: [PATCH 125/447] kvirc: rebuild against OpenSSL --- srcpkgs/kvirc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kvirc/template b/srcpkgs/kvirc/template index 68bcc327ead..41255b18e92 100644 --- a/srcpkgs/kvirc/template +++ b/srcpkgs/kvirc/template @@ -1,12 +1,12 @@ # Template file for 'kvirc' pkgname=kvirc version=5.0.0 -revision=6 +revision=7 wrksrc="KVIrc-$version" build_style=cmake configure_args="-DWANT_ENV_FLAGS=1 -DWANT_KDE=0" hostmakedepends="perl" -makedepends="zlib-devel qt5-devel qt5-webkit-devel libressl-devel python-devel perl +makedepends="zlib-devel qt5-devel qt5-webkit-devel openssl-devel python-devel perl qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds" short_desc="Qt-based IRC client" From 67cd67280a665d0a7cea363ac5396833c42f7a48 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:08 +0100 Subject: [PATCH 126/447] lastpass-cli: rebuild against OpenSSL --- srcpkgs/lastpass-cli/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lastpass-cli/template b/srcpkgs/lastpass-cli/template index e9860677f4a..505360bc039 100644 --- a/srcpkgs/lastpass-cli/template +++ b/srcpkgs/lastpass-cli/template @@ -1,7 +1,7 @@ # Template file for 'lastpass-cli' pkgname=lastpass-cli version=1.3.3 -revision=3 +revision=4 build_style=cmake make_install_target="install install-doc" hostmakedepends="asciidoc pkg-config" From 338ea216ff709d46713ef44f439fcd4a31327901 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:08 +0100 Subject: [PATCH 127/447] ldapvi: rebuild against OpenSSL --- srcpkgs/ldapvi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ldapvi/template b/srcpkgs/ldapvi/template index 4f2e420b726..1dda3c2ae6e 100644 --- a/srcpkgs/ldapvi/template +++ b/srcpkgs/ldapvi/template @@ -1,7 +1,7 @@ # Template file for 'ldapvi' pkgname=ldapvi version=1.7 -revision=10 +revision=11 build_style=gnu-configure configure_args="--with-sha" maintainer="Leah Neukirchen " From b8114490a18644dc1b33e0dde44d5a2eb67b5994 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:08 +0100 Subject: [PATCH 128/447] ldns: rebuild against OpenSSL --- srcpkgs/ldns/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template index 7a02c108b6d..6be7b24bfd1 100644 --- a/srcpkgs/ldns/template +++ b/srcpkgs/ldns/template @@ -1,13 +1,13 @@ # Template file for 'ldns' pkgname=ldns version=1.7.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-drill --with-examples --disable-dane-ta-usage --with-trust-anchor=/etc/dns/root.key --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" -makedepends="libpcap-devel libressl-devel dnssec-anchors" +makedepends="libpcap-devel openssl-devel dnssec-anchors" short_desc="Modern DNS/DNSSEC library -- utils" maintainer="Leah Neukirchen " license="BSD-3-Clause" @@ -30,7 +30,7 @@ libldns_package() { } } libldns-devel_package() { - depends="libldns>=${version}_${revision} libressl-devel" + depends="libldns>=${version}_${revision} openssl-devel" short_desc="Modern DNS/DNSSEC library -- development files" pkg_install() { vmove usr/bin/ldns-config From 85960ce0c80a2f521619d225aa99a0f262ad6b02 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:09 +0100 Subject: [PATCH 129/447] lftp: rebuild against OpenSSL --- srcpkgs/lftp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index 50f18cb4b25..322d64ba114 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -1,13 +1,13 @@ # Template file for 'lftp' pkgname=lftp version=4.9.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-modules --disable-rpath --without-included-regex --with-openssl i_cv_posix_fallocate_works=yes --with-zlib=${XBPS_CROSS_BASE}/usr --with-readline=${XBPS_CROSS_BASE}/usr gl_cv_func_signbit=yes" hostmakedepends="pkg-config" -makedepends="zlib-devel ncurses-devel readline-devel libressl-devel +makedepends="zlib-devel ncurses-devel readline-devel openssl-devel expat-devel libidn-devel gettext-devel" short_desc="Sophisticated FTP/HTTP client" maintainer="Orphaned " From de60cd8be6cded37b2f52e684f1ba4ef48eaef9d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:09 +0100 Subject: [PATCH 130/447] libarchive: rebuild against OpenSSL --- srcpkgs/libarchive/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 5c9e316c605..605cac399d3 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive version=3.5.1 -revision=1 +revision=2 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) @@ -11,7 +11,7 @@ configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) hostmakedepends="pkgconf" makedepends="zlib-devel bzip2-devel liblzma-devel $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel) - $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl libressl-devel)" + $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)" short_desc="Library to read/write several different streaming archive formats" maintainer="Juan RP " license="BSD-2-Clause" From b6a8b39a596df32202eb7295aed9ede46b325fca Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:09 +0100 Subject: [PATCH 131/447] libesmtp: rebuild against OpenSSL --- srcpkgs/libesmtp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template index 765a9baef4e..6b9d05b03b2 100644 --- a/srcpkgs/libesmtp/template +++ b/srcpkgs/libesmtp/template @@ -1,10 +1,10 @@ # Template file for 'libesmtp' pkgname=libesmtp version=1.0.6 -revision=20 +revision=21 build_style=gnu-configure configure_args="--disable-static --with-openssl" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Manage submission of emails using SMTP protocol" maintainer="Orphaned " license="LGPL-2.1-or-later" From 07174c550e82cc3d329cab9257fd9ec25098e0aa Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:09 +0100 Subject: [PATCH 132/447] libetpan: rebuild against OpenSSL --- srcpkgs/libetpan/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libetpan/template b/srcpkgs/libetpan/template index 9a4a32a1ec9..fb6c96eb33f 100644 --- a/srcpkgs/libetpan/template +++ b/srcpkgs/libetpan/template @@ -1,12 +1,12 @@ # Template file for 'libetpan' pkgname=libetpan version=1.9.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-ipv6 --with-curl --with-expat --with-openssl --with-zlib --with-sasl" hostmakedepends="libtool automake" -makedepends="db-devel expat-devel libressl-devel zlib-devel +makedepends="db-devel expat-devel openssl-devel zlib-devel libsasl-devel libcurl-devel" short_desc="Mail Framework library for C language" maintainer="Jakub Skrzypnik " From fa79fcec3432d97a6c888b231d4d2c98c1e59aa4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:09 +0100 Subject: [PATCH 133/447] libevent: rebuild against OpenSSL --- srcpkgs/libevent/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template index 5fc4abe05f3..546c43aec74 100644 --- a/srcpkgs/libevent/template +++ b/srcpkgs/libevent/template @@ -1,10 +1,10 @@ # Template file for 'libevent' pkgname=libevent version=2.1.12 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-stable" build_style=gnu-configure -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Abstract asynchronous event notification library" maintainer="Orphaned " license="BSD-3-Clause" From aa299d0c2baf67aa4edfbe0f7596f9b99f0016bd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:10 +0100 Subject: [PATCH 134/447] libfetch: rebuild against OpenSSL --- srcpkgs/libfetch/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template index b24a291cbc5..49ae77a163d 100644 --- a/srcpkgs/libfetch/template +++ b/srcpkgs/libfetch/template @@ -1,9 +1,9 @@ # Template file for 'libfetch' pkgname=libfetch version=2.34 -revision=22 +revision=23 build_style=gnu-makefile -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="File Transfer Library for URLs" maintainer="Orphaned " license="BSD-3-Clause" From 1e127610265b5a2309e5d3d84610b00e612cf302 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:10 +0100 Subject: [PATCH 135/447] libfido2: rebuild against OpenSSL --- srcpkgs/libfido2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libfido2/template b/srcpkgs/libfido2/template index 6933277caaa..a329477e119 100644 --- a/srcpkgs/libfido2/template +++ b/srcpkgs/libfido2/template @@ -1,11 +1,11 @@ # Template file for 'libfido2' pkgname=libfido2 version=1.6.0 -revision=1 +revision=2 build_style=cmake configure_args="-DUDEV_RULES_DIR=/usr/lib/udev/rules.d" hostmakedepends="pkg-config" -makedepends="libcbor-devel libressl-devel eudev-libudev-devel" +makedepends="libcbor-devel openssl-devel eudev-libudev-devel" short_desc="Library for FIDO 2.0, including communication with a device over USB" maintainer="Leah Neukirchen " license="BSD-2-Clause" From f14fda709486fd0d2f8702325e449f1a49a3fca1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:10 +0100 Subject: [PATCH 136/447] libgda: rebuild against OpenSSL --- srcpkgs/libgda/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgda/template b/srcpkgs/libgda/template index d5f301edcaa..0042a25ad1a 100644 --- a/srcpkgs/libgda/template +++ b/srcpkgs/libgda/template @@ -8,7 +8,7 @@ configure_args="--with-ui --with-gtksourceview --with-graphviz --enable-json --enable-system-sqlite" hostmakedepends="automake pkg-config intltool itstool flex perl glib-devel recode" makedepends="gtk+3-devel libxml2-devel libxslt-devel - libressl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel + openssl-devel libgcrypt-devel sqlite-devel db-devel libsoup-devel libsecret-devel libgnome-keyring-devel gtksourceview-devel graphviz-devel json-glib-devel readline-devel libmariadbclient-devel" conf_files="/etc/libgda-5.0/config" From 6bcf176a94b8f1db9caff37e573d603cb3066af7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:11 +0100 Subject: [PATCH 137/447] libgit2: rebuild against OpenSSL --- srcpkgs/libgit2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgit2/template b/srcpkgs/libgit2/template index 16b611692eb..2722bd6553f 100644 --- a/srcpkgs/libgit2/template +++ b/srcpkgs/libgit2/template @@ -1,10 +1,10 @@ # Template file for 'libgit2' pkgname=libgit2 version=1.0.1 -revision=2 +revision=3 build_style=cmake hostmakedepends="python3 git pkg-config" -makedepends="zlib-devel libressl-devel http-parser-devel libssh2-devel" +makedepends="zlib-devel openssl-devel http-parser-devel libssh2-devel" short_desc="Git linkable library" maintainer="q66 " license="custom:GPL-2.0-or-later WITH GCC-exception-2.0" From c9e48c21a5c149dafcea8643788bee45bfbc8843 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:11 +0100 Subject: [PATCH 138/447] libimobiledevice: rebuild against OpenSSL --- srcpkgs/libimobiledevice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template index 43fbd4531b7..a8bb2d08e09 100644 --- a/srcpkgs/libimobiledevice/template +++ b/srcpkgs/libimobiledevice/template @@ -1,10 +1,10 @@ # Template file for 'libimobiledevice' pkgname=libimobiledevice version=1.3.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkgconf python3-Cython" -makedepends="python3-devel libglib-devel libressl-devel +makedepends="python3-devel libglib-devel openssl-devel libusb-devel libplist-devel libusbmuxd-devel" short_desc="Library to communicate with Apple devices" maintainer="Orphaned " From 1945170ea3a6b40ab955200b20c3c2c3345ca349 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:11 +0100 Subject: [PATCH 139/447] libircclient: rebuild against OpenSSL --- srcpkgs/libircclient/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libircclient/template b/srcpkgs/libircclient/template index f5ba5bdc199..ae9adf37d68 100644 --- a/srcpkgs/libircclient/template +++ b/srcpkgs/libircclient/template @@ -1,11 +1,11 @@ # Template file for 'libircclient' pkgname=libircclient version=1.10 -revision=4 +revision=5 build_style=gnu-configure configure_args="--libdir=/usr/lib --enable-openssl --enable-ipv6 --enable-shared" hostmakedepends="automake libtool pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="IRC client library" maintainer="maciozo@maciozo.com " license="LGPL-3.0-or-later" From 10164298fae83b988a809f02a2e888e4be312687 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:11 +0100 Subject: [PATCH 140/447] libknet1: rebuild against OpenSSL --- srcpkgs/libknet1/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libknet1/template b/srcpkgs/libknet1/template index 4e073b09bdd..bdd6d2b14db 100644 --- a/srcpkgs/libknet1/template +++ b/srcpkgs/libknet1/template @@ -2,14 +2,14 @@ # only libraries and development files now, if interested in kronosnetd update! pkgname=libknet1 version=1.11 -revision=3 +revision=4 wrksrc=kronosnet-${version} build_style=gnu-configure configure_args="--disable-dependency-tracking --disable-libknet-sctp --disable-kronosnetd --disable-poc --disable-static" hostmakedepends="automake doxygen libtool libxml2-devel pkg-config libqb-devel" makedepends="bzip2-devel liblz4-devel liblzma-devel libnl3-devel libqb-devel - libressl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel" + openssl-devel libxml2-devel libzstd-devel lzo-devel nss-devel zlib-devel" short_desc="Kronosnet core switching implementation (libraries)" maintainer="Jiří Bělka " license="GPL-2.0-or-later, LGPL-2.1-only" From 8e7a397da917a7046075e8bd0ce1b1a55b2b7813 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:11 +0100 Subject: [PATCH 141/447] libmowgli: rebuild against OpenSSL --- srcpkgs/libmowgli/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template index 51004676d45..cf17648a4b7 100644 --- a/srcpkgs/libmowgli/template +++ b/srcpkgs/libmowgli/template @@ -1,11 +1,11 @@ # Template file for 'libmowgli' pkgname=libmowgli version=2.1.3 -revision=7 +revision=8 wrksrc="${pkgname}-2-${version}" build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Performance and usability-oriented extensions to C" maintainer="Orphaned " license="MIT" From b479c34c0450256a7d4b6f2d1bc451a4cc34a7a3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:12 +0100 Subject: [PATCH 142/447] libnice: rebuild against OpenSSL --- srcpkgs/libnice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template index 40972050300..ce48e719cae 100644 --- a/srcpkgs/libnice/template +++ b/srcpkgs/libnice/template @@ -1,13 +1,13 @@ # Template file for 'libnice' pkgname=libnice version=0.1.18 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dcrypto-library=openssl -Dgtk_doc=disabled -Dtests=disabled -Dexamples=disabled -Dintrospection=$(vopt_if gir enabled disabled)" hostmakedepends="glib-devel pkg-config" -makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel libressl-devel +makedepends="gstreamer1-devel libsoup-devel gupnp-igd-devel openssl-devel libglib-devel" short_desc="Implementation of the IETF's draft ICE (for P2P UDP data streams)" maintainer="Orphaned " From 83406c213b36291da5142600849308a892c952cc Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:12 +0100 Subject: [PATCH 143/447] libostree: rebuild against OpenSSL --- srcpkgs/libostree/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template index abad94721be..918f1604061 100644 --- a/srcpkgs/libostree/template +++ b/srcpkgs/libostree/template @@ -1,7 +1,7 @@ # Template file for 'libostree' pkgname=libostree version=2020.8 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" configure_args=" From 869cc6451a041e295e8e391ef7db92d0abc4c9f3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:12 +0100 Subject: [PATCH 144/447] librdkafka: rebuild against OpenSSL --- srcpkgs/librdkafka/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/librdkafka/template b/srcpkgs/librdkafka/template index 78a8d404618..4b6c741bf25 100644 --- a/srcpkgs/librdkafka/template +++ b/srcpkgs/librdkafka/template @@ -1,10 +1,10 @@ # Template file for 'librdkafka' pkgname=librdkafka version=1.4.4 -revision=2 +revision=3 build_style=configure configure_args="--prefix=/usr" -makedepends="zlib-devel libressl-devel libsasl-devel" +makedepends="zlib-devel openssl-devel libsasl-devel" short_desc="Apache Kafka C/C++ library" maintainer="Kyle Nusbaum " license="BSD-2-Clause" From 480795a82b22645a85256262284cce937b547d8f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:12 +0100 Subject: [PATCH 145/447] libssh: rebuild against OpenSSL --- srcpkgs/libssh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index 50b6097a21a..9b57379bfc8 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -1,11 +1,11 @@ # Template file for 'libssh' pkgname=libssh version=0.9.5 -revision=1 +revision=2 build_style=cmake configure_args="-DUNIT_TESTING=ON" hostmakedepends="pkg-config python3" -makedepends="zlib-devel libressl-devel cmocka-devel" +makedepends="zlib-devel openssl-devel cmocka-devel" checkdepends="openssh" short_desc="Multiplatform C library implementing the SSH v2 protocol" maintainer="Orphaned " From 5fe1051eed2e60f8eabf5f9b2b384d4f48f4dc92 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:12 +0100 Subject: [PATCH 146/447] libssh2: rebuild against OpenSSL --- srcpkgs/libssh2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template index e82591556f9..0291b28c4a1 100644 --- a/srcpkgs/libssh2/template +++ b/srcpkgs/libssh2/template @@ -1,10 +1,10 @@ # Template file for 'libssh2' pkgname=libssh2 version=1.9.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-libssl-prefix=${XBPS_CROSS_BASE}/usr" -makedepends="zlib-devel libressl-devel" +makedepends="zlib-devel openssl-devel" short_desc="Library implementing the SSH2 protocol" maintainer="Orphaned " license="BSD-3-Clause" From 488b10b36b8ce9523d347000b27a291539ee0065 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:13 +0100 Subject: [PATCH 147/447] libstrophe: rebuild against OpenSSL --- srcpkgs/libstrophe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libstrophe/template b/srcpkgs/libstrophe/template index 4d90ded8f47..714458f8a85 100644 --- a/srcpkgs/libstrophe/template +++ b/srcpkgs/libstrophe/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="$(vopt_enable cares) $(vopt_enable tls)" hostmakedepends="automake libtool pkg-config" makedepends="$(vopt_if cares c-ares-devel) expat-devel - $(vopt_if tls libressl-devel) zlib-devel" + $(vopt_if tls openssl-devel) zlib-devel" short_desc="Minimal XMPP library written in C" maintainer="Orphaned " license="GPL-3.0-only" From 9f8d0ac149a3c5e931a1e7f35b8018f6afde4a04 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:13 +0100 Subject: [PATCH 148/447] libtd: rebuild against OpenSSL --- srcpkgs/libtd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template index d39de7663c2..f719ab4d3f1 100644 --- a/srcpkgs/libtd/template +++ b/srcpkgs/libtd/template @@ -1,12 +1,12 @@ # Template file for 'libtd' pkgname=libtd version=1.7.0 -revision=1 +revision=2 wrksrc="td-${version}" build_style=cmake build_helper=qemu hostmakedepends="gperf" -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" short_desc="Cross-platform library for building Telegram clients" maintainer="Ivan Sokolov " license="BSL-1.0" From 638a972229bfc605b5c4a4057eafc506ce0d36ee Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:13 +0100 Subject: [PATCH 149/447] libtorrent: rebuild against OpenSSL --- srcpkgs/libtorrent/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template index fe2e4d73c21..582bf967439 100644 --- a/srcpkgs/libtorrent/template +++ b/srcpkgs/libtorrent/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--enable-static --disable-debug --without-kqueue --enable-aligned --with-posix-fallocate" hostmakedepends="automake libtool pkg-config" -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" # XXX: if built with XBPS_CHECK_PKGS, final binary will be dyn linked against libcppunit checkdepends="libcppunit-devel" short_desc="BitTorrent library written in C++" From 242f51777b073399694b1ba50f8575cb84b614c6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:13 +0100 Subject: [PATCH 150/447] libtorrent-rasterbar: rebuild against OpenSSL --- srcpkgs/libtorrent-rasterbar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template index 831e507c127..d67bafaa544 100644 --- a/srcpkgs/libtorrent-rasterbar/template +++ b/srcpkgs/libtorrent-rasterbar/template @@ -7,7 +7,7 @@ build_style=cmake configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON -Dpython-bindings=ON" hostmakedepends="pkg-config intltool libtool python3-devel" -makedepends="libressl-devel boost-devel geoip-devel python3-devel" +makedepends="openssl-devel boost-devel geoip-devel python3-devel" short_desc="C++ bittorrent library by Rasterbar Software" maintainer="Jürgen Buchmüller " license="BSD-3-Clause" @@ -50,7 +50,7 @@ libtorrent-rasterbar-python3_package() { } libtorrent-rasterbar-devel_package() { - depends="${sourcepkg}>=${version}_${revision} libressl-devel boost-devel geoip-devel" + depends="${sourcepkg}>=${version}_${revision} openssl-devel boost-devel geoip-devel" if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then depends+=" libatomic-devel" fi From b83c350de841cb5a10d7354bf34b77e1a45248f4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:13 +0100 Subject: [PATCH 151/447] libu2f-host: rebuild against OpenSSL --- srcpkgs/libu2f-host/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libu2f-host/template b/srcpkgs/libu2f-host/template index c16dae4a2d1..c2cd5b754dc 100644 --- a/srcpkgs/libu2f-host/template +++ b/srcpkgs/libu2f-host/template @@ -1,12 +1,12 @@ # Template file for 'libu2f-host' pkgname=libu2f-host version=1.1.10 -revision=4 +revision=5 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--with-openssl=yes" hostmakedepends="automake gengetopt libtool pkg-config" -makedepends="hidapi-devel json-c-devel libressl-devel" +makedepends="hidapi-devel json-c-devel openssl-devel" depends="libfido2" short_desc="C library and tool that implements the host-side of the U2F protocol" maintainer="Orphaned " From d2c5fdbe02d4555b438411a6da3faa62a14d7d9b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:14 +0100 Subject: [PATCH 152/447] libu2f-server: rebuild against OpenSSL --- srcpkgs/libu2f-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libu2f-server/template b/srcpkgs/libu2f-server/template index 5a46ee56633..661fc934531 100644 --- a/srcpkgs/libu2f-server/template +++ b/srcpkgs/libu2f-server/template @@ -1,11 +1,11 @@ # Template file for 'libu2f-server' pkgname=libu2f-server version=1.1.0 -revision=8 +revision=9 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure hostmakedepends="automake libtool pkg-config gengetopt check" -makedepends="json-c-devel hidapi-devel libressl-devel check-devel" +makedepends="json-c-devel hidapi-devel openssl-devel check-devel" short_desc="Yubico Universal 2nd Factor (U2F) Server C Library" maintainer="Michael Aldridge " license="BSD" From 5d154fa8f7e576205db788665f2780a7884b9cb1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:14 +0100 Subject: [PATCH 153/447] libucl: rebuild against OpenSSL --- srcpkgs/libucl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libucl/template b/srcpkgs/libucl/template index afb8f8dcbc0..04b2608684d 100644 --- a/srcpkgs/libucl/template +++ b/srcpkgs/libucl/template @@ -1,7 +1,7 @@ # Template file for 'libucl' pkgname=libucl version=0.8.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--enable-urls --enable-signatures" hostmakedepends="automake libtool pkg-config" From 08f33132eb0ad454b37ddbdd50e99bacd3c1f608 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:14 +0100 Subject: [PATCH 154/447] libwebsockets: rebuild against OpenSSL --- srcpkgs/libwebsockets/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libwebsockets/template b/srcpkgs/libwebsockets/template index e82f1946352..9311fe3afcd 100644 --- a/srcpkgs/libwebsockets/template +++ b/srcpkgs/libwebsockets/template @@ -1,11 +1,11 @@ # Template file for 'libwebsockets' pkgname=libwebsockets version=3.2.2 -revision=4 +revision=5 build_style=cmake configure_args="-DLWS_WITH_LIBEV=ON -DLWS_WITH_LIBUV=ON -DLWS_WITH_HTTP2=ON -DLWS_IPV6=ON -DLWS_HAVE_LIBCAP=ON" -makedepends="libcap-devel libev-devel libuv-devel libressl-devel zlib-devel" +makedepends="libcap-devel libev-devel libuv-devel openssl-devel zlib-devel" short_desc="Lightweight client and server websocket library" maintainer="Enno Boland " license="LGPL-2.1-only" @@ -17,7 +17,7 @@ checksum=166d6e17cab64bfc10c2a71799c298284540a1fa63f6ea3de5caccb34502243c CFLAGS="-Wno-error" libwebsockets-devel_package() { - depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel libressl-devel libuv-devel" + depends="libwebsockets>=${version}_${revision} libcap-devel libev-devel openssl-devel libuv-devel" short_desc+=" - development files" pkg_install() { vmove usr/bin From 1d08840cd8b60ae24c3df3b6394d47aa4cd91a37 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:14 +0100 Subject: [PATCH 155/447] libzip: rebuild against OpenSSL --- srcpkgs/libzip/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template index 5edf0e1908b..1104e1a8b3b 100644 --- a/srcpkgs/libzip/template +++ b/srcpkgs/libzip/template @@ -1,10 +1,10 @@ # Template file for 'libzip' pkgname=libzip version=1.7.3 -revision=1 +revision=2 build_style=cmake hostmakedepends="perl groff pkg-config" -makedepends="bzip2-devel libressl-devel zlib-devel liblzma-devel" +makedepends="bzip2-devel openssl-devel zlib-devel liblzma-devel" short_desc="C library for reading, creating, and modifying zip archives" maintainer="Orphaned " license="BSD-3-Clause" From 8ed53fadf88244ce2d5f5b6d637d0e545ade0034 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:14 +0100 Subject: [PATCH 156/447] lighttpd: rebuild against OpenSSL --- srcpkgs/lighttpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lighttpd/template b/srcpkgs/lighttpd/template index 8acb7af78f3..30970dc02b0 100644 --- a/srcpkgs/lighttpd/template +++ b/srcpkgs/lighttpd/template @@ -1,7 +1,7 @@ # Template file for 'lighttpd' pkgname=lighttpd version=1.4.57 -revision=1 +revision=2 build_style=meson configure_args="-Dwith_bzip=true -Dwith_fam=false -Dwith_gdbm=true -Dwith_geoip=false -Dwith_krb5=true -Dwith_ldap=true -Dwith_libev=true From 1ef15fd892f4de38d5e8f8ff2e43c3999af25783 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:15 +0100 Subject: [PATCH 157/447] links: rebuild against OpenSSL --- srcpkgs/links/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/links/template b/srcpkgs/links/template index b42bac91a13..06ca6e43960 100644 --- a/srcpkgs/links/template +++ b/srcpkgs/links/template @@ -1,11 +1,11 @@ # Template file for 'links' pkgname=links version=2.21 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-ssl --enable-graphics" hostmakedepends="pkg-config" -makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel" +makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel" short_desc="Graphics and text mode web browser, released under GPL" maintainer="Toyam Cox " license="GPL-2.0-or-later" From 6813b35d1de02a6c52444040fcf192ab279c0784 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:15 +0100 Subject: [PATCH 158/447] links-x11: rebuild against OpenSSL --- srcpkgs/links-x11/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/links-x11/template b/srcpkgs/links-x11/template index 3f68f321580..eb60b9fca0d 100644 --- a/srcpkgs/links-x11/template +++ b/srcpkgs/links-x11/template @@ -1,12 +1,12 @@ # Template file for 'links-x11' pkgname=links-x11 version=2.21 -revision=1 +revision=2 wrksrc="${pkgname%-x11}-${version}" build_style=gnu-configure configure_args="--with-ssl --enable-graphics --enable-x" hostmakedepends="pkg-config" -makedepends="bzip2-devel gpm-devel libpng-devel libressl-devel tiff-devel +makedepends="bzip2-devel gpm-devel libpng-devel openssl-devel tiff-devel libX11-devel libXt-devel" short_desc="Graphics and text mode web browser (with X11 graphics driver)" maintainer="newbluemoon " From 29454c865f2f857b87fc7124351aa86f80137f8d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:15 +0100 Subject: [PATCH 159/447] linux4.14: rebuild against OpenSSL --- srcpkgs/linux4.14/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux4.14/template b/srcpkgs/linux4.14/template index 7fa8117415d..ca8665e4bd3 100644 --- a/srcpkgs/linux4.14/template +++ b/srcpkgs/linux4.14/template @@ -19,7 +19,7 @@ noshlibprovides=yes preserve=yes archs="i686* x86_64* armv5tel* aarch64* ppc*" -hostmakedepends="bc elfutils-devel kmod libressl-devel perl uboot-mkimage gmp-devel libmpc-devel" +hostmakedepends="bc elfutils-devel kmod openssl-devel perl uboot-mkimage gmp-devel libmpc-devel" case "$XBPS_TARGET_MACHINE" in ppc64le*) broken="No ppc64le support";; From 2ef1cc2da91f78c37b1d1cdd3b94fa4ace933601 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:15 +0100 Subject: [PATCH 160/447] linux4.19: rebuild against OpenSSL --- srcpkgs/linux4.19/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index c5c83ab3ff1..4cc28852fb0 100644 --- a/srcpkgs/linux4.19/template +++ b/srcpkgs/linux4.19/template @@ -20,7 +20,7 @@ preserve=yes archs="i686* x86_64* arm* aarch64* ppc*" hostmakedepends="bc elfutils-devel flex gmp-devel kmod libmpc-devel - libressl-devel perl uboot-mkimage tar xz" + openssl-devel perl uboot-mkimage tar xz" _kernver="${version}_${revision}" triggers="kernel-hooks" From 4dd2ce080909704879f2dff0dbc3f0f25f2bea3a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:15 +0100 Subject: [PATCH 161/447] linux5.10: rebuild against OpenSSL --- srcpkgs/linux5.10/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template index a2bdd1c36dc..92ff4241b68 100644 --- a/srcpkgs/linux5.10/template +++ b/srcpkgs/linux5.10/template @@ -22,7 +22,7 @@ noshlibprovides=yes preserve=yes hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - libressl-devel perl uboot-mkimage cpio pahole python3" + openssl-devel perl uboot-mkimage cpio pahole python3" _kernver="${version}_${revision}" triggers="kernel-hooks" From dc1351219871774cb2f63258725583e2ba19385e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:16 +0100 Subject: [PATCH 162/447] linux5.4: rebuild against OpenSSL --- srcpkgs/linux5.4/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index fda74484e49..26b25d6fb93 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -20,7 +20,7 @@ preserve=yes archs="i686* x86_64* armv5tel* armv6l* armv7l* aarch64* ppc* mips*" hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - libressl-devel perl uboot-mkimage cpio" + openssl-devel perl uboot-mkimage cpio" _kernver="${version}_${revision}" triggers="kernel-hooks" From 55ec34a549fd15dba7106dfb4dd0ed68e2b9040e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:16 +0100 Subject: [PATCH 163/447] litecoin: rebuild against OpenSSL --- srcpkgs/litecoin/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 53331cd8851..9b20a8812c6 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -1,12 +1,12 @@ # Template file for 'litecoin' pkgname=litecoin version=0.17.1 -revision=7 +revision=8 build_style=gnu-configure configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static - --disable-tests --with-libressl" + --disable-tests --with-openssl" hostmakedepends="automake libtool pkg-config yasm protobuf which" -makedepends="libatomic-devel zlib-devel db-devel libressl-devel boost-devel +makedepends="libatomic-devel zlib-devel db-devel openssl-devel boost-devel qt5-tools-devel miniupnpc-devel protobuf-devel libevent-devel" short_desc="Peer-to-peer Internet currency based on scrypt cryptography" maintainer="Orphaned " From 4bfb811202391366fcf661f0d5fd6d150ed409c7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:16 +0100 Subject: [PATCH 164/447] live555: rebuild against OpenSSL --- srcpkgs/live555/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/live555/template b/srcpkgs/live555/template index c731916dda1..181675b6f3a 100644 --- a/srcpkgs/live555/template +++ b/srcpkgs/live555/template @@ -1,10 +1,10 @@ # Template file for 'live555' pkgname=live555 version=2020.08.11 -revision=1 +revision=2 wrksrc=live build_style=gnu-makefile -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Set of C++ libraries for multimedia streaming" maintainer="Denis Revin " license="LGPL-3.0-or-later" From 3d13a2fd010d0cc1d922e06adbc772f05041fcdd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:17 +0100 Subject: [PATCH 165/447] loudmouth: rebuild against OpenSSL --- srcpkgs/loudmouth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/loudmouth/template b/srcpkgs/loudmouth/template index 37212d47d81..4178683d5de 100644 --- a/srcpkgs/loudmouth/template +++ b/srcpkgs/loudmouth/template @@ -1,11 +1,11 @@ # Template file for 'loudmouth' pkgname=loudmouth version=1.5.3 -revision=11 +revision=12 build_style=gnu-configure configure_args="--with-ssl=openssl --with-asyncns --with-compile-warnings=no" hostmakedepends="pkg-config automake libtool glib-devel gtk-doc" -makedepends="libglib-devel libidn-devel libressl-devel" +makedepends="libglib-devel libidn-devel openssl-devel" short_desc="Lightweight Jabber client library written in C/Glib" maintainer="Orphaned " license="LGPL-2.1-or-later" From 3b09cd258348b5c728f611827d04461649794a7e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:17 +0100 Subject: [PATCH 166/447] lua51-luasec: rebuild against OpenSSL --- srcpkgs/lua51-luasec/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template index c02e45e994d..d9a1ab60631 100644 --- a/srcpkgs/lua51-luasec/template +++ b/srcpkgs/lua51-luasec/template @@ -2,11 +2,11 @@ pkgname=lua51-luasec reverts=0.6_1 version=0.5.1 -revision=11 +revision=12 wrksrc=${pkgname#*-}-${pkgname#*-}-${version} build_style=gnu-makefile hostmakedepends="lua51" -makedepends="lua51-devel libressl-devel" +makedepends="lua51-devel openssl-devel" depends="lua51" short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" maintainer="Duncaen " From a98eeeb06ea7df3a6486624f09434564710f5ceb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:17 +0100 Subject: [PATCH 167/447] lua52-luasec: rebuild against OpenSSL --- srcpkgs/lua52-luasec/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template index 6267ba4997a..557292e03a9 100644 --- a/srcpkgs/lua52-luasec/template +++ b/srcpkgs/lua52-luasec/template @@ -1,11 +1,11 @@ # Template file for 'lua52-luasec' pkgname=lua52-luasec version=0.6 -revision=10 +revision=11 wrksrc=${pkgname#*-}-${pkgname#*-}-${version} build_style=gnu-makefile hostmakedepends="lua52" -makedepends="lua52-devel libressl-devel" +makedepends="lua52-devel openssl-devel" depends="lua52" short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" maintainer="Duncaen " From 833edebada493922bb12c3b971844734f3651749 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:17 +0100 Subject: [PATCH 168/447] lua53-luasec: rebuild against OpenSSL --- srcpkgs/lua53-luasec/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template index 16e685daf5a..6cb4c1993b8 100644 --- a/srcpkgs/lua53-luasec/template +++ b/srcpkgs/lua53-luasec/template @@ -1,13 +1,13 @@ # Template file for 'lua53-luasec' pkgname=lua53-luasec version=0.8.1 -revision=4 +revision=5 wrksrc="luasec-luasec-${version}" build_style=gnu-makefile make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3" make_install_args="${make_build_args}" hostmakedepends="lua53" -makedepends="lua53-devel libressl-devel" +makedepends="lua53-devel openssl-devel" depends="lua53" short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" maintainer="Duncaen " From 24b7617d9b2695b83147bb4fca650c140f24e1d9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:18 +0100 Subject: [PATCH 169/447] lynx: rebuild against OpenSSL --- srcpkgs/lynx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lynx/template b/srcpkgs/lynx/template index dc5e3aeb224..73d88a39498 100644 --- a/srcpkgs/lynx/template +++ b/srcpkgs/lynx/template @@ -3,11 +3,11 @@ pkgname=lynx _distver=2.8.9 _patchver=1 version="${_distver}.${_patchver}" -revision=4 +revision=5 wrksrc="lynx${_distver}rel.${_patchver}" build_style=gnu-configure configure_args="--enable-widec --with-zlib --with-bzlib --with-ssl --enable-ipv6" -makedepends="zlib-devel bzip2-devel ncurses-devel libressl-devel" +makedepends="zlib-devel bzip2-devel ncurses-devel openssl-devel" short_desc="A text browser for the World Wide Web" maintainer="Enno Boland " license="GPL-2.0-or-later" From 7318966926846e20d795de2b584848fa43ff2212 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:18 +0100 Subject: [PATCH 170/447] mailx: rebuild against OpenSSL --- srcpkgs/mailx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template index 5dd28b31ea5..63ec23e72e0 100644 --- a/srcpkgs/mailx/template +++ b/srcpkgs/mailx/template @@ -1,10 +1,10 @@ # Template file for 'mailx' pkgname=mailx version=12.5 -revision=24 +revision=25 patch_args="-Np1" wrksrc="mailx-${version}" -makedepends="libressl-devel mit-krb5-devel" +makedepends="openssl-devel mit-krb5-devel" conf_files="/etc/mailx.rc" provides="mail-${version}_${revision}" short_desc="Feature-rich BSD mail(1)" From 285dc9e1485bb911e678c3a77d3e8f2db11ec3b1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:18 +0100 Subject: [PATCH 171/447] mairix: rebuild against OpenSSL --- srcpkgs/mairix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template index ca8d9ff53da..49f73671bcb 100644 --- a/srcpkgs/mairix/template +++ b/srcpkgs/mairix/template @@ -1,11 +1,11 @@ # Template file for 'mairix' pkgname=mairix version=0.24 -revision=7 +revision=8 build_style=configure configure_args="--prefix=/usr --mandir=/usr/share/man" hostmakedepends="flex bison" -makedepends="bzip2-devel libressl-devel zlib-devel" +makedepends="bzip2-devel openssl-devel zlib-devel" short_desc="A program for indexing and searching emails" maintainer="Leah Neukirchen " license="GPL-2.0-only" From 2b8f527ae7fd03d3f47800f5c591ba5d1399f736 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:18 +0100 Subject: [PATCH 172/447] mariadb: rebuild against OpenSSL --- srcpkgs/mariadb/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index b55a0cd36a3..04a1719dcf3 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -11,15 +11,15 @@ configure_args="-DMYSQL_DATADIR=/var/lib/mysql -DINSTALL_INCLUDEDIR=include/mysql -DINSTALL_DOCREADMEDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=share/mysql -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_DOCDIR=share/mysql/docs -DINSTALL_SHAREDIR=share/mysql - -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=system + -DWITH_ZLIB=system -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_EMBEDDED_SERVER=ON -DWITH_ARCHIVE_STORAGE_ENGINE=1 -DPLUGIN_TOKUDB=NO -DWITH_BLACKHOLE_STORAGE_ENGINE=1 -DWITH_PARTITION_STORAGE_ENGINE=1 -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 -DWITH_EXTRA_CHARSETS=complex -DWITH_LIBWRAP=OFF -DSTACK_DIRECTION=1 -DWITHOUT_PBXT_STORAGE_ENGINE=1 -DWITH_INNOBASE_STORAGE_ENGINE=1" -hostmakedepends="perl bison ncurses-devel libressl-devel libatomic-devel +hostmakedepends="perl bison ncurses-devel openssl-devel libatomic-devel pkg-config" -makedepends="zlib-devel ncurses-devel libressl-devel readline-devel pcre-devel +makedepends="zlib-devel ncurses-devel openssl-devel readline-devel pcre-devel libatomic-devel" depends="mariadb-client" short_desc="Fast SQL database server, drop-in replacement for MySQL" From 8a595371870662cbb8dc8403ad074a1fddffd89d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:19 +0100 Subject: [PATCH 173/447] mbox: rebuild against OpenSSL --- srcpkgs/mbox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mbox/template b/srcpkgs/mbox/template index 723f1621788..efcc71eaaa6 100644 --- a/srcpkgs/mbox/template +++ b/srcpkgs/mbox/template @@ -1,13 +1,13 @@ # Template file for 'mbox' pkgname=mbox version=0.0.0.140526 -revision=5 +revision=6 _commit=a131424b6cb577e1c916bd0e8ffb2084a5f73048 wrksrc="$pkgname-$_commit" build_wrksrc=src build_style=gnu-configure hostmakedepends="automake" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="A lightweight sandbox tool for non-root users" maintainer="Andrea Brancaleoni " license="MIT" From b0ef9c13bfb276e2b4ff18983d8e3a9ecda4d91c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:19 +0100 Subject: [PATCH 174/447] mbuffer: rebuild against OpenSSL --- srcpkgs/mbuffer/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mbuffer/template b/srcpkgs/mbuffer/template index b6dfb7f4cc3..a3a17c73a84 100644 --- a/srcpkgs/mbuffer/template +++ b/srcpkgs/mbuffer/template @@ -1,9 +1,9 @@ # Template file for 'mbuffer' pkgname=mbuffer version=20200929 -revision=1 +revision=2 build_style=gnu-configure -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Buffer data streams with many additional functions" maintainer="Diogo Leal " license="GPL-3.0-or-later" From 3cc91e42a02744de02ff63c319066f1cac6cb73c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:19 +0100 Subject: [PATCH 175/447] mdbook-linkcheck: rebuild against OpenSSL --- srcpkgs/mdbook-linkcheck/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mdbook-linkcheck/template b/srcpkgs/mdbook-linkcheck/template index 9c24020bfb4..35168db82f9 100644 --- a/srcpkgs/mdbook-linkcheck/template +++ b/srcpkgs/mdbook-linkcheck/template @@ -2,10 +2,10 @@ # New versions need to be tested for compatibility with mdBook pkgname=mdbook-linkcheck version=0.7.2 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Backend for mdBook which will check links for you" maintainer="Érico Nogueira " license="MIT" From bab8ff615475770e4cae21f150ff2bd9e92b0592 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:19 +0100 Subject: [PATCH 176/447] mdcat: rebuild against OpenSSL --- srcpkgs/mdcat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mdcat/template b/srcpkgs/mdcat/template index df89652f874..53a60fe6701 100644 --- a/srcpkgs/mdcat/template +++ b/srcpkgs/mdcat/template @@ -6,7 +6,7 @@ revision=2 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cargo hostmakedepends="cmake pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Cat for markdown" maintainer="Wilson Birney " license="MPL-2.0" From 5da0f44ed6db0b956b0f7bd17b83f40914c8a360 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:19 +0100 Subject: [PATCH 177/447] megatools: rebuild against OpenSSL --- srcpkgs/megatools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/megatools/template b/srcpkgs/megatools/template index 0f9e8539bfb..bb7e5322186 100644 --- a/srcpkgs/megatools/template +++ b/srcpkgs/megatools/template @@ -1,10 +1,10 @@ # Template file for 'megatools' pkgname=megatools version=1.10.3 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="pkg-config asciidoc" -makedepends="glib-networking gobject-introspection libressl-devel libcurl-devel fuse-devel libsodium-devel glib-devel" +makedepends="glib-networking gobject-introspection openssl-devel libcurl-devel fuse-devel libsodium-devel glib-devel" short_desc="Command line client for Mega.nz file sharing service" maintainer="RunningDroid " license="GPL-2.0-or-later" From 3ede56db8b31cfc396c384c371c7c401e60736df Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:20 +0100 Subject: [PATCH 178/447] mit-krb5: rebuild against OpenSSL --- srcpkgs/mit-krb5/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 004e0e02dbe..fa18e58b733 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -3,7 +3,7 @@ # also update srcpkgs/libgssglue/files/gssapi_mech.conf pkgname=mit-krb5 version=1.18.3 -revision=1 +revision=2 wrksrc="krb5-${version}" build_style=gnu-configure hostmakedepends="e2fsprogs-devel flex perl pkg-config" From 5fe355c2eb1239edd8e929ee651f101e1f4522fd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:20 +0100 Subject: [PATCH 179/447] mixxx: rebuild against OpenSSL --- srcpkgs/mixxx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template index 7082db1b596..18cf683fcf5 100644 --- a/srcpkgs/mixxx/template +++ b/srcpkgs/mixxx/template @@ -1,7 +1,7 @@ # Template file for 'mixxx' pkgname=mixxx version=2.2.4 -revision=6 +revision=7 wrksrc="mixxx-release-${version}" build_style=scons hostmakedepends="pkg-config protobuf" From 33692a8733fda5eea45cf14011a94cadf69876c2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:20 +0100 Subject: [PATCH 180/447] monero: rebuild against OpenSSL --- srcpkgs/monero/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 76537f0e249..f72c1f945ff 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -12,7 +12,7 @@ make_dirs=" /var/lib/monero 0750 monero monero /var/log/monero 0755 monero monero" hostmakedepends="pkg-config" -makedepends="libressl-devel boost-devel libldns-devel libunwind-devel +makedepends="openssl-devel boost-devel libldns-devel libunwind-devel readline-devel unbound-devel miniupnpc-devel expat-devel cppzmq czmq-devel libsodium-devel" short_desc="Private, secure, untraceable, decentralised digital currency" From fa8d20eb06bf6b9de56f2fc5daf40728a67fb434 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:20 +0100 Subject: [PATCH 181/447] mongo-c-driver: rebuild against OpenSSL --- srcpkgs/mongo-c-driver/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mongo-c-driver/template b/srcpkgs/mongo-c-driver/template index e360a5c65b1..fa18e33e8fe 100644 --- a/srcpkgs/mongo-c-driver/template +++ b/srcpkgs/mongo-c-driver/template @@ -5,7 +5,7 @@ revision=1 build_style=cmake configure_args="-DENABLE_TESTS=OFF" hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="High-performance MongoDB driver for C" maintainer="Andrew Benson " license="Apache-2.0" From d7d004049328c3541de50294b601071c26b575b2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:21 +0100 Subject: [PATCH 182/447] mongoose: rebuild against OpenSSL --- srcpkgs/mongoose/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index 9a6226dca8a..eddadc64733 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -1,10 +1,10 @@ # Template file for 'mongoose' pkgname=mongoose version=6.18 -revision=3 +revision=4 build_style=gnu-makefile make_use_env=compliant -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Easy to use Web server" maintainer="Orphaned " license="GPL-2.0-only" From 08a60c8b36a5603dee96adda0c3deb4b1fd10180 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:21 +0100 Subject: [PATCH 183/447] monit: rebuild against OpenSSL --- srcpkgs/monit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index 969135db82d..f56ddc84772 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -9,7 +9,7 @@ configure_args=" libmonit_cv_vsnprintf_c99_conformant=yes" conf_files="/etc/monitrc" hostmakedepends="automake libtool perl" -makedepends="pam-devel libressl-devel zlib-devel" +makedepends="pam-devel openssl-devel zlib-devel" short_desc="Utility for monitoring, processes, files, directories and devices" maintainer="Duncaen " license="AGPL-3.0-only" From e80befd54dfec7655f7d596632f69b9c82d0d9f5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:21 +0100 Subject: [PATCH 184/447] monolith: rebuild against OpenSSL --- srcpkgs/monolith/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/monolith/template b/srcpkgs/monolith/template index 64619618d91..b83fc229ffa 100644 --- a/srcpkgs/monolith/template +++ b/srcpkgs/monolith/template @@ -1,10 +1,10 @@ # Template file for 'monolith' pkgname=monolith version=2.4.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Save HTML pages with ease " maintainer="Benjamín Albiñana " license="Unlicense" From 7e7ce7a2d62eaa98a203b72bf670bbb17663f1d3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:21 +0100 Subject: [PATCH 185/447] mosh: rebuild against OpenSSL --- srcpkgs/mosh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index f3733d3fd84..34f3d46ecb7 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -1,10 +1,10 @@ # Template file for 'mosh' pkgname=mosh version=1.3.2 -revision=19 +revision=20 build_style=gnu-configure hostmakedepends="pkg-config protobuf" -makedepends="ncurses-devel protobuf-devel libutempter-devel libressl-devel" +makedepends="ncurses-devel protobuf-devel libutempter-devel openssl-devel" depends="perl-IO-Tty" short_desc="Mobile shell, remote terminal application that allows roaming" maintainer="Nathan Owens " From bbd5d2b932daadde34a2d76d1cae7ecf1eb4cfc2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:22 +0100 Subject: [PATCH 186/447] mosquitto: rebuild against OpenSSL --- srcpkgs/mosquitto/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template index 2f4ac6ccda2..78d19cba196 100644 --- a/srcpkgs/mosquitto/template +++ b/srcpkgs/mosquitto/template @@ -1,13 +1,13 @@ # Template file for 'mosquitto' pkgname=mosquitto version=1.6.3 -revision=4 +revision=5 build_style=gnu-makefile -make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by libressl +make_build_args="WITH_TLS_PSK=no WITH_WEBSOCKETS=yes" # PSK not supported by openssl make_install_args="prefix=/usr" make_check_target=test conf_files="/etc/mosquitto/mosquitto.conf" -makedepends="c-ares-devel libressl-devel libwebsockets-devel libuv-devel" +makedepends="c-ares-devel openssl-devel libwebsockets-devel libuv-devel" checkdepends="python bcunit-devel" short_desc="MQTT version 3.1/3.1.1/5.0 compatible message broker" maintainer="Lukas Braun " From 2fbeb6545a5e5b3956780885e62dca29c7fcbdb6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:22 +0100 Subject: [PATCH 187/447] mtd-utils: rebuild against OpenSSL --- srcpkgs/mtd-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template index af56075e3c7..0cbb7f1e70f 100644 --- a/srcpkgs/mtd-utils/template +++ b/srcpkgs/mtd-utils/template @@ -1,11 +1,11 @@ # Template file for 'mtd-utils' pkgname=mtd-utils version=2.1.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="autoconf automake libtool pkg-config" makedepends="acl-devel liblzma-devel libuuid-devel lzo-devel - zlib-devel libressl-devel libzstd-devel" + zlib-devel openssl-devel libzstd-devel" short_desc="Memory Technology Device Utilities" maintainer="Orphaned " license="GPL-2.0-or-later" From 08a9d9aa25a80528914f1625216154780b639847 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:22 +0100 Subject: [PATCH 188/447] mtree: rebuild against OpenSSL --- srcpkgs/mtree/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mtree/template b/srcpkgs/mtree/template index ceea99b34af..4eba212dbbb 100644 --- a/srcpkgs/mtree/template +++ b/srcpkgs/mtree/template @@ -1,11 +1,11 @@ # Template file for 'mtree' pkgname=mtree version=1.0.4 -revision=6 +revision=7 wrksrc="${pkgname}-port-${version}" build_style=gnu-configure hostmakedepends="automake" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Utility for creating and verifying file hierarchies" maintainer="Leah Neukirchen " license="BSD-3-Clause" From a550265514abdf022014a0d25a100c7936dc5693 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:22 +0100 Subject: [PATCH 189/447] mtxclient: rebuild against OpenSSL --- srcpkgs/mtxclient/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template index ccefdca1c90..5c5806d3cf7 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,11 +1,11 @@ # Template file for 'mtxclient' pkgname=mtxclient version=0.3.1 -revision=2 +revision=3 build_style=cmake configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON" hostmakedepends="pkg-config" -makedepends="boost-devel json-c++ olm-devel libressl-devel libsodium-devel" +makedepends="boost-devel json-c++ olm-devel openssl-devel libsodium-devel" short_desc="Client API library for the Matrix protocol" maintainer="Lorem " license="MIT" From d50f689e359d6a26b3934e98927ed5a80c23fc1a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:23 +0100 Subject: [PATCH 190/447] muchsync: rebuild against OpenSSL --- srcpkgs/muchsync/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/muchsync/template b/srcpkgs/muchsync/template index adb969d9450..e1703b4bf9c 100644 --- a/srcpkgs/muchsync/template +++ b/srcpkgs/muchsync/template @@ -1,10 +1,10 @@ # Template file for 'muchsync' pkgname=muchsync version=6 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config libxapian" -makedepends="libnotmuch-devel xapian-core-devel sqlite-devel libressl-devel" +makedepends="libnotmuch-devel xapian-core-devel sqlite-devel openssl-devel" depends="openssh notmuch" short_desc="Synchronize notmuch mail across machines" maintainer="Anjandev Momi " From 978180a82cffa7b7db945bb4c05fa08ba9bc90f0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:23 +0100 Subject: [PATCH 191/447] mumble: rebuild against OpenSSL --- srcpkgs/mumble/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index f60bf7310cf..cb155ffea3a 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -9,7 +9,7 @@ configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble" hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which" makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel - libcap-devel libressl-devel libsndfile-devel opus-devel protobuf-devel + libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel speech-dispatcher-devel speex-devel portaudio-devel" depends="desktop-file-utils qt5-plugin-sqlite" From e71a925f75cb770ce51466d28ce8e1ebfd939cfd Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:23 +0100 Subject: [PATCH 192/447] munge: rebuild against OpenSSL --- srcpkgs/munge/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/munge/template b/srcpkgs/munge/template index fbb4ac54f4b..9d8e339b979 100644 --- a/srcpkgs/munge/template +++ b/srcpkgs/munge/template @@ -1,13 +1,13 @@ # Template file for 'munge' pkgname=munge version=0.5.14 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-crypto-lib=openssl --with-openssl-prefix=${XBPS_CROSS_BASE}/usr x_ac_cv_check_fifo_recvfd=no ac_cv_file__dev_spx=no" hostmakedepends="pkg-config" -makedepends="bzip2-devel libressl-devel zlib-devel" +makedepends="bzip2-devel openssl-devel zlib-devel" depends="shadow" short_desc="MUNGE Uid 'N' Gid Emporium authentication service" maintainer="pulux " From 3af129ea26a11523d8781f67bc78be2baa770e12 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:23 +0100 Subject: [PATCH 193/447] mupdf: rebuild against OpenSSL --- srcpkgs/mupdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index 3e50870b95d..c8f05d1d345 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -1,7 +1,7 @@ # Template file for 'mupdf' pkgname=mupdf version=1.18.0 -revision=1 +revision=2 wrksrc="${pkgname}-${version}-source" hostmakedepends="pkg-config zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel libXcursor-devel From e101436de02f2f00e081b068da51c12bf99c78e0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:23 +0100 Subject: [PATCH 194/447] mutt: rebuild against OpenSSL --- srcpkgs/mutt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index e0394db84e2..39bf0a5dd1f 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -9,7 +9,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --with-gdbm=${XBPS_CROSS_BASE}/usr" conf_files="/etc/${pkgname}/Muttrc" hostmakedepends="libidn2-devel perl pkg-config" -makedepends="gdbm-devel gpgme-devel libidn2-devel libressl-devel libsasl-devel +makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel ncurses-devel" depends="cyrus-sasl-modules mime-types" short_desc="Mutt Mail Client" From 613b1110fe543b987c73f316984459058f2fa3b6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:24 +0100 Subject: [PATCH 195/447] namecoin: rebuild against OpenSSL --- srcpkgs/namecoin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template index 91ae3c35d9a..e4cfb3777b7 100644 --- a/srcpkgs/namecoin/template +++ b/srcpkgs/namecoin/template @@ -1,7 +1,7 @@ # Template file for 'namecoin' pkgname=namecoin version=0.18.1 -revision=4 +revision=5 wrksrc="${pkgname}-core-nc${version}" build_style=gnu-configure configure_args="--with-incompatible-bdb --disable-static From b981ca24e038432ae8eca82b087e0927d880138a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:24 +0100 Subject: [PATCH 196/447] nasa-wallpaper: rebuild against OpenSSL --- srcpkgs/nasa-wallpaper/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nasa-wallpaper/template b/srcpkgs/nasa-wallpaper/template index 59857b342e8..c53d0c1b4b1 100644 --- a/srcpkgs/nasa-wallpaper/template +++ b/srcpkgs/nasa-wallpaper/template @@ -1,10 +1,10 @@ # Template file for 'nasa-wallpaper' pkgname=nasa-wallpaper version=2.0 -revision=2 +revision=3 build_style="cargo" hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Change your desktop background with a NASA image" maintainer="Lugubris " license="Apache-2.0" From 802951b8e472c28cbfc070d7f9bb10204173107e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:24 +0100 Subject: [PATCH 197/447] neomutt: rebuild against OpenSSL --- srcpkgs/neomutt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neomutt/template b/srcpkgs/neomutt/template index 786c88fab1d..4ac918f807e 100644 --- a/srcpkgs/neomutt/template +++ b/srcpkgs/neomutt/template @@ -1,7 +1,7 @@ # Template file for 'neomutt' pkgname=neomutt version=20201120 -revision=1 +revision=2 wrksrc="neomutt-${version}" create_wrksrc=true build_wrksrc="$wrksrc" @@ -14,7 +14,7 @@ conf_files="/etc/neomuttrc" hostmakedepends="docbook-xsl gettext libxslt perl tcl w3m" makedepends="aspell-devel gdbm-devel gettext-devel gpgme-devel libidn-devel rocksdb-devel tdb-devel - libnotmuch-devel libressl-devel libsasl-devel lua54-devel zlib-devel" + libnotmuch-devel openssl-devel libsasl-devel lua54-devel zlib-devel" depends="mime-types" short_desc="Mutt with misc fixes and feature patches" maintainer="Toyam Cox " From a42d0f9a6c191e197ac78668d4e156cadc1d6aa8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:24 +0100 Subject: [PATCH 198/447] neon: rebuild against OpenSSL --- srcpkgs/neon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template index ae99ef69353..8367a705e0b 100644 --- a/srcpkgs/neon/template +++ b/srcpkgs/neon/template @@ -1,12 +1,12 @@ # Template file for 'neon' pkgname=neon version=0.31.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-expat --with-ssl=openssl --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static" hostmakedepends="pkg-config" -makedepends="zlib-devel expat-devel libressl-devel libproxy-devel" +makedepends="zlib-devel expat-devel openssl-devel libproxy-devel" depends="ca-certificates" short_desc="HTTP and WebDAV client library, with a C interface" maintainer="Orphaned " From 388f3fb1b4685a0d371188e0f76e09592e208ce3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:25 +0100 Subject: [PATCH 199/447] net-snmp: rebuild against OpenSSL --- srcpkgs/net-snmp/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template index b5c06106fb2..3abdceb0eca 100644 --- a/srcpkgs/net-snmp/template +++ b/srcpkgs/net-snmp/template @@ -1,9 +1,9 @@ # Template file for 'net-snmp' pkgname=net-snmp version=5.9 -revision=1 +revision=2 hostmakedepends="pkg-config unzip" -makedepends="bzip2-devel libressl-devel libnl-devel pciutils-devel +makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel libsensors-devel pcre-devel" short_desc="Simple Network Management Protocol (SNMP) suite" maintainer="Orphaned " @@ -44,7 +44,7 @@ libnet-snmp_package() { } net-snmp-devel_package() { - depends="libnet-snmp>=${version}_${revision} libressl-devel" + depends="libnet-snmp>=${version}_${revision} openssl-devel" short_desc+=" - development files" pkg_install() { vmove usr/bin/net-snmp-config From 1145171b85ff85f4e0a8cb48907c8fdd6adea368 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:25 +0100 Subject: [PATCH 200/447] netdata: rebuild against OpenSSL --- srcpkgs/netdata/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/netdata/template b/srcpkgs/netdata/template index d93f85660e8..69bb2a788e9 100644 --- a/srcpkgs/netdata/template +++ b/srcpkgs/netdata/template @@ -1,13 +1,13 @@ # Template file for 'netdata' pkgname=netdata version=1.28.0 -revision=1 +revision=2 wrksrc="${pkgname}-v${version}" build_style=gnu-configure configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no" hostmakedepends="pkg-config autoconf automake" makedepends="json-c-devel judy-devel libcap-devel liblz4-devel libmnl-devel - libnetfilter_acct-devel libressl-devel libuuid-devel libuv-devel zlib-devel" + libnetfilter_acct-devel openssl-devel libuuid-devel libuv-devel zlib-devel" depends="libcap-progs" short_desc="Real-time performance monitoring, done right" maintainer="Michael Aldridge " From 8200a402e202cf3b752244c567521dbbd7697d0d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:25 +0100 Subject: [PATCH 201/447] netpgp: rebuild against OpenSSL --- .../patches/lib_openssl__crypto.c.patch | 417 ++++++++++++++++++ srcpkgs/netpgp/patches/lib_signature_c.patch | 31 +- srcpkgs/netpgp/template | 6 +- 3 files changed, 449 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch diff --git a/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch new file mode 100644 index 00000000000..afa077902d9 --- /dev/null +++ b/srcpkgs/netpgp/patches/lib_openssl__crypto.c.patch @@ -0,0 +1,417 @@ +$NetBSD: patch-src_lib_openssl__crypto.c,v 1.1 2020/04/25 12:07:47 nia Exp $ + +Sync with NetBSD src to fix build with OpenSSL 1.1. + +--- src/lib/openssl_crypto.c.orig 2020-04-25 11:54:50.243962468 +0000 ++++ src/lib/openssl_crypto.c +@@ -88,18 +88,144 @@ __COPYRIGHT("@(#) Copyright (c) 2009 The + #include "netpgpdigest.h" + #include "packet.h" + ++static void ++takeRSA(const RSA *orsa, pgp_rsa_pubkey_t *pk, pgp_rsa_seckey_t *sk) ++{ ++ const BIGNUM *n, *e, *d, *q, *p; ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ RSA_get0_key(orsa, &n, &e, &d); ++ RSA_get0_factors(orsa, &q, &p); ++#else ++ n = orsa->n; ++ e = orsa->e; ++ d = orsa->d; ++ p = orsa->p; ++ q = orsa->q; ++#endif ++ if (sk) { ++ sk->d = BN_dup(d); ++ sk->p = BN_dup(p); ++ sk->q = BN_dup(q); ++ } ++ if (pk) { ++ pk->n = BN_dup(n); ++ pk->e = BN_dup(e); ++ } ++} + +-static void +-test_seckey(const pgp_seckey_t *seckey) ++static RSA * ++makeRSA(const pgp_rsa_pubkey_t *pubkey, const pgp_rsa_seckey_t *seckey) ++{ ++ BIGNUM *n, *e, *d, *p, *q; ++ RSA *orsa; ++ ++ orsa = RSA_new(); ++ n = BN_dup(pubkey->n); ++ e = BN_dup(pubkey->e); ++ ++ if (seckey) { ++ d = BN_dup(seckey->d); ++ p = BN_dup(seckey->p); ++ q = BN_dup(seckey->q); ++ } else { ++ d = p = q = NULL; ++ } ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ RSA_set0_key(orsa, n, e, d); ++ RSA_set0_factors(orsa, p, q); ++#else ++ BN_free(orsa->n); ++ BN_free(orsa->e); ++ orsa->n = n; ++ orsa->e = e; ++ if (d) { ++ BN_free(orsa->d); ++ orsa->d = d; ++ } ++ if (p) { ++ BN_free(orsa->p); ++ orsa->p = p; ++ } ++ if (q) { ++ BN_free(orsa->q); ++ orsa->q = q; ++ } ++#endif ++ return orsa; ++} ++ ++static DSA_SIG * ++makeDSA_SIG(const pgp_dsa_sig_t *sig) ++{ ++ DSA_SIG *osig; ++ BIGNUM *r, *s; ++ ++ osig = DSA_SIG_new(); ++ r = BN_dup(sig->r); ++ s = BN_dup(sig->s); ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ DSA_SIG_set0(osig, r, s); ++#else ++ BN_free(osig->r); ++ BN_free(osig->s); ++ osig->r = r; ++ osig->s = s; ++#endif ++ ++ return osig; ++} ++ ++static DSA * ++makeDSA(const pgp_dsa_pubkey_t *dsa, const pgp_dsa_seckey_t *secdsa) + { +- RSA *test = RSA_new(); ++ DSA *odsa; ++ BIGNUM *p, *q, *g, *y, *x; + +- test->n = BN_dup(seckey->pubkey.key.rsa.n); +- test->e = BN_dup(seckey->pubkey.key.rsa.e); ++ odsa = DSA_new(); + +- test->d = BN_dup(seckey->key.rsa.d); +- test->p = BN_dup(seckey->key.rsa.p); +- test->q = BN_dup(seckey->key.rsa.q); ++ p = BN_dup(dsa->p); ++ q = BN_dup(dsa->q); ++ g = BN_dup(dsa->g); ++ y = BN_dup(dsa->y); ++ x = secdsa ? secdsa->x : NULL; ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ DSA_set0_key(odsa, y, x); ++#else ++ BN_free(odsa->p); ++ BN_free(odsa->q); ++ BN_free(odsa->g); ++ BN_free(odsa->pub_key); ++ odsa->p = p; ++ odsa->q = q; ++ odsa->g = g; ++ odsa->pub_key = y; ++ if (x) { ++ BN_free(odsa->priv_key); ++ odsa->priv_key = x; ++ } ++#endif ++ return odsa; ++} ++ ++static void ++takeDSA(const DSA *odsa, pgp_dsa_seckey_t *sk) ++{ ++ const BIGNUM *x; ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++ DSA_get0_key(odsa, NULL, &x); ++#else ++ x = odsa->priv_key; ++#endif ++ sk->x = BN_dup(x); ++} ++ ++static void ++test_seckey(const pgp_seckey_t *seckey) ++{ ++ RSA *test = makeRSA(&seckey->pubkey.key.rsa, &seckey->key.rsa); + + if (RSA_check_key(test) != 1) { + (void) fprintf(stderr, +@@ -434,25 +560,15 @@ pgp_dsa_verify(const uint8_t *hash, size + const pgp_dsa_pubkey_t *dsa) + { + unsigned qlen; +- DSA_SIG *osig; +- DSA *odsa; ++ DSA_SIG *osig = makeDSA_SIG(sig); ++ DSA *odsa = makeDSA(dsa, NULL); + int ret; + +- osig = DSA_SIG_new(); +- osig->r = sig->r; +- osig->s = sig->s; +- +- odsa = DSA_new(); +- odsa->p = dsa->p; +- odsa->q = dsa->q; +- odsa->g = dsa->g; +- odsa->pub_key = dsa->y; +- + if (pgp_get_debug_level(__FILE__)) { + hexdump(stderr, "input hash", hash, hash_length); +- (void) fprintf(stderr, "Q=%d\n", BN_num_bytes(odsa->q)); ++ (void) fprintf(stderr, "Q=%d\n", BN_num_bytes(dsa->q)); + } +- if ((qlen = (unsigned)BN_num_bytes(odsa->q)) < hash_length) { ++ if ((qlen = (unsigned)BN_num_bytes(dsa->q)) < hash_length) { + hash_length = qlen; + } + ret = DSA_do_verify(hash, (int)hash_length, osig, odsa); +@@ -464,10 +580,7 @@ pgp_dsa_verify(const uint8_t *hash, size + return 0; + } + +- odsa->p = odsa->q = odsa->g = odsa->pub_key = NULL; + DSA_free(odsa); +- +- osig->r = osig->s = NULL; + DSA_SIG_free(osig); + + return (unsigned)ret; +@@ -488,19 +601,14 @@ pgp_rsa_public_decrypt(uint8_t *out, + size_t length, + const pgp_rsa_pubkey_t *pubkey) + { +- RSA *orsa; +- int n; +- +- orsa = RSA_new(); +- orsa->n = pubkey->n; +- orsa->e = pubkey->e; ++ RSA *orsa = makeRSA(pubkey, NULL); ++ int ret; + +- n = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING); ++ ret = RSA_public_decrypt((int)length, in, out, orsa, RSA_NO_PADDING); + +- orsa->n = orsa->e = NULL; + RSA_free(orsa); + +- return n; ++ return ret; + } + + /** +@@ -520,21 +628,10 @@ pgp_rsa_private_encrypt(uint8_t *out, + const pgp_rsa_seckey_t *seckey, + const pgp_rsa_pubkey_t *pubkey) + { +- RSA *orsa; +- int n; ++ RSA *orsa = makeRSA(pubkey, seckey); ++ int ret; + +- orsa = RSA_new(); +- orsa->n = BN_dup(pubkey->n); +- orsa->d = seckey->d; +- orsa->p = seckey->q; /* p and q are round the other way in openssl */ +- orsa->q = seckey->p; +- +- /* debug */ +- orsa->e = BN_dup(pubkey->e); +- /* If this isn't set, it's very likely that the programmer hasn't */ +- /* decrypted the secret key. RSA_check_key segfaults in that case. */ +- /* Use pgp_decrypt_seckey() to do that. */ +- if (orsa->d == NULL) { ++ if (seckey->d == NULL) { + (void) fprintf(stderr, "orsa is not set\n"); + return 0; + } +@@ -544,12 +641,11 @@ pgp_rsa_private_encrypt(uint8_t *out, + } + /* end debug */ + +- n = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING); ++ ret = RSA_private_encrypt((int)length, in, out, orsa, RSA_NO_PADDING); + +- orsa->n = orsa->d = orsa->p = orsa->q = NULL; + RSA_free(orsa); + +- return n; ++ return ret; + } + + /** +@@ -569,18 +665,10 @@ pgp_rsa_private_decrypt(uint8_t *out, + const pgp_rsa_seckey_t *seckey, + const pgp_rsa_pubkey_t *pubkey) + { +- RSA *keypair; ++ RSA *keypair = makeRSA(pubkey, seckey); + int n; + char errbuf[1024]; + +- keypair = RSA_new(); +- keypair->n = pubkey->n; /* XXX: do we need n? */ +- keypair->d = seckey->d; +- keypair->p = seckey->q; +- keypair->q = seckey->p; +- +- /* debug */ +- keypair->e = pubkey->e; + if (RSA_check_key(keypair) != 1) { + (void) fprintf(stderr, "RSA_check_key is not set\n"); + return 0; +@@ -600,7 +688,6 @@ pgp_rsa_private_decrypt(uint8_t *out, + ERR_error_string(err, &errbuf[0]); + (void) fprintf(stderr, "openssl error : %s\n", errbuf); + } +- keypair->n = keypair->d = keypair->p = keypair->q = NULL; + RSA_free(keypair); + + return n; +@@ -620,15 +707,11 @@ pgp_rsa_public_encrypt(uint8_t *out, + size_t length, + const pgp_rsa_pubkey_t *pubkey) + { +- RSA *orsa; ++ RSA *orsa = makeRSA(pubkey, NULL); + int n; + + /* printf("pgp_rsa_public_encrypt: length=%ld\n", length); */ + +- orsa = RSA_new(); +- orsa->n = pubkey->n; +- orsa->e = pubkey->e; +- + /* printf("len: %ld\n", length); */ + /* pgp_print_bn("n: ", orsa->n); */ + /* pgp_print_bn("e: ", orsa->e); */ +@@ -640,7 +723,6 @@ pgp_rsa_public_encrypt(uint8_t *out, + fd_out = BIO_new_fd(fileno(stderr), BIO_NOCLOSE); + ERR_print_errors(fd_out); + } +- orsa->n = orsa->e = NULL; + RSA_free(orsa); + + return n; +@@ -656,7 +738,9 @@ void + pgp_crypto_finish(void) + { + CRYPTO_cleanup_all_ex_data(); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + ERR_remove_state((unsigned long)0); ++#endif + } + + /** +@@ -692,25 +776,33 @@ rsa_generate_keypair(pgp_key_t *keydata, + BN_CTX *ctx; + pgp_output_t *output; + pgp_memory_t *mem; ++ BIGNUM *bne; ++ pgp_rsa_pubkey_t *pk; ++ pgp_rsa_seckey_t *sk; + + ctx = BN_CTX_new(); + pgp_keydata_init(keydata, PGP_PTAG_CT_SECRET_KEY); + seckey = pgp_get_writable_seckey(keydata); ++ pk = &seckey->pubkey.key.rsa; ++ sk = &seckey->key.rsa; + + /* generate the key pair */ + +- rsa = RSA_generate_key(numbits, e, NULL, NULL); ++ bne = BN_new(); ++ BN_set_word(bne, e); ++ ++ rsa = RSA_new(); ++ RSA_generate_key_ex(rsa, numbits, bne, NULL); ++ BN_free(bne); + + /* populate pgp key from ssl key */ ++ takeRSA(rsa, pk, sk); + + seckey->pubkey.version = PGP_V4; + seckey->pubkey.birthtime = time(NULL); + seckey->pubkey.days_valid = 0; + seckey->pubkey.alg = PGP_PKA_RSA; + +- seckey->pubkey.key.rsa.n = BN_dup(rsa->n); +- seckey->pubkey.key.rsa.e = BN_dup(rsa->e); +- + seckey->s2k_usage = PGP_S2KU_ENCRYPTED_AND_HASHED; + seckey->s2k_specifier = PGP_S2KS_SALTED; + /* seckey->s2k_specifier=PGP_S2KS_SIMPLE; */ +@@ -721,11 +813,8 @@ rsa_generate_keypair(pgp_key_t *keydata, + seckey->octetc = 0; + seckey->checksum = 0; + +- seckey->key.rsa.d = BN_dup(rsa->d); +- seckey->key.rsa.p = BN_dup(rsa->p); +- seckey->key.rsa.q = BN_dup(rsa->q); +- seckey->key.rsa.u = BN_mod_inverse(NULL, rsa->p, rsa->q, ctx); +- if (seckey->key.rsa.u == NULL) { ++ sk->u = BN_mod_inverse(NULL, sk->p, sk->q, ctx); ++ if (sk->u == NULL) { + (void) fprintf(stderr, "seckey->key.rsa.u is NULL\n"); + return 0; + } +@@ -817,18 +906,10 @@ pgp_dsa_sign(uint8_t *hashbuf, + const pgp_dsa_pubkey_t *pubdsa) + { + DSA_SIG *dsasig; +- DSA *odsa; +- +- odsa = DSA_new(); +- odsa->p = pubdsa->p; +- odsa->q = pubdsa->q; +- odsa->g = pubdsa->g; +- odsa->pub_key = pubdsa->y; +- odsa->priv_key = secdsa->x; ++ DSA *odsa = makeDSA(pubdsa, secdsa); + + dsasig = DSA_do_sign(hashbuf, (int)hashsize, odsa); + +- odsa->p = odsa->q = odsa->g = odsa->pub_key = odsa->priv_key = NULL; + DSA_free(odsa); + + return dsasig; +@@ -860,15 +941,12 @@ openssl_read_pem_seckey(const char *f, p + rsa = PEM_read_RSAPrivateKey(fp, NULL, NULL, pass); + } while (rsa == NULL); + } +- key->key.seckey.key.rsa.d = rsa->d; +- key->key.seckey.key.rsa.p = rsa->p; +- key->key.seckey.key.rsa.q = rsa->q; +- key->key.seckey.key.rsa.d = rsa->d; ++ takeRSA(rsa, NULL, &key->key.seckey.key.rsa); + } else if (strcmp(type, "ssh-dss") == 0) { + if ((dsa = PEM_read_DSAPrivateKey(fp, NULL, NULL, NULL)) == NULL) { + ok = 0; + } else { +- key->key.seckey.key.dsa.x = dsa->priv_key; ++ takeDSA(dsa, &key->key.seckey.key.dsa); + } + } else { + ok = 0; diff --git a/srcpkgs/netpgp/patches/lib_signature_c.patch b/srcpkgs/netpgp/patches/lib_signature_c.patch index 7fe2a78598f..3438dcdaf0f 100644 --- a/srcpkgs/netpgp/patches/lib_signature_c.patch +++ b/srcpkgs/netpgp/patches/lib_signature_c.patch @@ -1,10 +1,37 @@ -$NetBSD: patch-src_lib_signature.c,v 1.1 2018/03/15 20:21:52 khorben Exp $ +$NetBSD: patch-src_lib_signature.c,v 1.2 2020/04/25 12:07:47 nia Exp $ + +Fix build with OpenSSL 1.1 by syncing with NetBSD src Output signatures to the standard output for "-". --- src/lib/signature.c.orig 2012-03-05 02:20:18.000000000 +0000 +++ src/lib/signature.c -@@ -903,7 +903,11 @@ open_output_file(pgp_output_t **output, +@@ -232,6 +232,7 @@ dsa_sign(pgp_hash_t *hash, + unsigned t; + uint8_t hashbuf[NETPGP_BUFSIZ]; + DSA_SIG *dsasig; ++ const BIGNUM *r, *s; + + /* hashsize must be "equal in size to the number of bits of q, */ + /* the group generated by the DSA key's generator value */ +@@ -252,8 +253,14 @@ dsa_sign(pgp_hash_t *hash, + dsasig = pgp_dsa_sign(hashbuf, hashsize, sdsa, dsa); + + /* convert and write the sig out to memory */ +- pgp_write_mpi(output, dsasig->r); +- pgp_write_mpi(output, dsasig->s); ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ DSA_SIG_get0(dsasig, &r, &s); ++#else ++ r = dsasig->r; ++ s = dsasig->s; ++#endif ++ pgp_write_mpi(output, r); ++ pgp_write_mpi(output, s); + DSA_SIG_free(dsasig); + return 1; + } +@@ -903,7 +910,11 @@ open_output_file(pgp_output_t **output, /* setup output file */ if (outname) { diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index b8801c35ac7..2bc40e253d0 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -1,10 +1,10 @@ # Template file for 'netpgp' pkgname=netpgp version=20140220 -revision=18 +revision=19 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" -makedepends="zlib-devel bzip2-devel libressl-devel" +makedepends="zlib-devel bzip2-devel openssl-devel" short_desc="PGP signing, verification, encryption and decryption program" maintainer="Orphaned " license="3-clause-BSD" @@ -12,7 +12,7 @@ homepage="http://www.netbsd.org" distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/LOCAL_PORTS/netpgp-${version}.tar.gz" checksum=fbe403f037376a40afd19bc8a1786b55b67cf8092a723ef36a61d99260b66dbf -CFLAGS="-Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow" +CFLAGS="-Wno-error=unused-but-set-variable -Wno-error=cpp -Wno-format-truncation -Wno-stringop-truncation -Wno-stringop-overflow -Wno-error=format-overflow" pre_configure() { autoreconf -fi From b714dd0b2305eab89b5f968298a2d2881b8c8429 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:25 +0100 Subject: [PATCH 202/447] netsurf: rebuild against OpenSSL --- srcpkgs/netsurf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index 2443180f8df..a91ff22b098 100644 --- a/srcpkgs/netsurf/template +++ b/srcpkgs/netsurf/template @@ -1,7 +1,7 @@ # Template file for 'netsurf' pkgname=netsurf version=3.10 -revision=2 +revision=3 build_style=gnu-makefile make_use_env=yes make_build_args=" From 10b7d168281dca86fb2b0562a5c7ab99fd725444 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:25 +0100 Subject: [PATCH 203/447] network-ups-tools: rebuild against OpenSSL --- .../patches/openssl-1.1.patch | 181 ++++++++++++++++++ srcpkgs/network-ups-tools/template | 4 +- 2 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/network-ups-tools/patches/openssl-1.1.patch diff --git a/srcpkgs/network-ups-tools/patches/openssl-1.1.patch b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch new file mode 100644 index 00000000000..a83f1ca7b38 --- /dev/null +++ b/srcpkgs/network-ups-tools/patches/openssl-1.1.patch @@ -0,0 +1,181 @@ +From da1f5aa699f54e0f6977ab64a3bc2f90a51c3104 Mon Sep 17 00:00:00 2001 +From: Arjen de Korte +Date: Mon, 27 Nov 2017 21:10:13 +0100 +Subject: [PATCH] Add support for openssl-1.1.0 + +--- clients/upsclient.c ++++ clients/upsclient.c +@@ -299,11 +299,6 @@ + { + #ifdef WITH_OPENSSL + int ret, ssl_mode = SSL_VERIFY_NONE; +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +- const SSL_METHOD *ssl_method; +-#else +- SSL_METHOD *ssl_method; +-#endif + #elif defined(WITH_NSS) /* WITH_OPENSSL */ + SECStatus status; + #endif /* WITH_OPENSSL | WITH_NSS */ +@@ -315,22 +310,32 @@ + } + + #ifdef WITH_OPENSSL +- +- SSL_library_init(); +- SSL_load_error_strings(); + +- ssl_method = TLSv1_client_method(); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ SSL_load_error_strings(); ++ SSL_library_init(); + +- if (!ssl_method) { +- return 0; +- } ++ ssl_ctx = SSL_CTX_new(SSLv23_client_method()); ++#else ++ ssl_ctx = SSL_CTX_new(TLS_client_method()); ++#endif + +- ssl_ctx = SSL_CTX_new(ssl_method); + if (!ssl_ctx) { + upslogx(LOG_ERR, "Can not initialize SSL context"); + return -1; + } + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ /* set minimum protocol TLSv1 */ ++ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); ++#else ++ ret = SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION); ++ if (ret != 1) { ++ upslogx(LOG_ERR, "Can not set minimum protocol to TLSv1"); ++ return -1; ++ } ++#endif ++ + if (!certpath) { + if (certverify == 1) { + upslogx(LOG_ERR, "Can not verify certificate if any is specified"); +@@ -737,7 +742,7 @@ + switch(res) + { + case 1: +- upsdebugx(3, "SSL connected"); ++ upsdebugx(3, "SSL connected (%s)", SSL_get_version(ups->ssl)); + break; + case 0: + upslog_with_errno(1, "SSL_connect do not accept handshake."); +--- clients/upssched.c ++++ clients/upssched.c +@@ -794,7 +794,7 @@ + } + + if (!strcmp(cmd, "EXECUTE")) { +- if (ca1 == '\0') { ++ if (ca1[0] == '\0') { + upslogx(LOG_ERR, "Empty EXECUTE command argument"); + return; + } +--- m4/nut_check_libopenssl.m4 ++++ m4/nut_check_libopenssl.m4 +@@ -58,7 +58,7 @@ + + dnl check if openssl is usable + AC_CHECK_HEADERS(openssl/ssl.h, [nut_have_openssl=yes], [nut_have_openssl=no], [AC_INCLUDES_DEFAULT]) +- AC_CHECK_FUNCS(SSL_library_init, [], [nut_have_openssl=no]) ++ AC_CHECK_FUNCS(SSL_CTX_new, [], [nut_have_openssl=no]) + + if test "${nut_have_openssl}" = "yes"; then + nut_with_ssl="yes" +--- server/netssl.c ++++ server/netssl.c +@@ -274,7 +274,7 @@ + { + case 1: + client->ssl_connected = 1; +- upsdebugx(3, "SSL connected"); ++ upsdebugx(3, "SSL connected (%s)", SSL_get_version(client->ssl)); + break; + + case 0: +@@ -370,13 +370,7 @@ + { + #ifdef WITH_NSS + SECStatus status; +-#elif defined(WITH_OPENSSL) +-#if OPENSSL_VERSION_NUMBER >= 0x10000000L +- const SSL_METHOD *ssl_method; +-#else +- SSL_METHOD *ssl_method; +-#endif +-#endif /* WITH_NSS|WITH_OPENSSL */ ++#endif /* WITH_NSS */ + + if (!certfile) { + return; +@@ -386,18 +380,29 @@ + + #ifdef WITH_OPENSSL + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + SSL_load_error_strings(); + SSL_library_init(); + +- if ((ssl_method = TLSv1_server_method()) == NULL) { ++ ssl_ctx = SSL_CTX_new(SSLv23_server_method()); ++#else ++ ssl_ctx = SSL_CTX_new(TLS_server_method()); ++#endif ++ ++ if (!ssl_ctx) { + ssl_debug(); +- fatalx(EXIT_FAILURE, "TLSv1_server_method failed"); ++ fatalx(EXIT_FAILURE, "SSL_CTX_new failed"); + } + +- if ((ssl_ctx = SSL_CTX_new(ssl_method)) == NULL) { ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ /* set minimum protocol TLSv1 */ ++ SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3); ++#else ++ if (SSL_CTX_set_min_proto_version(ssl_ctx, TLS1_VERSION) != 1) { + ssl_debug(); +- fatalx(EXIT_FAILURE, "SSL_CTX_new failed"); ++ fatalx(EXIT_FAILURE, "SSL_CTX_set_min_proto_version(TLS1_VERSION)"); + } ++#endif + + if (SSL_CTX_use_certificate_chain_file(ssl_ctx, certfile) != 1) { + ssl_debug(); +--- configure 2021-02-13 22:54:47.106372805 +0100 ++++ - 2021-02-13 22:58:18.010481917 +0100 +@@ -10399,10 +10399,10 @@ + + done + +- for ac_func in SSL_library_init ++ for ac_func in SSL_CTX_new + do : +- ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init" +-if test "x$ac_cv_func_SSL_library_init" = xyes; then : ++ ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new" ++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SSL_LIBRARY_INIT 1 + _ACEOF +@@ -10510,10 +10510,10 @@ + + done + +- for ac_func in SSL_library_init ++ for ac_func in SSL_CTX_new + do : +- ac_fn_c_check_func "$LINENO" "SSL_library_init" "ac_cv_func_SSL_library_init" +-if test "x$ac_cv_func_SSL_library_init" = xyes; then : ++ ac_fn_c_check_func "$LINENO" "SSL_CTX_new" "ac_cv_func_SSL_CTX_new" ++if test "x$ac_cv_func_SSL_CTX_new" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_SSL_LIBRARY_INIT 1 + _ACEOF diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index bf2e50a540e..0f4f1ce5a3b 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -1,7 +1,7 @@ # Template file for 'network-ups-tools' pkgname=network-ups-tools version=2.7.4 -revision=11 +revision=12 wrksrc="nut-${version}" build_style=gnu-configure configure_args=" @@ -11,7 +11,7 @@ configure_args=" --with-libltdl --without-ipmi --without-freeipmi --without-systemdsystemunitdir --with-snmp --with-drvpath=/usr/libexec/nut $(vopt_with cgi) --with-statepath=/run/ups" hostmakedepends="pkg-config" -makedepends="avahi-libs-devel libressl-devel libusb-compat-devel neon-devel +makedepends="avahi-libs-devel openssl-devel libusb-compat-devel neon-devel net-snmp-devel $(vopt_if cgi gd-devel) libltdl-devel" conf_files=" /etc/ups/ups.conf From e2b0bafcad97366bb131da0450a58249d184f5e4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:26 +0100 Subject: [PATCH 204/447] nextcloud-client: rebuild against OpenSSL --- srcpkgs/nextcloud-client/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index dc4398a6319..9969e062461 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,7 +1,7 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client version=3.1.1 -revision=1 +revision=2 wrksrc="desktop-${version}" build_style=cmake configure_args="-Wno-dev $(vopt_if shibboleth '' '-DNO_SHIBBOLETH=True') From d4f5e12717b355949edda8e0f29bdda66dc810e8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:26 +0100 Subject: [PATCH 205/447] nghttp2: rebuild against OpenSSL --- srcpkgs/nghttp2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nghttp2/template b/srcpkgs/nghttp2/template index 6df92fef8f3..8967d79b244 100644 --- a/srcpkgs/nghttp2/template +++ b/srcpkgs/nghttp2/template @@ -1,10 +1,10 @@ # Template file for 'nghttp2' pkgname=nghttp2 version=1.42.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="zlib-devel libressl-devel libevent-devel jansson-devel +makedepends="zlib-devel openssl-devel libevent-devel jansson-devel libev-devel c-ares-devel" checkdepends="libcppunit-devel" short_desc="HTTP/2 C Library" From 66fcfcc9a429a8c450b74a1355742ea727f913bf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:26 +0100 Subject: [PATCH 206/447] nginx: rebuild against OpenSSL --- srcpkgs/nginx/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index 14dd2dec287..e6a98933f0f 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -3,7 +3,7 @@ pkgname=nginx version=1.18.0 revision=3 build_style=gnu-makefile -hostmakedepends="libressl-devel pcre-devel $(vopt_if geoip geoip-devel)" +hostmakedepends="openssl-devel pcre-devel $(vopt_if geoip geoip-devel)" makedepends="${hostmakedepends}" short_desc="High performance web and reverse proxy server" maintainer="Orphaned " From bd3f1e07d7b220bc42df8861b3c1b23258f24ba0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:26 +0100 Subject: [PATCH 207/447] ngircd: rebuild against OpenSSL --- srcpkgs/ngircd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index 1ed799b794f..7634efdfdc2 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -1,11 +1,11 @@ # Template file for 'ngircd' pkgname=ngircd version=26 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-ipv6 --with-openssl --without-ident ac_cv_func_getaddrinfo=yes" hostmakedepends="pkg-config" -makedepends="zlib-devel libressl-devel" +makedepends="zlib-devel openssl-devel" conf_files="/etc/ngircd.conf" short_desc="Free, portable and lightweight Internet Relay Chat server" maintainer="Orphaned " From e511c98d9f0f09ac9a77ebe487053a44a6d1da4a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:27 +0100 Subject: [PATCH 208/447] nix: rebuild against OpenSSL --- srcpkgs/nix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 17648c62b2a..be65950c14a 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,13 +1,13 @@ # Template file for 'nix' pkgname=nix version=2.3.9 -revision=1 +revision=2 build_style=gnu-configure # Use /nix/var as suggested by the official Manual. configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh" hostmakedepends="curl pkg-config flex tar xz" makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel - liblzma-devel libressl-devel libsodium-devel sqlite-devel + liblzma-devel openssl-devel libsodium-devel sqlite-devel libseccomp-devel editline-devel" depends="curl tar xz" short_desc="Purely functional package manager" From 5a8665960ff21840cbea4631c8f7dea9ebb9129e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:27 +0100 Subject: [PATCH 209/447] nmap: rebuild against OpenSSL --- srcpkgs/nmap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index 7429d64cf81..a261abe69ea 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -6,7 +6,7 @@ revision=5 build_style=gnu-configure configure_args="--without-ndiff --with-openssl --with-zenmap $(vopt_with lua liblua)" hostmakedepends="python" -makedepends="libpcap-devel libressl-devel libssh2-devel pcre-devel +makedepends="libpcap-devel openssl-devel libssh2-devel pcre-devel $(vopt_if lua lua53-devel)" short_desc="Utility for network discovery and security auditing" maintainer="Piraty " From 324322fbe9353be5d06f38da5e7506bd32f9c3e7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:27 +0100 Subject: [PATCH 210/447] nmh: rebuild against OpenSSL --- srcpkgs/nmh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template index 070ea37e54c..0c234f74d82 100644 --- a/srcpkgs/nmh/template +++ b/srcpkgs/nmh/template @@ -1,10 +1,10 @@ # Template file for 'nmh' pkgname=nmh version=1.7.1 -revision=5 +revision=6 build_style=gnu-configure configure_args="--with-cyrus-sasl --with-tls" -makedepends="db-devel libcurl-devel libressl-devel libsasl-devel ncurses-devel" +makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel" checkdepends="groff lynx tzdata tar" conf_files="/etc/nmh/*" short_desc="Message Handling System (New RAND Mail Handler)" From 0ed5b3b674256cd1c9e5ae795138bfd6103e77a5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:27 +0100 Subject: [PATCH 211/447] nrpe: rebuild against OpenSSL --- srcpkgs/nrpe/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nrpe/template b/srcpkgs/nrpe/template index d466c7dc856..6a598b0909e 100644 --- a/srcpkgs/nrpe/template +++ b/srcpkgs/nrpe/template @@ -1,7 +1,7 @@ # Template file for 'nrpe' pkgname=nrpe version=4.0.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-pkgsysconfdir=/etc/nagios --with-pluginsdir=/usr/lib/monitoring-plugins --with-nagios-user=_nagios @@ -9,7 +9,7 @@ configure_args="--with-pkgsysconfdir=/etc/nagios --with-ssl-inc=${XBPS_CROSS_BASE}/usr/include" make_build_args="nrpe" make_install_args="install-daemon install-config" -makedepends="libressl-devel" +makedepends="openssl-devel" depends="monitoring-plugins" make_dirs="/etc/nagios 0775 _nagios _nagios" conf_files="/etc/nagios/nrpe.cfg" From d9f37295b95a27d9c04e3226b2004796e217068b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:28 +0100 Subject: [PATCH 212/447] ntp: rebuild against OpenSSL --- srcpkgs/ntp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index efdbe31c339..fa88f33f92b 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,12 +1,12 @@ # Template file for 'ntp' pkgname=ntp version=4.2.8p15 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd --enable-all-clocks ol_cv_pthread_select_yields=yes" hostmakedepends="pkg-config bison perl" -makedepends="libedit-devel libressl-devel libcap-devel libevent-devel pps-tools-devel" +makedepends="libedit-devel openssl-devel libcap-devel libevent-devel pps-tools-devel" short_desc="Network Time Protocol daemon and utilities" maintainer="Orphaned " license="NTP" From 42a9fad4271c442d443d451b9e6a4ccec17c1761 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:28 +0100 Subject: [PATCH 213/447] nushell: rebuild against OpenSSL --- srcpkgs/nushell/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nushell/template b/srcpkgs/nushell/template index 9a14dc1771e..b7905e70e4b 100644 --- a/srcpkgs/nushell/template +++ b/srcpkgs/nushell/template @@ -5,7 +5,7 @@ revision=2 build_style=cargo configure_args="--features=extra" hostmakedepends="pkg-config python3 libgit2-devel" -makedepends="libressl-devel libgit2-devel libX11-devel libxcb-devel" +makedepends="openssl-devel libgit2-devel libX11-devel libxcb-devel" short_desc="Modern shell for the GitHub era" maintainer="Jan Christian Grünhage " license="MIT" From 845df395581b1751b5f3c67a94cffc3af5724989 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:28 +0100 Subject: [PATCH 214/447] nzbget: rebuild against OpenSSL --- srcpkgs/nzbget/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nzbget/template b/srcpkgs/nzbget/template index f40dbb60d8c..3dfdc9154f1 100644 --- a/srcpkgs/nzbget/template +++ b/srcpkgs/nzbget/template @@ -1,7 +1,7 @@ # Template file for 'nzbget' pkgname=nzbget version=21.0 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-tlslib=OpenSSL --with-libcurses-includes=${XBPS_CROSS_BASE}/usr/include @@ -9,7 +9,7 @@ configure_args="--with-tlslib=OpenSSL --with-zlib-includes=${XBPS_CROSS_BASE}/usr/include --with-zlib-libraries=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="pkg-config" -makedepends="libxml2-devel ncurses-devel libressl-devel" +makedepends="libxml2-devel ncurses-devel openssl-devel" short_desc="Download from Usenet using .nzb files" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" From dd07ad898991b2bd96fdc7b7ea19b0966cea1935 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:28 +0100 Subject: [PATCH 215/447] open-iscsi: rebuild against OpenSSL --- srcpkgs/open-iscsi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template index b67ae2bb725..7cd8308b049 100644 --- a/srcpkgs/open-iscsi/template +++ b/srcpkgs/open-iscsi/template @@ -1,11 +1,11 @@ # Template file for 'open-iscsi' pkgname=open-iscsi version=2.1.3 -revision=1 +revision=2 conf_files="/etc/iscsi/iscsid.conf /etc/iscsi/initiatorname.iscsi" build_style=gnu-configure hostmakedepends="automake libtool pkg-config" -makedepends="libisns-devel libkmod-devel libmount-devel libressl-devel" +makedepends="libisns-devel libkmod-devel libmount-devel openssl-devel" short_desc="Open-iSCSI userland tools" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" From 53ef55468ef403a4d1f6503f3e292b095035beef Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:28 +0100 Subject: [PATCH 216/447] open-isns: rebuild against OpenSSL --- srcpkgs/open-isns/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/open-isns/template b/srcpkgs/open-isns/template index a92c52bfcf4..2d7a0ddbef9 100644 --- a/srcpkgs/open-isns/template +++ b/srcpkgs/open-isns/template @@ -4,7 +4,7 @@ version=0.101 revision=1 build_style=gnu-configure configure_args="--enable-shared" -makedepends="libressl-devel" +makedepends="openssl-devel" make_install_args="install install_hdrs install_lib SYSTEMDDIR=/tmp" conf_files="/etc/isns/isnsdd.conf /etc/isns/isnsd.conf /etc/isns/isnsadm.conf" short_desc="Server and client for iSNS" From 45a4ee5d2d7a9bba4ddc4887a2c8c19e8e783bac Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:29 +0100 Subject: [PATCH 217/447] opendkim: rebuild against OpenSSL --- .../patches/openssl_1.1.0_compat.patch | 90 +++++++++++++++++++ srcpkgs/opendkim/template | 10 ++- 2 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch new file mode 100644 index 00000000000..3957bb12bcb --- /dev/null +++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch @@ -0,0 +1,90 @@ +Description: Build and work with either openssl 1.0.2 or 1.1.0 + * Add patch to build with either openssl 1.0.2 or 1.1.0 (Closes: #828466) + - Thanks to Sebastian Andrzej Siewior for the patch +Author: Sebastian Andrzej Siewior +Bug-Debian: http://bugs.debian.org/828466 +Origin: vendor +Forwarded: no +Reviewed-By: Scott Kitterman +Last-Update: + +--- 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 ]], ++ [[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 " license="BSD-3-Clause, Sendmail" @@ -14,6 +14,10 @@ distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz" checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b python_version=2 #unverified +pre_configure() { + autoreconf -fi +} + post_install() { vlicense LICENSE vlicense LICENSE.Sendmail From 97013c937a58883ede21e7e9caf5697899a03bda Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:29 +0100 Subject: [PATCH 218/447] openfortivpn: rebuild against OpenSSL --- srcpkgs/openfortivpn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openfortivpn/template b/srcpkgs/openfortivpn/template index 846d7d72512..3ba99f7b266 100644 --- a/srcpkgs/openfortivpn/template +++ b/srcpkgs/openfortivpn/template @@ -1,7 +1,7 @@ # Template file for 'openfortivpn' pkgname=openfortivpn version=1.16.0 -revision=1 +revision=2 build_style=gnu-configure configure_args=" --enable-proc @@ -11,7 +11,7 @@ configure_args=" --with-resolvconf=/usr/bin/resolvconf --with-rt_dst" hostmakedepends="autoconf automake pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Client for PPP+SSL VPN tunnel services" maintainer="Duncaen " license="GPL-3.0-or-later" From 550ac569bc144edc362a77b662aa16ecd52669ab Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:29 +0100 Subject: [PATCH 219/447] openldap: rebuild against OpenSSL --- srcpkgs/openldap/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openldap/template b/srcpkgs/openldap/template index 850a60b132c..ba4e3cee2e6 100644 --- a/srcpkgs/openldap/template +++ b/srcpkgs/openldap/template @@ -1,7 +1,7 @@ # Template file for 'openldap' pkgname=openldap version=2.4.57 -revision=1 +revision=2 build_style=gnu-configure configure_args="--prefix=/usr --libexecdir=/usr/libexec @@ -14,7 +14,7 @@ configure_args="--prefix=/usr --enable-bdb --enable-hdb --enable-overlays=mod --enable-meta=mod --disable-static --with-yielding_select=yes --enable-modules" hostmakedepends="pkg-config groff automake libtool" -makedepends="libressl-devel libsasl-devel db-devel libltdl-devel" +makedepends="openssl-devel libsasl-devel db-devel libltdl-devel" depends="openldap-tools>=${version}_${revision}" conf_files="/etc/openldap/ldap.conf /etc/openldap/slapd.conf" short_desc="OpenLDAP (Lightweight Directory Access Protocol)" From 5a09c2147f07120f07d44312bcf45ee1db9be4c4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:29 +0100 Subject: [PATCH 220/447] opensc: rebuild against OpenSSL --- srcpkgs/opensc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template index 84e085bd326..596cd849584 100644 --- a/srcpkgs/opensc/template +++ b/srcpkgs/opensc/template @@ -1,13 +1,13 @@ # Template file for 'opensc' pkgname=opensc version=0.21.0 -revision=1 +revision=2 wrksrc="OpenSC-${version}" build_style=gnu-configure configure_args="--enable-man --enable-sm --enable-static=no --enable-doc --with-xsl-stylesheetsdir=/usr/share/xsl/docbook" hostmakedepends="automake docbook-xsl libtool libxslt pkg-config" -makedepends="libressl-devel pcsclite-devel readline-devel zlib-devel" +makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel" short_desc="Tools and libraries for smart cards" maintainer="Orphaned " license="LGPL-2.1-or-later" From 320f5610d0e0a2bfa0b51ac18d1e0ca261a9feee Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:30 +0100 Subject: [PATCH 221/447] opensmtpd: rebuild against OpenSSL --- srcpkgs/opensmtpd/template | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 971f78680b5..10890fec2a4 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -1,7 +1,7 @@ # Template file for 'opensmtpd' pkgname=opensmtpd version=6.8.0p2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-path-socket=/run --with-path-pidfile=/run @@ -9,17 +9,12 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt --with-maildir=/var/mail --with-auth-pam=smtpd - ac_cv_func_arc4random=yes - ac_cv_func_arc4random_buf=yes - ac_cv_func_arc4random_stir=no - ac_cv_func_arc4random_uniform=yes - ac_cv_search_arc4random=-lcrypto ac_cv_func_explicit_bzero=no ac_cv_func_reallocarray=no ac_cv_func_strlcat=no ac_cv_func_strlcpy=no" hostmakedepends="automake libtool pkg-config bison" -makedepends="zlib-devel libressl-devel libevent-devel db-devel pam-devel" +makedepends="zlib-devel openssl-devel libevent-devel db-devel pam-devel" depends="ca-certificates" conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases" short_desc="Free implementation of the server-side SMTP protocol" From a9321375571f00ed4d2f2660a21f0008b3c10393 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:30 +0100 Subject: [PATCH 222/447] openssh: rebuild against OpenSSL --- srcpkgs/openssh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index 119ba23a2a1..71d85964fbf 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -17,7 +17,7 @@ configure_args="--datadir=/usr/share/openssh hostmakedepends="automake" makedepends="libedit-devel pam-devel zlib-devel $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldns 'libldns-devel') - $(vopt_if ssl 'libressl-devel') $(vopt_if fido2 'libfido2-devel')" + $(vopt_if ssl 'openssl-devel') $(vopt_if fido2 'libfido2-devel')" short_desc="OpenSSH free Secure Shell (SSH) client and server implementation" maintainer="Leah Neukirchen " license="BSD-2-Clause, ISC" From 5baa204ad14f11f5e6cbe0f8fa1c2fb72de065a1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:30 +0100 Subject: [PATCH 223/447] openvswitch: rebuild against OpenSSL --- srcpkgs/openvswitch/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openvswitch/template b/srcpkgs/openvswitch/template index e158dd8b0a5..a4a0b541ed9 100644 --- a/srcpkgs/openvswitch/template +++ b/srcpkgs/openvswitch/template @@ -7,7 +7,7 @@ build_style=gnu-configure configure_args="--with-rundir=/run/openvswitch" pycompile_dirs="usr/share/openvswitch/python" hostmakedepends="pkg-config python3" -makedepends="libressl-devel libcap-ng-devel" +makedepends="openssl-devel libcap-ng-devel" depends="python" short_desc="Production quality, multilayer virtual switch" maintainer="Renato Aguiar " From 7c6385e5be62146e2a4aa70eeea1c121b06514b6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:30 +0100 Subject: [PATCH 224/447] opkg: rebuild against OpenSSL --- srcpkgs/opkg/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template index b46ee5dc5bb..a1c1c2a910e 100644 --- a/srcpkgs/opkg/template +++ b/srcpkgs/opkg/template @@ -1,7 +1,7 @@ # Template file for 'opkg' pkgname=opkg version=0.4.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-sha256 --without-libsolv --with-static-libopkg $(vopt_if ssl '--enable-openssl --enable-ssl-curl') $(vopt_enable gpg)" From 0646eb42b499d9ad6d966c4e920a90ae64ad32de Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:31 +0100 Subject: [PATCH 225/447] opmsg: rebuild against OpenSSL --- srcpkgs/opmsg/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/opmsg/template b/srcpkgs/opmsg/template index 41c452b8e4b..eef0965e2d0 100644 --- a/srcpkgs/opmsg/template +++ b/srcpkgs/opmsg/template @@ -1,12 +1,12 @@ # Template file for 'opmsg' pkgname=opmsg version=1.78s -revision=3 +revision=4 wrksrc="${pkgname}-rel-${version}" build_wrksrc=src build_style=gnu-makefile make_use_env=yes -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Replacement for gpg which can encrypt/sign/verify your mails" maintainer="travankor " license="GPL-3.0-or-later" @@ -17,7 +17,6 @@ checksum=e5dd6aaafddceb1c9eda755acc6763f91a2d724bd6b58214d198c9e72c8043da do_configure() { vsed -e "s|^INC=.*|INC += -I${XBPS_CROSS_BASE}/usr/include|" \ -e "10iLIBS+=-L${XBPS_CROSS_BASE}/usr/lib" \ - -e 's|^DEFS=$|DEFS += -DHAVE_LIBRESSL|' \ -e "s|^LDFLAGS=$|LDFLAGS+=-L${XBPS_CROSS_BASE}/usr/lib|" \ -e "s|^CXX=c++$|CXX=${CXX}|" \ -e 's|^LD=c++$|LD=$(CXX)|' \ From 1bc4852b0454641079a81aa1d188a5eb4c4664ad Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:31 +0100 Subject: [PATCH 226/447] opusfile: rebuild against OpenSSL --- srcpkgs/opusfile/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template index 115f2ea9d36..2b2169eed3c 100644 --- a/srcpkgs/opusfile/template +++ b/srcpkgs/opusfile/template @@ -1,10 +1,10 @@ # Template file for 'opusfile' pkgname=opusfile version=0.12 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" -makedepends="libogg-devel opus-devel libressl-devel" +makedepends="libogg-devel opus-devel openssl-devel" short_desc="Library for opening, seeking, and decoding .opus files" maintainer="Orphaned " license="BSD-3-Clause" From 2303b0faaeb9170d8044fc7a54fe295f05e40e95 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:31 +0100 Subject: [PATCH 227/447] pacman: rebuild against OpenSSL --- srcpkgs/pacman/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template index 0ea2567b905..d23aba0468b 100644 --- a/srcpkgs/pacman/template +++ b/srcpkgs/pacman/template @@ -1,7 +1,7 @@ # Template file for 'pacman' pkgname=pacman version=5.2.2 -revision=1 +revision=2 make_dirs="/var/lib/pacman 0755 root root /usr/var/cache/pacman/pkg 0755 root root /usr/share/libalpm/hooks 0755 root root" From da974c55e490658e8491cc5527a7ddf44eefc87e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:31 +0100 Subject: [PATCH 228/447] pam-u2f: rebuild against OpenSSL --- srcpkgs/pam-u2f/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template index 285e1ae4229..7c1b5034a28 100644 --- a/srcpkgs/pam-u2f/template +++ b/srcpkgs/pam-u2f/template @@ -1,12 +1,12 @@ # Template file for 'pam-u2f' pkgname=pam-u2f version=1.1.0 -revision=1 +revision=2 wrksrc="${pkgname/-/_}-${version}" build_style=gnu-configure configure_args="--with-pam-dir=/usr/lib/security" hostmakedepends="automake libtool pkg-config asciidoc" -makedepends="libfido2-devel libressl-devel pam-devel" +makedepends="libfido2-devel openssl-devel pam-devel" short_desc="Pluggable Authentication Module (PAM) for U2F" maintainer="Michael Aldridge " license="BSD-2-Clause" From 763ed699b1a45b075b249622189378c7a03bab66 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:31 +0100 Subject: [PATCH 229/447] pam_ssh: rebuild against OpenSSL --- srcpkgs/pam_ssh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template index f8a17f44cc9..eba01a0fa45 100644 --- a/srcpkgs/pam_ssh/template +++ b/srcpkgs/pam_ssh/template @@ -1,13 +1,13 @@ # Template file for 'pam_ssh' pkgname=pam_ssh version=2.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-pam-dir=/usr/lib/security ac_cv_openssldir=/usr --includedir=${XBPS_CROSS_BASE}/usr/include --libdir=${XBPS_CROSS_BASE}/usr/lib" hostmakedepends="openssh" -makedepends="libressl-devel pam-devel" +makedepends="openssl-devel pam-devel" short_desc="PAM module providing single sign-on behavior for SSH" maintainer="Alexander Gehrke " license="BSD-2-Clause" From 29ff17cf51e69bbafd6effa2ec4a26833dfc52f8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:32 +0100 Subject: [PATCH 230/447] pam_ssh_agent_auth: rebuild against OpenSSL --- .../pam_ssh_agent_auth/patches/openssl.patch | 881 ++++++++++++++++++ srcpkgs/pam_ssh_agent_auth/template | 5 +- 2 files changed, 884 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/pam_ssh_agent_auth/patches/openssl.patch diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch new file mode 100644 index 00000000000..bda9a37a5ff --- /dev/null +++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch @@ -0,0 +1,881 @@ +From eef90424a0545b7b0125dfaf5e3cef3c5248ada0 Mon Sep 17 00:00:00 2001 +From: Guido Falsi +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 " license="MIT" From ec1e0ebb0371be6f2a37ce5ba286ce078c4b7d51 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:32 +0100 Subject: [PATCH 231/447] partclone: rebuild against OpenSSL --- srcpkgs/partclone/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template index 59c975d9354..4813a8a250d 100644 --- a/srcpkgs/partclone/template +++ b/srcpkgs/partclone/template @@ -1,14 +1,14 @@ # Template file for 'partclone' pkgname=partclone version=0.3.17 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-rpath --enable-ncursesw --enable-f2fs --enable-extfs --enable-hfsp --enable-fat --enable-exfat --enable-ntfs --enable-btrfs --enable-minix --enable-nilfs2" hostmakedepends="pkg-config automake autoconf libtool" makedepends="e2fsprogs-devel libuuid-devel ncurses-devel ntfs-3g-devel - nilfs-utils-devel libressl-devel" + nilfs-utils-devel openssl-devel" short_desc="File system clone and restore utilities" maintainer="Orphaned " license="GPL-2.0-or-later" From 823788c776d43c9623bda366266236fc6eabd822 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:32 +0100 Subject: [PATCH 232/447] pen: rebuild against OpenSSL --- srcpkgs/pen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template index 574ae3c928a..d55a7f21272 100644 --- a/srcpkgs/pen/template +++ b/srcpkgs/pen/template @@ -1,9 +1,9 @@ # Template file for 'pen' pkgname=pen version=0.34.1 -revision=5 +revision=6 build_style=gnu-configure -makedepends="geoip-devel libressl-devel" +makedepends="geoip-devel openssl-devel" configure_args="--with-docdir=/usr/share/doc/pen" short_desc="Load balancer for simple TCP/UDP based protocols" maintainer="Orphaned " From 4c42c4f894af9f5507320ba2b4e25d39229e6534 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:32 +0100 Subject: [PATCH 233/447] perl-Crypt-OpenSSL-Bignum: rebuild against OpenSSL --- srcpkgs/perl-Crypt-OpenSSL-Bignum/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template index 5be6d0e1cea..0d6407501fb 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-Bignum/template +++ b/srcpkgs/perl-Crypt-OpenSSL-Bignum/template @@ -1,11 +1,11 @@ # Template file for 'perl-Crypt-OpenSSL-Bignum' pkgname=perl-Crypt-OpenSSL-Bignum version=0.09 -revision=11 +revision=12 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl" -makedepends="perl libressl-devel" +makedepends="perl openssl-devel" depends="${hostmakedepends}" short_desc="Crypt::OpenSSL::Bignum - OpenSSL multiprecision integer arithmetic" maintainer="Orphaned " From d874392fa2a72c9fd2c15ab1686ab9ef55d1781c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:32 +0100 Subject: [PATCH 234/447] perl-Crypt-OpenSSL-RSA: rebuild against OpenSSL --- srcpkgs/perl-Crypt-OpenSSL-RSA/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Crypt-OpenSSL-RSA/template b/srcpkgs/perl-Crypt-OpenSSL-RSA/template index 2c004efbe61..ad093d06840 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-RSA/template +++ b/srcpkgs/perl-Crypt-OpenSSL-RSA/template @@ -1,11 +1,11 @@ # Template file for 'perl-Crypt-OpenSSL-RSA' pkgname=perl-Crypt-OpenSSL-RSA version=0.31 -revision=6 +revision=7 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl perl-Crypt-OpenSSL-Guess" -makedepends="perl libressl-devel" +makedepends="perl openssl-devel" depends="perl" checkdepends="perl-Crypt-OpenSSL-Random" short_desc="Crypt::OpenSSL::RSA - RSA encoding and decoding" From 64eb69a0885f655312b5074325692175451e4a58 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:33 +0100 Subject: [PATCH 235/447] perl-Crypt-OpenSSL-Random: rebuild against OpenSSL --- srcpkgs/perl-Crypt-OpenSSL-Random/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Crypt-OpenSSL-Random/template b/srcpkgs/perl-Crypt-OpenSSL-Random/template index fa24a5ff2e0..d81f4b99f7a 100644 --- a/srcpkgs/perl-Crypt-OpenSSL-Random/template +++ b/srcpkgs/perl-Crypt-OpenSSL-Random/template @@ -1,11 +1,11 @@ # Template file for 'perl-Crypt-OpenSSL-Random' pkgname=perl-Crypt-OpenSSL-Random version=0.15 -revision=9 +revision=10 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module hostmakedepends="perl perl-Crypt-OpenSSL-Guess" -makedepends="perl libressl-devel" +makedepends="perl openssl-devel" depends="perl" short_desc="Crypt::OpenSSL::Random - OpenSSL PRNG" maintainer="Kevin Berry " From 523a2cb23987e9f15efadc133e4437df8c1b1479 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:33 +0100 Subject: [PATCH 236/447] perl-DBD-mysql: rebuild against OpenSSL --- srcpkgs/perl-DBD-mysql/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/perl-DBD-mysql/template b/srcpkgs/perl-DBD-mysql/template index a647f5bd13c..0f2f563136f 100644 --- a/srcpkgs/perl-DBD-mysql/template +++ b/srcpkgs/perl-DBD-mysql/template @@ -5,7 +5,7 @@ revision=6 wrksrc="DBD-mysql-${version}" build_style=perl-module hostmakedepends="perl perl-DBI perl-Devel-CheckLib" -makedepends="${hostmakedepends} libmariadbclient-devel libressl-devel zlib-devel" +makedepends="${hostmakedepends} libmariadbclient-devel openssl-devel zlib-devel" depends="perl-DBI" checkdepends="perl-Test-Deep" short_desc="DBD::mysql - MySQL DBI driver" From 6e66e1c47a4f29d11ac7dd97c4e047cc1eae9bfb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:33 +0100 Subject: [PATCH 237/447] perl-Net-SSH2: rebuild against OpenSSL --- srcpkgs/perl-Net-SSH2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/perl-Net-SSH2/template b/srcpkgs/perl-Net-SSH2/template index a8bab131d2c..541ad9a6e03 100644 --- a/srcpkgs/perl-Net-SSH2/template +++ b/srcpkgs/perl-Net-SSH2/template @@ -1,7 +1,7 @@ # Template file for 'perl-Net-SSH2' pkgname=perl-Net-SSH2 version=0.72 -revision=1 +revision=2 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module configure_args="inc=${XBPS_CROSS_BASE}/usr/include lib=${XBPS_CROSS_BASE}/usr/lib" From 8af07f2fdee7be5a9c994f6c434c2f9704742016 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:33 +0100 Subject: [PATCH 238/447] perl-Net-SSLeay: rebuild against OpenSSL --- srcpkgs/perl-Net-SSLeay/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/perl-Net-SSLeay/template b/srcpkgs/perl-Net-SSLeay/template index 1033a5ac930..0170dffa670 100644 --- a/srcpkgs/perl-Net-SSLeay/template +++ b/srcpkgs/perl-Net-SSLeay/template @@ -4,8 +4,8 @@ version=1.90 revision=1 wrksrc="${pkgname/perl-/}-${version}" build_style=perl-module -hostmakedepends="perl libressl" -makedepends="perl zlib-devel libressl-devel" +hostmakedepends="perl openssl" +makedepends="perl zlib-devel openssl-devel" depends="perl" checkdepends="perl-Test-Warn perl-Test-NoWarnings perl-Test-Exception perl-Test-Pod" short_desc="Net::SSLeay - Perl extension for using OpenSSL" From 05963c495973f84d109178f81a7f1e504754a5e5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:33 +0100 Subject: [PATCH 239/447] pev: rebuild against OpenSSL --- srcpkgs/pev/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pev/template b/srcpkgs/pev/template index 14c40aa13ed..4a55528f83b 100644 --- a/srcpkgs/pev/template +++ b/srcpkgs/pev/template @@ -1,11 +1,11 @@ # Template file for 'pev' pkgname=pev version=0.81 -revision=1 +revision=2 build_style=gnu-makefile make_build_args="prefix=/usr sysconfdir=/etc" make_install_args="prefix=/usr sysconfdir=/etc" -makedepends="libressl-devel pcre-devel" +makedepends="openssl-devel pcre-devel" # We don't need python for check, only their PE binary is needed checkdepends="which python3" short_desc="PE file analysis toolkit" From 5925b8962739c1fff3f2581ec71da578fad3b34b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:34 +0100 Subject: [PATCH 240/447] pgadmin3: unbundle libssh2 --- .../patches/pgadmin3_unbundle-libssh.patch | 68 +++++++++++++++++++ srcpkgs/pgadmin3/template | 8 ++- 2 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch new file mode 100644 index 00000000000..f3bcf852150 --- /dev/null +++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch @@ -0,0 +1,68 @@ +diff -rupN configure.ac.in configure.ac.in +--- configure.ac.in 2020-03-24 05:15:11.000000000 +0100 ++++ configure.ac.in 2020-04-09 14:54:07.189090418 +0200 +@@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio. + AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h]) + AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no]) + AM_CONDITIONAL([HAVE_SYS_UN_H], test "x$have_sys_un_h" = xyes) +-AC_CONFIG_HEADERS([pgadmin/include/libssh2/libssh2_config.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL +diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk +--- pgadmin/include/module.mk 2020-03-24 05:15:11.000000000 +0100 ++++ pgadmin/include/module.mk 2020-04-09 14:54:07.190090419 +0200 +@@ -36,5 +36,4 @@ include include/gqb/module.mk + include include/hotdraw/module.mk + include include/utils/module.mk + include include/ogl/module.mk +-include include/libssh2/module.mk + +diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am +--- pgadmin/Makefile.am 2020-03-24 05:15:11.000000000 +0100 ++++ pgadmin/Makefile.am 2020-04-09 14:54:09.880094260 +0200 +@@ -49,7 +49,6 @@ include gqb/module.mk + include hotdraw/module.mk + include ui/module.mk + include utils/module.mk +-include libssh2/module.mk + + if SUN_CC + __CFLAGS="" +@@ -80,10 +79,9 @@ nobase_dist_pkgdata_DATA += \ + $(TMP_ui) + endif + +-if BUILD_SSH_TUNNEL +-AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ) +-else + AM_CPPFLAGS = -DDATA_DIR=\"$(pkgdatadir)/\" -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ) ++if BUILD_SSH_TUNNEL ++AM_LDFLAGS = -lssh2 + endif + + # Automake trys to execute install-exec-hook if it appears anywhere in the file, so we need a dummy +@@ -100,11 +98,7 @@ nobase_dist_data_DATA += \ + $(TMP_ui) + endif + +-if BUILD_SSH_TUNNEL +-AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include -I$(top_srcdir)/pgadmin/include/libssh2 $(__CPPFLAGS) $(__EDB_LIBPQ) +-else + AM_CPPFLAGS = -I$(top_srcdir)/pgadmin/include $(__CPPFLAGS) $(__EDB_LIBPQ) +-endif + + install-exec-hook: + cd $(bindir) ;\ +diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp +--- pgadmin/utils/sshTunnel.cpp 2020-03-24 05:15:11.000000000 +0100 ++++ pgadmin/utils/sshTunnel.cpp 2020-04-09 14:54:07.191090420 +0200 +@@ -15,7 +15,7 @@ + + #undef ssize_t + #define ssize_t long +-#include "libssh2/libssh2.h" ++#include + #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 " license="0BSD" @@ -15,7 +16,8 @@ nocross=yes CXXFLAGS="-Wno-narrowing" -post_extract() { +pre_configure() { + autoreconf -fi sed -i 's/wxrc/&-3.0/' pgadmin/ui/embed-xrc sed -i 's,${WX_HOME}/bin/wx-config,&-gtk3,g' configure } From 41940d8a8a15ec382e6a42126571fe70a92aab92 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:34 +0100 Subject: [PATCH 241/447] pgbackrest: rebuild against OpenSSL --- srcpkgs/pgbackrest/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pgbackrest/template b/srcpkgs/pgbackrest/template index 92d52abe21a..b501ed9385e 100644 --- a/srcpkgs/pgbackrest/template +++ b/srcpkgs/pgbackrest/template @@ -1,12 +1,12 @@ # Template file for 'pgbackrest' pkgname=pgbackrest version=2.26 -revision=2 +revision=3 wrksrc="${pkgname}-release-${version}" build_wrksrc="src" build_style=gnu-configure hostmakedepends="perl pkg-config" -makedepends="libressl-devel libxml2-devel perl postgresql-libs-devel zlib-devel" +makedepends="openssl-devel libxml2-devel perl postgresql-libs-devel zlib-devel" short_desc="Reliable PostgreSQL Backup & Restore" maintainer="Anachron " license="MIT" From 8991eb0716d61fcf353765f72a47fa5bceef983e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:35 +0100 Subject: [PATCH 242/447] pidgin-sipe: rebuild against OpenSSL --- srcpkgs/pidgin-sipe/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template index a51d5b1035a..9ea248618f4 100644 --- a/srcpkgs/pidgin-sipe/template +++ b/srcpkgs/pidgin-sipe/template @@ -1,10 +1,10 @@ # Template file for 'pidgin-sipe' pkgname=pidgin-sipe version=1.25.0 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config intltool" -makedepends="pidgin-devel libressl-devel libxml2-devel dbus-glib-devel +makedepends="pidgin-devel openssl-devel libxml2-devel dbus-glib-devel libnice-devel gst-plugins-base1-devel farstream-devel" depends="pidgin gst-plugins-bad1 gst-libav gst-plugins-good1 gst-plugins-ugly1" short_desc="SIP/SIMPLE plugin for Pidgin IM" From c4efdf8f48d6b40518c11f5abf6e23e07c70f2fa Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:35 +0100 Subject: [PATCH 243/447] pijul: rebuild against OpenSSL --- srcpkgs/pijul/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index 2a750381983..40df186b938 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,11 +1,11 @@ # Template file for 'pijul' pkgname=pijul version=0.12.2 -revision=3 +revision=4 build_style=cargo _sequoia_ver=0.9.0 hostmakedepends="pkg-config clang" -makedepends="libsodium-devel libressl-devel nettle-devel" +makedepends="libsodium-devel openssl-devel nettle-devel" short_desc="Distributed version control system based on patches" maintainer="Toyam Cox " license="GPL-2.0-only" From 60b91fb09672ca42cafd6d18972874a99c2c260e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:35 +0100 Subject: [PATCH 244/447] pjproject: rebuild against OpenSSL --- srcpkgs/pjproject/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template index 9915f8a0da6..c94ead90e9d 100644 --- a/srcpkgs/pjproject/template +++ b/srcpkgs/pjproject/template @@ -3,7 +3,7 @@ # and this template is heavily based on Alpine's APKBUILD. pkgname=pjproject version=2.8 -revision=4 +revision=5 disable_parallel_build=yes build_style=gnu-configure configure_args="--enable-shared \ @@ -16,7 +16,7 @@ configure_args="--enable-shared \ # libyuv packaged for Void. Thought I could be smart and use # webrtc-audio-processing, but it doesn't have what I need. Using the # bundled versions would also pollute build with libyuv and libwebrtc (yuck). -makedepends="libressl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel +makedepends="openssl-devel alsa-lib-devel libgsm-devel speex-devel speexdsp-devel libsrtp-devel libsamplerate-devel" short_desc="Open source SIP and media stack" maintainer="Christopher Brannon " From ac4dc9936224407c7806e1ff3ec599ce5a9cdabc Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:35 +0100 Subject: [PATCH 245/447] pkcs11-helper: rebuild against OpenSSL --- srcpkgs/pkcs11-helper/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pkcs11-helper/template b/srcpkgs/pkcs11-helper/template index f7f2bf3730b..1be136f157a 100644 --- a/srcpkgs/pkcs11-helper/template +++ b/srcpkgs/pkcs11-helper/template @@ -1,12 +1,12 @@ # Template file for 'pkcs11-helper' pkgname=pkcs11-helper version=1.25.1 -revision=5 +revision=6 wrksrc="${pkgname}-${pkgname}-${version}" build_style=gnu-configure configure_args="--enable-doc --disable-static $(vopt_enable threading slotevent) $(vopt_enable threading)" hostmakedepends="automake libtool pkg-config doxygen" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Library to help simplify interacting with PKCS#11 providers" maintainer="Aloz1 " license="GPL-2.0-only, BSD-3-Clause" From e6b994a25d9a79c1cca464abb40b28f065d49ee0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:35 +0100 Subject: [PATCH 246/447] poco: rebuild against OpenSSL --- srcpkgs/poco/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/poco/template b/srcpkgs/poco/template index 99f8fe17780..ce317d041bc 100644 --- a/srcpkgs/poco/template +++ b/srcpkgs/poco/template @@ -1,11 +1,11 @@ # Template file for 'poco' pkgname=poco version=1.9.4 -revision=2 +revision=3 wrksrc="${pkgname}-${version}-all" build_style=cmake configure_args="-DPOCO_UNBUNDLED=ON" -makedepends="libressl-devel zlib-devel pcre-devel expat-devel sqlite-devel" +makedepends="openssl-devel zlib-devel pcre-devel expat-devel sqlite-devel" short_desc="C++ class libraries for building network-based applications" maintainer="Julien Dehos " license="BSL-1.0" From 436ee235113bce2bafa862a13b0961ca934074d2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:36 +0100 Subject: [PATCH 247/447] podofo: rebuild against OpenSSL --- srcpkgs/podofo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/podofo/template b/srcpkgs/podofo/template index b0ed2e0e19c..9bb66cbf8e1 100644 --- a/srcpkgs/podofo/template +++ b/srcpkgs/podofo/template @@ -4,7 +4,7 @@ version=0.9.7 revision=1 build_style=cmake configure_args="-DPODOFO_BUILD_SHARED=TRUE" -makedepends="fontconfig-devel libidn-devel libressl-devel lua53-devel tiff-devel" +makedepends="fontconfig-devel libidn-devel openssl-devel lua53-devel tiff-devel" short_desc="Library to work with the PDF file format" maintainer="Andrea Brancaleoni " license="GPL-2.0-or-later, LGPL-2.1-or-later" From 12898ca631ee8e7698768ff03be8b211561e4a70 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:36 +0100 Subject: [PATCH 248/447] postgresql: rebuild against OpenSSL --- srcpkgs/postgresql/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index e055ff9767c..e5eda8fb05c 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -1,7 +1,7 @@ # Template file for 'postgresql' pkgname=postgresql version=9.6.20 -revision=1 +revision=2 build_style=gnu-configure make_build_target=world configure_args="--with-openssl --with-python @@ -10,7 +10,7 @@ configure_args="--with-openssl --with-python --without-bonjour --with-libxml --with-libxslt --disable-rpath --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs" hostmakedepends="docbook2x flex gettext openjade" -makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl +makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl python-devel readline-devel tcl-devel" checkdepends="tzdata" short_desc="Sophisticated open-source Object-Relational DBMS" From b84a08759bfacaf0662e022f159106118451f235 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:36 +0100 Subject: [PATCH 249/447] postgresql12: rebuild against OpenSSL --- srcpkgs/postgresql12/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template index 0fe9056dc2a..59d1185c889 100644 --- a/srcpkgs/postgresql12/template +++ b/srcpkgs/postgresql12/template @@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python --without-bonjour --with-libxml --with-libxslt --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs" hostmakedepends="docbook2x gettext flex openjade" -makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl +makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl python3-devel readline-devel tcl-devel" checkdepends="tzdata" short_desc="Sophisticated open-source Object-Relational DBMS" From 5955a4083ebcb49064c35920f48eaa42109e3f3b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:37 +0100 Subject: [PATCH 250/447] postgresql13: rebuild against OpenSSL --- srcpkgs/postgresql13/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template index 82ee631a17b..b462d69f279 100644 --- a/srcpkgs/postgresql13/template +++ b/srcpkgs/postgresql13/template @@ -13,7 +13,7 @@ configure_args="--with-openssl --with-python --without-bonjour --with-libxml --with-libxslt --with-system-tzdata=/usr/share/zoneinfo --enable-nls --with-uuid=e2fs" hostmakedepends="docbook2x gettext flex openjade" -makedepends="libfl-devel libressl-devel libuuid-devel libxslt-devel pam-devel perl +makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl python3-devel readline-devel tcl-devel" checkdepends="tzdata" short_desc="Sophisticated open-source Object-Relational DBMS" From 8ed6fa8f64126fb01975c4a1b1cc3794857ba8e6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:37 +0100 Subject: [PATCH 251/447] ppp: rebuild against OpenSSL --- srcpkgs/ppp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template index 64a484a6fc7..5986bd713fd 100644 --- a/srcpkgs/ppp/template +++ b/srcpkgs/ppp/template @@ -6,8 +6,8 @@ # When update this package pkgname=ppp version=2.4.7 -revision=13 -makedepends="libpcap-devel libressl-devel" +revision=14 +makedepends="libpcap-devel openssl-devel" short_desc="PPP (Point-to-Point Protocol) daemon" maintainer="Orphaned " license="BSD-3-Clause, LGPL-2.0-or-later, GPL-2.0-or-later, Public Domain" From 9c8d96bbaa244432a615096fc5d8ac70295ef21f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:37 +0100 Subject: [PATCH 252/447] prosody: rebuild against OpenSSL --- srcpkgs/prosody/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/prosody/template b/srcpkgs/prosody/template index 1dbecd585f6..d88227f3b70 100644 --- a/srcpkgs/prosody/template +++ b/srcpkgs/prosody/template @@ -1,7 +1,7 @@ # Template file for 'prosody' pkgname=prosody version=0.11.7 -revision=1 +revision=2 build_style=configure configure_args=" --ostype=linux @@ -19,7 +19,7 @@ conf_files=" /etc/prosody/certs/makefile /etc/prosody/certs/GNUmakefile" make_dirs="/var/lib/prosody 0755 prosody prosody" -makedepends="lua51-devel libressl-devel libidn-devel" +makedepends="lua51-devel openssl-devel libidn-devel" depends="lua51-luasocket lua51-luafilesystem lua51-luaexpat lua51-luasec lua51-BitOp" short_desc="Lightweight and extensible Jabber/XMPP server written in Lua" From d0c6630ed34a59d68807202cb54fbbef5df3fb44 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:37 +0100 Subject: [PATCH 253/447] pulseaudio: rebuild against OpenSSL --- srcpkgs/pulseaudio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 6819c2c1b70..01ddc8ed732 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=14.2 -revision=1 +revision=2 build_style=meson # XXX: new version should be able to enable systemd functionality using elogind configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled @@ -12,7 +12,7 @@ configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled hostmakedepends="cmake m4 gettext libtool orc-devel perl-XML-Parser pkg-config" makedepends="$(vopt_if avahi avahi-libs-devel) eudev-libudev-devel fftw-devel jack-devel libSM-devel libXtst-devel libasyncns-devel libbluetooth-devel - libcap-devel libcap-progs libglib-devel libltdl-devel libressl-devel + libcap-devel libcap-progs libglib-devel libltdl-devel openssl-devel libsndfile-devel libsoxr-devel orc-devel sbc-devel speex-devel tdb-devel webrtc-audio-processing-devel xcb-util-devel check-devel" depends="rtkit" From c4419a31688b313247fb23c0d3021f530eb3c175 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:38 +0100 Subject: [PATCH 254/447] python: rebuild against OpenSSL --- srcpkgs/python/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 4498f6fc67c..fc52e87228e 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -4,11 +4,11 @@ # pkgname=python version=2.7.18 -revision=2 +revision=3 wrksrc="Python-${version}" pycompile_dirs="usr/lib/python2.7" hostmakedepends="pkg-config" -makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel +makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel sqlite-devel bzip2-devel zlib-devel" depends="ca-certificates" short_desc="Interpreted, interactive, object-oriented programming language" From bc17f0020a4b7c1ff9d488a26bd51bbda9acb969 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:38 +0100 Subject: [PATCH 255/447] python-M2Crypto: rebuild against OpenSSL --- srcpkgs/python-M2Crypto/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index 7a85be3041a..4c684d18f57 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -1,12 +1,12 @@ # Template file for 'python-M2Crypto' pkgname=python-M2Crypto version=0.35.2 -revision=5 +revision=6 wrksrc="M2Crypto-${version}" build_style=python-module pycompile_module="M2Crypto" -hostmakedepends="python-setuptools python3-setuptools swig libressl-devel" -makedepends="libressl-devel python-devel python3-devel" +hostmakedepends="python-setuptools python3-setuptools swig openssl-devel" +makedepends="openssl-devel python-devel python3-devel" depends="python-typing" short_desc="Python2 crypto and SSL toolkit" maintainer="Orphaned " From 6359be60b566ab61198c171c9bcdffb9bde2a898 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:38 +0100 Subject: [PATCH 256/447] python-cryptography: rebuild against OpenSSL --- srcpkgs/python-cryptography/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python-cryptography/template b/srcpkgs/python-cryptography/template index 2363ec3042d..b9801c3c409 100644 --- a/srcpkgs/python-cryptography/template +++ b/srcpkgs/python-cryptography/template @@ -4,9 +4,9 @@ version=3.3.2 revision=1 wrksrc="cryptography-${version}" build_style=python2-module -hostmakedepends="python-setuptools libressl-devel python-enum34 +hostmakedepends="python-setuptools openssl-devel python-enum34 python-ipaddress python-six python-cffi python-idna" -makedepends="libressl-devel python-devel" +makedepends="openssl-devel python-devel" depends="python-cffi python-six python-enum34 python-idna python-ipaddress" checkdepends="python-cryptography_vectors python-hypothesis python-pretend python-pytest python-pytz python-iso8601 ${depends}" From 5377e2435d3cc57847a7815a1d6b338daeda1c5d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:38 +0100 Subject: [PATCH 257/447] python3: rebuild against OpenSSL --- srcpkgs/python3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index cce59898a92..85e1e07fe96 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -4,11 +4,11 @@ # pkgname=python3 version=3.9.1 -revision=1 +revision=2 wrksrc="Python-${version}" pycompile_dirs="usr/lib/python${version%.*}" hostmakedepends="pkgconf" -makedepends="libffi-devel readline-devel gdbm-devel libressl-devel +makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel" depends="ca-certificates" checkdepends="$depends iana-etc" From 8fb753ad88da7c0ce2d7155537b7c7e5d5e9fc51 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:38 +0100 Subject: [PATCH 258/447] python3-curl: rebuild against OpenSSL --- srcpkgs/python3-curl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template index 8405b412383..e985ecf8534 100644 --- a/srcpkgs/python3-curl/template +++ b/srcpkgs/python3-curl/template @@ -1,11 +1,11 @@ # Template file for 'python3-curl' pkgname=python3-curl version=7.43.0.3 -revision=9 +revision=10 wrksrc="pycurl-${version}" build_style=python3-module hostmakedepends="python3-devel" -makedepends="libressl-devel libcurl-devel ${hostmakedepends}" +makedepends="openssl-devel libcurl-devel ${hostmakedepends}" short_desc="Python3 interface to cURL library" maintainer="Orphaned " license="LGPL-2.1-or-later, MIT" From 7415161f05449d6d78aa6a1db2bd7c55fa84295d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:39 +0100 Subject: [PATCH 259/447] python3-scrypt: rebuild against OpenSSL --- srcpkgs/python3-scrypt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-scrypt/template b/srcpkgs/python3-scrypt/template index 5008c8dfbb8..f73f4c55576 100644 --- a/srcpkgs/python3-scrypt/template +++ b/srcpkgs/python3-scrypt/template @@ -1,11 +1,11 @@ # Template file for 'python3-scrypt' pkgname=python3-scrypt version=0.8.17 -revision=2 +revision=3 wrksrc="scrypt-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -makedepends="python3-devel libressl-devel" +makedepends="python3-devel openssl-devel" short_desc="Python 3 bindings for the scrypt key derivation function" maintainer="projectmoon " license="BSD-2-Clause" From 13c278a0ecddb56df680936eb8eb90f335e9f29e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:39 +0100 Subject: [PATCH 260/447] qca-qt5: rebuild against OpenSSL --- srcpkgs/qca-qt5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template index c255fca31b2..9e1cd59b839 100644 --- a/srcpkgs/qca-qt5/template +++ b/srcpkgs/qca-qt5/template @@ -1,13 +1,13 @@ # Template file for 'qca-qt5' pkgname=qca-qt5 version=2.3.1 -revision=1 +revision=2 wrksrc="${pkgname%-*}-${version}" build_style=cmake configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs -DUSE_RELATIVE_PATHS=true" hostmakedepends="pkg-config ca-certificates" -makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates libressl-devel" +makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel" depends="ca-certificates" short_desc="Qt5 Cryptographic Architecture" maintainer="John " From c31eaf8aef2f8446183f8e34dbb6d4ec9884b163 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:39 +0100 Subject: [PATCH 261/447] qingy: switch to libgcrypt --- srcpkgs/qingy/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template index c335bf971e8..02c89bd1cca 100644 --- a/srcpkgs/qingy/template +++ b/srcpkgs/qingy/template @@ -1,13 +1,13 @@ # Template file for 'qingy' pkgname=qingy version=1.0.0 -revision=28 +revision=29 lib32disabled=yes build_style=gnu-configure -makedepends="ncurses-devel libressl-devel +makedepends="ncurses-devel libgcrypt-devel $(vopt_if pam pam-devel) $(vopt_if x11 'libXScrnSaver-devel libX11-devel xorgproto')" configure_args="--disable-optimizations --disable-static --disable-DirectFB-support - $(vopt_enable pam) $(vopt_enable x11 x-support)" + --enable-crypto=libgcrypt $(vopt_enable pam) $(vopt_enable x11 x-support)" short_desc="Qingy Is Not Getty" maintainer="Jens E. Becker " license="GPL-2" From 2943e6d05fd9132dd099d4412d7f2909886d8855 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:40 +0100 Subject: [PATCH 262/447] qt5: rebuild against OpenSSL --- .../patches/qtnetwork-5.15.0-libressl.patch | 420 ------------------ srcpkgs/qt5/template | 9 +- 2 files changed, 6 insertions(+), 423 deletions(-) delete mode 100644 srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch diff --git a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch b/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch deleted file mode 100644 index 997e68156c6..00000000000 --- a/srcpkgs/qt5/patches/qtnetwork-5.15.0-libressl.patch +++ /dev/null @@ -1,420 +0,0 @@ -From 2aa448121ff62e104d333f192a7f19fc76d0cf19 Mon Sep 17 00:00:00 2001 -From: Stefan Strogin -Date: Wed, 5 Feb 2020 03:49:35 +0200 -Subject: [PATCH] [PATCH] QSslSocket - add LibreSSL support - -Upstream-Status: Inappropriate -[Upstream is not willing to accept any patches for LibreSSL support] -Signed-off-by: Stefan Strogin ---- - src/network/ssl/qsslcertificate_openssl.cpp | 2 +- - src/network/ssl/qsslcontext_openssl.cpp | 19 +++++++- - src/network/ssl/qsslcontext_openssl_p.h | 7 +++ - src/network/ssl/qsslkey_openssl.cpp | 2 +- - src/network/ssl/qsslsocket_openssl.cpp | 2 +- - .../ssl/qsslsocket_openssl_symbols.cpp | 37 ++++++++++++++- - .../ssl/qsslsocket_openssl_symbols_p.h | 45 ++++++++++++++++++- - 7 files changed, 107 insertions(+), 7 deletions(-) - -diff --git qtbase/src/network/ssl/qsslcertificate_openssl.cpp qtbase/src/network/ssl/qsslcertificate_openssl.cpp -index ca9d61ccb1..19774432ce 100644 ---- qtbase/src/network/ssl/qsslcertificate_openssl.cpp -+++ qtbase/src/network/ssl/qsslcertificate_openssl.cpp -@@ -661,7 +661,7 @@ static QMultiMap _q_mapFromX509Name(X509_NAME *name) - unsigned char *data = nullptr; - int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e)); - info.insert(name, QString::fromUtf8((char*)data, size)); --#if QT_CONFIG(opensslv11) -+#if QT_CONFIG(opensslv11) && !defined(LIBRESSL_VERSION_NUMBER) - q_CRYPTO_free(data, nullptr, 0); - #else - q_CRYPTO_free(data); -diff --git qtbase/src/network/ssl/qsslcontext_openssl.cpp qtbase/src/network/ssl/qsslcontext_openssl.cpp -index c9f202f573..2ecdbbb7e5 100644 ---- qtbase/src/network/ssl/qsslcontext_openssl.cpp -+++ qtbase/src/network/ssl/qsslcontext_openssl.cpp -@@ -351,9 +351,11 @@ init_context: - return; - } - -+#ifndef LIBRESSL_VERSION_NUMBER - // A nasty hacked OpenSSL using a level that will make our auto-tests fail: - if (q_SSL_CTX_get_security_level(sslContext->ctx) > 1 && *forceSecurityLevel()) - q_SSL_CTX_set_security_level(sslContext->ctx, 1); -+#endif - - const long anyVersion = - #if QT_CONFIG(dtls) -@@ -408,16 +410,28 @@ init_context: - maxVersion = DTLS1_VERSION; - break; - case QSsl::DtlsV1_0OrLater: -+#ifdef DTLS_MAX_VERSION - minVersion = DTLS1_VERSION; - maxVersion = DTLS_MAX_VERSION; -+#else -+ Q_UNREACHABLE(); -+#endif // DTLS_MAX_VERSION - break; - case QSsl::DtlsV1_2: -+#ifdef DTLS1_2_VERSION - minVersion = DTLS1_2_VERSION; - maxVersion = DTLS1_2_VERSION; -+#else -+ Q_UNREACHABLE(); -+#endif // DTLS1_2_VERSION - break; - case QSsl::DtlsV1_2OrLater: -+#if defined(DTLS1_2_VERSION) && defined(DTLS_MAX_VERSION) - minVersion = DTLS1_2_VERSION; - maxVersion = DTLS_MAX_VERSION; -+#else -+ Q_UNREACHABLE(); -+#endif // DTLS1_2_VERSION && DTLS_MAX_VERSION - break; - case QSsl::TlsV1_3OrLater: - #ifdef TLS1_3_VERSION -@@ -722,6 +736,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) - } - #endif // ocsp - -+#ifndef LIBRESSL_VERSION_NUMBER - QSharedPointer cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free); - if (cctx) { - q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx); -@@ -768,7 +783,9 @@ void QSslContext::applyBackendConfig(QSslContext *sslContext) - sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_finish() failed")); - sslContext->errorCode = QSslError::UnspecifiedError; - } -- } else { -+ } else -+#endif // LIBRESSL_VERSION_NUMBER -+ { - sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed")); - sslContext->errorCode = QSslError::UnspecifiedError; - } -diff --git qtbase/src/network/ssl/qsslcontext_openssl_p.h qtbase/src/network/ssl/qsslcontext_openssl_p.h -index 70cb97aad8..01a61cf535 100644 ---- qtbase/src/network/ssl/qsslcontext_openssl_p.h -+++ qtbase/src/network/ssl/qsslcontext_openssl_p.h -@@ -61,6 +61,13 @@ - - QT_BEGIN_NAMESPACE - -+#ifndef DTLS_ANY_VERSION -+#define DTLS_ANY_VERSION 0x1FFFF -+#endif -+#ifndef TLS_ANY_VERSION -+#define TLS_ANY_VERSION 0x10000 -+#endif -+ - #ifndef QT_NO_SSL - - class QSslContextPrivate; -diff --git qtbase/src/network/ssl/qsslkey_openssl.cpp qtbase/src/network/ssl/qsslkey_openssl.cpp -index 43cb8c6de8..a27336aa26 100644 ---- qtbase/src/network/ssl/qsslkey_openssl.cpp -+++ qtbase/src/network/ssl/qsslkey_openssl.cpp -@@ -360,7 +360,7 @@ static QByteArray doCrypt(QSslKeyPrivate::Cipher cipher, const QByteArray &data, - q_EVP_CipherUpdate(ctx, - reinterpret_cast(output.data()), &len, - reinterpret_cast(data.constData()), data.size()); -- q_EVP_CipherFinal(ctx, -+ q_EVP_CipherFinal_ex(ctx, - reinterpret_cast(output.data()) + len, &i); - len += i; - -diff --git qtbase/src/network/ssl/qsslsocket_openssl.cpp qtbase/src/network/ssl/qsslsocket_openssl.cpp -index 277037e59c..f599498df5 100644 ---- qtbase/src/network/ssl/qsslsocket_openssl.cpp -+++ qtbase/src/network/ssl/qsslsocket_openssl.cpp -@@ -653,7 +653,7 @@ bool QSslSocketBackendPrivate::initSslContext() - else if (mode == QSslSocket::SslServerMode) - q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); - --#if OPENSSL_VERSION_NUMBER >= 0x10101006L -+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) - // Set the client callback for TLSv1.3 PSK - if (mode == QSslSocket::SslClientMode - && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { -diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -index ed80fc14bd..bad2ee2e41 100644 ---- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp -@@ -146,10 +146,13 @@ DEFINEFUNC2(int, BN_is_word, BIGNUM *a, a, BN_ULONG w, w, return 0, return) - DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return) - DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return) - DEFINEFUNC2(EVP_PKEY_CTX *, EVP_PKEY_CTX_new, EVP_PKEY *pkey, pkey, ENGINE *e, e, return nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC(int, EVP_PKEY_param_check, EVP_PKEY_CTX *ctx, ctx, return 0, return) -+#endif - DEFINEFUNC(void, EVP_PKEY_CTX_free, EVP_PKEY_CTX *ctx, ctx, return, return) - DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return) - DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return) - DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return) - DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -@@ -157,10 +160,20 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMYARG, DUMMYARG, return null - DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG) - DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG) - DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return) -+#else -+DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return) -+DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG) -+DEFINEFUNC(_STACK *, sk_new_null, DUMMYARG, DUMMYARG, return nullptr, return) -+DEFINEFUNC2(void, sk_push, _STACK *a, a, void *b, b, return, DUMMYARG) -+DEFINEFUNC(void, sk_free, _STACK *a, a, return, DUMMYARG) -+DEFINEFUNC2(void *, sk_value, STACK *a, a, int b, b, return nullptr, return) -+#endif // LIBRESSL_VERSION_NUMBER - DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return) - DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC(int, SSL_CTX_get_security_level, const SSL_CTX *ctx, ctx, return -1, return) - DEFINEFUNC2(void, SSL_CTX_set_security_level, SSL_CTX *ctx, ctx, int level, level, return, return) -+#endif - #ifdef TLS1_3_VERSION - DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return) - DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG) -@@ -184,7 +197,11 @@ DEFINEFUNC2(void, X509_STORE_set_verify_cb, X509_STORE *a, a, X509_STORE_CTX_ver - DEFINEFUNC3(int, X509_STORE_set_ex_data, X509_STORE *a, a, int idx, idx, void *data, data, return 0, return) - DEFINEFUNC2(void *, X509_STORE_get_ex_data, X509_STORE *r, r, int idx, idx, return nullptr, return) - DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC3(void, CRYPTO_free, void *str, str, const char *file, file, int line, line, return, DUMMYARG) -+#else -+DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG) -+#endif - DEFINEFUNC(long, OpenSSL_version_num, void, DUMMYARG, return 0, return) - DEFINEFUNC(const char *, OpenSSL_version, int a, a, return nullptr, return) - DEFINEFUNC(unsigned long, SSL_SESSION_get_ticket_lifetime_hint, const SSL_SESSION *session, session, return 0, return) -@@ -224,7 +241,9 @@ DEFINEFUNC5(int, OCSP_id_get0_info, ASN1_OCTET_STRING **piNameHash, piNameHash, - ASN1_OCTET_STRING **piKeyHash, piKeyHash, ASN1_INTEGER **pserial, pserial, OCSP_CERTID *cid, cid, - return 0, return) - DEFINEFUNC2(OCSP_RESPONSE *, OCSP_response_create, int status, status, OCSP_BASICRESP *bs, bs, return nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC(const STACK_OF(X509) *, OCSP_resp_get0_certs, const OCSP_BASICRESP *bs, bs, return nullptr, return) -+#endif - DEFINEFUNC2(int, OCSP_id_cmp, OCSP_CERTID *a, a, OCSP_CERTID *b, b, return -1, return) - DEFINEFUNC7(OCSP_SINGLERESP *, OCSP_basic_add1_status, OCSP_BASICRESP *r, r, OCSP_CERTID *c, c, int s, s, - int re, re, ASN1_TIME *rt, rt, ASN1_TIME *t, t, ASN1_TIME *n, n, return nullptr, return) -@@ -269,7 +288,7 @@ DEFINEFUNC2(int, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX *ctx, ctx, int ke - DEFINEFUNC5(int, EVP_CipherInit, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *type, type, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) - DEFINEFUNC6(int, EVP_CipherInit_ex, EVP_CIPHER_CTX *ctx, ctx, const EVP_CIPHER *cipher, cipher, ENGINE *impl, impl, const unsigned char *key, key, const unsigned char *iv, iv, int enc, enc, return 0, return) - DEFINEFUNC5(int, EVP_CipherUpdate, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, const unsigned char *in, in, int inl, inl, return 0, return) --DEFINEFUNC3(int, EVP_CipherFinal, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) -+DEFINEFUNC3(int, EVP_CipherFinal_ex, EVP_CIPHER_CTX *ctx, ctx, unsigned char *out, out, int *outl, outl, return 0, return) - DEFINEFUNC(const EVP_MD *, EVP_get_digestbyname, const char *name, name, return nullptr, return) - #ifndef OPENSSL_NO_DES - DEFINEFUNC(const EVP_CIPHER *, EVP_des_cbc, DUMMYARG, DUMMYARG, return nullptr, return) -@@ -356,12 +375,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return - - DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return) - DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return) - DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return) -+#ifndef LIBRESSL_VERSION_NUMBER - DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return); - DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return); - DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return); - DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return); - DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return); - DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return); -+#endif - DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG) - DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return) - DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return) -@@ -846,20 +867,26 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(EVP_CIPHER_CTX_reset) - RESOLVEFUNC(EVP_PKEY_up_ref) - RESOLVEFUNC(EVP_PKEY_CTX_new) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(EVP_PKEY_param_check) -+#endif - RESOLVEFUNC(EVP_PKEY_CTX_free) - RESOLVEFUNC(EVP_PKEY_base_id) - RESOLVEFUNC(RSA_bits) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(OPENSSL_sk_new_null) - RESOLVEFUNC(OPENSSL_sk_push) - RESOLVEFUNC(OPENSSL_sk_free) - RESOLVEFUNC(OPENSSL_sk_num) - RESOLVEFUNC(OPENSSL_sk_pop_free) - RESOLVEFUNC(OPENSSL_sk_value) -+#endif - RESOLVEFUNC(DH_get0_pqg) - RESOLVEFUNC(SSL_CTX_set_options) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(SSL_CTX_get_security_level) - RESOLVEFUNC(SSL_CTX_set_security_level) -+#endif - #ifdef TLS1_3_VERSION - RESOLVEFUNC(SSL_CTX_set_ciphersuites) - RESOLVEFUNC(SSL_set_psk_use_session_callback) -@@ -898,7 +925,9 @@ bool q_resolveOpenSslSymbols() - - RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint) - RESOLVEFUNC(DH_bits) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(DSA_bits) -+#endif - - #if QT_CONFIG(dtls) - RESOLVEFUNC(DTLSv1_listen) -@@ -928,7 +957,9 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(OCSP_check_validity) - RESOLVEFUNC(OCSP_cert_to_id) - RESOLVEFUNC(OCSP_id_get0_info) -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(OCSP_resp_get0_certs) -+#endif - RESOLVEFUNC(OCSP_basic_sign) - RESOLVEFUNC(OCSP_response_create) - RESOLVEFUNC(i2d_OCSP_RESPONSE) -@@ -979,7 +1010,7 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(EVP_CipherInit) - RESOLVEFUNC(EVP_CipherInit_ex) - RESOLVEFUNC(EVP_CipherUpdate) -- RESOLVEFUNC(EVP_CipherFinal) -+ RESOLVEFUNC(EVP_CipherFinal_ex) - RESOLVEFUNC(EVP_get_digestbyname) - #ifndef OPENSSL_NO_DES - RESOLVEFUNC(EVP_des_cbc) -@@ -1058,12 +1089,14 @@ bool q_resolveOpenSslSymbols() - RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey) - RESOLVEFUNC(SSL_CTX_use_PrivateKey_file) - RESOLVEFUNC(SSL_CTX_get_cert_store); -+#ifndef LIBRESSL_VERSION_NUMBER - RESOLVEFUNC(SSL_CONF_CTX_new); - RESOLVEFUNC(SSL_CONF_CTX_free); - RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx); - RESOLVEFUNC(SSL_CONF_CTX_set_flags); - RESOLVEFUNC(SSL_CONF_CTX_finish); - RESOLVEFUNC(SSL_CONF_cmd); -+#endif - RESOLVEFUNC(SSL_accept) - RESOLVEFUNC(SSL_clear) - RESOLVEFUNC(SSL_connect) -diff --git qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h -index c46afcf53e..3945bada5f 100644 ---- qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h -+++ qtbase/src/network/ssl/qsslsocket_openssl_symbols_p.h -@@ -80,6 +80,13 @@ QT_BEGIN_NAMESPACE - - #define DUMMYARG - -+#ifdef LIBRESSL_VERSION_NUMBER -+typedef _STACK STACK; -+typedef STACK OPENSSL_STACK; -+typedef void OPENSSL_INIT_SETTINGS; -+typedef int (*X509_STORE_CTX_verify_cb)(int ok,X509_STORE_CTX *ctx); -+#endif -+ - #if !defined QT_LINKED_OPENSSL - // **************** Shared declarations ****************** - // ret func(arg) -@@ -230,7 +237,11 @@ const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x); - Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a); - Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem(); - -+#ifndef LIBRESSL_VERSION_NUMBER - int q_DSA_bits(DSA *a); -+#else -+#define q_DSA_bits(dsa) q_BN_num_bits((dsa)->p) -+#endif - int q_EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *c); - Q_AUTOTEST_EXPORT int q_EVP_PKEY_up_ref(EVP_PKEY *a); - EVP_PKEY_CTX *q_EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e); -@@ -238,12 +249,29 @@ void q_EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx); - int q_EVP_PKEY_param_check(EVP_PKEY_CTX *ctx); - int q_EVP_PKEY_base_id(EVP_PKEY *a); - int q_RSA_bits(RSA *a); -+ -+#ifndef LIBRESSL_VERSION_NUMBER - Q_AUTOTEST_EXPORT int q_OPENSSL_sk_num(OPENSSL_STACK *a); - Q_AUTOTEST_EXPORT void q_OPENSSL_sk_pop_free(OPENSSL_STACK *a, void (*b)(void *)); - Q_AUTOTEST_EXPORT OPENSSL_STACK *q_OPENSSL_sk_new_null(); - Q_AUTOTEST_EXPORT void q_OPENSSL_sk_push(OPENSSL_STACK *st, void *data); - Q_AUTOTEST_EXPORT void q_OPENSSL_sk_free(OPENSSL_STACK *a); - Q_AUTOTEST_EXPORT void * q_OPENSSL_sk_value(OPENSSL_STACK *a, int b); -+#else // LIBRESSL_VERSION_NUMBER -+int q_sk_num(STACK *a); -+#define q_OPENSSL_sk_num(a) q_sk_num(a) -+void q_sk_pop_free(STACK *a, void (*b)(void *)); -+#define q_OPENSSL_sk_pop_free(a, b) q_sk_pop_free(a, b) -+STACK *q_sk_new_null(); -+#define q_OPENSSL_sk_new_null() q_sk_new_null() -+void q_sk_push(STACK *st, void *data); -+#define q_OPENSSL_sk_push(st, data) q_sk_push(st, data) -+void q_sk_free(STACK *a); -+#define q_OPENSSL_sk_free q_sk_free -+void *q_sk_value(STACK *a, int b); -+#define q_OPENSSL_sk_value(a, b) q_sk_value(a, b) -+#endif // LIBRESSL_VERSION_NUMBER -+ - int q_SSL_session_reused(SSL *a); - unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op); - int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -@@ -269,8 +297,13 @@ int q_DH_bits(DH *dh); - # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \ - | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL) - -+#ifndef LIBRESSL_VERSION_NUMBER - #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st) - #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i) -+#else -+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st) -+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i) -+#endif // LIBRESSL_VERSION_NUMBER - - #define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \ - | OPENSSL_INIT_ADD_ALL_DIGESTS \ -@@ -279,7 +312,11 @@ int q_DH_bits(DH *dh); - | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) - - int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); -+#ifndef LIBRESSL_VERSION_NUMBER - void q_CRYPTO_free(void *str, const char *file, int line); -+#else -+void q_CRYPTO_free(void *a); -+#endif - - long q_OpenSSL_version_num(); - const char *q_OpenSSL_version(int type); -@@ -395,7 +432,7 @@ int q_EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen); - int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned char *key, const unsigned char *iv, int enc); - int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc); - int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); --int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); -+int q_EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); - const EVP_MD *q_EVP_get_digestbyname(const char *name); - - #ifndef OPENSSL_NO_DES -@@ -497,12 +534,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b); - int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b); - int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c); - X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a); -+#ifndef LIBRESSL_VERSION_NUMBER - SSL_CONF_CTX *q_SSL_CONF_CTX_new(); - void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a); - void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b); - unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b); - int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a); - int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c); -+#endif - void q_SSL_free(SSL *a); - STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a); - const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a); -@@ -728,7 +767,11 @@ int q_OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd, ASN1_GENERALIZEDTIME *n - int q_OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd, ASN1_OCTET_STRING **pikeyHash, - ASN1_INTEGER **pserial, OCSP_CERTID *cid); - -+#ifndef LIBRESSL_VERSION_NUMBER - const STACK_OF(X509) *q_OCSP_resp_get0_certs(const OCSP_BASICRESP *bs); -+#else -+#define q_OCSP_resp_get0_certs(bs) ((bs)->certs) -+#endif - Q_AUTOTEST_EXPORT OCSP_CERTID *q_OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer); - Q_AUTOTEST_EXPORT void q_OCSP_CERTID_free(OCSP_CERTID *cid); - int q_OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b); --- -2.29.2 - diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 90d9c9be83f..355c774a7ff 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -12,7 +12,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel libinput-devel libmng-devel libmariadbclient-devel libproxy-devel libvpx-devel libwebp-devel libxslt-devel cups-devel minizip-devel opus-devel pciutils-devel pcre2-devel postgresql-libs-devel - protobuf-devel pulseaudio-devel tslib-devel libressl-devel + protobuf-devel pulseaudio-devel tslib-devel openssl-devel unixodbc-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel libzstd-devel harfbuzz-devel" depends="qt5-dbus qt5-gui qt5-core qt5-widgets qt5-network qt5-xml @@ -28,8 +28,11 @@ replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0" lib32mode=full +_openssl=1 # Work around SSLv3_{client,server}_method missing in libressl-2.3.3 -CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG" +if [ ! "$_openssl" ]; then + CFLAGS="-DOPENSSL_NO_PSK -DOPENSSL_NO_NEXTPROTONEG" +fi CXXFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned" # Required for musl libc LDFLAGS="-pthread -ldl -fPIE -Wl,-z,stack-size=2097152" @@ -1059,7 +1062,7 @@ qt5-tools_package() { } qt5-devel_package() { - depends="zlib-devel libressl-devel>=2.1.4 libXext-devel libXrender-devel + depends="zlib-devel openssl-devel libXext-devel libXrender-devel fontconfig-devel libglib-devel MesaLib-devel mtdev-devel dbus-devel icu-devel cups-devel qt5-gui-${version}_${revision} From 098d4957bd1f7e2c96a7ff6d8f3da5b65962bb07 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:40 +0100 Subject: [PATCH 263/447] qupzilla1: rebuild against OpenSSL --- srcpkgs/qupzilla1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qupzilla1/template b/srcpkgs/qupzilla1/template index e72f0f95897..8ea79ae32d8 100644 --- a/srcpkgs/qupzilla1/template +++ b/srcpkgs/qupzilla1/template @@ -1,7 +1,7 @@ # Template file for 'qupzilla1' pkgname=qupzilla1 version=1.8.9 -revision=16 +revision=17 wrksrc="QupZilla-${version}" build_style=qmake hostmakedepends="pkg-config" From ef1deea45081b0531ed023488ca0b18aa241d1b8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:40 +0100 Subject: [PATCH 264/447] rabbitmq-c: rebuild against OpenSSL --- srcpkgs/rabbitmq-c/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template index 606905e2161..95ad7a33343 100644 --- a/srcpkgs/rabbitmq-c/template +++ b/srcpkgs/rabbitmq-c/template @@ -1,11 +1,11 @@ # Template file for 'rabbitmq-c' pkgname=rabbitmq-c version=0.10.0 -revision=1 +revision=2 build_style=cmake make_check_target=test hostmakedepends="popt xmlto doxygen" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="RabbitMQ C client" maintainer="Hans-J. Schmid " license="MIT" From 10a6684535ee4c80c912775aba46965efd713346 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:40 +0100 Subject: [PATCH 265/447] rdedup: rebuild against OpenSSL --- srcpkgs/rdedup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template index 9a1d9ffc944..c392e3c0e2f 100644 --- a/srcpkgs/rdedup/template +++ b/srcpkgs/rdedup/template @@ -1,11 +1,11 @@ # Template file for 'rdedup' pkgname=rdedup version=3.1.1 -revision=5 +revision=6 wrksrc=rdedup-rdedup-v${version} build_style=cargo hostmakedepends="pkg-config clang" -makedepends="libressl-devel liblzma-devel libsodium-devel" +makedepends="openssl-devel liblzma-devel libsodium-devel" short_desc="Data deduplication engine" maintainer="Orphaned " license="MPL-2.0" From 14152a195019771a4cc55bbb76d6235561927fcf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:41 +0100 Subject: [PATCH 266/447] rdis-git: rebuild against OpenSSL --- srcpkgs/rdis-git/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template index c1f4ef4128c..5aaa5d669b7 100644 --- a/srcpkgs/rdis-git/template +++ b/srcpkgs/rdis-git/template @@ -1,9 +1,9 @@ # Template file for 'rdis-git' pkgname=rdis-git version=20150722 -revision=11 +revision=12 hostmakedepends="pkg-config git" -makedepends="libressl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel" +makedepends="openssl-devel gtk+3-devel jansson-devel LuaJIT-devel udis86-devel" short_desc="A binary analysis tool for Linux" maintainer="Orphaned " license="GPL-3" From 0a423be0e09d434cd13babf3592262606230439c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:41 +0100 Subject: [PATCH 267/447] re: rebuild against OpenSSL --- srcpkgs/re/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/re/template b/srcpkgs/re/template index 1d866b46543..542c03c133f 100644 --- a/srcpkgs/re/template +++ b/srcpkgs/re/template @@ -8,7 +8,7 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS USE_DTLS_SRTP=yes USE_ZLIB=yes" make_install_args="$make_build_args" make_use_env=1 -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" short_desc="Portable library for real-time communications" maintainer="John " license="BSD-3-Clause" From 92c8afaa947c4fb0bbe008345dd346ba19657bf8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:41 +0100 Subject: [PATCH 268/447] remmina: rebuild against OpenSSL --- srcpkgs/remmina/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/remmina/template b/srcpkgs/remmina/template index 5dbc85f433a..53043809e67 100644 --- a/srcpkgs/remmina/template +++ b/srcpkgs/remmina/template @@ -1,7 +1,7 @@ # Template file for 'remmina' pkgname=remmina version=1.4.10 -revision=1 +revision=2 wrksrc="Remmina-v${version}" build_style=cmake configure_args="-DWITH_APPINDICATOR=OFF -DCMAKE_USE_PTHREADS_INIT=ON" From cece39209767ee0c210edfcefdffd5581c5e2dad Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:41 +0100 Subject: [PATCH 269/447] rhash: rebuild against OpenSSL --- srcpkgs/rhash/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rhash/template b/srcpkgs/rhash/template index 749f9755106..f93e7c512dc 100644 --- a/srcpkgs/rhash/template +++ b/srcpkgs/rhash/template @@ -7,7 +7,7 @@ build_style=configure configure_args="--enable-openssl --disable-openssl-runtime --prefix=/usr --sysconfdir=/etc" conf_files="/etc/rhashrc" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Utility for computing hash sums and creating magnet links" maintainer="Leah Neukirchen " license="0BSD" From df4b954dde5041afc0d0ec48618177bc80cf91fe Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:42 +0100 Subject: [PATCH 270/447] rooster: rebuild against OpenSSL --- srcpkgs/rooster/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rooster/template b/srcpkgs/rooster/template index a8a905fcb76..a3f64c3a52d 100644 --- a/srcpkgs/rooster/template +++ b/srcpkgs/rooster/template @@ -4,7 +4,7 @@ version=2.9.0 revision=1 build_style=cargo hostmakedepends="pkg-config python3" -makedepends="libX11-devel libXmu-devel libressl-devel libsodium-devel" +makedepends="libX11-devel libXmu-devel openssl-devel libsodium-devel" short_desc="Simple password manager for geeks" maintainer="Ulf " license="Apache-2.0" From d2fb7b71d1d8268fe023ce0a797dfc4c25cb3139 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:42 +0100 Subject: [PATCH 271/447] rpi-imager: rebuild against OpenSSL --- srcpkgs/rpi-imager/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template index 7d854e58d5f..b00e8ed63e9 100644 --- a/srcpkgs/rpi-imager/template +++ b/srcpkgs/rpi-imager/template @@ -1,7 +1,7 @@ # Template file for 'rpi-imager' pkgname=rpi-imager version=1.5 -revision=1 +revision=2 build_style=cmake hostmakedepends="qt5-host-tools qt5-qmake" makedepends="qt5-devel qt5-declarative-devel qt5-svg-devel qt5-tools-devel From f05c3b5a23d7fd6551235ffb7831ebc10f20cf96 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:42 +0100 Subject: [PATCH 272/447] rspamd: rebuild against OpenSSL --- srcpkgs/rspamd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index a4c2e4a697e..c8edf0f279d 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -1,7 +1,7 @@ # Template file for 'rspamd' pkgname=rspamd version=1.9.4 -revision=4 +revision=5 archs="x86_64* i686* aarch64* armv[67]* ppc64*" build_style=cmake configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd From b4ec43474c69c4c08f00efd03e659c08352afbb8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:43 +0100 Subject: [PATCH 273/447] rstudio: rebuild against OpenSSL --- srcpkgs/rstudio/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index 9c4f296dce8..904bec8ca96 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.3.1093 -revision=1 +revision=2 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_USE_SYSTEM_BOOST=ON @@ -9,7 +9,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop -DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio" hostmakedepends="unzip pandoc openjdk apache-ant qt5-qmake R mathjax which" -makedepends="zlib-devel libuuid-devel libressl-devel pam-devel +makedepends="zlib-devel libuuid-devel openssl-devel pam-devel boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel qt5-xmlpatterns-devel qt5-webchannel-devel qt5-webengine-devel From 9495e573f64691e2b2aaf1fb48c9f451ac03affb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:43 +0100 Subject: [PATCH 274/447] rsync: rebuild against OpenSSL --- srcpkgs/rsync/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template index 15815f9725d..a1df98d33f5 100644 --- a/srcpkgs/rsync/template +++ b/srcpkgs/rsync/template @@ -1,12 +1,12 @@ # Template file for 'rsync' pkgname=rsync version=3.2.3 -revision=2 +revision=3 build_style=gnu-configure conf_files="/etc/rsyncd.conf" hostmakedepends="perl" makedepends="zlib-devel acl-devel popt-devel xxHash-devel liblz4-devel - libressl-devel libzstd-devel" + openssl-devel libzstd-devel" short_desc="Remote fast incremental file transfer tool" maintainer="Lugubris " license="GPL-3.0-only" From 66d4ba80bc887d64d78e2deca584eed7321357b1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:43 +0100 Subject: [PATCH 275/447] rtmpdump: rebuild against OpenSSL --- srcpkgs/rtmpdump/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index f98160d7f18..a2bc8ada302 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -1,10 +1,10 @@ # Template file for 'rtmpdump' pkgname=rtmpdump version=2.4.20161210 -revision=8 +revision=9 _patchlevel=${version##*.} create_wrksrc=yes -makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'libressl-devel')" +makedepends="zlib-devel $(vopt_if gnutls 'gnutls-devel' 'openssl-devel')" short_desc="Toolkit for RTMP streams" maintainer="Orphaned " license="GPL-2, LGPL-2.1" From ce7e0909c56d03081a1272d963f4ce954838a0dc Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:43 +0100 Subject: [PATCH 276/447] ruby: rebuild against OpenSSL --- srcpkgs/ruby/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index cd06d004172..6ba92b5bdef 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -9,7 +9,7 @@ configure_args="--enable-shared --disable-rpath DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config" make_build_args="all capi" hostmakedepends="pkg-config bison groff" -makedepends="zlib-devel readline-devel libffi-devel libressl-devel +makedepends="zlib-devel readline-devel libffi-devel openssl-devel gdbm-devel libyaml-devel pango-devel" checkdepends="tzdata" short_desc="Ruby programming language" From 40d434640792c3602f18d06d26f82b9df534c80a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:43 +0100 Subject: [PATCH 277/447] rust-cargo-audit: rebuild against OpenSSL --- srcpkgs/rust-cargo-audit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rust-cargo-audit/template b/srcpkgs/rust-cargo-audit/template index 68cafe5b71f..b733afa1a7b 100644 --- a/srcpkgs/rust-cargo-audit/template +++ b/srcpkgs/rust-cargo-audit/template @@ -1,11 +1,11 @@ # Template file for 'rust-cargo-audit' pkgname=rust-cargo-audit version=0.13.1 -revision=1 +revision=2 wrksrc="${pkgname/rust-/}-${version}" build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel libssh2-devel zlib-devel" +makedepends="openssl-devel libssh2-devel zlib-devel" short_desc="Audit Cargo.lock for crates with security vulnerabilities" maintainer="Enno Boland " license="Apache-2.0, MIT" From edbe595a35f52d1429e717b928ddcea959081af9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:44 +0100 Subject: [PATCH 278/447] rust-sccache: rebuild against OpenSSL --- srcpkgs/rust-sccache/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template index dda7b73393e..5d8f2bf185c 100644 --- a/srcpkgs/rust-sccache/template +++ b/srcpkgs/rust-sccache/template @@ -1,11 +1,11 @@ # Template file for 'rust-sccache' pkgname=rust-sccache version=0.2.13 -revision=2 +revision=3 wrksrc="${pkgname/rust-/}-${version}" build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Sccache is a ccache-like tool" maintainer="Enno Boland " license="Apache-2.0" From ee9534dd22be65e3d733e8d8eb19d383ddf15eb5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:44 +0100 Subject: [PATCH 279/447] rustup: rebuild against OpenSSL --- srcpkgs/rustup/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template index 5890c26c1f5..89676f12e7c 100644 --- a/srcpkgs/rustup/template +++ b/srcpkgs/rustup/template @@ -8,7 +8,7 @@ build_style=cargo build_helper=qemu configure_args="--features no-self-update --bin rustup-init" hostmakedepends="pkg-config" -makedepends="libressl-devel zlib-devel libcurl-devel" +makedepends="openssl-devel zlib-devel libcurl-devel" short_desc="Rust toolchain installer" maintainer="Jan Christian Grünhage " license="Apache-2.0, MIT" From f2eac405a1ccec47a71b8d0da876a26fab2484e7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:44 +0100 Subject: [PATCH 280/447] s-nail: rebuild against OpenSSL --- srcpkgs/s-nail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template index 6c2c55085aa..c892bb98dc0 100644 --- a/srcpkgs/s-nail/template +++ b/srcpkgs/s-nail/template @@ -4,7 +4,7 @@ version=14.9.21 revision=1 build_helper="qemu" hostmakedepends="perl" -makedepends="libidn2-devel libressl-devel ncurses-devel" +makedepends="libidn2-devel openssl-devel ncurses-devel" conf_files="/etc/s-nail.rc" short_desc="Mail processing system with a command syntax reminiscent of ed" maintainer="Leah Neukirchen " From fb8c8635e6a12fdb5b9ae15b9ebfa6db7a390b54 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:44 +0100 Subject: [PATCH 281/447] s3fs-fuse: rebuild against OpenSSL --- srcpkgs/s3fs-fuse/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/s3fs-fuse/template b/srcpkgs/s3fs-fuse/template index d450104505b..7ccbf82bcdf 100644 --- a/srcpkgs/s3fs-fuse/template +++ b/srcpkgs/s3fs-fuse/template @@ -1,7 +1,7 @@ # Template file for 's3fs-fuse' pkgname=s3fs-fuse version=1.86 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-openssl ac_cv_file__git=no" hostmakedepends="automake libtool pkg-config" From 08e67dee01571583782292f8f3204e0784730ed4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:44 +0100 Subject: [PATCH 282/447] sbsigntool: rebuild against OpenSSL --- srcpkgs/sbsigntool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sbsigntool/template b/srcpkgs/sbsigntool/template index 6ee86139b27..6e6c32ddf3e 100644 --- a/srcpkgs/sbsigntool/template +++ b/srcpkgs/sbsigntool/template @@ -1,12 +1,12 @@ # Template file for 'sbsigntool' pkgname=sbsigntool version=0.9.4 -revision=3 +revision=4 archs="x86_64* i686* aarch64* arm*" wrksrc=sbsigntools-$version build_style=gnu-configure hostmakedepends="autoconf automake pkg-config help2man" -makedepends="binutils-devel libressl-devel libuuid-devel gnu-efi-libs" +makedepends="binutils-devel openssl-devel libuuid-devel gnu-efi-libs" short_desc="Signing utility for UEFI secure boot" maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" From a961e973007cde4275d2ad692dc433548f21ba4e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:45 +0100 Subject: [PATCH 283/447] scrypt: rebuild against OpenSSL --- srcpkgs/scrypt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template index 63e77c1e72a..8d313c2fff1 100644 --- a/srcpkgs/scrypt/template +++ b/srcpkgs/scrypt/template @@ -1,9 +1,9 @@ # Template file for 'scrypt' pkgname=scrypt version=1.3.1 -revision=1 +revision=2 build_style=gnu-configure -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Scrypt key derivation function" maintainer="Orphaned " license="BSD-2-Clause" From 4668546c75d1376247fa8eb90cb5c07a7b2c42e6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:45 +0100 Subject: [PATCH 284/447] seafile-libclient: rebuild against OpenSSL --- srcpkgs/seafile-libclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/seafile-libclient/template b/srcpkgs/seafile-libclient/template index 622189d447f..db394362f18 100644 --- a/srcpkgs/seafile-libclient/template +++ b/srcpkgs/seafile-libclient/template @@ -2,7 +2,7 @@ # WARNING: upstream sometimes retag source. Wait for official announcement pkgname=seafile-libclient version=7.0.10 -revision=1 +revision=2 _distname="${pkgname/-libclient/}" wrksrc="${_distname}-${version}" build_style=gnu-configure From 62c24925dc3b789809b802df107cbf0d35da10c7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:45 +0100 Subject: [PATCH 285/447] serf: rebuild against OpenSSL --- srcpkgs/serf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template index e340a6b013c..a9ac8a6d35e 100644 --- a/srcpkgs/serf/template +++ b/srcpkgs/serf/template @@ -1,11 +1,11 @@ # Template file for 'serf' pkgname=serf version=1.3.9 -revision=12 +revision=13 build_style=scons make_build_args="PREFIX=/usr" -hostmakedepends="libressl-devel" -makedepends="zlib-devel gdbm-devel libressl-devel apr-util-devel" +hostmakedepends="openssl-devel" +makedepends="zlib-devel gdbm-devel openssl-devel apr-util-devel" short_desc="High-performance asynchronous HTTP client library" maintainer="Orphaned " license="Apache-2.0" From 513c2d88cd441bc4d77eec4535331dbe60a8e46a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:45 +0100 Subject: [PATCH 286/447] sgfutils: rebuild against OpenSSL --- srcpkgs/sgfutils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template index 23494b6ef56..95e84d22279 100644 --- a/srcpkgs/sgfutils/template +++ b/srcpkgs/sgfutils/template @@ -1,7 +1,7 @@ # Template file for 'sgfutils' pkgname=sgfutils version=0.25 -revision=6 +revision=7 build_style=gnu-makefile short_desc="Collection of utilities to handle SGF files" maintainer='Brandon Wilson ' @@ -9,5 +9,5 @@ license="GPL-2" homepage="http://www.cwi.nl/~aeb/go/sgfutils/html/" distfiles="http://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz" checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2 -makedepends="libressl-devel" +makedepends="openssl-devel" depends="ImageMagick" From b710075b1920602f7dd6b1d0a01d27db3498488c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:46 +0100 Subject: [PATCH 287/447] signal-backup-decode: rebuild against OpenSSL --- srcpkgs/signal-backup-decode/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/signal-backup-decode/template b/srcpkgs/signal-backup-decode/template index 3b5cfb2f526..119546b61ea 100644 --- a/srcpkgs/signal-backup-decode/template +++ b/srcpkgs/signal-backup-decode/template @@ -1,10 +1,10 @@ # Template file for 'signal-backup-decode' pkgname=signal-backup-decode version=0.2.0 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel sqlite-devel" +makedepends="openssl-devel sqlite-devel" short_desc="Decode Signal Android Backups" maintainer="Spencer Burris " license="GPL-3.0-or-later" From 309d95e1577a9f1661a7d06a9cc4e4acfb5d8e13 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:46 +0100 Subject: [PATCH 288/447] slrn: rebuild against OpenSSL --- srcpkgs/slrn/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slrn/template b/srcpkgs/slrn/template index 916aa0d013a..95d39885983 100644 --- a/srcpkgs/slrn/template +++ b/srcpkgs/slrn/template @@ -1,14 +1,14 @@ # Template file for 'slrn' pkgname=slrn version=1.0.3a -revision=7 +revision=8 wrksrc="${pkgname}-${version%a}" build_style=gnu-configure configure_args="--with-slrnpull --with-ssl --with-slanginc=${XBPS_CROSS_BASE}/usr/include --with-slanglib=${XBPS_CROSS_BASE}/usr/lib slrn_cv_va_copy=yes slrn_cv___va_copy=yes slrn_cv_va_val_copy=yes" -makedepends="libressl-devel slang-devel" +makedepends="openssl-devel slang-devel" short_desc="Text mode Usenet news reader" maintainer="Leah Neukirchen " license="GPL-2" From 038ec601fccf16b47f47cfc8717c412968f57a36 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:46 +0100 Subject: [PATCH 289/447] so: rebuild against OpenSSL --- srcpkgs/so/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/so/template b/srcpkgs/so/template index ecdbb5331ee..fc753102686 100644 --- a/srcpkgs/so/template +++ b/srcpkgs/so/template @@ -4,7 +4,7 @@ version=0.4.3 revision=1 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Terminal interface for Stack Overflow" maintainer="Benjamín Albiñana " license="MIT" From c5b78ee30b45632618fb9cb49e7d263f26aa6af4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:46 +0100 Subject: [PATCH 290/447] socat: rebuild against OpenSSL --- srcpkgs/socat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index 8f96fccff84..54beac3b452 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -1,11 +1,11 @@ # Template file for 'socat' pkgname=socat version=1.7.3.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-libwrap --enable-fips ac_cv_have_z_modifier=yes" -makedepends="readline-devel libressl-devel" +makedepends="readline-devel openssl-devel" short_desc="Relay for bidirectional data transfer between two independent channels" maintainer="Orphaned " license="GPL-2.0-only" From 936d4161bfc1089e4237448721196a983b931630 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:47 +0100 Subject: [PATCH 291/447] spice: rebuild against OpenSSL --- srcpkgs/spice/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template index 5a2b3b95560..98559c4a507 100644 --- a/srcpkgs/spice/template +++ b/srcpkgs/spice/template @@ -1,13 +1,13 @@ # Template file for 'spice' pkgname=spice version=0.14.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-tunnel --disable-opengl --enable-smartcard --with-sasl --disable-static --enable-xinerama --disable-celt051" hostmakedepends="pkg-config python" makedepends="spice-protocol libjpeg-turbo-devel pixman-devel - libressl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel + openssl-devel opus-devel alsa-lib-devel libXfixes-devel libXrender-devel libXrandr-devel libsasl-devel libXinerama-devel libglib-devel libcacard-devel nss-devel" short_desc="Implements the SPICE protocol" From ccb01f704ce9dbd87b5be8a6d53951ac694153d8 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:47 +0100 Subject: [PATCH 292/447] spice-gtk: rebuild against OpenSSL --- srcpkgs/spice-gtk/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index 59fa5da8e8b..b61e4e8d096 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -1,7 +1,7 @@ # Template file for 'spice-gtk' pkgname=spice-gtk version=0.37 -revision=5 +revision=6 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir enabled disabled) @@ -11,7 +11,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dpulse=disabled -Dgtk_doc=disabled" hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel spice-protocol python3-six python3-parsing perl" -makedepends="acl-devel liblz4-devel pixman-devel opus-devel libressl-devel +makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup-devel usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel phodav-devel gstreamer1-devel gst-plugins-base1-devel vte3-devel" @@ -33,7 +33,7 @@ case "$XBPS_TARGET_MACHINE" in esac spice-gtk-devel_package() { - depends="gtk+3-devel pixman-devel libressl-devel opus-devel + depends="gtk+3-devel pixman-devel openssl-devel opus-devel libva-devel libsasl-devel liblz4-devel usbredir-devel phodav-devel json-glib-devel gstreamer1-devel gst-plugins-base1-devel spice-protocol $(vopt_if gir libgirepository-devel) From 0aab83b41ec37136d852c4fd38da4f55c7a58318 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:47 +0100 Subject: [PATCH 293/447] spiped: rebuild against OpenSSL --- srcpkgs/spiped/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/spiped/template b/srcpkgs/spiped/template index eeb9ac5b011..765b0b00959 100644 --- a/srcpkgs/spiped/template +++ b/srcpkgs/spiped/template @@ -1,9 +1,9 @@ # Template file for 'spiped' pkgname=spiped version=1.6.1 -revision=1 +revision=2 build_style=gnu-makefile -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Spiped secure pipe daemon" maintainer="Orphaned " license="BSD-2-Clause" From d1370a5448ffdea88d5acd8c531384201a139eb3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:47 +0100 Subject: [PATCH 294/447] spotify-tui: rebuild against OpenSSL --- srcpkgs/spotify-tui/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spotify-tui/template b/srcpkgs/spotify-tui/template index 1c027e542e2..5c197c20cee 100644 --- a/srcpkgs/spotify-tui/template +++ b/srcpkgs/spotify-tui/template @@ -4,7 +4,7 @@ version=0.23.0 revision=1 build_style=cargo hostmakedepends="pkg-config python3" -makedepends="libressl-devel python3-devel libxcb-devel" +makedepends="openssl-devel python3-devel libxcb-devel" short_desc="Spotify for the terminal" maintainer="Andrew Benson " license="MIT" From c297f12bb5305f24326605143c84860db9289b9f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:47 +0100 Subject: [PATCH 295/447] spotifyd: rebuild against OpenSSL --- srcpkgs/spotifyd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/spotifyd/template b/srcpkgs/spotifyd/template index cb77beb238b..b707c4a9806 100644 --- a/srcpkgs/spotifyd/template +++ b/srcpkgs/spotifyd/template @@ -5,7 +5,7 @@ revision=1 build_style=cargo configure_args="--no-default-features" hostmakedepends="pkg-config" -makedepends="libressl-devel $(vopt_if alsa alsa-lib-devel) +makedepends="openssl-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if portaudio portaudio-devel) $(vopt_if dbus dbus-devel)" short_desc="Spotify client running as a UNIX daemon" From 18af96adce15b086ee74cad86000cd28f0cd1f63 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:48 +0100 Subject: [PATCH 296/447] sqlcipher: rebuild against OpenSSL --- srcpkgs/sqlcipher/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlcipher/template b/srcpkgs/sqlcipher/template index eea7cc60f56..74c98205efa 100644 --- a/srcpkgs/sqlcipher/template +++ b/srcpkgs/sqlcipher/template @@ -1,11 +1,11 @@ # Template file for 'sqlcipher' pkgname=sqlcipher version=4.3.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-tempstore=yes" hostmakedepends="tcl" -makedepends="libressl-devel readline-devel" +makedepends="openssl-devel readline-devel" short_desc="SQLite extension that provides transparent 256-bit AES encryption" maintainer="Steve Prybylski " license="BSD-3-Clause" From 41d5a8341edae8130112efb36ea158755ac1441c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:48 +0100 Subject: [PATCH 297/447] sqmail: rebuild against OpenSSL --- srcpkgs/sqmail/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template index 39d4211762d..95b7c46373c 100644 --- a/srcpkgs/sqmail/template +++ b/srcpkgs/sqmail/template @@ -1,7 +1,7 @@ # Template file for 'sqmail' pkgname=sqmail version=4.0.10 -revision=1 +revision=2 create_wrksrc=yes build_wrksrc="mail/${pkgname}/${pkgname}-${version}/src" makedepends="fehQlibs libidn2-devel ucspi-ssl-devel" From 2054d36808d2de35ddd76fea6af59940675abedb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:48 +0100 Subject: [PATCH 298/447] srain: rebuild against OpenSSL --- srcpkgs/srain/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/srain/template b/srcpkgs/srain/template index 7a28616db50..abf70431e84 100644 --- a/srcpkgs/srain/template +++ b/srcpkgs/srain/template @@ -1,12 +1,12 @@ # Template file for 'srain' pkgname=srain version=1.1.3 -revision=1 +revision=2 build_style=configure build_helper=gir configure_args="--prefix=/usr --sysconfdir=/etc" hostmakedepends="pkg-config gettext glib-devel" -makedepends="glib-devel gtk+3-devel libconfig-devel libressl-devel +makedepends="glib-devel gtk+3-devel libconfig-devel openssl-devel libsecret-devel libsoup-devel" short_desc="Modern IRC client written in GTK" maintainer="avoidr " From 2fc9e9c04358bec902bd9e1c330f389efc8c36e2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:49 +0100 Subject: [PATCH 299/447] stremio-shell: rebuild against OpenSSL --- srcpkgs/stremio-shell/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template index 100543c5f4f..e26d066c062 100644 --- a/srcpkgs/stremio-shell/template +++ b/srcpkgs/stremio-shell/template @@ -1,7 +1,7 @@ # Template file for 'stremio-shell' pkgname=stremio-shell version=4.4.120 -revision=1 +revision=2 _singleapplication_hash=6fbf6bffc848821d41a09ccd9fc0ede83bbbcdce _libmpv_hash=75ce9ce61f118da27105b770e7a728da832483be build_style=qmake From dc4243b3641a5968637cf6aa6a24fe182fbf726a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:49 +0100 Subject: [PATCH 300/447] stunnel: rebuild against OpenSSL --- srcpkgs/stunnel/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/stunnel/template b/srcpkgs/stunnel/template index e3f5a07353d..54ecff002a0 100644 --- a/srcpkgs/stunnel/template +++ b/srcpkgs/stunnel/template @@ -1,11 +1,11 @@ # Template file for 'stunnel' pkgname=stunnel version=5.46 -revision=4 +revision=5 build_style=gnu-configure configure_args="--enable-ipv6 --with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="perl" -makedepends="libressl-devel" +makedepends="openssl-devel" checkdepends="nmap procps-ng" short_desc="SSL encryption wrapper" maintainer="Toyam Cox " @@ -34,7 +34,7 @@ post_install() { # One thing OpenBSD does that we don't do here is add a _stunnel user/group and # modify the configuration samples to chroot and use this by default. # As of 5.38 the signature expected for the CRYPTO_set_mem_functions seems to -# be out of line with what libressl provides. +# be out of line with what openssl provides. # LibreSSL wants 'void (*)(void *)' but argument is of type 'void (*)(void *, const char *, int)' # This is probably not a security problem. EDIT: Well, it would break. Badly. # -- From 2097b037a1dfc3f06f5189fee7b687e7b5647bea Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:49 +0100 Subject: [PATCH 301/447] supertuxkart: rebuild against OpenSSL --- srcpkgs/supertuxkart/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template index fdacba9b730..519bc615782 100644 --- a/srcpkgs/supertuxkart/template +++ b/srcpkgs/supertuxkart/template @@ -1,7 +1,7 @@ # Template file for 'supertuxkart' pkgname=supertuxkart version=1.2 -revision=2 +revision=3 wrksrc="SuperTuxKart-${version}-src" build_style=cmake hostmakedepends="pkg-config" @@ -9,7 +9,7 @@ makedepends="libgomp-devel libjpeg-turbo-devel libpng-devel libbluetooth-devel glu-devel libvorbis-devel libXrandr-devel libopenal-devel fribidi-devel libcurl-devel freetype-devel libopenglrecorder-devel wayland-devel harfbuzz-devel libenet-devel - libogg-devel MesaLib-devel libressl-devel zlib-devel SDL2-devel glew-devel" + libogg-devel MesaLib-devel openssl-devel zlib-devel SDL2-devel glew-devel" depends="desktop-file-utils hicolor-icon-theme supertuxkart-data" short_desc="Kart racing game featuring Tux and his friends" maintainer="Orphaned " From 4e30643d9973d8024e8328a6f3268f3cf44748ce Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:50 +0100 Subject: [PATCH 302/447] swi-prolog: rebuild against OpenSSL --- srcpkgs/swi-prolog/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/swi-prolog/template b/srcpkgs/swi-prolog/template index ce5d45085d8..90996f6a5fd 100644 --- a/srcpkgs/swi-prolog/template +++ b/srcpkgs/swi-prolog/template @@ -8,7 +8,7 @@ build_helper="qemu" configure_args="-DBUILD_TESTING=OFF" hostmakedepends="pkg-config" makedepends="gmp-devel libXft-devel libXinerama-devel libXpm-devel libXt-devel - libarchive-devel libjpeg-turbo-devel libressl-devel readline-devel + libarchive-devel libjpeg-turbo-devel openssl-devel readline-devel unixodbc-devel zlib-devel pcre-devel libyaml-devel" short_desc="Comprehensive free Prolog environment" maintainer="Leah Neukirchen " From 96d7d21995c90472d93b3f9b22cea27cd7c3ba68 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:50 +0100 Subject: [PATCH 303/447] swiften: rebuild against OpenSSL --- srcpkgs/swiften/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index 45118dea56c..969ef1eb5d7 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -1,10 +1,10 @@ # Template file for 'swiften' pkgname=swiften version=4.0.3 -revision=1 +revision=2 wrksrc="swift-${version}" hostmakedepends="scons pkg-config" -makedepends="boost-devel libressl-devel libxml2-devel libidn-devel +makedepends="boost-devel openssl-devel libxml2-devel libidn-devel lua51-devel miniupnpc-devel sqlite-devel" short_desc="XMPP library for C++" maintainer="John Regan " From 97cd20fdf2aeb2cbfb5ac33ea24a730b51b32a41 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:50 +0100 Subject: [PATCH 304/447] swirc: rebuild against OpenSSL --- srcpkgs/swirc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template index 9f35c447670..fb9285bd1fd 100644 --- a/srcpkgs/swirc/template +++ b/srcpkgs/swirc/template @@ -1,11 +1,11 @@ # Template file for 'swirc' pkgname=swirc version=3.2.5 -revision=1 +revision=2 build_style=configure make_install_args="PREFIX=/usr" hostmakedepends="pkg-config which" -makedepends="libcurl-devel libressl-devel ncurses-devel libidn-devel" +makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel" checkdepends="cmocka-devel" short_desc="Curses ICB and IRC client" maintainer="Markus Uhlin " From d23016f6ff86039c67aae1c04a4a6d9e345a9576 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:50 +0100 Subject: [PATCH 305/447] sylpheed: rebuild against OpenSSL --- srcpkgs/sylpheed/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index 1e01726ef40..f1f5ca80767 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -5,7 +5,7 @@ revision=6 build_style=gnu-configure configure_args="--disable-compface --disable-gtkspell --enable-ldap --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr" hostmakedepends="automake libtool pkg-config flex gettext-devel gtk+-devel gpgme-devel glib-devel" -makedepends="libfl-devel zlib-devel libressl-devel gtk+-devel gpgme-devel libldap-devel" +makedepends="libfl-devel zlib-devel openssl-devel gtk+-devel gpgme-devel libldap-devel" short_desc="GTK+ Lightweight and user-friendly e-mail client" maintainer="Orphaned " license=" GPL-2.0-or-later, LGPL-2.1-or-later" From 545b069b6d94c1f933b77da79c5f9abdfcfbb501 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:50 +0100 Subject: [PATCH 306/447] synergy: rebuild against OpenSSL --- srcpkgs/synergy/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template index b329e4d5921..0c4f3b4f130 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -1,7 +1,7 @@ # Template file for 'synergy' pkgname=synergy version=1.13.0 -revision=1 +revision=2 wrksrc="${pkgname}-core-${version}-stable" build_style=cmake configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON" From 7cf08233f1b46c425fed9ea6f8dfa2e159ef8dd7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:51 +0100 Subject: [PATCH 307/447] sysdig: rebuild against OpenSSL --- srcpkgs/sysdig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index fa7fafc80d2..4ae90f82f02 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -1,7 +1,7 @@ # Template file for 'sysdig' pkgname=sysdig version=0.27.1 -revision=5 +revision=6 build_style=cmake configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF -DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF @@ -10,7 +10,7 @@ configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF make_cmd=make hostmakedepends="wget pkg-config protobuf" makedepends="LuaJIT-devel c-ares-devel elfutils-devel grpc-devel jsoncpp-devel - libcurl-devel libprotoc-devel libressl-devel ncurses-devel protobuf-devel + libcurl-devel libprotoc-devel openssl-devel ncurses-devel protobuf-devel tbb-devel zlib-devel" depends="dkms" short_desc="Open source system-level exploration and troubleshooting tool" From f10ffcd6c03f210c2f5ed17ab022756f99c83ca0 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:51 +0100 Subject: [PATCH 308/447] taisei: rebuild against OpenSSL --- srcpkgs/taisei/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/taisei/template b/srcpkgs/taisei/template index 5a34fe9f6e6..b47f44502eb 100644 --- a/srcpkgs/taisei/template +++ b/srcpkgs/taisei/template @@ -1,7 +1,7 @@ # Template file for 'taisei' pkgname=taisei version=1.3.1 -revision=3 +revision=4 wrksrc="taisei-v${version}" build_style=meson hostmakedepends="pkg-config python3-docutils" From d1a5231d1497b9d580ec910ad315add14ceb5b93 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:51 +0100 Subject: [PATCH 309/447] tarpaulin: rebuild against OpenSSL --- srcpkgs/tarpaulin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tarpaulin/template b/srcpkgs/tarpaulin/template index c4015a5eebc..56fceeb4c43 100644 --- a/srcpkgs/tarpaulin/template +++ b/srcpkgs/tarpaulin/template @@ -1,11 +1,11 @@ # Template file for 'tarpaulin' pkgname=tarpaulin version=0.14.3 -revision=1 +revision=2 archs="x86_64*" build_style=cargo hostmakedepends="pkg-config cmake" -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" short_desc="Code coverage tool for Rust/Cargo projects" maintainer="Jan Christian Grünhage " license="MIT, Apache-2.0" From be86643d18ae8c0219c03269b50c821d628fc3a9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:51 +0100 Subject: [PATCH 310/447] tcpdump: rebuild against OpenSSL --- srcpkgs/tcpdump/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template index aea1e1a91e5..56ca1adb796 100644 --- a/srcpkgs/tcpdump/template +++ b/srcpkgs/tcpdump/template @@ -3,7 +3,7 @@ pkgname=tcpdump version=4.99.0 revision=1 build_style=gnu-configure -makedepends="libpcap-devel libressl-devel" +makedepends="libpcap-devel openssl-devel" checkdepends="perl" short_desc="A tool for network monitoring and data acquisition" maintainer="Orphaned " From 32f4bea844aa7c50e9dc9e881f3c5596bccbc5b6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:52 +0100 Subject: [PATCH 311/447] tcpflow: rebuild against OpenSSL --- srcpkgs/tcpflow/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template index 727795843c7..decc27a0a27 100644 --- a/srcpkgs/tcpflow/template +++ b/srcpkgs/tcpflow/template @@ -1,11 +1,11 @@ # Template file for 'tcpflow' pkgname=tcpflow version=1.5.2 -revision=2 +revision=3 wrksrc="$pkgname-$pkgname-$version" build_style=gnu-configure hostmakedepends="automake" -makedepends="libpcap-devel zlib-devel libressl-devel boost-devel" +makedepends="libpcap-devel zlib-devel openssl-devel boost-devel" short_desc="Captures data transmitted as part of TCP connections" maintainer="Orphaned " license="GPL-3.0-only" From 89d93b4f2ed21d0b5140f896dfd6ec3b9fca87c1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:52 +0100 Subject: [PATCH 312/447] tealdeer: rebuild against OpenSSL --- srcpkgs/tealdeer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tealdeer/template b/srcpkgs/tealdeer/template index 88121c7d2b4..72b8a1117c2 100644 --- a/srcpkgs/tealdeer/template +++ b/srcpkgs/tealdeer/template @@ -1,11 +1,11 @@ # Template file for 'tealdeer' pkgname=tealdeer version=1.4.1 -revision=1 +revision=2 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" -depends="libressl" +makedepends="openssl-devel" +depends="openssl" short_desc="Very fast implementation of tldr in Rust" maintainer="jcgruenhage " license="MIT, Apache-2.0" From 778cb98f60b6236a16d9dc2acb0f69ca0386bb94 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:52 +0100 Subject: [PATCH 313/447] tectonic: rebuild against OpenSSL --- srcpkgs/tectonic/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template index 709c265d4aa..b339ce146d7 100644 --- a/srcpkgs/tectonic/template +++ b/srcpkgs/tectonic/template @@ -1,11 +1,11 @@ # Template file for 'tectonic' pkgname=tectonic version=0.3.3 -revision=1 +revision=2 wrksrc="tectonic-tectonic-${version}" build_style=cargo hostmakedepends="pkg-config" -makedepends="harfbuzz-devel libressl-devel" +makedepends="harfbuzz-devel openssl-devel" short_desc="Modernized, complete, self-contained TeX/LaTeX engine" maintainer="Chinmay Pai " license="MIT" From 9fe749ea198390388488f054df90fd81d837407d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:52 +0100 Subject: [PATCH 314/447] telegram-desktop: rebuild against OpenSSL --- srcpkgs/telegram-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 04aa1ec98a6..5778f4c2d76 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=2.5.1 -revision=1 +revision=2 wrksrc="tdesktop-${version}-full" build_style=cmake build_helper="qemu" From 28209f6ab9997070e38df98dc3eadc17bfe29ef5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:52 +0100 Subject: [PATCH 315/447] telepathy-salut: switch to GnuTLS --- srcpkgs/telepathy-salut/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template index e5cf92d2d0c..8c3d2dace29 100644 --- a/srcpkgs/telepathy-salut/template +++ b/srcpkgs/telepathy-salut/template @@ -1,14 +1,14 @@ # Template file for 'telepathy-salut' pkgname=telepathy-salut version=0.8.1 -revision=19 +revision=20 lib32disabled=yes build_style=gnu-configure -configure_args="--disable-tests --disable-plugins --with-tls=openssl ---disable-avahi-tests --disable-static" +configure_args="--disable-tests --disable-plugins --with-tls=gnutls + --disable-avahi-tests --disable-static" hostmakedepends="pkg-config python xmldiff glib-devel" makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel - libressl-devel libuuid-devel sqlite-devel" + gnutls-devel libuuid-devel sqlite-devel" depends="avahi" short_desc="Link-local XMPP connection manager for Telepathy" maintainer="Orphaned " From c1113fe3045fde3e8141414ac7c44645722678e7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:53 +0100 Subject: [PATCH 316/447] thc-hydra: rebuild against OpenSSL --- srcpkgs/thc-hydra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thc-hydra/template b/srcpkgs/thc-hydra/template index 19a37248d13..1d457533617 100644 --- a/srcpkgs/thc-hydra/template +++ b/srcpkgs/thc-hydra/template @@ -1,10 +1,10 @@ # Template file for 'thc-hydra' pkgname=thc-hydra version=9.1 -revision=1 +revision=2 build_style=gnu-configure make_install_args="MANDIR=/share/man/man1" -makedepends="zlib-devel libressl-devel libidn-devel ncurses-devel pcre-devel +makedepends="zlib-devel openssl-devel libidn-devel ncurses-devel pcre-devel postgresql-libs-devel libmariadbclient-devel libssh-devel" short_desc="Tool to guess/crack valid login/password pairs" maintainer="Michael Aldridge " From 02ed7cf3fe8da87d945a6a090d3ba16fb0cb76fa Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:53 +0100 Subject: [PATCH 317/447] thrift: rebuild against OpenSSL --- srcpkgs/thrift/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/thrift/template b/srcpkgs/thrift/template index 0630ef06a52..9ac4bb481c3 100644 --- a/srcpkgs/thrift/template +++ b/srcpkgs/thrift/template @@ -1,10 +1,10 @@ # Template file for 'thrift' pkgname=thrift version=0.13.0 -revision=5 +revision=6 build_style=gnu-configure configure_args="--without-python" -makedepends="boost-devel libressl-devel" +makedepends="boost-devel openssl-devel" checkdepends="zlib-devel libevent-devel" short_desc="Apache Thrift compiler" maintainer="Orphaned " From 95e2416913bfad5fb8e9c0e606fe222fa24e21e7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:53 +0100 Subject: [PATCH 318/447] tinc: rebuild against OpenSSL --- srcpkgs/tinc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template index 19fd8755e14..1252d5a1734 100644 --- a/srcpkgs/tinc/template +++ b/srcpkgs/tinc/template @@ -1,9 +1,9 @@ # Template file for 'tinc' pkgname=tinc version=1.0.36 -revision=2 +revision=3 build_style=gnu-configure -makedepends="zlib-devel lzo-devel libressl-devel" +makedepends="zlib-devel lzo-devel openssl-devel" short_desc="VPN (Virtual Private Network) daemon" maintainer="Orphaned " license="GPL-2.0-or-later" From 11d283ad783f05a8f7547765f72c67ebe30549c4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:53 +0100 Subject: [PATCH 319/447] tmplgen: rebuild against OpenSSL --- srcpkgs/tmplgen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tmplgen/template b/srcpkgs/tmplgen/template index 1025bb7adcd..f352a5f3fd6 100644 --- a/srcpkgs/tmplgen/template +++ b/srcpkgs/tmplgen/template @@ -1,10 +1,10 @@ # Template file for 'tmplgen' pkgname=tmplgen version=1.3.1 -revision=3 +revision=4 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Void Linux template generator for language-specific package managers" maintainer="Enno Boland " license="GPL-3.0-or-later" From 827386794918ebaf2fc8b2d2bd0ce32232142f24 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:54 +0100 Subject: [PATCH 320/447] tnftp: rebuild against OpenSSL --- srcpkgs/tnftp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template index 90ac354163c..c0b75c164f2 100644 --- a/srcpkgs/tnftp/template +++ b/srcpkgs/tnftp/template @@ -1,10 +1,10 @@ # Template file for 'tnftp' pkgname=tnftp version=20200705 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool" -makedepends="libressl-devel ncurses-devel" +makedepends="openssl-devel ncurses-devel" short_desc="NetBSD enhanced ftp client" maintainer="Leah Neukirchen " license="BSD" From ac44e1dea42ea27bad0524179e401159d9ff3e56 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:54 +0100 Subject: [PATCH 321/447] tor: rebuild against OpenSSL --- srcpkgs/tor/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index ab802a5d377..3c3dffc6338 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -1,7 +1,7 @@ # Template file for 'tor' pkgname=tor version=0.4.4.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-zstd" hostmakedepends="pkg-config" From f8a9878ca92566af6f266a3eb1033372ac198f24 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:54 +0100 Subject: [PATCH 322/447] tpm-tools: rebuild against OpenSSL --- srcpkgs/tpm-tools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tpm-tools/template b/srcpkgs/tpm-tools/template index 61caecd515d..c581d165345 100644 --- a/srcpkgs/tpm-tools/template +++ b/srcpkgs/tpm-tools/template @@ -1,11 +1,11 @@ # Template file for 'tpm-tools' pkgname=tpm-tools version=1.3.9.1 -revision=6 +revision=7 create_wrksrc=yes build_style=gnu-configure hostmakedepends="perl" # wants pod2man -makedepends="libressl-devel trousers-devel" +makedepends="openssl-devel trousers-devel" short_desc="Manage and diagnose tools for a Trusted Platform Module (TPM)" maintainer="Toyam Cox " license="CPL" From 863274b19aa2112c00e07604d3f4c1a295316266 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:54 +0100 Subject: [PATCH 323/447] transmission: rebuild against OpenSSL --- srcpkgs/transmission/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 7249c93b03a..5a61a0a2bdd 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -1,7 +1,7 @@ # Template file for 'transmission' pkgname=transmission version=3.00 -revision=4 +revision=5 build_style=cmake configure_args="-DENABLE_CLI=ON" hostmakedepends="autoconf automake intltool glib-devel From 812eda3ee747368bf7b867432d86e5e8e41e864b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:55 +0100 Subject: [PATCH 324/447] trousers: rebuild against OpenSSL --- srcpkgs/trousers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template index 59aa7ec6d10..5d962adec91 100644 --- a/srcpkgs/trousers/template +++ b/srcpkgs/trousers/template @@ -1,11 +1,11 @@ # Template file for 'trousers' pkgname=trousers version=0.3.14 -revision=10 +revision=11 create_wrksrc=yes build_style=gnu-configure conf_files="/etc/tcsd.conf" -makedepends="libressl-devel" +makedepends="openssl-devel" system_accounts=tss tss_homedir=/var/lib/tpm short_desc="Trusted Computing Software Stack for the TPM" From 278b82ec84b3249bc537a0e72668dd528ab9e963 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:55 +0100 Subject: [PATCH 325/447] ttyd: rebuild against OpenSSL --- srcpkgs/ttyd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ttyd/template b/srcpkgs/ttyd/template index 85bee66710e..e870724e1d9 100644 --- a/srcpkgs/ttyd/template +++ b/srcpkgs/ttyd/template @@ -1,10 +1,10 @@ # Template file for 'ttyd' pkgname=ttyd version=1.6.0 -revision=4 +revision=5 build_style=cmake hostmakedepends="pkg-config xxd" -makedepends="libwebsockets-devel json-c-devel libressl-devel zlib-devel +makedepends="libwebsockets-devel json-c-devel openssl-devel zlib-devel libuv-devel" short_desc="Share your terminal over the web" maintainer="Toyam Cox " From 21c0e76abba36fc0eec8a7c6ae000143e450321f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:55 +0100 Subject: [PATCH 326/447] tvheadend: rebuild against OpenSSL --- srcpkgs/tvheadend/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tvheadend/template b/srcpkgs/tvheadend/template index e32d30f917f..230ecb59257 100644 --- a/srcpkgs/tvheadend/template +++ b/srcpkgs/tvheadend/template @@ -1,7 +1,7 @@ # Template file for 'tvheadend' pkgname=tvheadend version=4.2.8 -revision=4 +revision=5 wrksrc=tvheadend-${version} build_style=gnu-configure configure_args="--enable-dvbscan --disable-ffmpeg_static @@ -9,7 +9,7 @@ configure_args="--enable-dvbscan --disable-ffmpeg_static --disable-libx265_static --disable-libvpx_static --disable-libtheora_static --disable-libvorbis_static --disable-libfdkaac_static" hostmakedepends="gettext pkg-config python git which" -makedepends="avahi-libs-devel libressl-devel zlib-devel libcurl-devel ffmpeg-devel" +makedepends="avahi-libs-devel openssl-devel zlib-devel libcurl-devel ffmpeg-devel" short_desc="TV streaming server" maintainer="lemmi " license="GPL-3.0-only" From 4603b854bd8cd0c2d68440028e1301be134a8cae Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:55 +0100 Subject: [PATCH 327/447] u-boot-tools: rebuild against OpenSSL --- srcpkgs/u-boot-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/u-boot-tools/template b/srcpkgs/u-boot-tools/template index c486f52927e..aa1f0981f7c 100644 --- a/srcpkgs/u-boot-tools/template +++ b/srcpkgs/u-boot-tools/template @@ -7,7 +7,7 @@ build_style=gnu-makefile make_build_args="HOSTSTRIP=: STRIP=:" make_build_target="tools envtools" hostmakedepends="bison flex" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Das U-Boot tools" maintainer="Duncaen " license="GPL-2.0-or-later" From c1cd805e739391a880c54d802aa1c6c384e75581 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:55 +0100 Subject: [PATCH 328/447] ucspi-ssl: rebuild against OpenSSL --- srcpkgs/ucspi-ssl/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ucspi-ssl/template b/srcpkgs/ucspi-ssl/template index 0fa5f09c9d2..1f2c6c36793 100644 --- a/srcpkgs/ucspi-ssl/template +++ b/srcpkgs/ucspi-ssl/template @@ -2,12 +2,12 @@ pkgname=ucspi-ssl reverts="0.99e_3 0.99e_2 0.99e_1" version=0.11.6a -revision=2 +revision=3 create_wrksrc=yes build_wrksrc="host/superscript.com/net/${pkgname}-${version}/src" build_style=gnu-makefile -hostmakedepends="fehQlibs libressl-devel perl" -makedepends="fehQlibs libressl-devel perl" +hostmakedepends="fehQlibs openssl-devel perl" +makedepends="fehQlibs openssl-devel perl" depends="ucspi-tcp6" short_desc="Command-line tools for building SSL client-server applications" maintainer="Leah Neukirchen " @@ -70,7 +70,7 @@ do_install() { ucspi-ssl-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision} libressl-devel" + depends="${sourcepkg}>=${version}_${revision} openssl-devel" pkg_install() { vinstall ucspissl.a 0644 usr/lib vinstall ucspissl.h 0644 usr/include From 13f5891564bf8d803e6dcbc99ad3bd319018c974 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:56 +0100 Subject: [PATCH 329/447] uftp: rebuild against OpenSSL --- srcpkgs/uftp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/uftp/template b/srcpkgs/uftp/template index 59b29b58648..f0c6347e26e 100644 --- a/srcpkgs/uftp/template +++ b/srcpkgs/uftp/template @@ -1,9 +1,9 @@ # Template file for 'uftp' pkgname=uftp version=5.0 -revision=1 +revision=2 build_style=gnu-makefile -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Encrypted multicast file transfer program" maintainer="Orphaned " license="GPL-3.0-or-later" From 5cd4873333cb4d8e06aec5897f655a2358ca6f9c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:56 +0100 Subject: [PATCH 330/447] umurmur: rebuild against OpenSSL --- srcpkgs/umurmur/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/umurmur/template b/srcpkgs/umurmur/template index 276bdd8302c..ec425daa69b 100644 --- a/srcpkgs/umurmur/template +++ b/srcpkgs/umurmur/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--enable-shmapi --with-ssl=openssl" conf_files="/etc/umurmur/umurmur.conf" hostmakedepends="automake libtool" -makedepends="libconfig-devel libressl-devel protobuf-c-devel" +makedepends="libconfig-devel openssl-devel protobuf-c-devel" short_desc="Minimalistic Mumble server" maintainer="Duncaen " license="BSD-3-clause" From 12df56447c12bb4abc88360449efb001acc7c933 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:56 +0100 Subject: [PATCH 331/447] unbound: rebuild against OpenSSL --- srcpkgs/unbound/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/unbound/template b/srcpkgs/unbound/template index 69ee650fbf3..ed5b00ced6c 100644 --- a/srcpkgs/unbound/template +++ b/srcpkgs/unbound/template @@ -34,7 +34,7 @@ libunbound_package() { } unbound-devel_package() { - depends="libunbound>=${version}_${revision} libressl-devel libevent-devel" + depends="libunbound>=${version}_${revision} openssl-devel libevent-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From 248733ce0a526e81029da37126267d1b9bb8c508 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:56 +0100 Subject: [PATCH 332/447] vanitygen: rebuild against OpenSSL --- srcpkgs/vanitygen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template index 21cdeac96a9..8fb4fa5ca44 100644 --- a/srcpkgs/vanitygen/template +++ b/srcpkgs/vanitygen/template @@ -1,9 +1,9 @@ # Template file for 'vanitygen' pkgname=vanitygen version=1.53 -revision=1 +revision=2 wrksrc="vanitygen-plus-PLUS${version}" -makedepends="pcre-devel libressl-devel" +makedepends="pcre-devel openssl-devel" short_desc="Bitcoin vanity address generator" maintainer="Orphaned " license="AGPL-3.0-or-later" From cb9ee6a24a2f3a89e67ee40b7999cd47f6ff5733 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:57 +0100 Subject: [PATCH 333/447] vboot-utils: rebuild against OpenSSL --- srcpkgs/vboot-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vboot-utils/template b/srcpkgs/vboot-utils/template index 61068975964..5bac667ce94 100644 --- a/srcpkgs/vboot-utils/template +++ b/srcpkgs/vboot-utils/template @@ -1,11 +1,11 @@ # Template file for 'vboot-utils' pkgname=vboot-utils version=45.7262 -revision=13 +revision=14 archs="x86_64* i686* aarch64* arm*" _githash=0e8c964915fffb58032bb59bdb31949de718ca90 hostmakedepends="pkg-config git" -makedepends="libressl-devel libuuid-devel liblzma-devel libyaml-devel" +makedepends="openssl-devel libuuid-devel liblzma-devel libyaml-devel" short_desc="Verified boot kernel utilities" maintainer="Enno Boland " license="BSD-3-Clause" From f34a62831dbe4eef3cb29063e954d2e236b15323 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:57 +0100 Subject: [PATCH 334/447] vde2: rebuild against OpenSSL --- srcpkgs/vde2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template index 044f465e70a..5d0efce366a 100644 --- a/srcpkgs/vde2/template +++ b/srcpkgs/vde2/template @@ -1,12 +1,12 @@ # Template file for 'vde2' pkgname=vde2 version=2.3.2 -revision=22 +revision=23 build_style=gnu-configure configure_args="--disable-static --enable-experimental --disable-python --enable-kernel-switch" hostmakedepends="automake libtool" -makedepends="libpcap-devel libressl-devel" +makedepends="libpcap-devel openssl-devel" conf_files=" /etc/vde2/vdecmd /etc/vde2/libvdemgmt/asyncrecv.rc From deccb2fc0ae2b20cb10027b86afd4763ae8cf684 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:57 +0100 Subject: [PATCH 335/447] virtuoso: rebuild against OpenSSL --- srcpkgs/virtuoso/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/virtuoso/template b/srcpkgs/virtuoso/template index 7650d871fcd..77ea433a107 100644 --- a/srcpkgs/virtuoso/template +++ b/srcpkgs/virtuoso/template @@ -1,13 +1,13 @@ # Template file for 'virtuoso' pkgname=virtuoso version=7.2.5.1 -revision=2 +revision=3 archs="x86_64* aarch64* ppc64le*" wrksrc="${pkgname}-opensource-${version}" build_style=gnu-configure configure_args="--enable-static" hostmakedepends="automake libtool flex gperf net-tools" -makedepends="libressl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel" +makedepends="openssl-devel libldap-devel readline-devel libxml2-devel mit-krb5-devel" short_desc="Scalable cross-platform server of virtuoso" maintainer="Jürgen Buchmüller " license="GPL-2" From ca6408f30bf7ab3b9192e994c3b986b962fa43f9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:58 +0100 Subject: [PATCH 336/447] volta: rebuild against OpenSSL --- srcpkgs/volta/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/volta/template b/srcpkgs/volta/template index 4f59d154235..7904ffeb444 100644 --- a/srcpkgs/volta/template +++ b/srcpkgs/volta/template @@ -5,7 +5,7 @@ revision=1 archs="x86_64" # Due to volta pulling pre-built binaries later. Evil. build_style="cargo" hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="JavaScript tool version sync helper" maintainer="Alex Lohr " license="BSD-2-Clause" From 8ca59b1527cf46c8f32847a9242d83ef8949a6a3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:58 +0100 Subject: [PATCH 337/447] vpn-ws: rebuild against OpenSSL --- srcpkgs/vpn-ws/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vpn-ws/template b/srcpkgs/vpn-ws/template index bfa1bcc9f34..498ca5775a8 100644 --- a/srcpkgs/vpn-ws/template +++ b/srcpkgs/vpn-ws/template @@ -1,10 +1,10 @@ # Template file for 'vpn-ws' pkgname=vpn-ws version=0.2 -revision=6 +revision=7 build_style=gnu-makefile make_use_env=yes -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="VPN system over webhooks" maintainer="Toyam Cox " license="MIT" From e0bf609f044eeb9808ef9cd727ec2ccda815413b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:58 +0100 Subject: [PATCH 338/447] vsftpd: rebuild against OpenSSL --- srcpkgs/vsftpd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template index 58c56630007..866fa5db305 100644 --- a/srcpkgs/vsftpd/template +++ b/srcpkgs/vsftpd/template @@ -1,9 +1,9 @@ # Template file for 'vsftpd' pkgname=vsftpd version=3.0.3 -revision=13 +revision=14 build_style=gnu-makefile -makedepends="pam-devel libcap-devel libnsl-devel libressl-devel" +makedepends="pam-devel libcap-devel libnsl-devel openssl-devel" short_desc="FTP daemon with focus on security" maintainer="Enno Boland " license="GPL-2.0-only" From c2953e9f44a157ec8b213de855d0e9e6d0a69383 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:58 +0100 Subject: [PATCH 339/447] w3m: rebuild against OpenSSL --- srcpkgs/w3m/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template index 6c42a09ff1f..8befde6048b 100644 --- a/srcpkgs/w3m/template +++ b/srcpkgs/w3m/template @@ -1,14 +1,14 @@ # Template file for 'w3m' pkgname=w3m version=0.5.3+git20210102 -revision=1 +revision=2 wrksrc="${pkgname}-${version/+/-}" build_style=gnu-configure configure_args="--libexecdir=/usr/lib --enable-image=x11,fb --with-nkf=/usr/bin/nkf --with-imagelib=imlib2 --with-termlib=ncurses --disable-w3mmailer" hostmakedepends="pkg-config gc-devel perl gettext nkf" -makedepends="zlib-devel ncurses-devel gc-devel libressl-devel imlib2-devel +makedepends="zlib-devel ncurses-devel gc-devel openssl-devel imlib2-devel libX11-devel" short_desc="Text-based Web browser and pager (with Debian patches)" maintainer="Đoàn Trần Công Danh " From 17a9324664efc08925756c094b6bb08a85263fef Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:58 +0100 Subject: [PATCH 340/447] watchman: rebuild against OpenSSL --- srcpkgs/watchman/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/watchman/template b/srcpkgs/watchman/template index be338d5ce96..a7effa00bcb 100644 --- a/srcpkgs/watchman/template +++ b/srcpkgs/watchman/template @@ -1,11 +1,11 @@ # Template file for 'watchman' pkgname=watchman version=4.9.0 -revision=6 +revision=7 build_style=gnu-configure configure_args="--disable-statedir --enable-lenient" hostmakedepends="pkg-config automake libtool" -makedepends="pcre-devel libressl-devel" +makedepends="pcre-devel openssl-devel" short_desc="Watches files and records, or triggers actions, when they change" maintainer="Orphaned " license="Apache-2.0" From 397502c9830b38b837d70a4ae91347eedfd66ea9 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:59 +0100 Subject: [PATCH 341/447] wesnoth: rebuild against OpenSSL --- srcpkgs/wesnoth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template index 19ccacf3e55..7b9b5bd64a0 100644 --- a/srcpkgs/wesnoth/template +++ b/srcpkgs/wesnoth/template @@ -1,13 +1,13 @@ # Template file for 'wesnoth' pkgname=wesnoth version=1.14.13 -revision=2 +revision=3 build_style=cmake configure_args="-DENABLE_OMP=1" hostmakedepends="pkg-config gettext" makedepends="dbus-devel libgomp-devel fribidi-devel SDL2_image-devel SDL2_net-devel SDL2_ttf-devel SDL2_mixer-devel pango-devel libvorbis-devel - zlib-devel bzip2-devel boost-devel libressl-devel SDL2-devel" + zlib-devel bzip2-devel boost-devel openssl-devel SDL2-devel" depends="desktop-file-utils" short_desc="Turn-based fantasy strategy game" maintainer="Philipp Hirsch " From 2e0de4d418676f85a394ba675c4b45561a01ec78 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:59 +0100 Subject: [PATCH 342/447] wget: rebuild against OpenSSL --- srcpkgs/wget/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 49fb40112f1..9e89672141e 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -7,7 +7,7 @@ configure_args="$(vopt_if ssl '--with-ssl=openssl') $(vopt_if gnutls '--with-ssl conf_files="/etc/wgetrc" hostmakedepends="perl pkg-config" makedepends="libidn2-devel zlib-devel libuuid-devel pcre2-devel - $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'libressl-devel')" + $(vopt_if gnutls 'gnutls-devel') $(vopt_if ssl 'openssl-devel')" depends="ca-certificates" checkdepends="perl-HTTP-Daemon perl-IO-Socket-SSL" short_desc="GNU wget download utility" From 261e2196f65f096a1cbb96e6cd7559de1925ca61 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:59 +0100 Subject: [PATCH 343/447] wpa_supplicant: rebuild against OpenSSL --- srcpkgs/wpa_supplicant/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index cee5bf9b3f1..72dddc37f6d 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -12,7 +12,7 @@ checksum=fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17 patch_args="-Np1" hostmakedepends="pkg-config" -makedepends="libnl3-devel libressl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)" +makedepends="libnl3-devel openssl-devel $(vopt_if dbus dbus-devel) $(vopt_if readline readline-devel)" build_options="dbus readline" build_options_default="dbus readline" conf_files="/etc/${pkgname}/${pkgname}.conf" From f65926dbf957d13523800de3327052c3e885206a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:18:59 +0100 Subject: [PATCH 344/447] wrk: rebuild against OpenSSL --- srcpkgs/wrk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wrk/template b/srcpkgs/wrk/template index 66aac0f34b5..b2deb5e0ffb 100644 --- a/srcpkgs/wrk/template +++ b/srcpkgs/wrk/template @@ -1,11 +1,11 @@ # Template file for 'wrk' pkgname=wrk version=4.1.0 -revision=5 +revision=6 build_style=gnu-makefile make_build_args="VER=${version} WITH_OPENSSL=/usr WITH_LUAJIT=/usr" hostmakedepends="LuaJIT" -makedepends="LuaJIT-devel libressl-devel" +makedepends="LuaJIT-devel openssl-devel" short_desc="Modern HTTP benchmarking tool" maintainer="Noel Cower " license="Apache-2.0" From 93c09699222ef567bdeef5fe4f476fb2806623e2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:00 +0100 Subject: [PATCH 345/447] wvstreams: rebuild against OpenSSL --- srcpkgs/wvstreams/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template index 57426742a2d..068c2194427 100644 --- a/srcpkgs/wvstreams/template +++ b/srcpkgs/wvstreams/template @@ -1,14 +1,14 @@ # Template file for 'wvstreams' pkgname=wvstreams version=4.6.1 -revision=19 +revision=20 build_style=gnu-configure maintainer="Enno Boland " license="LGPL-2" short_desc="Library for doing network in C++" homepage="https://code.google.com/p/wvstreams" distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz" -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt" conf_files="/etc/uniconf.conf" From 7584143dea200f0d1661ecdc1d5bd336835c39b2 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:00 +0100 Subject: [PATCH 346/447] x11vnc: rebuild against OpenSSL --- srcpkgs/x11vnc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/x11vnc/template b/srcpkgs/x11vnc/template index 361c6916436..4b8ff04a9eb 100644 --- a/srcpkgs/x11vnc/template +++ b/srcpkgs/x11vnc/template @@ -1,11 +1,11 @@ # Template file for 'x11vnc' pkgname=x11vnc version=0.9.16 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="libXdamage-devel libXinerama-devel libXrandr-devel libXtst-devel -libjpeg-turbo-devel libressl-devel libvncserver-devel zlib-devel" +libjpeg-turbo-devel openssl-devel libvncserver-devel zlib-devel" short_desc="VNC server for real X displays" maintainer="Leah Neukirchen " license="GPL-2.0-or-later" From e051653a041a72670ab1caa0f39324b793a3f813 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:00 +0100 Subject: [PATCH 347/447] xar: rebuild against OpenSSL --- srcpkgs/xar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template index 6cb55b95fb7..79117d197a9 100644 --- a/srcpkgs/xar/template +++ b/srcpkgs/xar/template @@ -1,10 +1,10 @@ # Template file for 'xar' pkgname=xar version=1.6.1 -revision=8 +revision=9 build_style=gnu-configure configure_args="ac_cv_sizeof_uid_t=4" -makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel libressl-devel" +makedepends="zlib-devel bzip2-devel e2fsprogs-devel acl-devel libxml2-devel openssl-devel" short_desc="Archiver for the eXtensible ARchiver format" maintainer="Orphaned " license="BSD-3-Clause" From 8c35eb16f2b0a00b63a9c781b70dcbbb29f0c057 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:00 +0100 Subject: [PATCH 348/447] xarcan: rebuild against OpenSSL --- srcpkgs/xarcan/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xarcan/template b/srcpkgs/xarcan/template index 1c182c12d60..222f434d0bc 100644 --- a/srcpkgs/xarcan/template +++ b/srcpkgs/xarcan/template @@ -1,13 +1,13 @@ # Template file for 'xarcan' pkgname=xarcan version=0.6.0 -revision=1 +revision=2 build_style=meson configure_args="-Dglamor=true -Dint10=false -Dipv6=true -Dsystemd_logind=false -Ddefault_font_path=/usr/share/fonts/X11" hostmakedepends="automake font-util libtool pkg-config xorg-util-macros xtrans" makedepends="MesaLib-devel arcan-devel libX11-devel libXfont2-devel libdrm-devel - libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel pixman-devel + libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel pixman-devel xorgproto" short_desc="Patched Xserver that bridges connections to Arcan" maintainer="Piraty " From 248f4b10dd7b4753901f9f40fddeb560d827eddf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:00 +0100 Subject: [PATCH 349/447] xbps: rebuild against OpenSSL --- srcpkgs/xbps/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 728179a46fc..a96512be32c 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -14,7 +14,7 @@ checksum=0cbd8d5f23a62047c75974bca21da9f004a94efffd7f37c68562a8dbc869fb2a hostmakedepends="pkgconf" checkdepends="kyua" -makedepends="zlib-devel libressl-devel libarchive-devel" +makedepends="zlib-devel openssl-devel libarchive-devel" depends="ca-certificates xbps-triggers" make_dirs="/etc/xbps.d 0755 root root" From 027abf871cfdf04ed1262307b4d1bad34041b954 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:01 +0100 Subject: [PATCH 350/447] xca: rebuild against OpenSSL --- srcpkgs/xca/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xca/template b/srcpkgs/xca/template index b6f6f33c421..e4ee1de4687 100644 --- a/srcpkgs/xca/template +++ b/srcpkgs/xca/template @@ -1,10 +1,10 @@ # Template file for 'xca' pkgname=xca version=2.1.2 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="pkg-config qt5-tools qt5-host-tools perl tar" -makedepends="qt5-devel libressl-devel libltdl-devel" +makedepends="qt5-devel openssl-devel libltdl-devel" depends="qt5-plugin-sqlite" short_desc="X Certificate and Key Management" maintainer="Denis Revin " From 4ae261a8b95e974ed180645b94f8cd14efd3515b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:01 +0100 Subject: [PATCH 351/447] xmlsec1: rebuild against OpenSSL --- srcpkgs/xmlsec1/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template index 6eb0a22e27f..d564b5142ca 100644 --- a/srcpkgs/xmlsec1/template +++ b/srcpkgs/xmlsec1/template @@ -1,7 +1,7 @@ # Template file for 'xmlsec1' pkgname=xmlsec1 version=1.2.31 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config gnutls-devel" makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel From 52af89b9aed817c0ac0fcc8cd6ff9186df6faec3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:01 +0100 Subject: [PATCH 352/447] yara: rebuild against OpenSSL --- srcpkgs/yara/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index 72e285db6f8..9824b70c3d0 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-magic --enable-cuckoo" hostmakedepends="automake libtool pkg-config" -makedepends="libressl-devel file-devel jansson-devel protobuf-c-devel" +makedepends="openssl-devel file-devel jansson-devel protobuf-c-devel" short_desc="Pattern matching swiss knife for malware researchers" maintainer="Andrew Benson " license="BSD-3-Clause" From add9757329f96b549a60357b7423e5e264c5507f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:01 +0100 Subject: [PATCH 353/447] ympd: rebuild against OpenSSL --- srcpkgs/ympd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ympd/template b/srcpkgs/ympd/template index c848f47dea2..14437beb538 100644 --- a/srcpkgs/ympd/template +++ b/srcpkgs/ympd/template @@ -1,10 +1,10 @@ # Template file for 'ympd' pkgname=ympd version=1.3.0 -revision=6 +revision=7 build_style=cmake hostmakedepends="perl pkg-config" -makedepends="libmpdclient-devel libressl-devel" +makedepends="libmpdclient-devel openssl-devel" short_desc="Standalone MPD Web GUI written in C" maintainer="John " license="GPL-2.0-only" From 17960ef50aece98fd3c0fc88a7782530ced3bbdb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:02 +0100 Subject: [PATCH 354/447] yubico-piv-tool: rebuild against OpenSSL --- srcpkgs/yubico-piv-tool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/yubico-piv-tool/template b/srcpkgs/yubico-piv-tool/template index cdb948f8b36..c660d62461a 100644 --- a/srcpkgs/yubico-piv-tool/template +++ b/srcpkgs/yubico-piv-tool/template @@ -6,10 +6,10 @@ _libykcs_desc="Yubikey PIV pkcs11 library" pkgname=yubico-piv-tool version=2.1.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="automake libtool gengetopt pkg-config help2man perl" -makedepends="libressl-devel check-devel pcsclite-devel" +makedepends="openssl-devel check-devel pcsclite-devel" short_desc="Yubikey PIV management tool" maintainer="Aloz1 " license="BSD-2-Clause" From cf2231670225eedeaef3a80ea215e82fbafa2889 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:02 +0100 Subject: [PATCH 355/447] zbackup: rebuild against OpenSSL --- srcpkgs/zbackup/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zbackup/template b/srcpkgs/zbackup/template index c55e64fd7bf..3d3886ce124 100644 --- a/srcpkgs/zbackup/template +++ b/srcpkgs/zbackup/template @@ -1,10 +1,10 @@ # Template file for 'zbackup' pkgname=zbackup version=1.4.4 -revision=20 +revision=21 build_style=cmake hostmakedepends="protobuf" -makedepends="zlib-devel liblzma-devel protobuf-devel libressl-devel lzo-devel" +makedepends="zlib-devel liblzma-devel protobuf-devel openssl-devel lzo-devel" short_desc="Versatile deduplicating backup tool" maintainer="Orphaned " license="GPL-2.0-or-later" From 374fa97e837cf5a64419d9907dfb5cf36b468b1f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:02 +0100 Subject: [PATCH 356/447] zchunk: rebuild against OpenSSL --- srcpkgs/zchunk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template index 876a896bbef..069a4d4bfc0 100644 --- a/srcpkgs/zchunk/template +++ b/srcpkgs/zchunk/template @@ -24,7 +24,7 @@ post_install() { zchunk-devel_package() { short_desc+=" - development files" - depends="${sourcepkg}-${version}_${revision} libressl-devel libzstd-devel" + depends="${sourcepkg}-${version}_${revision} openssl-devel libzstd-devel" pkg_install() { vmove usr/include vmove "usr/lib/*.so" From 55d2e2ec0f539be126b5d92fca40d4a544ab7012 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:02 +0100 Subject: [PATCH 357/447] zeek: rebuild against OpenSSL --- srcpkgs/zeek/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zeek/template b/srcpkgs/zeek/template index b3158659258..89b593c6964 100644 --- a/srcpkgs/zeek/template +++ b/srcpkgs/zeek/template @@ -1,12 +1,12 @@ # Template file for 'zeek' pkgname=zeek version=3.2.3 -revision=1 +revision=2 archs="x86_64* i686* aarch64* armv7* ppc64*" build_style=cmake -hostmakedepends="flex pkg-config python3 libpcap-devel libressl-devel +hostmakedepends="flex pkg-config python3 libpcap-devel openssl-devel bind-devel zlib-devel" -makedepends="bind-devel geoip-devel libpcap-devel libressl-devel zlib-devel" +makedepends="bind-devel geoip-devel libpcap-devel openssl-devel zlib-devel" short_desc="Advanced framework for network traffic analysis" maintainer="Andrew Benson " license="BSD-3-Clause" From 1e50d6d335737c1ad91a06ce7829d7c1b66f7527 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:19:03 +0100 Subject: [PATCH 358/447] znc: rebuild against OpenSSL --- srcpkgs/znc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template index e2f396cb8e0..02ca0634bb2 100644 --- a/srcpkgs/znc/template +++ b/srcpkgs/znc/template @@ -1,7 +1,7 @@ # Template file for 'znc' pkgname=znc version=1.8.2 -revision=3 +revision=4 build_style=gnu-configure configure_args=" --enable-python @@ -10,7 +10,7 @@ configure_args=" --enable-cyrus --with-tcl=$XBPS_CROSS_BASE/usr/lib" hostmakedepends="pkg-config perl tar" -makedepends="libressl-devel python3-devel tcl-devel libsasl-devel +makedepends="openssl-devel python3-devel tcl-devel libsasl-devel icu-devel zlib-devel perl" short_desc="Advanced IRC Bouncer" maintainer="Duncaen " From a1dbad40a0047d2f14010e3f0509986f585b3bf7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:02 +0100 Subject: [PATCH 359/447] NetworkManager-openconnect: rebuild against OpenSSL --- srcpkgs/NetworkManager-openconnect/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/NetworkManager-openconnect/template b/srcpkgs/NetworkManager-openconnect/template index f32a075180f..aa80daaa005 100644 --- a/srcpkgs/NetworkManager-openconnect/template +++ b/srcpkgs/NetworkManager-openconnect/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" makedepends="gcr-devel gtk+3-devel liblz4-devel libnma-devel - libressl-devel libsecret-devel libxml2-devel openconnect-devel" + openssl-devel libsecret-devel libxml2-devel openconnect-devel" depends="openconnect" short_desc="NetworkManager VPN plugin for OpenConnect" maintainer="Enno Boland " From e60fcf9a0297c6fdec9835e0506b5c8a6c5b3b82 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:04 +0100 Subject: [PATCH 360/447] amp: rebuild against OpenSSL --- srcpkgs/amp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/amp/template b/srcpkgs/amp/template index 425c0b14bbf..7f703a696c2 100644 --- a/srcpkgs/amp/template +++ b/srcpkgs/amp/template @@ -5,7 +5,7 @@ revision=1 build_style=cargo hostmakedepends="cmake git python3" makedepends="libxcb-devel" -depends="libressl libxcb zlib" +depends="openssl libxcb zlib" short_desc="Complete text editor for your terminal" maintainer="Wilson Birney " license="GPL-3.0-or-later" From 3be9afbc247333b894c0f1a36b957059273d30eb Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:06 +0100 Subject: [PATCH 361/447] android-tools: rebuild against OpenSSL --- srcpkgs/android-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template index a75a37d7076..16d755c4bc0 100644 --- a/srcpkgs/android-tools/template +++ b/srcpkgs/android-tools/template @@ -5,7 +5,7 @@ revision=1 archs="armv* aarch64* x86_64* i686* ppc64le*" build_style=cmake hostmakedepends="perl go protobuf" -makedepends="gtest-devel zlib-devel libressl-devel libusb-devel pcre2-devel +makedepends="gtest-devel zlib-devel openssl-devel libusb-devel pcre2-devel liblz4-devel libzstd-devel protobuf-devel brotli-devel" short_desc="Android platform tools (adb and fastboot)" maintainer="John " From 70c7fe22f87782b09c3616711167284f2ffca145 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:10 +0100 Subject: [PATCH 362/447] beaglebone-kernel: rebuild against OpenSSL --- srcpkgs/beaglebone-kernel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/beaglebone-kernel/template b/srcpkgs/beaglebone-kernel/template index 1616a8572cb..b36c9b36eb5 100644 --- a/srcpkgs/beaglebone-kernel/template +++ b/srcpkgs/beaglebone-kernel/template @@ -23,7 +23,7 @@ _kernver="${version}_${revision}" nostrip=yes noverifyrdeps=yes archs="armv7l*" -hostmakedepends="git perl kmod uboot-mkimage libressl bc" +hostmakedepends="git perl kmod uboot-mkimage openssl bc" makedepends="ncurses-devel" triggers="kernel-hooks" # These files could be modified when an external module is built. From 08ff1a2b641e7da6051fab894f2f8a6de265b8b1 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:17 +0100 Subject: [PATCH 363/447] c-client: rebuild against OpenSSL --- .../patches/1006_openssl1.1_autoverify.patch | 58 +++++++++++++++++++ srcpkgs/c-client/template | 2 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch new file mode 100644 index 00000000000..a8552ff2687 --- /dev/null +++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch @@ -0,0 +1,58 @@ +Description: Support OpenSSL 1.1 + When building with OpenSSL 1.1 and newer, use the new built-in + hostname verification instead of code that doesn't compile due to + structs having been made opaque. +Bug-Debian: https://bugs.debian.org/828589 + +--- src/osdep/unix/ssl_unix.c ++++ src/osdep/unix/ssl_unix.c +@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM * + /* disable certificate validation? */ + if (flags & NET_NOVALIDATECERT) + SSL_CTX_set_verify (stream->context,SSL_VERIFY_NONE,NIL); +- else SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify); ++ else { ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 ++ X509_VERIFY_PARAM *param = SSL_CTX_get0_param(stream->context); ++ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS); ++ X509_VERIFY_PARAM_set1_host(param, host, 0); ++#endif ++ ++ SSL_CTX_set_verify (stream->context,SSL_VERIFY_PEER,ssl_open_verify); + /* set default paths to CAs... */ ++ } + SSL_CTX_set_default_verify_paths (stream->context); + /* ...unless a non-standard path desired */ + if (s = (char *) mail_parameters (NIL,GET_SSLCAPATH,NIL)) +@@ -266,6 +274,7 @@ static char *ssl_start_work (SSLSTREAM * + if (SSL_write (stream->con,"",0) < 0) + return ssl_last_error ? ssl_last_error : "SSL negotiation failed"; + /* need to validate host names? */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + if (!(flags & NET_NOVALIDATECERT) && + (err = ssl_validate_cert (cert = SSL_get_peer_certificate (stream->con), + host))) { +@@ -275,6 +284,7 @@ static char *ssl_start_work (SSLSTREAM * + sprintf (tmp,"*%.128s: %.255s",err,cert ? cert->name : "???"); + return ssl_last_error = cpystr (tmp); + } ++#endif + return NIL; + } + +@@ -313,6 +323,7 @@ static int ssl_open_verify (int ok,X509_ + * Returns: NIL if validated, else string of error message + */ + ++#if OPENSSL_VERSION_NUMBER < 0x10100000 + static char *ssl_validate_cert (X509 *cert,char *host) + { + int i,n; +@@ -342,6 +353,7 @@ static char *ssl_validate_cert (X509 *ce + else ret = "Unable to locate common name in certificate"; + return ret; + } ++#endif + + /* Case-independent wildcard pattern match + * Accepts: base string diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template index 48bbfcee467..6484d7ec507 100644 --- a/srcpkgs/c-client/template +++ b/srcpkgs/c-client/template @@ -3,7 +3,7 @@ pkgname=c-client version=2007f revision=3 wrksrc="imap-${version}" -makedepends="pam-devel libressl-devel e2fsprogs-devel" +makedepends="pam-devel openssl-devel e2fsprogs-devel" short_desc="IMAP client library" maintainer="John Regan " license="Apache-2.0" From 51108fda84d0a86d279beba861ce39628af20480 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:20 +0100 Subject: [PATCH 364/447] cgit: rebuild against OpenSSL --- srcpkgs/cgit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cgit/template b/srcpkgs/cgit/template index adbf71c7942..719df688847 100644 --- a/srcpkgs/cgit/template +++ b/srcpkgs/cgit/template @@ -9,7 +9,7 @@ make_build_args=" CGIT_DATA_PATH=/usr/share/webapps/cgit CGIT_SCRIPT_PATH=/usr/libexec/cgit" hostmakedepends="asciidoc" -makedepends="libressl-devel zlib-devel" +makedepends="openssl-devel zlib-devel" checkdepends="perl" short_desc="Hyperfast web frontend for git repositories written in C" maintainer="Duncaen " From d80e026c791a9f01ee81dfb9baec50170c8b72ea Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:29 +0100 Subject: [PATCH 365/447] chntpw: rebuild against OpenSSL --- srcpkgs/chntpw/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chntpw/template b/srcpkgs/chntpw/template index 78a76973a5c..20bb5178fca 100644 --- a/srcpkgs/chntpw/template +++ b/srcpkgs/chntpw/template @@ -4,7 +4,7 @@ version=140201 revision=1 build_style=gnu-makefile hostmakedepends="unzip" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Offline Windows Password and Registry Editor" maintainer="Leah Neukirchen " license="GPL-2" From 0b6970fa4c43662979a1816b45ab96beb7569a0a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:29 +0100 Subject: [PATCH 366/447] choosenim: rebuild against OpenSSL --- srcpkgs/choosenim/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template index d76f1a49bc7..b345ef579c2 100644 --- a/srcpkgs/choosenim/template +++ b/srcpkgs/choosenim/template @@ -2,8 +2,8 @@ pkgname=choosenim version=0.7.4 revision=2 -hostmakedepends="git nim libressl-devel pkg-config" -makedepends="libressl-devel zlib-devel libarchive-devel" +hostmakedepends="git nim openssl-devel pkg-config" +makedepends="openssl-devel zlib-devel libarchive-devel" depends="gcc" short_desc="Nim toolchain installer" maintainer="SolitudeSF " @@ -34,7 +34,7 @@ do_build() { esac LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static openssl)" LDFLAGS+=" $($PKG_CONFIG --libs-only-l --static libarchive)" - LDFLAGS+=" -lrt -ldl" + LDFLAGS+=" -lrt -ldl -lpthread" : >nim.cfg if [ -z "$CROSS_BUILD" ]; then cat >>nim.cfg <<-EOF From 08db3a1e15cdbb1ebea0a913a45f843c4187655b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:35 +0100 Subject: [PATCH 367/447] ci20-kernel: rebuild against OpenSSL --- srcpkgs/ci20-kernel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ci20-kernel/template b/srcpkgs/ci20-kernel/template index 88fccd11847..da1685b6600 100644 --- a/srcpkgs/ci20-kernel/template +++ b/srcpkgs/ci20-kernel/template @@ -22,7 +22,7 @@ noverifyrdeps=yes noshlibprovides=yes archs="mispel*" -hostmakedepends="perl kmod uboot-mkimage libressl bc" +hostmakedepends="perl kmod uboot-mkimage openssl bc" makedepends="ncurses-devel" triggers="kernel-hooks" # These files could be modified when an external module is built. From b7e9e687a492ab0b1773fc31d51d323d84981b4d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:54 +0100 Subject: [PATCH 368/447] crda: rebuild against OpenSSL --- srcpkgs/crda/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/crda/template b/srcpkgs/crda/template index 59ebaf7d24c..d73db2a6b95 100644 --- a/srcpkgs/crda/template +++ b/srcpkgs/crda/template @@ -5,7 +5,7 @@ revision=5 _dbname=wireless-regdb _dbversion=2016.06.10 _dbsrc="${XBPS_BUILDDIR}/${_dbname}-${_dbversion}/" -hostmakedepends="libressl python python-M2Crypto pkg-config" +hostmakedepends="openssl python python-M2Crypto pkg-config" makedepends="libnl-devel libgcrypt-devel" depends="iw" short_desc="Central Regulatory Domain Agent for wireless networks" From cd21c74a9f2c3f62bb1240a8c2d702dc6a805890 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:55:57 +0100 Subject: [PATCH 369/447] srcpkgs: rebuild against OpenSSL --- srcpkgs/cryfs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template index 6d4a2f9fb84..ccd1f994c15 100644 --- a/srcpkgs/cryfs/template +++ b/srcpkgs/cryfs/template @@ -6,7 +6,7 @@ create_wrksrc=yes build_style=cmake configure_args="-DCRYFS_UPDATE_CHECKS=off" hostmakedepends="git python" -makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel libressl-devel" +makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel openssl-devel" depends="fuse" short_desc="Cryptographic filesystem for the cloud" maintainer="Andy Weidenbaum " From 0e38070f6e9c24eded466cba7573826e6b0dde11 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:00 +0100 Subject: [PATCH 370/447] crystal: rebuild against OpenSSL --- srcpkgs/crystal/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/crystal/template b/srcpkgs/crystal/template index d37fd8b2f19..1e5ad325733 100644 --- a/srcpkgs/crystal/template +++ b/srcpkgs/crystal/template @@ -11,8 +11,8 @@ hostmakedepends="which tar git llvm10 pkg-config" makedepends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel libxml2-devel" depends="gc-devel libatomic_ops pcre-devel libevent-devel libyaml-devel - libxml2-devel gmp-devel libressl-devel llvm10 gcc pkg-config" -checkdepends="readline-devel libyaml-devel gmp-devel libressl-devel" + libxml2-devel gmp-devel openssl-devel llvm10 gcc pkg-config" +checkdepends="readline-devel libyaml-devel gmp-devel openssl-devel" short_desc="Crystal Programming Language" maintainer="lvmbdv " license="Apache-2.0" From 57f23ff4b31ecb2cd4811bbce9dedf2771feafab Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:01 +0100 Subject: [PATCH 371/447] dkms: rebuild against OpenSSL --- srcpkgs/dkms/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index ec68606557a..80f59c1a7af 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -18,7 +18,7 @@ case "$XBPS_TARGET_MACHINE" in esac if [ "$CROSS_BUILD" ]; then - depends+=" libressl-devel gmp-devel libada-devel libmpc-devel flex" + depends+=" openssl-devel gmp-devel libada-devel libmpc-devel flex" fi do_install() { From a8cf7783b60e6031d3a30946a49fa8eae767c283 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:01 +0100 Subject: [PATCH 372/447] dovecot-plugin-pigeonhole: rebuild against OpenSSL --- srcpkgs/dovecot-plugin-pigeonhole/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/dovecot-plugin-pigeonhole/template b/srcpkgs/dovecot-plugin-pigeonhole/template index 778c0f16f2a..74822242909 100644 --- a/srcpkgs/dovecot-plugin-pigeonhole/template +++ b/srcpkgs/dovecot-plugin-pigeonhole/template @@ -13,7 +13,7 @@ configure_args="--prefix=/usr make_build_args="LIBDOVECOT_INCLUDE=-I${XBPS_CROSS_BASE}/usr/include/dovecot LIBS=-L${XBPS_CROSS_BASE}/usr/lib/dovecot" hostmakedepends="libldap-devel" -makedepends="dovecot-devel libressl-devel libldap-devel" +makedepends="dovecot-devel openssl-devel libldap-devel" short_desc="Sieve implementation for Dovecot" maintainer="Leah Neukirchen " license="LGPL-2.1-or-later" From 71ad634198da450d928864e016b2d87af4f58f10 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:04 +0100 Subject: [PATCH 373/447] easyrsa: rebuild against OpenSSL --- srcpkgs/easyrsa/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/easyrsa/template b/srcpkgs/easyrsa/template index 5fb47055643..c6a0372e593 100644 --- a/srcpkgs/easyrsa/template +++ b/srcpkgs/easyrsa/template @@ -3,7 +3,7 @@ pkgname=easyrsa version=3.0.8 revision=1 wrksrc="EasyRSA-${version}" -depends="libressl" +depends="openssl" short_desc="Simple shell based CA utility" maintainer="Adam Gausmann " license="GPL-2.0-only" From 5050ce419529c730ca50c48c6703310c1719cda6 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:04 +0100 Subject: [PATCH 374/447] fbpdf: rebuild against OpenSSL --- srcpkgs/fbpdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fbpdf/template b/srcpkgs/fbpdf/template index f97f4e2b65e..167c74c6ba3 100644 --- a/srcpkgs/fbpdf/template +++ b/srcpkgs/fbpdf/template @@ -6,7 +6,7 @@ _githash=f59002487edba502aaa93e9aec3bb6ebbbe41b0e _gitshort="${_githash:0:7}" wrksrc="fbpdf-${_gitshort}" build_style=gnu-makefile -makedepends="djvulibre-devel freetype-devel harfbuzz-devel libressl-devel +makedepends="djvulibre-devel freetype-devel harfbuzz-devel openssl-devel gumbo-parser-devel mupdf-devel" short_desc="Small framebuffer PDF/DJVU viewer" maintainer="Leah Neukirchen " From 25f4bacca05827f5b1f94ca3787c30c6cc2a9625 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:07 +0100 Subject: [PATCH 375/447] godot: rebuild against OpenSSL --- srcpkgs/godot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 5b17ece10d0..84bab43bb5b 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -18,7 +18,7 @@ make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no hostmakedepends="pkg-config clang" makedepends=" alsa-lib-devel freetype-devel glu-devel libXcursor-devel libXi-devel - libXinerama-devel libXrender-devel libXrandr-devel libressl-devel libX11-devel + libXinerama-devel libXrender-devel libXrandr-devel openssl-devel libX11-devel bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel" From 312973723d537ded50632efae2bebcd2947e3933 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:10 +0100 Subject: [PATCH 376/447] gtklp: rebuild against OpenSSL --- srcpkgs/gtklp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gtklp/template b/srcpkgs/gtklp/template index 4887b446460..ab34cc264ff 100644 --- a/srcpkgs/gtklp/template +++ b/srcpkgs/gtklp/template @@ -5,7 +5,7 @@ revision=1 build_style="gnu-configure" configure_args="--enable-ssl --with-cups-config=${XBPS_CROSS_BASE}/usr/bin/cups-config" hostmakedepends="automake libtool pkg-config gettext" -makedepends="libressl-devel gtk+-devel cups-devel" +makedepends="openssl-devel gtk+-devel cups-devel" short_desc="Gtk frontend to cups - IPP support" maintainer="Carlo Dormeletti " license="GPL-2.0-or-later" From 4df1977b13f07cb7a76377cd7865736da723ae30 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:13 +0100 Subject: [PATCH 377/447] hcxdumptool: rebuild against OpenSSL --- srcpkgs/hcxdumptool/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hcxdumptool/template b/srcpkgs/hcxdumptool/template index f07ba897c95..6b75577957f 100644 --- a/srcpkgs/hcxdumptool/template +++ b/srcpkgs/hcxdumptool/template @@ -3,7 +3,7 @@ pkgname=hcxdumptool version=6.1.1 revision=1 build_style=gnu-makefile -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Small tool to capture packets from wlan devices" maintainer="Felix Hanley " license="MIT" From 5c905268de154ca55a846641433fc7792bdadc04 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:16 +0100 Subject: [PATCH 378/447] hcxtools: rebuild against OpenSSL --- srcpkgs/hcxtools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/hcxtools/template b/srcpkgs/hcxtools/template index 4ff580c68f7..22d7f18adea 100644 --- a/srcpkgs/hcxtools/template +++ b/srcpkgs/hcxtools/template @@ -3,7 +3,7 @@ pkgname=hcxtools version=6.1.1 revision=1 build_style=gnu-makefile -makedepends="libressl-devel libcurl-devel zlib-devel" +makedepends="openssl-devel libcurl-devel zlib-devel" short_desc="Portable solution for conversion of cap/pcap/pcapng WiFi dump files" maintainer="Felix Hanley " license="MIT" From dab36404465a6f4fcd95f6276ef9808be367ab90 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:18 +0100 Subject: [PATCH 379/447] ifuse: rebuild against OpenSSL --- srcpkgs/ifuse/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template index fcc104db297..0d1944b6137 100644 --- a/srcpkgs/ifuse/template +++ b/srcpkgs/ifuse/template @@ -4,7 +4,7 @@ version=1.1.4 revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake" -makedepends="libressl-devel fuse-devel libimobiledevice-devel" +makedepends="openssl-devel fuse-devel libimobiledevice-devel" depends="usbmuxd" short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch" maintainer="Orphaned " From 3092f03ec419df2d93379ad924cd6042fa0dae30 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:18 +0100 Subject: [PATCH 380/447] kodi-addon-inputstream-rtmp: rebuild against OpenSSL --- srcpkgs/kodi-addon-inputstream-rtmp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi-addon-inputstream-rtmp/template b/srcpkgs/kodi-addon-inputstream-rtmp/template index dc5b7f15d68..bee02ae906e 100644 --- a/srcpkgs/kodi-addon-inputstream-rtmp/template +++ b/srcpkgs/kodi-addon-inputstream-rtmp/template @@ -7,7 +7,7 @@ wrksrc="inputstream.rtmp-${version}-${_kodi_release}" build_style=cmake hostmakedepends="pkg-config" makedepends="kodi-devel kodi-platform-devel p8-platform-devel tinyxml-devel - libressl-devel zlib-devel librtmp-devel" + openssl-devel zlib-devel librtmp-devel" short_desc="RTMP input stream add-on for Kodi" maintainer="Orphaned " license="GPL-2.0-or-later" From a4ee75d7aaa3e23126785f7e2016d6f95a5d4622 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:26 +0100 Subject: [PATCH 381/447] kodi-addon-vfs-sftp: rebuild against OpenSSL --- srcpkgs/kodi-addon-vfs-sftp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi-addon-vfs-sftp/template b/srcpkgs/kodi-addon-vfs-sftp/template index 0a974c1c350..5ba4d6a33c3 100644 --- a/srcpkgs/kodi-addon-vfs-sftp/template +++ b/srcpkgs/kodi-addon-vfs-sftp/template @@ -6,7 +6,7 @@ _kodi_release=Leia wrksrc="vfs.sftp-${version}-${_kodi_release}" build_style=cmake hostmakedepends="pkg-config" -makedepends="kodi-devel kodi-platform p8-platform-devel libressl-devel libssh-devel zlib-devel" +makedepends="kodi-devel kodi-platform p8-platform-devel openssl-devel libssh-devel zlib-devel" short_desc="VFS SFTP addon for Kodi" maintainer="Foxlet " license="GPL-2.0-or-later" From 5efd6773c62c374e24b7d2af1dd15028a84af57e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:28 +0100 Subject: [PATCH 382/447] kodi-rpi: rebuild against OpenSSL --- srcpkgs/kodi-rpi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template index d69ef928f5b..e30b07767f1 100644 --- a/srcpkgs/kodi-rpi/template +++ b/srcpkgs/kodi-rpi/template @@ -27,7 +27,7 @@ makedepends=" libjpeg-turbo-devel avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmariadbclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel fribidi-devel sqlite-devel freetype-devel jasper-devel faac-devel - faad2-devel libmodplug-devel libressl-devel libass-devel libmad-devel + faad2-devel libmodplug-devel openssl-devel libass-devel libmad-devel fontconfig-devel libsamplerate-devel libmms-devel libcurl-devel ffmpeg-devel enca-devel boost-devel libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libnfs-devel From 7e7b822cd8312e17cabe82a0e7e47bff597f39fa Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:36 +0100 Subject: [PATCH 383/447] libasr: rebuild against OpenSSL --- srcpkgs/libasr/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libasr/template b/srcpkgs/libasr/template index 484976cde3c..a3049ffb2f1 100644 --- a/srcpkgs/libasr/template +++ b/srcpkgs/libasr/template @@ -4,7 +4,7 @@ version=1.0.4 revision=1 build_style=gnu-configure hostmakedepends="automake libtool" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Simple and portable asynchronous resolver library" maintainer="Leah Neukirchen " license="BSD-2-Clause" From 49655464201fe2afa5dffd8c1f3d6ca81a8ceb1a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:56:49 +0100 Subject: [PATCH 384/447] libbsd: rebuild against OpenSSL --- srcpkgs/libbsd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template index 1600ec38023..9b6197fdf0d 100644 --- a/srcpkgs/libbsd/template +++ b/srcpkgs/libbsd/template @@ -3,7 +3,7 @@ pkgname=libbsd version=0.10.0 revision=1 build_style=gnu-configure -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Provides useful functions commonly found on BSD system" maintainer="Duncaen " license="ISC, MIT, Beerware, BSD-2-Clause, BSD-3-Clause, BSD-4-Clause" From 6b95c576fa3e2006ee455ab402db19ad3a977e69 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:06 +0100 Subject: [PATCH 385/447] libevhtp: rebuild against OpenSSL --- srcpkgs/libevhtp/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libevhtp/template b/srcpkgs/libevhtp/template index bf8ac0a25e8..f26da5d93a5 100644 --- a/srcpkgs/libevhtp/template +++ b/srcpkgs/libevhtp/template @@ -3,7 +3,7 @@ pkgname=libevhtp version=1.2.18 revision=1 build_style=cmake -makedepends="libevent-devel libressl-devel oniguruma-devel" +makedepends="libevent-devel openssl-devel oniguruma-devel" short_desc="Create extremely-fast and secure embedded HTTP servers with ease" maintainer="Toyam Cox " license="BSD-3-Clause" From b5a98a5cbc627b141b1ca780d7b5efe87752510e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:08 +0100 Subject: [PATCH 386/447] librepcb: rebuild against OpenSSL --- srcpkgs/librepcb/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/librepcb/template b/srcpkgs/librepcb/template index dfd5c86e785..4950f2761af 100644 --- a/srcpkgs/librepcb/template +++ b/srcpkgs/librepcb/template @@ -5,7 +5,7 @@ revision=1 build_style=qmake configure_args="-r librepcb.pro" hostmakedepends="unzip qt5-qmake qt5-host-tools" -makedepends="qt5-devel zlib-devel libressl-devel SFML-devel qt5-svg-devel" +makedepends="qt5-devel zlib-devel openssl-devel SFML-devel qt5-svg-devel" short_desc="Powerful, innovative and intuitive EDA tool for everyone" maintainer="Orphaned " license="GPL-3.0-or-later" From e30d6f3deea685e709a69f243e5f91b4ba252946 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:13 +0100 Subject: [PATCH 387/447] libsignal-protocol-c: rebuild against OpenSSL --- srcpkgs/libsignal-protocol-c/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libsignal-protocol-c/template b/srcpkgs/libsignal-protocol-c/template index 9fa03bf6054..c56f32df49f 100644 --- a/srcpkgs/libsignal-protocol-c/template +++ b/srcpkgs/libsignal-protocol-c/template @@ -4,7 +4,7 @@ version=2.3.3 revision=2 build_style=cmake configure_args="-DBUILD_SHARED_LIBS=ON" -makedepends="libressl-devel" +makedepends="openssl-devel" checkdepends="pkg-config check-devel" short_desc="Signal Protocol C Library" maintainer="teldra " From ada418d9068da170fa08ee162a756e6310334dc3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:14 +0100 Subject: [PATCH 388/447] libvncserver: rebuild against OpenSSL --- srcpkgs/libvncserver/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template index cac51f79d51..847c91c4395 100644 --- a/srcpkgs/libvncserver/template +++ b/srcpkgs/libvncserver/template @@ -5,7 +5,7 @@ revision=1 wrksrc="libvncserver-LibVNCServer-${version}" build_style=cmake hostmakedepends="pkg-config" -makedepends="zlib-devel libjpeg-turbo-devel libpng-devel libressl-devel gnutls-devel" +makedepends="zlib-devel libjpeg-turbo-devel libpng-devel openssl-devel gnutls-devel" short_desc="C libraries to easily implement VNC server or client functionality" maintainer="Orphaned " license="GPL-2.0-or-later" From 3191482f99ec82addb9937aaac10a983e382542f Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:15 +0100 Subject: [PATCH 389/447] linux-tools: rebuild against OpenSSL --- srcpkgs/linux-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 8c46de1e1ea..a3760e4965b 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -7,7 +7,7 @@ build_style=meta hostmakedepends="asciidoc automake flex gettext libtool perl python3 python3-docutils xmlto" makedepends="babeltrace-devel binutils-devel elfutils-devel eudev-libudev-devel - libcap-devel liblzma-devel libressl-devel libsysfs-devel libunwind-devel + libcap-devel liblzma-devel openssl-devel libsysfs-devel libunwind-devel libzstd-devel ncurses-devel pciutils-devel python3-devel readline-devel slang-devel" depends="cpupower-${version}_${revision} perf-${version}_${revision} usbip-${version}_${revision}" From 1d2ed4e72bfee3a63081b79663bb06fb2d8db3b4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:16 +0100 Subject: [PATCH 390/447] linux4.4: rebuild against OpenSSL --- srcpkgs/linux4.4/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux4.4/template b/srcpkgs/linux4.4/template index b837ced471e..e81afe07bdd 100644 --- a/srcpkgs/linux4.4/template +++ b/srcpkgs/linux4.4/template @@ -19,7 +19,7 @@ noshlibprovides=yes preserve=yes archs="i686* x86_64* ppc*" -hostmakedepends="bc perl kmod uboot-mkimage libressl-devel" +hostmakedepends="bc perl kmod uboot-mkimage openssl-devel" case "$XBPS_TARGET_MACHINE" in ppc64le*) broken="No ppc64le support";; From cb0e568ef3caa6e1a751631a63a7a282d216c87c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:18 +0100 Subject: [PATCH 391/447] linux4.9: rebuild against OpenSSL --- srcpkgs/linux4.9/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/linux4.9/template b/srcpkgs/linux4.9/template index 8b613c09ee8..cd9a1fd97e4 100644 --- a/srcpkgs/linux4.9/template +++ b/srcpkgs/linux4.9/template @@ -19,7 +19,7 @@ noshlibprovides=yes preserve=yes archs="i686* x86_64* aarch64* ppc*" -hostmakedepends="bc perl kmod uboot-mkimage libressl-devel" +hostmakedepends="bc perl kmod uboot-mkimage openssl-devel" case "$XBPS_TARGET_MACHINE" in ppc64le*) broken="No ppc64le support";; From 210c33aa396358e94287c04beb782e458f168e2a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:20 +0100 Subject: [PATCH 392/447] miniupnpd: rebuild against OpenSSL --- srcpkgs/miniupnpd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/miniupnpd/template b/srcpkgs/miniupnpd/template index a406253f2ec..430fb02e6cf 100644 --- a/srcpkgs/miniupnpd/template +++ b/srcpkgs/miniupnpd/template @@ -15,7 +15,7 @@ conf_files=" /etc/miniupnpd/*.conf /etc/miniupnpd/*.sh" hostmakedepends="pkg-config" -makedepends="libnfnetlink-devel iptables-devel libressl-devel" +makedepends="libnfnetlink-devel iptables-devel openssl-devel" short_desc="Lightweight UPnP IGD daemon" maintainer="Duncaen " license="BSD-3-Clause" From 8dc520a8ba3a72e1af7b1e816824103fb47dea6a Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:46 +0100 Subject: [PATCH 393/447] mktorrent: rebuild against OpenSSL --- srcpkgs/mktorrent/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mktorrent/template b/srcpkgs/mktorrent/template index 51de7921fb6..fcd5d3d707a 100644 --- a/srcpkgs/mktorrent/template +++ b/srcpkgs/mktorrent/template @@ -4,7 +4,7 @@ version=1.1 revision=2 build_style=gnu-makefile make_build_args="USE_OPENSSL=1" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Simple command line utility to create BitTorrent metainfo files" maintainer="Georg Schabel " license="GPL-2.0-or-later" From 69e778c7d7b07951fdf92843072d61551b59b480 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:49 +0100 Subject: [PATCH 394/447] musikcube: rebuild against OpenSSL --- srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++ srcpkgs/musikcube/template | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch new file mode 100644 index 00000000000..dc807dbf6bf --- /dev/null +++ b/srcpkgs/musikcube/patches/microhttpd.patch @@ -0,0 +1,16 @@ +Although musikcube thinks that MHD (microhttpd) version 0.9.70 +defines MHD_Result, the headers installed by our version 0.9.70 +(see PR 247180) don't define that type. So bump the version +check here trivially, to keep using int. + +--- src/plugins/server/HttpServer.h.orig 2020-07-18 17:58:19 UTC ++++ src/plugins/server/HttpServer.h +@@ -43,7 +43,7 @@ extern "C" { + #include + #include + +-#if MHD_VERSION < 0x00097000 ++#if MHD_VERSION < 0x00097001 + #define MHD_Result int + #endif + diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index c5d5cb0b40c..47e7dd85bbc 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -7,7 +7,7 @@ make_cmd=make configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true" hostmakedepends="pkg-config" makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel - libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel + openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel sndio-devel" short_desc="Terminal-based music player in c++" From a2f9f56669a41b64410057cf4e130aa40ae0f065 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:57:50 +0100 Subject: [PATCH 395/447] next: rebuild against OpenSSL --- srcpkgs/next/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/next/template b/srcpkgs/next/template index d6e20377f46..7a00d3b089e 100644 --- a/srcpkgs/next/template +++ b/srcpkgs/next/template @@ -5,8 +5,8 @@ revision=1 wrksrc=nyxt-${version} build_style=gnu-makefile hostmakedepends="sbcl curl pkg-config" -makedepends="webkit2gtk-devel libfixposix-devel libressl-devel" -depends="sqlite xclip libfixposix-devel libressl-devel" +makedepends="webkit2gtk-devel libfixposix-devel openssl-devel" +depends="sqlite xclip libfixposix-devel openssl-devel" short_desc="Keyboard-oriented, extensible web-browser" maintainer="0x0f0f0f " license="BSD-3-Clause" From 0ee1ecdb2b7e67190f8650445263b881e86fdff4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:08 +0100 Subject: [PATCH 396/447] ngrep: rebuild against OpenSSL --- srcpkgs/ngrep/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template index bc30aa05a2c..02a301eb639 100644 --- a/srcpkgs/ngrep/template +++ b/srcpkgs/ngrep/template @@ -6,7 +6,7 @@ wrksrc="ngrep-${version/./_}" build_style=gnu-configure configure_args="--enable-ipv6 --enable-pcre EXTRA_LIBS=-lpcre" hostmakedepends="pkg-config" -makedepends="pcre-devel libpcap-devel libressl-devel" +makedepends="pcre-devel libpcap-devel openssl-devel" short_desc="Like GNU grep applied to the network layer" maintainer="Orphaned " license="MIT" From 3d4d899f67fc034df5802ea04210b296247de63c Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:09 +0100 Subject: [PATCH 397/447] nim: rebuild against OpenSSL --- srcpkgs/nim/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nim/template b/srcpkgs/nim/template index fd3a0e45510..0e1d3a5445c 100644 --- a/srcpkgs/nim/template +++ b/srcpkgs/nim/template @@ -8,7 +8,7 @@ _fusionversion=e942c649892b2ae3802851fba6bc5d251326e5fb create_wrksrc=yes build_wrksrc="Nim-$version" hostmakedepends="ed" -depends="gcc libressl-devel" +depends="gcc openssl-devel" short_desc="Nim programming language" maintainer="allan " license="MIT" From 6e517df1d8b19be3453bce3fb025b5b3f43ba5a5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:10 +0100 Subject: [PATCH 398/447] nodejs-lts-10: rebuild against OpenSSL --- srcpkgs/nodejs-lts-10/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template index 773b0dcf1a0..0d28125a75f 100644 --- a/srcpkgs/nodejs-lts-10/template +++ b/srcpkgs/nodejs-lts-10/template @@ -4,11 +4,11 @@ version=10.23.1 revision=1 wrksrc="node-v${version}" hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel) - $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) + $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" makedepends="zlib-devel python-devel $(vopt_if icu icu-devel) - $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) + $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel)" short_desc="Evented I/O for V8 javascript (Dubnium)" @@ -20,7 +20,7 @@ checksum=88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa python_version=2 #unverified build_options="ssl libuv http_parser icu nghttp2 cares" -desc_option_ssl="Enable shared libressl" +desc_option_ssl="Enable shared openssl" desc_option_libuv="Enable shared libuv" desc_option_http_parser="Enable shared http-parser" desc_option_icu="Enable shared icu" From abafd79a979329231d62465f946aead777c2542d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:11 +0100 Subject: [PATCH 399/447] nodejs-lts: rebuild against OpenSSL --- srcpkgs/nodejs-lts/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template index c19a4b0198e..edb108631ae 100644 --- a/srcpkgs/nodejs-lts/template +++ b/srcpkgs/nodejs-lts/template @@ -5,11 +5,11 @@ revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="pkg-config python libatomic-devel zlib-devel which - $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) + $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" makedepends="libatomic-devel zlib-devel python-devel $(vopt_if icu icu-devel) - $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) + $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" short_desc="Evented I/O for V8 javascript" @@ -21,7 +21,7 @@ checksum=5318a5db1484050430371b77dece281a5b078a14e6962e105aa5790bdb3c3bed python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares" -desc_option_ssl="Enable shared libressl" +desc_option_ssl="Enable shared openssl" desc_option_libuv="Enable shared libuv" desc_option_http_parser="Enable shared http-parser and llhttp" desc_option_icu="Enable shared icu" From 804967db9c7a9b182a084c39acf5c01da6e16688 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:12 +0100 Subject: [PATCH 400/447] nodejs: rebuild against OpenSSL --- srcpkgs/nodejs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 3d84f1c0de6..e89a169ad61 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -5,11 +5,11 @@ revision=1 wrksrc="node-v${version}" # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079 hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel - $(vopt_if icu icu-devel) $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) + $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" makedepends="libatomic-devel zlib-devel $(vopt_if icu icu-devel) - $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel) + $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel) $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel) $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)" short_desc="Evented I/O for V8 javascript" @@ -21,7 +21,7 @@ checksum=8610d81b2d4afc3a79afbe6209d510125131c45cae22cac63bb767dcfec1cbf0 python_version=3 build_options="ssl libuv http_parser icu nghttp2 cares" -desc_option_ssl="Enable shared libressl" +desc_option_ssl="Enable shared openssl" desc_option_libuv="Enable shared libuv" desc_option_http_parser="Enable shared http-parser and llhttp" desc_option_icu="Enable shared icu" From 9191a046ef459a7205fb699891a89a9730c3f3d7 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:34 +0100 Subject: [PATCH 401/447] tree-wide: rebuild against OpenSSL --- srcpkgs/odroid-u2-kernel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template index 2ff1a86c6de..748f904ee1d 100644 --- a/srcpkgs/odroid-u2-kernel/template +++ b/srcpkgs/odroid-u2-kernel/template @@ -22,7 +22,7 @@ _kernver="${version}_${revision}" nostrip=yes noverifyrdeps=yes archs="armv7l" -hostmakedepends="perl python kmod uboot-mkimage libressl elfutils bc" +hostmakedepends="perl python kmod uboot-mkimage openssl elfutils bc" makedepends="ncurses-devel" depends="kmod>=11_2" triggers="kernel-hooks" From 79935f02fb8bdfec0dbab298835d7d5a117cde37 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:38 +0100 Subject: [PATCH 402/447] open-vm-tools: rebuild against OpenSSL --- srcpkgs/open-vm-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template index 91f592220c4..b751d6d89f8 100644 --- a/srcpkgs/open-vm-tools/template +++ b/srcpkgs/open-vm-tools/template @@ -10,7 +10,7 @@ configure_args="--sbindir=/usr/bin --with-udev-rules-dir=/usr/lib/udev/rules.d --without-xmlsecurity --without-kernel-modules $(vopt_with x11 x) $(vopt_with pam)" hostmakedepends="automake libtool pkg-config glib-devel rpcsvc-proto" -makedepends="fuse-devel glib-devel libmspack-devel libressl-devel libtirpc-devel +makedepends="fuse-devel glib-devel libmspack-devel openssl-devel libtirpc-devel libxerces-c-devel procps-ng-devel $(vopt_if pam 'pam-devel') $(vopt_if x11 'gtkmm-devel libXtst-devel xmlsec1-devel')" short_desc="Open source implementation of VMware Tools" From 3ecbecf0af50e312cf0ecfb0d36591551ba6a431 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:58:45 +0100 Subject: [PATCH 403/447] openjdk11: rebuild against OpenSSL --- srcpkgs/openjdk11/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openjdk11/template b/srcpkgs/openjdk11/template index df3cf793ae5..7e7177eff69 100644 --- a/srcpkgs/openjdk11/template +++ b/srcpkgs/openjdk11/template @@ -29,7 +29,7 @@ configure_args=" make_build_args="images $(vopt_if docs docs)" make_check_target="test-hotspot-gtest" hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates - libressl zlib-devel which make-ca" + openssl zlib-devel which make-ca" makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel fontconfig-devel zlib-devel lcms2-devel" From 60c9f5643e171c085ab7cb28387e668be509d697 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:01 +0100 Subject: [PATCH 404/447] opensmtpd-extras: rebuild against OpenSSL --- srcpkgs/opensmtpd-extras/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template index 164eaf6dfc5..ab11b171f8c 100644 --- a/srcpkgs/opensmtpd-extras/template +++ b/srcpkgs/opensmtpd-extras/template @@ -7,7 +7,7 @@ build_style=gnu-configure configure_args="--with-table-passwd --with-table-ldap --with-table-mysql --with-table-postgres --with-table-socketmap --with-table-sqlite" hostmakedepends="automake libtool" -makedepends="libressl-devel libevent-devel postgresql-libs-devel +makedepends="openssl-devel libevent-devel postgresql-libs-devel libmariadbclient-devel sqlite-devel" depends="opensmtpd" short_desc="Free implementation of the server-side SMTP protocol - extras" From 68f3cea8535f76a23c081d00d0a8011e8d14b87e Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:04 +0100 Subject: [PATCH 405/447] openvpn: rebuild against OpenSSL --- srcpkgs/openvpn/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index f6ebdbb57d6..43eedcd2da0 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -6,7 +6,7 @@ build_style=gnu-configure configure_args="$(vopt_enable pkcs11) --disable-systemd $(vopt_if mbedtls --with-crypto-library=mbedtls)" hostmakedepends="pkg-config" -makedepends="$(vopt_if mbedtls mbedtls-devel libressl-devel) lzo-devel pam-devel +makedepends="$(vopt_if mbedtls mbedtls-devel openssl-devel) lzo-devel pam-devel $(vopt_if pkcs11 pkcs11-helper-devel) cmocka-devel" short_desc="Easy-to-use, robust, and highly configurable VPN" maintainer="Orphaned " From dfaaed5678712fb392c0a9adccdc10be143b04d3 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:05 +0100 Subject: [PATCH 406/447] passwordsafe: rebuild against OpenSSL --- srcpkgs/passwordsafe/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 435612f3ae7..a73067d8fb3 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -10,7 +10,7 @@ configure_args="-DNO_GTEST=ON" # build process uses perl to generate core_st.cpp and zip to generate help files hostmakedepends="perl zip pkg-config gettext" makedepends="wxWidgets-gtk3-devel libXt-devel libXtst-devel libxerces-c-devel libuuid-devel - libykpers-devel qrencode-devel libressl-devel libcurl-devel file-devel" + libykpers-devel qrencode-devel openssl-devel libcurl-devel file-devel" short_desc="Simple & Secure Password Management" maintainer="Rui Abreu Ferreira " license="Artistic-2.0" From 940a66f32fbf5c427877e2cbc3f4377140d878e5 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:07 +0100 Subject: [PATCH 407/447] pinebookpro-kernel: rebuild against OpenSSL --- srcpkgs/pinebookpro-kernel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pinebookpro-kernel/template b/srcpkgs/pinebookpro-kernel/template index 79931617762..f64e68bb459 100644 --- a/srcpkgs/pinebookpro-kernel/template +++ b/srcpkgs/pinebookpro-kernel/template @@ -20,7 +20,7 @@ noshlibprovides=yes preserve=yes hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - libressl-devel perl uboot-mkimage cpio python3" + openssl-devel perl uboot-mkimage cpio python3" _kernver="${version}_${revision}" triggers="kernel-hooks" From a98a7fd70d4aeed04e5d667e90dac9e2dd1b373d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:13 +0100 Subject: [PATCH 408/447] pinephone-kernel: rebuild against OpenSSL --- srcpkgs/pinephone-kernel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pinephone-kernel/template b/srcpkgs/pinephone-kernel/template index 56d1028beb6..16b6b68d379 100644 --- a/srcpkgs/pinephone-kernel/template +++ b/srcpkgs/pinephone-kernel/template @@ -22,7 +22,7 @@ noshlibprovides=yes preserve=yes hostmakedepends="tar xz bc elfutils-devel flex gmp-devel kmod libmpc-devel - libressl-devel perl uboot-mkimage cpio pahole python3" + openssl-devel perl uboot-mkimage cpio pahole python3" _kernver="${version}_${revision}" triggers="kernel-hooks" From 03ad2efce8539c18345f16ad53451e18f2d54087 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:14 +0100 Subject: [PATCH 409/447] pmbootstrap: rebuild against OpenSSL --- srcpkgs/pmbootstrap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pmbootstrap/template b/srcpkgs/pmbootstrap/template index 0f486a2dd23..4fa80fff8ed 100644 --- a/srcpkgs/pmbootstrap/template +++ b/srcpkgs/pmbootstrap/template @@ -4,7 +4,7 @@ version=1.29.1 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-setuptools coreutils procps-ng libressl git" +depends="python3-setuptools coreutils procps-ng openssl git" short_desc="PostmarketOS's chroot, build and flash tool" maintainer="bra1nwave " license="GPL-3.0-or-later" From a7cd2368e623f502190deaa3b1c484a171f802df Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:15 +0100 Subject: [PATCH 410/447] python-tkinter: rebuild against OpenSSL --- srcpkgs/python-tkinter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template index 85e80035fa1..7063efc5575 100644 --- a/srcpkgs/python-tkinter/template +++ b/srcpkgs/python-tkinter/template @@ -12,7 +12,7 @@ revision=2 wrksrc="Python-${version}" pycompile_dirs="usr/lib/python2.7/lib-tk" hostmakedepends="pkg-config" -makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel +makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel sqlite-devel bzip2-devel zlib-devel tk-devel" short_desc="${_desc} - GUI toolkit for Python2" maintainer="Orphaned " From 228d1691a28818644db4cf1d41dbf61ff27b3119 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:17 +0100 Subject: [PATCH 411/447] python3-grpcio: rebuild against OpenSSL --- srcpkgs/python3-grpcio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index eb7f99b77bd..c3cc569db15 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -6,7 +6,7 @@ archs="x86_64* i686* aarch64* armv[67]* ppc64le*" wrksrc="${pkgname#*-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools python3-six" -makedepends="python3-devel zlib-devel c-ares-devel re2-devel libressl-devel" +makedepends="python3-devel zlib-devel c-ares-devel re2-devel openssl-devel" depends="python3-six" short_desc="HTTP/2-based gRPC framework for Python" maintainer="Andrew J. Hesford " From 7d56eaee1af194697ba6e071b33b59ccb8e3b49b Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:22 +0100 Subject: [PATCH 412/447] python3-mysqlclient: rebuild against OpenSSL --- srcpkgs/python3-mysqlclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-mysqlclient/template b/srcpkgs/python3-mysqlclient/template index efbda51472b..af49371f230 100644 --- a/srcpkgs/python3-mysqlclient/template +++ b/srcpkgs/python3-mysqlclient/template @@ -5,7 +5,7 @@ revision=4 wrksrc="mysqlclient-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -makedepends="libmariadbclient-devel python3-devel zlib-devel libressl-devel" +makedepends="libmariadbclient-devel python3-devel zlib-devel openssl-devel" short_desc="Python3 interface to MySQL/MariaDB" maintainer="Alin Dobre " license="GPL-2.0-or-later" From c2b47d5f730471040cf721c222f7aa5121aa20a4 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:24 +0100 Subject: [PATCH 413/447] python3-tkinter: rebuild against OpenSSL --- srcpkgs/python3-tkinter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index 580463b906b..9fc2d44bce5 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -15,7 +15,7 @@ pycompile_dirs=" usr/lib/python${version%.*}/turtledemo usr/lib/python${version%.*}/turtle.py" hostmakedepends="pkg-config" -makedepends="libffi-devel readline-devel gdbm-devel libressl-devel +makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel tk-devel" short_desc="${_desc} - GUI toolkit for Python3" maintainer="Andrew J. Hesford " From 809aecee6ecb8a34516791cc30f3b7ecbf39cc36 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:32 +0100 Subject: [PATCH 414/447] rdesktop: rebuild against OpenSSL --- srcpkgs/rdesktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template index 70c8cf288c8..616ee3541ef 100644 --- a/srcpkgs/rdesktop/template +++ b/srcpkgs/rdesktop/template @@ -5,7 +5,7 @@ revision=3 build_style=gnu-configure configure_args="--with-ipv6 --with-sound=alsa --with-openssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config automake" -makedepends="libressl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel +makedepends="openssl-devel alsa-lib-devel libsamplerate-devel libXrandr-devel pcsclite-devel libgssglue-devel mit-krb5-devel libXcursor-devel libtasn1-devel nettle-devel gnutls-devel" short_desc="Open source client for Windows Remote Desktop Services" From ae4b828cd01bad5df964564dfc7d401738252067 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 23:59:49 +0100 Subject: [PATCH 415/447] remwharead: rebuild against OpenSSL --- srcpkgs/remwharead/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template index ebb6eb27ff8..f219b008811 100644 --- a/srcpkgs/remwharead/template +++ b/srcpkgs/remwharead/template @@ -4,7 +4,7 @@ version=0.10.0 revision=1 build_style=cmake hostmakedepends="poco-devel asciidoc pkg-config" -makedepends="poco-devel libxdg-basedir-devel libressl-devel expat-devel pcre-devel sqlite-devel boost-devel" +makedepends="poco-devel libxdg-basedir-devel openssl-devel expat-devel pcre-devel sqlite-devel boost-devel" short_desc="Saves URIs of things you want to remember in a database" maintainer="teldra " license="GPL-3.0-only" From 6c5818fded8283a1cda7b1f99eb9394792ce08ae Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:10 +0100 Subject: [PATCH 416/447] rmilter: rebuild against OpenSSL --- srcpkgs/rmilter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template index a1c14a2b038..a131af6c7f0 100644 --- a/srcpkgs/rmilter/template +++ b/srcpkgs/rmilter/template @@ -5,7 +5,7 @@ revision=1 build_style=cmake configure_args="-DMILTER_USER=rmilter -DSBINDIR=/usr/bin" hostmakedepends="pkg-config bison flex" -makedepends="libressl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel" +makedepends="openssl-devel pcre-devel libmilter-devel opendkim-devel libsasl-devel libmemcached-devel glib-devel" short_desc="Postfix/sendmail integration for rspamd" maintainer="John Regan " license="BSD" From aaca1f0327db25dfd27a1fd6a2b16d393ae35648 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:17 +0100 Subject: [PATCH 417/447] rpi-kernel: rebuild against OpenSSL --- srcpkgs/rpi-kernel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index f9f170aedc0..1fe4e2477e1 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -29,7 +29,7 @@ noshlibprovides=yes # RPi, RPi2, RPi3 archs="armv6l* armv7l* aarch64*" -hostmakedepends="perl kmod uboot-mkimage libressl-devel bc bison flex" +hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex" makedepends="ncurses-devel" triggers="kernel-hooks" # These files could be modified when an external module is built. From e537b369547371db9c03baaf1556a7a751a64261 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:20 +0100 Subject: [PATCH 418/447] rtags: rebuild against OpenSSL --- srcpkgs/rtags/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template index d718e6c3090..baf721c4160 100644 --- a/srcpkgs/rtags/template +++ b/srcpkgs/rtags/template @@ -6,7 +6,7 @@ build_style=cmake # Don't run tests in do_install, please. configure_args="-DSKIP_CTEST=TRUE" hostmakedepends="pkg-config clang" -makedepends="llvm libressl-devel zlib-devel" +makedepends="llvm openssl-devel zlib-devel" checkdepends="perl python3-PyHamcrest python3-nose" short_desc="C/C++ indexer with integration for Emacs based on clang" maintainer="Alexander Egorenkov " From be0ba5b0556693b8a1096fc7ab4293bc467ea278 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:21 +0100 Subject: [PATCH 419/447] s6-networking: rebuild against OpenSSL --- srcpkgs/s6-networking/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/s6-networking/template b/srcpkgs/s6-networking/template index 969f65823f1..4c28d6a94cf 100644 --- a/srcpkgs/s6-networking/template +++ b/srcpkgs/s6-networking/template @@ -3,11 +3,11 @@ pkgname=s6-networking version=2.4.0.0 revision=2 build_style=configure -configure_args="--libdir=/usr/lib $(vopt_if libressl --enable-ssl=libressl) +configure_args="--libdir=/usr/lib $(vopt_if openssl --enable-ssl=openssl) $(vopt_if bearssl --enable-ssl=bearssl) --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin" -makedepends="execline-devel $(vopt_if libressl libressl-devel) skalibs-devel +makedepends="execline-devel $(vopt_if openssl openssl-devel) skalibs-devel s6-devel s6-dns-devel $(vopt_if bearssl bearssl-devel)" short_desc="Suite of small network utilities for Unix systems" maintainer="lemmi " @@ -17,11 +17,11 @@ changelog="https://skarnet.org/software/s6-networking/upgrade.html" distfiles="${homepage}/${pkgname}-${version}.tar.gz" checksum=f8fda2dd95286420e9a9254220a39dd724d4fe2cd24d6df2ebd3ca421d9f1efb -build_options="bearssl libressl" +build_options="bearssl openssl" build_options_default="bearssl" desc_option_bearssl="Use BearSSL as SSL library" -desc_option_libressl="Use LibreSSL as SSL library" -vopt_conflict bearssl libressl +desc_option_openssl="Use LibreSSL as SSL library" +vopt_conflict bearssl openssl case "$XBPS_TARGET_MACHINE" in *-musl) @@ -46,7 +46,7 @@ s6-networking-doc_package() { s6-networking-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision} skalibs-devel - $(vopt_if libressl libressl-devel) $(vopt_if bearssl bearssl-devel)" + $(vopt_if openssl openssl-devel) $(vopt_if bearssl bearssl-devel)" pkg_install() { vmove usr/include vmove "usr/lib/*.a" From 5d22d7222958cc2729da1a057a4647654f85bab3 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:26 +0100 Subject: [PATCH 420/447] sane: rebuild against OpenSSL --- srcpkgs/sane/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index aaaf65d5d2d..f75ea181344 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -10,7 +10,7 @@ configure_args="--disable-locking --enable-ipv6 --enable-pthread $(vopt_with snmp)" hostmakedepends="pkg-config" makedepends="avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel - v4l-utils-devel libusb-devel libressl-devel libxml2-devel + v4l-utils-devel libusb-devel openssl-devel libxml2-devel $(vopt_if snmp net-snmp-devel)" depends="$(vopt_if snmp net-snmp)" conf_files="/etc/sane.d/*.conf" From dccb46584024c448fbbbe30c837f6ac2d65df285 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:33 +0100 Subject: [PATCH 421/447] slurm-wlm: rebuild against OpenSSL --- srcpkgs/slurm-wlm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index 4d19c3ff527..46fc8773520 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -8,7 +8,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="perl cgit python pkg-config" # XXX: ofed, DataWarp, netloc, blcr -makedepends="munge-devel lua53-devel pam-devel libressl-devel gtk+-devel +makedepends="munge-devel lua53-devel pam-devel openssl-devel gtk+-devel ncurses-devel readline-devel libmariadbclient-devel json-c-devel libhwloc-devel freeipmi-devel" short_desc="Workload manager for Linux clusters of all sizes" From 2553f5e631950aeed21039ab2ed0af5dd2ad72b5 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:01:52 +0100 Subject: [PATCH 422/447] sun7i-kernel: rebuild against OpenSSL --- srcpkgs/sun7i-kernel/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sun7i-kernel/template b/srcpkgs/sun7i-kernel/template index 755636a526d..9649421e793 100644 --- a/srcpkgs/sun7i-kernel/template +++ b/srcpkgs/sun7i-kernel/template @@ -27,7 +27,7 @@ _kernver="${version}_${revision}" nostrip=yes noverifyrdeps=yes archs="armv7l*" -hostmakedepends="perl python kmod uboot-mkimage libressl bc" +hostmakedepends="perl python kmod uboot-mkimage openssl bc" makedepends="ncurses-devel" triggers="kernel-hooks" # These files could be modified when an external module is built. From 5cb7e2c5d3e137bca49e1c8f2634233960e7a807 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:02:06 +0100 Subject: [PATCH 423/447] sysbench: rebuild against OpenSSL --- srcpkgs/sysbench/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template index 1cfb63d7caa..032f10234ea 100644 --- a/srcpkgs/sysbench/template +++ b/srcpkgs/sysbench/template @@ -9,7 +9,7 @@ configure_args=" --with-system-ck --with-system-luajit" hostmakedepends="automake libtool pkg-config" -makedepends="LuaJIT-devel ck-devel libmariadbclient-devel libressl-devel +makedepends="LuaJIT-devel ck-devel libmariadbclient-devel openssl-devel postgresql-libs-devel zlib-devel" short_desc="Scriptable database and system performance benchmark" maintainer="Duncaen " From 75595fd5e85fcc5c12c90bcde8c9dd0196e63f80 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:02:08 +0100 Subject: [PATCH 424/447] tagparser: rebuild against OpenSSL --- srcpkgs/tagparser/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template index 1b013eb6f5c..95bafecd321 100644 --- a/srcpkgs/tagparser/template +++ b/srcpkgs/tagparser/template @@ -5,7 +5,7 @@ revision=1 build_style=cmake configure_args="-DBUILD_SHARED_LIBS:BOOL=ON" hostmakedepends="pkg-config" -makedepends="cpp-utilities-devel zlib-devel libressl-devel" +makedepends="cpp-utilities-devel zlib-devel openssl-devel" short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags" maintainer="Andrew J. Hesford " license="GPL-2.0-only" From 2319fd16379d4c27c992c948bb7476ba88e7a672 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:02:28 +0100 Subject: [PATCH 425/447] taizen: rebuild against OpenSSL --- srcpkgs/taizen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/taizen/template b/srcpkgs/taizen/template index fe2e78bc723..8bd61b187e6 100644 --- a/srcpkgs/taizen/template +++ b/srcpkgs/taizen/template @@ -6,7 +6,7 @@ _githash=39f77b5c1128d710b12244e433677daaf87c085e wrksrc="${pkgname}-${_githash}" build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel ncurses-devel" +makedepends="openssl-devel ncurses-devel" short_desc="Browse mediawiki pages from the command line" maintainer="travankor " license="MIT" @@ -14,7 +14,7 @@ homepage="https://github.com/NerdyPepper/taizen" distfiles="${homepage}/archive/${_githash}.tar.gz" checksum=7de71509bc2b4494af1e103ddb18e0eeafe0bd90c797d6cae343c44f583bfd15 nocross="Attempts to run non-native binaries during build" -broken="constraints force old openssl, incompatible with libressl" +broken="constraints force old openssl, incompatible with openssl" pre_build() { cargo update --package openssl-sys --precise 0.9.35 From 5984fca28c9ef3c9a9a18d5c68f78fd3e02bfca1 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:21 +0100 Subject: [PATCH 426/447] tarsnap: rebuild against OpenSSL --- srcpkgs/tarsnap/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tarsnap/template b/srcpkgs/tarsnap/template index d0cd51a5425..c316e666ada 100644 --- a/srcpkgs/tarsnap/template +++ b/srcpkgs/tarsnap/template @@ -5,7 +5,7 @@ revision=1 wrksrc=${pkgname}-autoconf-${version} build_style=gnu-configure configure_args="--sysconfdir=/etc/${pkgname}" -makedepends="e2fsprogs-devel libressl-devel" +makedepends="e2fsprogs-devel openssl-devel" depends="bzip2 xz" conf_files="/etc/tarsnap/tarsnap.conf" short_desc="An online encrypted backup service (client)" From ea9a0517a2d23599a22a2cf6eb11fecef6732678 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:24 +0100 Subject: [PATCH 427/447] testssl.sh: rebuild against OpenSSL --- srcpkgs/testssl.sh/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/testssl.sh/template b/srcpkgs/testssl.sh/template index 317c175a2b1..0592cc11945 100644 --- a/srcpkgs/testssl.sh/template +++ b/srcpkgs/testssl.sh/template @@ -2,7 +2,7 @@ pkgname=testssl.sh version=3.0.2 revision=2 -depends="libressl bind-utils" +depends="openssl bind-utils" short_desc="Command line tool which checks a server for the support of TLS/SSL" maintainer="Enno Boland " license="GPL-2.0-only" From 0b126279abe2ea72a29da827156900bc7abc2a22 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:26 +0100 Subject: [PATCH 428/447] tg_owt: rebuild against OpenSSL --- srcpkgs/tg_owt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template index c772b0cbb61..ceff7a631a8 100644 --- a/srcpkgs/tg_owt/template +++ b/srcpkgs/tg_owt/template @@ -9,7 +9,7 @@ wrksrc="tg_owt-$_commit" build_style=cmake configure_args="-DBUILD_SHARED_LIBS=OFF" hostmakedepends="pkg-config yasm protobuf25" -makedepends="alsa-lib-devel pulseaudio-devel libressl-devel opus-devel +makedepends="alsa-lib-devel pulseaudio-devel openssl-devel opus-devel libvpx-devel ffmpeg-devel libjpeg-turbo-devel protobuf-devel" depends="$makedepends" short_desc="WebRTC library for Telegram-desktop" From 9e3012b185f9346662f0df14cd2005f8851f6b8c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:39 +0100 Subject: [PATCH 429/447] turbovnc: rebuild against OpenSSL --- srcpkgs/turbovnc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index a48723aca0b..12db4b8c9c5 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -7,7 +7,7 @@ configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0 -DTVNC_SYSTEMLIBS=ON" hostmakedepends="rsync" makedepends="libjpeg-turbo-devel libXt-devel libXaw-devel libXcursor-devel pam-devel - zlib-devel freetype-devel bzip2-devel libressl-devel" + zlib-devel freetype-devel bzip2-devel openssl-devel" depends="perl" short_desc="Optimized version of TightVNC VNC client and server" maintainer="Orphaned " From 8bf46eb50ff63e7aa53f4d5aaa935dcdccf59410 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:44 +0100 Subject: [PATCH 430/447] websocat: rebuild against OpenSSL --- srcpkgs/websocat/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/websocat/template b/srcpkgs/websocat/template index eb781dbc641..c7b3e552b4e 100644 --- a/srcpkgs/websocat/template +++ b/srcpkgs/websocat/template @@ -4,7 +4,7 @@ version=1.6.0 revision=1 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel" +makedepends="openssl-devel" short_desc="Netcat, curl and socat for WebSockets" maintainer="Zach Dykstra " license="MIT" From 52e0914d14c24225f191517238355558eebd2b4f Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:47 +0100 Subject: [PATCH 431/447] xen: rebuild against OpenSSL --- srcpkgs/xen/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index bc00c7cc8e0..092460ea73e 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -13,7 +13,7 @@ configure_args="$(vopt_enable stubdom) --disable-systemd hostmakedepends="acpica-utils automake bison flex fig2dev gettext ghostscript git ocaml ocaml-findlib pandoc pkg-config python3-Markdown tar texinfo wget" makedepends="SDL-devel dev86 dtc-devel e2fsprogs-devel gnutls-devel libaio-devel - libbluetooth-devel libglib-devel liblzma-devel libnl3-devel libressl-devel + libbluetooth-devel libglib-devel liblzma-devel libnl3-devel openssl-devel netpbm pciutils-devel pixman-devel python3-devel seabios yajl-devel" depends="bridge-utils perl xen-hypervisor" short_desc="Xen hypervisor utilities" From 1ca9afcf8050962b42f66c1881f278f03e3f140c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:48 +0100 Subject: [PATCH 432/447] srcpkgs: rebuild against OpenSSL --- srcpkgs/xorg-server/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index 06f51d611e8..5accaf6523d 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -13,7 +13,7 @@ configure_args="-Dipv6=true -Dxorg=true -Dxnest=true -Dxephyr=true hostmakedepends="pkg-config wayland-devel xkbcomp flex" makedepends="MesaLib-devel libXaw-devel libXfont-devel libXfont2-devel libXrender-devel libXres-devel libXtst-devel libXv-devel libXxf86dga-devel - libdmx-devel libepoxy-devel libressl-devel libtirpc-devel libxkbfile-devel + libdmx-devel libepoxy-devel openssl-devel libtirpc-devel libxkbfile-devel libxkbui-devel pixman-devel wayland-devel wayland-protocols xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel xkbcomp nettle-devel $(vopt_if elogind 'dbus-devel')" From 627311adaf3f3493db78fd4ffa6ec2ca5e8b5fc1 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:03:56 +0100 Subject: [PATCH 433/447] zathura-pdf-mupdf: rebuild against OpenSSL --- srcpkgs/zathura-pdf-mupdf/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template index 799dfb3189e..aaa55ee19dd 100644 --- a/srcpkgs/zathura-pdf-mupdf/template +++ b/srcpkgs/zathura-pdf-mupdf/template @@ -4,7 +4,7 @@ version=0.3.6 revision=2 build_style=meson hostmakedepends="pkg-config" -makedepends="mupdf-devel zathura-devel libressl-devel libopenjpeg2-devel +makedepends="mupdf-devel zathura-devel openssl-devel libopenjpeg2-devel libjpeg-turbo-devel libjbig2dec" depends="zathura" short_desc="PDF support for zathura (using mupdf)" From 212f00f46a3ffacbb583320d2e0a5f7f402882d6 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:04:00 +0100 Subject: [PATCH 434/447] zeroinstall: rebuild against OpenSSL --- srcpkgs/zeroinstall/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template index 580b0c5c74e..514e22f7655 100644 --- a/srcpkgs/zeroinstall/template +++ b/srcpkgs/zeroinstall/template @@ -6,7 +6,7 @@ wrksrc="0install-v${version}" build_style=gnu-makefile make_install_target="install_system" hostmakedepends="gettext ocaml opam m4 tar pkg-config which" -makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel" +makedepends="openssl-devel libcurl-devel gnupg glib-devel gtk+3-devel" depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils" short_desc="Cross-distribution software installation system" maintainer="mobinmob " From 1f2745196e385777d15b03de56508007a01c77c9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 7 Jan 2021 00:04:07 +0100 Subject: [PATCH 435/447] zola: rebuild against OpenSSL --- srcpkgs/zola/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zola/template b/srcpkgs/zola/template index 982f970698c..7b60c37e0de 100644 --- a/srcpkgs/zola/template +++ b/srcpkgs/zola/template @@ -4,7 +4,7 @@ version=0.13.0 revision=1 build_style=cargo hostmakedepends="pkg-config" -makedepends="libressl-devel libsass-devel oniguruma-devel" +makedepends="openssl-devel libsass-devel oniguruma-devel" short_desc="Fast opinionated static site generator written in rust" maintainer="Carson Page " license="MIT" From e0967d1db3324d9a615eaa6a2dfbb294ea664692 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 25 Jan 2021 18:21:24 +0100 Subject: [PATCH 436/447] libluv: rebuild against OpenSSL --- srcpkgs/libluv/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/libluv/template b/srcpkgs/libluv/template index 767f729527e..569b30e8242 100644 --- a/srcpkgs/libluv/template +++ b/srcpkgs/libluv/template @@ -13,14 +13,14 @@ maintainer="andry-dev " license="Apache-2.0" homepage="https://github.com/luvit/luv" distfiles="https://github.com/luvit/luv/releases/download/${_distver}/luv-${_distver}.tar.gz - https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in" + https://raw.githubusercontent.com/luvit/luv/${_distver}/libluv.pc.in" checksum="f2e7eb372574f25c6978c1dc74280d22efdcd7df2dda4a286c7fe7dceda26445 be2a4909c724e09a50de42b1caa3c82c1b1afee8b80abf20c6944f1df1c7fd0e" skip_extraction="libluv.pc.in" -if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then - hostmakedepends+=" gcc-multilib" -fi +#if [ "$CROSS_BUILD" -a "$XBPS_MACHINE" = "x86_64" ]; then +# hostmakedepends+=" gcc-multilib" +#fi post_extract() { cp ${XBPS_SRCDISTDIR}/libluv-${version}/libluv.pc.in ${wrksrc}/libluv.pc.in From ac48ca74905debd41e24266c94741b6ac5b81b9d Mon Sep 17 00:00:00 2001 From: John Date: Wed, 3 Feb 2021 00:44:57 +0100 Subject: [PATCH 437/447] mumble: build umurmur without Ice rpc support --- srcpkgs/mumble/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index cb155ffea3a..fc694a08570 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -6,9 +6,10 @@ build_style=qmake configure_args="CONFIG+=bundled-celt CONFIG+=no-bundled-opus CONFIG+=no-update CONFIG+=no-bundled-speex CONFIG+=no-g15 CONFIG+=no-xevie CONFIG+=pulseaudio $(vopt_if jack CONFIG+=jackaudio) CONFIG+=no-embed-qt-translations - CONFIG+=no-oss CONFIG+=portaudio DEFINES+=PLUGIN_PATH=/usr/lib/mumble" -hostmakedepends="Ice pkg-config protobuf qt5-host-tools qt5-qmake python3 which" -makedepends="Ice-devel MesaLib-devel avahi-compat-libs-devel boost-devel + CONFIG+=no-oss CONFIG+=portaudio CONFIG+=no-ice + DEFINES+=PLUGIN_PATH=/usr/lib/mumble" +hostmakedepends="pkg-config protobuf qt5-host-tools qt5-qmake python3 which" +makedepends="MesaLib-devel avahi-compat-libs-devel boost-devel libcap-devel openssl-devel libsndfile-devel opus-devel protobuf-devel pulseaudio-devel $(vopt_if jack jack-devel) qt5-devel qt5-svg-devel speech-dispatcher-devel speex-devel portaudio-devel" From 30fccafd3618454be43bcde185daf4ef21cf7f6b Mon Sep 17 00:00:00 2001 From: John Date: Sat, 6 Feb 2021 21:55:55 +0100 Subject: [PATCH 438/447] vpnc: switch to OpenSSL --- srcpkgs/vpnc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vpnc/template b/srcpkgs/vpnc/template index 84f434690cd..00f2c46e500 100644 --- a/srcpkgs/vpnc/template +++ b/srcpkgs/vpnc/template @@ -9,7 +9,7 @@ make_use_env=yes make_build_args="SBINDIR=/usr/bin" make_check_target=test hostmakedepends="perl" -makedepends="libgcrypt-devel libressl-devel" +makedepends="libgcrypt-devel openssl-devel" depends="net-tools vpnc-scripts" short_desc="Client for cisco vpn concentrator" maintainer="Enno Boland " From 7378c6b90fa80de01a8b9ffa7d0d67ac71b3297a Mon Sep 17 00:00:00 2001 From: John Date: Sat, 6 Feb 2021 21:56:09 +0100 Subject: [PATCH 439/447] libsasl: remove libressl patch --- srcpkgs/libsasl/patches/libressl.patch | 61 -------------------------- 1 file changed, 61 deletions(-) delete mode 100644 srcpkgs/libsasl/patches/libressl.patch diff --git a/srcpkgs/libsasl/patches/libressl.patch b/srcpkgs/libsasl/patches/libressl.patch deleted file mode 100644 index b82503636b5..00000000000 --- a/srcpkgs/libsasl/patches/libressl.patch +++ /dev/null @@ -1,61 +0,0 @@ -Source: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/security/cyrus-sasl2/patches/patch-saslauthd_lak_c -Upstream: No -Reason: LibreSSL compatibility - -$OpenBSD: patch-saslauthd_lak_c,v 1.1 2018/11/19 08:24:23 ajacoutot Exp $ - -64-bit time_t - -Fix for LibreSSL - -Index: saslauthd/lak.c ---- a/saslauthd/lak.c.orig -+++ b/saslauthd/lak.c -@@ -841,12 +841,12 @@ static int lak_connect( - - rc = ldap_set_option(lak->ld, LDAP_OPT_NETWORK_TIMEOUT, &(lak->conf->timeout)); - if (rc != LDAP_OPT_SUCCESS) { -- syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec); -+ syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_NETWORK_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec); - } - - rc = ldap_set_option(lak->ld, LDAP_OPT_TIMEOUT, &(lak->conf->timeout)); - if (rc != LDAP_OPT_SUCCESS) { -- syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %ld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec); -+ syslog(LOG_WARNING|LOG_AUTH, "Unable to set LDAP_OPT_TIMEOUT %lld.%ld.", lak->conf->timeout.tv_sec, lak->conf->timeout.tv_usec); - } - - rc = ldap_set_option(lak->ld, LDAP_OPT_TIMELIMIT, &(lak->conf->time_limit)); -@@ -1749,28 +1749,28 @@ static int lak_base64_decode( - - int rc, i, tlen = 0; - char *text; -- EVP_ENCODE_CTX *enc_ctx = EVP_ENCODE_CTX_new(); -+ EVP_ENCODE_CTX *enc_ctx = calloc(1, sizeof(EVP_ENCODE_CTX)); - - if (enc_ctx == NULL) - return LAK_NOMEM; - - text = (char *)malloc(((strlen(src)+3)/4 * 3) + 1); - if (text == NULL) { -- EVP_ENCODE_CTX_free(enc_ctx); -+ free(enc_ctx); - return LAK_NOMEM; - } - - EVP_DecodeInit(enc_ctx); - rc = EVP_DecodeUpdate(enc_ctx, (unsigned char *) text, &i, (const unsigned char *)src, strlen(src)); - if (rc < 0) { -- EVP_ENCODE_CTX_free(enc_ctx); -+ free(enc_ctx); - free(text); - return LAK_FAIL; - } - tlen += i; - EVP_DecodeFinal(enc_ctx, (unsigned char *) text, &i); - -- EVP_ENCODE_CTX_free(enc_ctx); -+ free(enc_ctx); - - *ret = text; - if (rlen != NULL) From c44d95f2020986d85417788b9d8fdceaed7f7680 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 6 Feb 2021 22:18:29 +0100 Subject: [PATCH 440/447] starship: switch to OpenSSL --- srcpkgs/starship/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/starship/template b/srcpkgs/starship/template index 08d0c71e41d..af48a7894d7 100644 --- a/srcpkgs/starship/template +++ b/srcpkgs/starship/template @@ -5,7 +5,7 @@ revision=1 build_style=cargo build_helper=qemu hostmakedepends="pkg-config libgit2-devel" -makedepends="libressl-devel libgit2-devel" +makedepends="openssl-devel libgit2-devel" checkdepends="git fish-shell" short_desc="Minimal, fast and customizable cross-shell prompt" maintainer="Aluísio Augusto Silva Gonçalves " From adb9b2c15353ba983ac5d20c5b9f6339c44af33e Mon Sep 17 00:00:00 2001 From: John Date: Sun, 7 Feb 2021 14:41:26 +0100 Subject: [PATCH 441/447] catch2: remove upstreamed patch --- srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} | 4 ---- 1 file changed, 4 deletions(-) rename srcpkgs/catch2/patches/{musl-test.patch => errno-tests.patch} (82%) diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/errno-tests.patch similarity index 82% rename from srcpkgs/catch2/patches/musl-test.patch rename to srcpkgs/catch2/patches/errno-tests.patch index f469dc45e02..ad5c67918dd 100644 --- a/srcpkgs/catch2/patches/musl-test.patch +++ b/srcpkgs/catch2/patches/errno-tests.patch @@ -1,7 +1,3 @@ -From: Johnnynator - -errno on Musl and Glibc expand differently by one space ---- --- scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +0100 +++ - 2020-12-31 16:19:56.118506507 +0100 @@ -44,7 +44,7 @@ From 377f9eb6412a7687edbdc98b26d99e0ad9b25cd9 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 11 Feb 2021 18:57:38 +0100 Subject: [PATCH 442/447] maturin: switch to OpenSSL --- srcpkgs/maturin/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 60ba6329812..7a68cdfb46e 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -7,7 +7,7 @@ build_style=cargo # The list of enabled features should be reconciled with each new release configure_args="--no-default-features --features auditwheel,log,upload,human-panic" hostmakedepends="python3-setuptools python3-toml" -makedepends="libressl-devel" +makedepends="openssl-devel" depends="python3-toml" short_desc="Build and publish crates as python packages" maintainer="Andrew J. Hesford " From 3f91f1e2ec1eea59e994e49740972c7e7ea22788 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 11 Feb 2021 18:59:02 +0100 Subject: [PATCH 443/447] python3-adblock: switch to OpenSSL --- srcpkgs/python3-adblock/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-adblock/template b/srcpkgs/python3-adblock/template index c1200f89027..0e91c4077dc 100644 --- a/srcpkgs/python3-adblock/template +++ b/srcpkgs/python3-adblock/template @@ -5,8 +5,8 @@ revision=1 wrksrc="${pkgname/python3/python}-${version}" build_style=python3-pep517 build_helper="rust" -hostmakedepends="maturin pkg-config cargo libressl-devel" -makedepends="libressl-devel python3-devel" +hostmakedepends="maturin pkg-config cargo openssl-devel" +makedepends="openssl-devel python3-devel" depends="python3" checkdepends="python3-pytest" short_desc="Brave's adblock library in Python" From 95c71216e43cbab4b4036adb43fd28b41cd1dae0 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 11 Feb 2021 18:59:38 +0100 Subject: [PATCH 444/447] python3-cryptography: switch to OpenSSL --- srcpkgs/python3-cryptography/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template index 1234e0987d7..2e25f76f571 100644 --- a/srcpkgs/python3-cryptography/template +++ b/srcpkgs/python3-cryptography/template @@ -6,7 +6,7 @@ wrksrc="${pkgname#python3-}-${version}" build_style=python3-module build_helper="rust" hostmakedepends="python3-setuptools-rust python3-cffi cargo" -makedepends="python3-devel libressl-devel" +makedepends="python3-devel openssl-devel" depends="python3-cffi" checkdepends="python3-pytest-subtests python3-pytz python3-iso8601 python3-cryptography_vectors python3-pretend python3-hypothesis $depends" From 4329a645f400fe4e6a298ba5ad6fe1538e01d253 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 13 Feb 2021 21:05:24 +0100 Subject: [PATCH 445/447] *-luasec: update to 1.0 unify into a single template and add lua54 support --- srcpkgs/lua51-luasec | 1 + srcpkgs/lua51-luasec/patches/libressl.patch | 36 --------- srcpkgs/lua51-luasec/template | 29 ------- srcpkgs/lua52-luasec | 1 + srcpkgs/lua52-luasec/template | 28 ------- srcpkgs/lua53-luasec | 1 + srcpkgs/lua53-luasec/template | 34 -------- srcpkgs/lua54-luasec/template | 87 +++++++++++++++++++++ 8 files changed, 90 insertions(+), 127 deletions(-) create mode 120000 srcpkgs/lua51-luasec delete mode 100644 srcpkgs/lua51-luasec/patches/libressl.patch delete mode 100644 srcpkgs/lua51-luasec/template create mode 120000 srcpkgs/lua52-luasec delete mode 100644 srcpkgs/lua52-luasec/template create mode 120000 srcpkgs/lua53-luasec delete mode 100644 srcpkgs/lua53-luasec/template create mode 100644 srcpkgs/lua54-luasec/template diff --git a/srcpkgs/lua51-luasec b/srcpkgs/lua51-luasec new file mode 120000 index 00000000000..2326404994a --- /dev/null +++ b/srcpkgs/lua51-luasec @@ -0,0 +1 @@ +lua54-luasec \ No newline at end of file diff --git a/srcpkgs/lua51-luasec/patches/libressl.patch b/srcpkgs/lua51-luasec/patches/libressl.patch deleted file mode 100644 index 531278fa148..00000000000 --- a/srcpkgs/lua51-luasec/patches/libressl.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git src/ssl.c src/ssl.c -index 2fa6ede..bd8a744 100644 ---- src/ssl.c -+++ src/ssl.c -@@ -395,24 +395,30 @@ static int meth_want(lua_State *L) - } - return 1; - } -- -+ - /** - * Return the compression method used. - */ - static int meth_compression(lua_State *L) - { -+#if !defined(OPENSSL_NO_COMP) - const COMP_METHOD *comp; -+#endif - p_ssl ssl = (p_ssl)luaL_checkudata(L, 1, "SSL:Connection"); - if (ssl->state != LSEC_STATE_CONNECTED) { - lua_pushnil(L); - lua_pushstring(L, "closed"); - return 2; - } -+#if !defined(OPENSSL_NO_COMP) - comp = SSL_get_current_compression(ssl->ssl); - if (comp) - lua_pushstring(L, SSL_COMP_get_name(comp)); - else - lua_pushnil(L); -+#else -+ lua_pushnil(L); -+#endif - return 1; - } - diff --git a/srcpkgs/lua51-luasec/template b/srcpkgs/lua51-luasec/template deleted file mode 100644 index d9a1ab60631..00000000000 --- a/srcpkgs/lua51-luasec/template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'lua51-luasec' -pkgname=lua51-luasec -reverts=0.6_1 -version=0.5.1 -revision=12 -wrksrc=${pkgname#*-}-${pkgname#*-}-${version} -build_style=gnu-makefile -hostmakedepends="lua51" -makedepends="lua51-devel openssl-devel" -depends="lua51" -short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" -maintainer="Duncaen " -license="MIT" -homepage="https://github.com/brunoos/luasec" -distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz" -checksum=6d5c5f8e0521f3194668d9a839774e079e2fd5c45b15538dc7b8cacc56719406 - -replaces="luasec<=0.5.1_1" - -do_build() { - lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h - make linux CC=$CC LD=$CC \ - INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.1" \ - LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib -} - -post_install() { - vlicense LICENSE -} diff --git a/srcpkgs/lua52-luasec b/srcpkgs/lua52-luasec new file mode 120000 index 00000000000..2326404994a --- /dev/null +++ b/srcpkgs/lua52-luasec @@ -0,0 +1 @@ +lua54-luasec \ No newline at end of file diff --git a/srcpkgs/lua52-luasec/template b/srcpkgs/lua52-luasec/template deleted file mode 100644 index 557292e03a9..00000000000 --- a/srcpkgs/lua52-luasec/template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'lua52-luasec' -pkgname=lua52-luasec -version=0.6 -revision=11 -wrksrc=${pkgname#*-}-${pkgname#*-}-${version} -build_style=gnu-makefile -hostmakedepends="lua52" -makedepends="lua52-devel openssl-devel" -depends="lua52" -short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" -maintainer="Duncaen " -license="MIT" -homepage="https://github.com/brunoos/luasec" -distfiles="https://github.com/brunoos/luasec/archive/${pkgname#*-}-${version}.tar.gz" -checksum=cef3a35c18beb8a54d9c8ce6260a4cabbd9a386de8711320d084daffad0aed5d - -do_build() { - lua src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.h - make linux CC=$CC LD=$CC \ - INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua5.2" \ - LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib -} - -pre_install() { - export LUAPATH=${DESTDIR}/usr/share/lua/5.2 - export LUACPATH=${DESTDIR}/usr/lib/lua/5.2 - vlicense LICENSE -} diff --git a/srcpkgs/lua53-luasec b/srcpkgs/lua53-luasec new file mode 120000 index 00000000000..2326404994a --- /dev/null +++ b/srcpkgs/lua53-luasec @@ -0,0 +1 @@ +lua54-luasec \ No newline at end of file diff --git a/srcpkgs/lua53-luasec/template b/srcpkgs/lua53-luasec/template deleted file mode 100644 index 6cb4c1993b8..00000000000 --- a/srcpkgs/lua53-luasec/template +++ /dev/null @@ -1,34 +0,0 @@ -# Template file for 'lua53-luasec' -pkgname=lua53-luasec -version=0.8.1 -revision=5 -wrksrc="luasec-luasec-${version}" -build_style=gnu-makefile -make_build_args="LUAPATH=/usr/share/lua/5.3 LUACPATH=/usr/lib/lua/5.3" -make_install_args="${make_build_args}" -hostmakedepends="lua53" -makedepends="lua53-devel openssl-devel" -depends="lua53" -short_desc="Lua binding for OpenSSL library to provide TLS/SSL communication" -maintainer="Duncaen " -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 " +license="MIT" +homepage="https://github.com/brunoos/luasec" +distfiles="https://github.com/brunoos/luasec/archive/v${version}.tar.gz" +checksum=912bfd2050338895207cf24bc8dd26fa9ebddc34006cb8c33d488156d41ac932 + +post_extract() { + mkdir -p lua5.1 + mv * lua5.1 || true + cp -a lua5.1 lua5.2 + cp -a lua5.1 lua5.3 + cp -a lua5.1 lua5.4 +} + +do_configure() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + lua${luaver} src/options.lua -g ${XBPS_CROSS_BASE}/usr/include/openssl/ssl.h > src/options.c + popd + done +} + +do_build() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make linux CC=$CC LD=$CC \ + INC_PATH="-I${XBPS_CROSS_BASE}/usr/include -I${XBPS_CROSS_BASE}/usr/include/lua${luaver}" \ + LIB_PATH=-L${XBPS_CROSS_BASE}/usr/lib + popd + done +} + +do_install() { + for luaver in 5.1 5.2 5.3 5.4; do + pushd lua${luaver} + make DESTDIR=${DESTDIR} LUAPATH=/usr/share/lua/${luaver} LUACPATH=/usr/lib/lua/${luaver} install + popd + done + vlicense lua5.4/LICENSE +} + +lua51-luasec_package() { + depends="lua51" + short_desc="${_desc} (5.1.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.1/LICENSE" + vmove usr/lib/lua/5.1 + vmove usr/share/lua/5.1 + } +} + +lua52-luasec_package() { + depends="lua52" + short_desc="${_desc} (5.2.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.2/LICENSE" + vmove usr/lib/lua/5.2 + vmove usr/share/lua/5.2 + } +} + +lua53-luasec_package() { + depends="lua53" + short_desc="${_desc} (5.3.x)" + pkg_install() { + vlicense "${wrksrc}/lua5.3/LICENSE" + vmove usr/lib/lua/5.3 + vmove usr/share/lua/5.3 + } +} + +luasec_package() { + depends="lua53-luasec>=${version}_${revision}" + short_desc+=" (transitional dummy package)" + build_style=meta +} From 3edbd4b5db48df14176b432aef33fad0cb697969 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 6 Jan 2021 18:17:42 +0100 Subject: [PATCH 446/447] Ice: remove package --- common/shlibs | 13 ----- srcpkgs/Ice-devel | 1 - srcpkgs/Ice/patches/archs.patch | 62 -------------------- srcpkgs/Ice/patches/fix-musl.patch | 11 ---- srcpkgs/Ice/patches/libressl.patch | 37 ------------ srcpkgs/Ice/template | 94 ------------------------------ srcpkgs/libIce | 1 - srcpkgs/removed-packages/template | 5 +- 8 files changed, 4 insertions(+), 220 deletions(-) delete mode 120000 srcpkgs/Ice-devel delete mode 100644 srcpkgs/Ice/patches/archs.patch delete mode 100644 srcpkgs/Ice/patches/fix-musl.patch delete mode 100644 srcpkgs/Ice/patches/libressl.patch delete mode 100644 srcpkgs/Ice/template delete mode 120000 srcpkgs/libIce diff --git a/common/shlibs b/common/shlibs index 3b84249d9c1..a7f9f94d3e4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -961,19 +961,6 @@ libmcpp.so.0 libmcpp-2.7.2_1 libjitterentropy.so.3 jitterentropy-3.0.0_1 libkdecorations2.so.5 kdecoration-5.8.4_1 libkdecorations2private.so.7 kdecoration-5.18.0_1 -libGlacier2.so.35 libIce-3.5.0_1 -libIce.so.35 libIce-3.5.0_1 -libIceSSL.so.35 libIce-3.5.0_1 -libIceUtil.so.35 libIce-3.5.0_1 -libIceStormService.so.35 libIce-3.5.0_1 -libIceStorm.so.35 libIce-3.5.0_1 -libFreeze.so.35 libIce-3.5.0_1 -libSlice.so.35 libIce-3.5.0_1 -libIceBox.so.35 libIce-3.5.0_1 -libIceGrid.so.35 libIce-3.5.0_1 -libIcePatch2.so.35 libIce-3.5.0_1 -libIceDB.so.35 libIce-3.5.0_1 -libIceXML.so.35 libIce-3.5.0_1 libvdpau.so.1 libvdpau-0.4.1_1 libgsm.so.1 libgsm-1.0.13_13 libcgroup.so.1 libcgroup-0.37.1_1 diff --git a/srcpkgs/Ice-devel b/srcpkgs/Ice-devel deleted file mode 120000 index afa20b55e8d..00000000000 --- a/srcpkgs/Ice-devel +++ /dev/null @@ -1 +0,0 @@ -Ice \ No newline at end of file diff --git a/srcpkgs/Ice/patches/archs.patch b/srcpkgs/Ice/patches/archs.patch deleted file mode 100644 index 2c1f9c5d7e7..00000000000 --- a/srcpkgs/Ice/patches/archs.patch +++ /dev/null @@ -1,62 +0,0 @@ ---- cpp/include/IceUtil/Config.h -+++ cpp/include/IceUtil/Config.h -@@ -20,31 +20,28 @@ - # include - #endif - --#if defined(__i386) || defined(_M_IX86) || defined(__x86_64) || \ -- defined(_M_X64) || defined(_M_IA64) || defined(__alpha__) || \ -- defined(__ARMEL__) || defined(_M_ARM_FP) || \ -- defined(__MIPSEL__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN)) --# define ICE_LITTLE_ENDIAN --#elif defined(__sparc) || defined(__sparc__) || defined(__hppa) || \ -- defined(__ppc__) || defined(__powerpc) || defined(_ARCH_COM) || \ -- defined(__MIPSEB__) || (defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN)) --# define ICE_BIG_ENDIAN --#else --# error "Unknown architecture" -+#if defined(HAVE_ENDIAN_H) -+# include -+# if __BYTE_ORDER==__LITTLE_ENDIAN -+# define ICE_LITTLE_ENDIAN -+# elif __BYTE_ORDER==__BIG_ENDIAN -+# define ICE_BIG_ENDIAN -+# else -+# error "Unknown endian type" -+# endif - #endif - - // - // 32 or 64 bit mode? - // --#if defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \ -- defined(__linux) && defined(__x86_64) || \ -- defined(__hppa) && defined(__LP64__) || \ -- defined(_ARCH_COM) && defined(__64BIT__) || \ -- defined(__alpha__) || \ -- defined(_WIN64) --# define ICE_64 --#else --# define ICE_32 -+#if defined(HAVE_LIMITS_H) -+# include -+# include -+# if __WORDSIZE == 64 -+# define ICE_64 -+# else -+# define ICE_32 -+# endif - #endif - - // ---- cpp/src/IceUtil/Makefile -+++ cpp/src/IceUtil/Makefile -@@ -41,7 +41,7 @@ - include $(top_srcdir)/config/Make.rules - - CPPFLAGS := $(CPPFLAGS) $(ICEUTIL_FLAGS) -DICE_UTIL_API_EXPORTS -I.. --LINKWITH := $(ICEUTIL_OS_LIBS) -+LINKWITH := $(ICEUTIL_OS_LIBS) -lrt - - ifeq ($(STATICLIBS),yes) - $(libdir)/$(LIBNAME): $(OBJS) diff --git a/srcpkgs/Ice/patches/fix-musl.patch b/srcpkgs/Ice/patches/fix-musl.patch deleted file mode 100644 index c03824b70f5..00000000000 --- a/srcpkgs/Ice/patches/fix-musl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cpp/include/IceUtil/Mutex.h.orig 2016-03-27 17:49:17.579001730 +0200 -+++ cpp/include/IceUtil/Mutex.h 2016-03-27 17:51:56.591989829 +0200 -@@ -231,7 +231,7 @@ Mutex::init(MutexProtocol - // Enable mutex error checking in debug builds - // - #ifndef NDEBUG --#if defined(__linux) && !defined(__USE_UNIX98) -+#if defined(__linux) && !defined(__USE_UNIX98) && defined(PTHREAD_MUTEX_ERRORCHECK_NP) - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP); - #else - rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK); diff --git a/srcpkgs/Ice/patches/libressl.patch b/srcpkgs/Ice/patches/libressl.patch deleted file mode 100644 index 6b56ecc63e4..00000000000 --- a/srcpkgs/Ice/patches/libressl.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- cpp/src/Glacier2/CryptPermissionsVerifierI.cpp.orig 2014-07-15 16:06:05.470463382 +0200 -+++ cpp/src/Glacier2/CryptPermissionsVerifierI.cpp 2014-07-15 16:09:18.591065235 +0200 -@@ -8,6 +8,7 @@ - // ********************************************************************** - - #include -+#include - #include - - using namespace std; ---- cpp/src/IceGrid/RegistryI.cpp.orig 2014-07-15 16:10:22.943599009 +0200 -+++ cpp/src/IceGrid/RegistryI.cpp 2014-07-15 16:10:40.950748368 +0200 -@@ -40,6 +40,7 @@ - - #include - -+#include - #include // For crypt() passwords - - #include ---- cpp/src/IceSSL/Instance.cpp.orig 2014-07-15 15:59:44.430302828 +0200 -+++ cpp/src/IceSSL/Instance.cpp 2014-07-15 16:02:59.590921603 +0200 -@@ -274,12 +274,14 @@ IceSSL::Instance::Instance(const Communi - string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon"); - if(!entropyDaemon.empty()) - { -+#ifdef HAVE_SSL_RAND_EGD - if(RAND_egd(entropyDaemon.c_str()) <= 0) - { - PluginInitializationException ex(__FILE__, __LINE__); - ex.reason = "IceSSL: EGD failure using file " + entropyDaemon; - throw ex; - } -+#endif - } - #endif - if(!RAND_status()) diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template deleted file mode 100644 index d27bb350c74..00000000000 --- a/srcpkgs/Ice/template +++ /dev/null @@ -1,94 +0,0 @@ -# Template file for 'Ice' -pkgname=Ice -version=3.5.1 -revision=22 -build_wrksrc=cpp -makedepends="zlib-devel bzip2-devel mcpp-devel db-devel expat-devel libressl-devel" -short_desc="Internet Communications Engine (Ice)" -maintainer="Orphaned " -license="GPL-2.0-only, ICE" -homepage="http://www.zeroc.com" -distfiles="${homepage}/download/Ice/${version%.*}/${pkgname}-${version}.tar.gz" -checksum=989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392 -python_version=2 #unverified - -if [ "$CROSS_BUILD" ]; then - # Cross build requires the host's slice2cpp and slice2freeze - hostmakedepends+=" Ice" -fi - -do_configure() { - sed -i -e "s|^#OPTIMIZE|OPTIMIZE|" config/Make.rules - sed -i -e "s|x)/config|x)/lib/Ice/config|" config/Make.rules - sed -i '/^embedded_runpath_prefix*/d' config/Make.rules - sed -i -e 's|x)/man/man1|x)/share/man/man1|' config/Make.rules - sed -i -e "s|test demo||" Makefile - - # Simple fixes for musl libc instead of a proper patch - sed -i -e 's|__GNUC__|__GLIBC__|' src/IceUtil/Exception.cpp - sed -i -e 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' src/IceUtil/RecMutex.cpp - sed -i -e 's|sys/poll\.h|poll.h|' src/Ice/*.h - - # Patch to find our $CXX and always use our $CXXFLAGS - sed -i config/Make.rules.Linux \ - -e "s|= g++|= ${CXX}|" \ - -e "s|ifeq (\$(CXX),g++)|ifeq (\$(CXX),${CXX})|" \ - -e "/CXXARCHFLAGS\s+=/ s| -m.*|${CXXFLAGS}|" \ - -e "s|\$(CXX) -shared|${CXX} -shared|" \ - -e "s|-rdynamic|-rdynamic -Wl,-rpath,\$(libdir) ${LDFLAGS}|" \ - -e "s|-Werror|-Wno-error|" - # Fix cross building - if [ "$CROSS_BUILD" ]; then - # Use host's slice2cpp and slice2freeze - sed -i config/Make.rules \ - -e 's|$(SLICE2CPP) $(SLICE2CPPFLAGS)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2cpp $(SLICE2CPPFLAGS)|' - find . -name Makefile -exec sed -i "{}" \ - -e 's|^\(\s\)$(SLICE2FREEZE)|\1LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \ - -e '/SLICE2FREEZECMD\s=/ s|$(SLICE2FREEZE)|LD_LIBRARY_PATH=/usr/lib /usr/bin/slice2freeze|' \ - \; - fi -} - -do_build() { - export CXXFLAGS+=" -fPIC -DPIC" - make prefix=/usr ${makejobs} -} - -do_install() { - case "$XBPS_MACHINE" in - x86_64*) - vmkdir usr/lib - ln -s lib ${DESTDIR}/usr/lib64 - ;; - esac - make prefix=${DESTDIR}/usr install - [ -h ${DESTDIR}/usr/lib64 ] && rm -f ${DESTDIR}/usr/lib64 - - mv ${DESTDIR}/usr/slice ${DESTDIR}/usr/share - rm ${DESTDIR}/usr/LICENSE ${DESTDIR}/usr/ICE_LICENSE - rm ${DESTDIR}/usr/CHANGES ${DESTDIR}/usr/RELEASE_NOTES - cd ${wrksrc} - vlicense ICE_LICENSE - vdoc CHANGES - vdoc RELEASE_NOTES - - # remove unused cruft - rm -f ${DESTDIR}/usr/lib/*.class -} - -libIce_package() { - short_desc+=" - runtime libraries" - pkg_install() { - vmove "usr/lib/*.so.*" - vmove usr/lib/Ice - } -} - -Ice-devel_package() { - depends="libIce>=${version}_${revision} Ice>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.so" - } -} diff --git a/srcpkgs/libIce b/srcpkgs/libIce deleted file mode 120000 index afa20b55e8d..00000000000 --- a/srcpkgs/libIce +++ /dev/null @@ -1 +0,0 @@ -Ice \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index c4dc2785068..d6b039e4ccf 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=29 +revision=30 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -52,6 +52,9 @@ replaces=" gtkhtml-devel<=4.10.0_1 libgtkhtml<=4.10.0_1 httperf<=0.9.0_9 + Ice<=3.5.1_24 + Ice-devel<=3.5.1_24 + libIce<=3.5.1_24 icecat<=78.6.1_1 icecat-i18n-ach<=78.6.1_1 icecat-i18n-af<=78.6.1_1 From bfb876e5225e968de77512d24e7a99e7eec9a8a3 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 13 Feb 2021 18:38:48 +0100 Subject: [PATCH 447/447] acme-client: remove package --- srcpkgs/acme-client/INSTALL.msg | 1 - srcpkgs/acme-client/template | 25 ------------------------- srcpkgs/acme-client/update | 1 - srcpkgs/removed-packages/template | 1 + 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 srcpkgs/acme-client/INSTALL.msg delete mode 100644 srcpkgs/acme-client/template delete mode 100644 srcpkgs/acme-client/update diff --git a/srcpkgs/acme-client/INSTALL.msg b/srcpkgs/acme-client/INSTALL.msg deleted file mode 100644 index a799d36a283..00000000000 --- a/srcpkgs/acme-client/INSTALL.msg +++ /dev/null @@ -1 +0,0 @@ -NOTE: acme-client uses new default directories since version 0.1.12 diff --git a/srcpkgs/acme-client/template b/srcpkgs/acme-client/template deleted file mode 100644 index d583ddfa476..00000000000 --- a/srcpkgs/acme-client/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'acme-client' -pkgname=acme-client -version=0.1.16 -revision=5 -_distver=VERSION_${version//./_} -wrksrc=acme-client-portable-${_distver} -build_style=gnu-makefile -make_install_args="MAN1DIR=/usr/share/man/man1 BINDIR=/usr/bin" -hostmakedepends="pkg-config" -makedepends="libbsd-devel libressl-devel" -short_desc="A secure ACME client" -maintainer="Toyam Cox " -license="ISC" -homepage="https://kristaps.bsd.lv/acme-client/" -distfiles="https://github.com/kristapsdz/acme-client-portable/archive/${_distver}.tar.gz" -checksum=69d5867ae8b7db49f08a0c536655e41f960bab7c033b234ff0e2a03fab98f667 - -CFLAGS="-fcommon -DHAVE_CONFIG_H" -case "$XBPS_TARGET_MACHINE" in - *-musl) CFLAGS+=" -DMUSL_LIBC" ;; -esac - -post_install() { - vlicense LICENSE.md -} diff --git a/srcpkgs/acme-client/update b/srcpkgs/acme-client/update deleted file mode 100644 index d56d0ea5fd7..00000000000 --- a/srcpkgs/acme-client/update +++ /dev/null @@ -1 +0,0 @@ -pattern='VERSION_\K[\d_]+' diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index d6b039e4ccf..c3a9617dd22 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -11,6 +11,7 @@ homepage="https://voidlinux.org" replaces=" Platinum9-theme<=0.0.0.20170720_3 XorCurses<=0.2.2_1 + acme-client<=0.1.16_5 albert<=0.16.1_4 apg<=2.2.3_5 arm-mem-git<=20131108_2