From 670bf5a8cc5bc605eede8ca2fd55b50a5c9f8660 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sat, 16 Oct 2021 00:04:30 -0600
Subject: [PATCH] main: migrate to explicit openssl1.1-compat-dev dependency to
support openssl 1.1 downgrade
---
main/abuild/APKBUILD | 4 ++--
main/arm-trusted-firmware/APKBUILD | 4 ++--
main/axel/APKBUILD | 4 ++--
main/bind/APKBUILD | 4 ++--
main/busybox/APKBUILD | 4 ++--
main/ca-certificates/APKBUILD | 4 ++--
main/cgit/APKBUILD | 4 ++--
main/charybdis/APKBUILD | 4 ++--
main/eggdrop/APKBUILD | 4 ++--
main/elinks/APKBUILD | 4 ++--
main/email/APKBUILD | 4 ++--
main/encfs/APKBUILD | 4 ++--
main/gvpe/APKBUILD | 4 ++--
main/haproxy/APKBUILD | 4 ++--
main/irssi/APKBUILD | 4 ++--
main/kmod/APKBUILD | 4 ++--
main/knot/APKBUILD | 4 ++--
main/lftp/APKBUILD | 4 ++--
main/libasr/APKBUILD | 4 ++--
main/librelp/APKBUILD | 4 ++--
main/libretls/APKBUILD | 6 +++---
main/libssh2/APKBUILD | 4 ++--
main/lighttpd/APKBUILD | 4 ++--
main/links/APKBUILD | 4 ++--
main/linux-lts/APKBUILD | 4 ++--
main/linux-octeon/APKBUILD | 4 ++--
main/linux-rpi/APKBUILD | 4 ++--
main/lua-cqueues/APKBUILD | 4 ++--
main/lua-sec/APKBUILD | 4 ++--
main/lynx/APKBUILD | 4 ++--
main/mini_httpd/APKBUILD | 4 ++--
main/monit/APKBUILD | 4 ++--
main/mosh/APKBUILD | 4 ++--
main/mtd-utils/APKBUILD | 4 ++--
main/ngircd/APKBUILD | 4 ++--
main/nmap/APKBUILD | 4 ++--
main/nrpe/APKBUILD | 4 ++--
main/nsd/APKBUILD | 4 ++--
main/open-iscsi/APKBUILD | 4 ++--
main/open-isns/APKBUILD | 4 ++--
main/partimage/APKBUILD | 4 ++--
main/perdition/APKBUILD | 4 ++--
main/perl-crypt-openssl-random/APKBUILD | 4 ++--
main/perl-crypt-openssl-rsa/APKBUILD | 4 ++--
main/perl-crypt-ssleay/APKBUILD | 4 ++--
main/perl-net-ssleay/APKBUILD | 4 ++--
main/ppp/APKBUILD | 4 ++--
main/rhash/APKBUILD | 4 ++--
main/sbsigntool/APKBUILD | 4 ++--
main/sipp/APKBUILD | 4 ++--
main/sipsak/APKBUILD | 4 ++--
main/smokeping/APKBUILD | 4 ++--
main/socat/APKBUILD | 4 ++--
main/ssmtp/APKBUILD | 4 ++--
main/tarsnap/APKBUILD | 4 ++--
main/tcl-tls/APKBUILD | 4 ++--
main/tcpdump/APKBUILD | 4 ++--
main/tcpflow/APKBUILD | 4 ++--
main/tinc/APKBUILD | 4 ++--
main/umurmur/APKBUILD | 4 ++--
main/vde2/APKBUILD | 4 ++--
main/wget/APKBUILD | 4 ++--
main/zfs/APKBUILD | 4 ++--
63 files changed, 127 insertions(+), 127 deletions(-)
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index af665bb8be0d..4e5181c5c099 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=3.9.0_rc2
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="https://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -13,7 +13,7 @@ if [ "$CBUILD" = "$CHOST" ]; then
depends="$depends curl"
fi
makedepends_build="pkgconfig scdoc"
-makedepends_host="openssl-dev zlib-dev"
+makedepends_host="openssl1.1-compat-dev zlib-dev"
makedepends="$makedepends_host $makedepends_build"
checkdepends="bats"
install="$pkgname.pre-install $pkgname.pre-upgrade"
diff --git a/main/arm-trusted-firmware/APKBUILD b/main/arm-trusted-firmware/APKBUILD
index 3532ddcfbb87..b6a1b772131d 100644
--- a/main/arm-trusted-firmware/APKBUILD
+++ b/main/arm-trusted-firmware/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=arm-trusted-firmware
pkgver=2.5
-pkgrel=1
+pkgrel=2
pkgdesc="ARM Trusted Firmware-A (TF-A)"
url="https://github.com/ARM-software/arm-trusted-firmware"
arch="aarch64"
license="BSD-3-Clause"
-makedepends="dtc openssl-dev gcc-arm-none-eabi"
+makedepends="dtc openssl1.1-compat-dev gcc-arm-none-eabi"
source="https://github.com/ARM-software/arm-trusted-firmware/archive/v$pkgver/arm-trusted-firmware-v$pkgver.tar.gz
rk3399-baudrate.patch"
options="!check" # No tests
diff --git a/main/axel/APKBUILD b/main/axel/APKBUILD
index 5fbda1de91aa..3f2ee25250e5 100644
--- a/main/axel/APKBUILD
+++ b/main/axel/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=axel
pkgver=2.17.10
-pkgrel=1
+pkgrel=2
pkgdesc="A multiple-connection concurrent downloader"
url="https://github.com/axel-download-accelerator/axel"
arch="all"
options="!check" # has no checks
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc"
source="$url/releases/download/v$pkgver/axel-$pkgver.tar.xz"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 4ed51c79be10..cb9b574c7140 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -10,7 +10,7 @@ _ver=${pkgver%_p*}
_p=${pkgver#*_p}
_major=${pkgver%%.*}
[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
-pkgrel=2
+pkgrel=3
pkgdesc="The ISC DNS server"
url="https://www.isc.org/"
arch="all"
@@ -34,7 +34,7 @@ makedepends="
libxml2-dev
linux-headers
openldap-dev
- openssl-dev
+ openssl1.1-compat-dev
perl
protobuf-c-dev
$_py3deps
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 25b8b0130261..edf2508a70f4 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -4,13 +4,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
pkgver=1.34.1
-pkgrel=0
+pkgrel=1
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url="https://busybox.net/"
arch="all"
license="GPL-2.0-only"
makedepends_build="perl"
-makedepends_host="linux-headers openssl-dev libretls-dev"
+makedepends_host="linux-headers openssl1.1-compat-dev libretls-dev"
makedepends="$makedepends_build $makedepends_host"
checkdepends="zip"
provides="/bin/sh"
diff --git a/main/ca-certificates/APKBUILD b/main/ca-certificates/APKBUILD
index fb0185e474dc..6a4d7ab8d616 100644
--- a/main/ca-certificates/APKBUILD
+++ b/main/ca-certificates/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ca-certificates
pkgver=20191127
-pkgrel=6
+pkgrel=7
pkgdesc="Common CA certificates PEM files from Mozilla"
url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/"
arch="all"
# There is a GPL-2.0-or-later script inside the source but it is not shipped
license="MPL-2.0 AND MIT"
makedepends_build="perl"
-makedepends_host="openssl-dev"
+makedepends_host="openssl1.1-compat-dev"
subpackages="$pkgname-doc $pkgname-bundle"
# c_rehash is either in libcrypto1.0 or openssl depending on package, grr. replace both of them
replaces="libcrypto1.0 openssl openssl1.0"
diff --git a/main/cgit/APKBUILD b/main/cgit/APKBUILD
index fc3c9c0eaf6f..930ead579d56 100644
--- a/main/cgit/APKBUILD
+++ b/main/cgit/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=cgit
pkgver=1.2.3
-pkgrel=1
+pkgrel=2
_gitver=2.25.1
pkgdesc="A fast webinterface for git"
url="https://git.zx2c4.com/cgit/"
arch="all"
license="GPL-2.0-only"
-makedepends="openssl-dev zlib-dev lua5.3-dev asciidoc"
+makedepends="openssl1.1-compat-dev zlib-dev lua5.3-dev asciidoc"
subpackages="$pkgname-doc"
source="http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz
https://www.kernel.org/pub/software/scm/git/git-$_gitver.tar.gz
diff --git a/main/charybdis/APKBUILD b/main/charybdis/APKBUILD
index 30ab935d33af..1e1d7284abb6 100644
--- a/main/charybdis/APKBUILD
+++ b/main/charybdis/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=charybdis
pkgver=4.1.2
-pkgrel=3
+pkgrel=4
pkgdesc="A highly-scalable IRCv3-compliant IRC daemon"
url="https://github.com/charybdis-ircd/charybdis"
arch="all"
license="GPL-2.0-or-later"
pkgusers="ircd"
makedepends="automake autoconf libtool
- bison flex openssl-dev zlib-dev file
+ bison flex openssl1.1-compat-dev zlib-dev file
sqlite-dev libltdl"
install="$pkgname.pre-install"
subpackages="$pkgname-openrc"
diff --git a/main/eggdrop/APKBUILD b/main/eggdrop/APKBUILD
index 63e91d2c6669..6d63c4fd8c1b 100644
--- a/main/eggdrop/APKBUILD
+++ b/main/eggdrop/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=eggdrop
pkgver=1.8.4
-pkgrel=3
+pkgrel=4
pkgdesc="World's most popular Open Source IRC bot"
url="https://eggheads.org/"
arch="all"
license='GPL-2.0-or-later'
options="!check" # No test suite
-makedepends="openssl-dev tcl-dev !bind-libs"
+makedepends="openssl1.1-compat-dev tcl-dev !bind-libs"
subpackages="$pkgname-doc $pkgname-logs2html $pkgname-gseen"
source="$pkgname-$pkgver.tar.gz::https://github.com/eggheads/eggdrop/archive/v$pkgver.tar.gz
eggdrop-langdir.patch
diff --git a/main/elinks/APKBUILD b/main/elinks/APKBUILD
index 89dd60f51992..647e33b3689c 100644
--- a/main/elinks/APKBUILD
+++ b/main/elinks/APKBUILD
@@ -3,13 +3,13 @@
pkgname=elinks
pkgver=0.13
_ver=${pkgver/_/}
-pkgrel=7
+pkgrel=8
pkgdesc="a text mode web browser"
url="http://elinks.or.cz/"
arch="all"
license="GPL"
depends=
-makedepends="bzip2-dev zlib-dev openssl-dev expat-dev gettext-dev"
+makedepends="bzip2-dev zlib-dev openssl1.1-compat-dev expat-dev gettext-dev"
install=
subpackages="$pkgname-doc $pkgname-lang"
source="https://dev.alpinelinux.org/archive/elinks/elinks-$pkgver.tar.bz2
diff --git a/main/email/APKBUILD b/main/email/APKBUILD
index e31747f48135..579aefb7c21b 100644
--- a/main/email/APKBUILD
+++ b/main/email/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=email
pkgver=3.1.4
-pkgrel=10
+pkgrel=11
pkgdesc="command line SMTP client that's simple"
options="!check" # No testsuite
url="http://www.cleancode.org/projects/email"
arch="all"
license="GPL-2.0-or-later"
depends="openssl"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc"
source="https://dev.alpinelinux.org/archive/email/email-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-3.1.3" # Release was made with the wrong tarball name
diff --git a/main/encfs/APKBUILD b/main/encfs/APKBUILD
index df249db44c91..bbd9ca95e0aa 100644
--- a/main/encfs/APKBUILD
+++ b/main/encfs/APKBUILD
@@ -3,12 +3,12 @@
pkgname=encfs
pkgver=1.9.5
_ver=${pkgver/_/-}
-pkgrel=11
+pkgrel=12
pkgdesc="EncFS provides an encrypted filesystem in user-space"
url="https://vgough.github.io/encfs/"
arch="all"
license="GPL-3.0-only"
-makedepends="rlog-dev openssl-dev fuse-dev boost-dev
+makedepends="rlog-dev openssl1.1-compat-dev fuse-dev boost-dev
libtool gettext-dev cmake tinyxml2-dev perl"
subpackages="$pkgname-doc $pkgname-lang $pkgname-libs"
source="$pkgname-$_ver.tar.gz::https://github.com/vgough/encfs/archive/v$_ver.tar.gz"
diff --git a/main/gvpe/APKBUILD b/main/gvpe/APKBUILD
index 381a48c9c5c4..c69b851805d9 100644
--- a/main/gvpe/APKBUILD
+++ b/main/gvpe/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gvpe
pkgver=3.1
-pkgrel=1
+pkgrel=2
pkgdesc="GNU Virtual Private Ethernet"
url="http://software.schmorp.de/pkg/gvpe.html"
arch="all"
license="GPL-2.0"
depends=""
-makedepends="openssl-dev libev-dev zlib-dev gmp-dev linux-headers"
+makedepends="openssl1.1-compat-dev libev-dev zlib-dev gmp-dev linux-headers"
source="https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.gz
compile-fix.patch
musl-getopt_long.patch
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD
index 73803ebfa485..1c6a96496e7e 100644
--- a/main/haproxy/APKBUILD
+++ b/main/haproxy/APKBUILD
@@ -6,7 +6,7 @@ pkgname=haproxy
# Using LTS versions is easier to keep it in good shape for stable releases
pkgver=2.4.7
_pkgmajorver=${pkgver%.*}
-pkgrel=0
+pkgrel=1
pkgdesc="A TCP/HTTP reverse proxy for high availability environments"
url="https://www.haproxy.org/"
arch="all"
@@ -14,7 +14,7 @@ license="(GPL-2.0-or-later AND GPL-2.1-or-later) WITH OpenSSL-Exception"
_luaver=5.4
options="!check textrels" # FIXME: depends on vtest
# riscv64 build reports textrels
-makedepends="pcre-dev openssl-dev linux-headers lua$_luaver-dev zlib-dev"
+makedepends="pcre-dev openssl1.1-compat-dev linux-headers lua$_luaver-dev zlib-dev"
install="haproxy.pre-install haproxy.pre-upgrade"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://www.haproxy.org/download/$_pkgmajorver/src/haproxy-$pkgver.tar.gz
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index 81a3e51ae093..ee1a561aebee 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=irssi
pkgver=1.2.3
-pkgrel=2
+pkgrel=3
pkgdesc="Modular textUI IRC client with IPv6 support"
url="https://irssi.org/"
arch="all"
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends="glib-dev openssl-dev ncurses-dev perl-dev automake autoconf libtool libotr-dev"
+makedepends="glib-dev openssl1.1-compat-dev ncurses-dev perl-dev automake autoconf libtool libotr-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-proxy $pkgname-perl $pkgname-otr"
source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz
"
diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD
index 36c0f43f66cc..5425544b2021 100644
--- a/main/kmod/APKBUILD
+++ b/main/kmod/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=kmod
pkgver=29
-pkgrel=1
+pkgrel=2
pkgdesc="Linux kernel module management utilities"
url="http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary"
arch="all"
@@ -10,7 +10,7 @@ options="!check" # https://bugs.gentoo.org/408915#c3
license="GPL-2.0-or-later"
# gnu sed is needed for symlink
makedepends_build="sed libxslt"
-makedepends_host="$depends_dev zlib-dev xz-dev zstd-dev openssl-dev"
+makedepends_host="$depends_dev zlib-dev xz-dev zstd-dev openssl1.1-compat-dev"
makedepends="$makedepends_build $makedepends_host"
triggers="$pkgname.trigger=/lib/modules/*"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-libs
diff --git a/main/knot/APKBUILD b/main/knot/APKBUILD
index 380505e7b714..12c564e3f9e4 100644
--- a/main/knot/APKBUILD
+++ b/main/knot/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=knot
pkgver=3.0.8
-pkgrel=1
+pkgrel=2
pkgdesc="An high-performance authoritative-only DNS server"
url="https://www.knot-dns.cz/"
# testsuite fails on 32 bit arches with musl 1.2
@@ -26,7 +26,7 @@ makedepends="
lmdb-dev
m4
nghttp2-dev
- openssl-dev
+ openssl1.1-compat-dev
perl
sed
userspace-rcu-dev
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index 3aacb7f22c33..78e42f0b45aa 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=lftp
pkgver=4.9.2
-pkgrel=2
+pkgrel=3
pkgdesc="Sophisticated ftp/http client"
url="https://lftp.tech"
arch="all"
license="GPL-3.0-or-later"
-makedepends="zlib-dev openssl-dev readline-dev ncurses-dev"
+makedepends="zlib-dev openssl1.1-compat-dev readline-dev ncurses-dev"
subpackages="$pkgname-doc"
source="https://lftp.yar.ru/ftp/lftp-$pkgver.tar.xz"
diff --git a/main/libasr/APKBUILD b/main/libasr/APKBUILD
index f9a4423a81c0..03f75e23b741 100644
--- a/main/libasr/APKBUILD
+++ b/main/libasr/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=libasr
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="libasr is a free, simple and portable asynchronous resolver library"
url="https://www.opensmtpd.org"
arch="all"
license="ISC"
-makedepends="mandoc bison openssl-dev automake autoconf libtool libbsd-dev"
+makedepends="mandoc bison openssl1.1-compat-dev automake autoconf libtool libbsd-dev"
subpackages="$pkgname-dbg $pkgname-static $pkgname-dev"
source="https://github.com/OpenSMTPD/libasr/archive/$pkgver/libasr-$pkgver.tar.gz
0002-Replace-missing-res_randomid-with-the-more-secure-ar.patch
diff --git a/main/librelp/APKBUILD b/main/librelp/APKBUILD
index b6bfe16a0417..dff74ade3876 100644
--- a/main/librelp/APKBUILD
+++ b/main/librelp/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=librelp
pkgver=1.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="The Reliable Event Logging Protocol library"
url="https://www.rsyslog.com"
arch="all"
license="GPL-3.0-or-later"
-makedepends="gnutls-dev openssl-dev"
+makedepends="gnutls-dev openssl1.1-compat-dev"
subpackages="$pkgname-static $pkgname-dev"
source="https://download.rsyslog.com/librelp/librelp-$pkgver.tar.gz"
options="!check" # XXX: all tests fail, don't know why
diff --git a/main/libretls/APKBUILD b/main/libretls/APKBUILD
index c8379fae94d0..bf568cffe425 100644
--- a/main/libretls/APKBUILD
+++ b/main/libretls/APKBUILD
@@ -2,16 +2,16 @@
# Maintainer: Ariadne Conill <ariadne@dereferenced.org>
pkgname=libretls
pkgver=3.3.4
-pkgrel=1
+pkgrel=2
pkgdesc="port of libtls from libressl to openssl"
arch="all"
url="https://git.causal.agency/libretls/"
license="ISC AND (BSD-3-Clause OR MIT)"
depends="ca-certificates-bundle"
-depends_dev="openssl-dev"
+depends_dev="openssl1.1-compat-dev"
base_deps="autoconf automake libtool"
makedepends="$depends_dev $base_deps"
-makedepends_host="openssl-dev"
+makedepends_host="openssl1.1-compat-dev"
makedepends_build="$base_deps"
subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
diff --git a/main/libssh2/APKBUILD b/main/libssh2/APKBUILD
index 757af902a3cb..9a953f378398 100644
--- a/main/libssh2/APKBUILD
+++ b/main/libssh2/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libssh2
pkgver=1.10.0
-pkgrel=1
+pkgrel=2
pkgdesc="library for accessing ssh1/ssh2 protocol servers"
url="https://libssh2.org/"
arch="all"
license="BSD-3-Clause"
-makedepends_host="openssl-dev zlib-dev"
+makedepends_host="openssl1.1-compat-dev zlib-dev"
subpackages="$pkgname-dbg $pkgname-static $pkgname-dev $pkgname-doc"
source="http://www.libssh2.org/download/libssh2-$pkgver.tar.gz
"
diff --git a/main/lighttpd/APKBUILD b/main/lighttpd/APKBUILD
index 9bd1bb83ce60..d73fcfc7d56a 100644
--- a/main/lighttpd/APKBUILD
+++ b/main/lighttpd/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lighttpd
pkgver=1.4.59
-pkgrel=1
+pkgrel=2
pkgdesc="Secure, fast, compliant and very flexible web-server"
url="https://www.lighttpd.net"
arch="all"
@@ -10,7 +10,7 @@ license="BSD-3-Clause"
install="$pkgname.pre-install $pkgname.pre-upgrade"
pkgusers="lighttpd"
pkggroups="lighttpd"
-makedepends="flex pcre-dev openssl-dev zlib-dev bzip2-dev lua5.3-dev
+makedepends="flex pcre-dev openssl1.1-compat-dev zlib-dev bzip2-dev lua5.3-dev
automake autoconf openldap-dev libxml2-dev sqlite-dev libev-dev
bsd-compat-headers"
subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc $pkgname-mod_auth
diff --git a/main/links/APKBUILD b/main/links/APKBUILD
index 2d9738c3c82a..21e15d473900 100644
--- a/main/links/APKBUILD
+++ b/main/links/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=links
pkgver=2.25
-pkgrel=0
+pkgrel=1
pkgdesc="Web browser running in both graphics and text mode"
url="http://links.twibright.com/"
arch="all"
options="!check" # No test suite.
license="GPL-2.0-or-later WITH OpenSSL-Exception"
subpackages="$pkgname-doc"
-makedepends="bzip2-dev openssl-dev zlib-dev libevent-dev zstd-dev"
+makedepends="bzip2-dev openssl1.1-compat-dev zlib-dev libevent-dev zstd-dev"
source="http://links.twibright.com/download/links-$pkgver.tar.bz2"
build() {
diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index 071ed46e63af..fd0941cb33ad 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -7,12 +7,12 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=0
+pkgrel=1
pkgdesc="Linux lts kernel"
url="https://www.kernel.org"
depends="mkinitfs"
_depends_dev="perl gmp-dev elfutils-dev bash flex bison"
-makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev
+makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl1.1-compat-dev
diffutils findutils"
options="!strip"
_config=${config:-config-lts.${CARCH}}
diff --git a/main/linux-octeon/APKBUILD b/main/linux-octeon/APKBUILD
index f4c5c36752ee..5faf7107bac8 100644
--- a/main/linux-octeon/APKBUILD
+++ b/main/linux-octeon/APKBUILD
@@ -7,12 +7,12 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=$pkgver;;
esac
-pkgrel=1
+pkgrel=2
pkgdesc="Linux lts kernel (for Octeon)"
url="http://kernel.org"
depends="mkinitfs"
_depends_dev="perl gmp-dev elfutils-dev bash flex bison"
-makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl-dev
+makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any openssl1.1-compat-dev
diffutils"
options="!strip"
_config=${config:-config-lts.${CARCH}}
diff --git a/main/linux-rpi/APKBUILD b/main/linux-rpi/APKBUILD
index a89674ea408f..28febefad548 100644
--- a/main/linux-rpi/APKBUILD
+++ b/main/linux-rpi/APKBUILD
@@ -6,13 +6,13 @@ case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=${pkgver};;
esac
-pkgrel=0
+pkgrel=1
pkgdesc="Linux kernel with Raspberry Pi patches"
url=https://github.com/raspberrypi/linux
depends="mkinitfs linux-firmware-brcm linux-firmware-cypress"
_depends_dev="perl gmp-dev elfutils-dev bash"
makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware
- bison flex openssl-dev findutils
+ bison flex openssl1.1-compat-dev findutils
"
options="!strip !check"
_rpi_repo="git://github.com/raspberrypi/linux.git"
diff --git a/main/lua-cqueues/APKBUILD b/main/lua-cqueues/APKBUILD
index 5249dee4fd2e..f41c22173ac5 100644
--- a/main/lua-cqueues/APKBUILD
+++ b/main/lua-cqueues/APKBUILD
@@ -4,12 +4,12 @@ _luaversions="5.1 5.2 5.3 5.4"
pkgname=lua-cqueues
_pkgname=cqueues
pkgver=20200726
-pkgrel=2
+pkgrel=3
pkgdesc="Lua event loop using coroutines"
url="http://25thandclement.com/~william/projects/cqueues.html"
arch="all"
license="MIT"
-makedepends="openssl-dev m4 bsd-compat-headers"
+makedepends="openssl1.1-compat-dev m4 bsd-compat-headers"
for _i in $_luaversions; do
makedepends="$makedepends lua$_i-dev"
subpackages="$subpackages lua$_i-$_pkgname:_package"
diff --git a/main/lua-sec/APKBUILD b/main/lua-sec/APKBUILD
index 93f496d332b4..6f5d35191b50 100644
--- a/main/lua-sec/APKBUILD
+++ b/main/lua-sec/APKBUILD
@@ -3,12 +3,12 @@
_luaversions="5.1 5.2 5.3 5.4"
pkgname=lua-sec
pkgver=1.0.2
-pkgrel=1
+pkgrel=2
pkgdesc="TLS/SSL Support for Lua"
url="https://github.com/brunoos/luasec/wiki"
arch="all"
license="MIT"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc"
for _i in $_luaversions; do
makedepends="$makedepends lua$_i-dev"
diff --git a/main/lynx/APKBUILD b/main/lynx/APKBUILD
index e6cb7243a847..3a4b22a2cf63 100644
--- a/main/lynx/APKBUILD
+++ b/main/lynx/APKBUILD
@@ -4,13 +4,13 @@
pkgname=lynx
pkgver=2.8.9_p1
_relver=${pkgver/_p/rel.}
-pkgrel=6
+pkgrel=7
pkgdesc="Cross-platform text-based browser"
url="https://lynx.invisible-island.net/"
arch="all"
license="GPL-2.0-only"
depends="gzip"
-makedepends="openssl-dev gettext zlib-dev glib-dev perl ncurses-dev"
+makedepends="openssl1.1-compat-dev gettext zlib-dev glib-dev perl ncurses-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="http://invisible-mirror.net/archives/lynx/tarballs/lynx$_relver.tar.bz2
CVE-2021-38165.patch"
diff --git a/main/mini_httpd/APKBUILD b/main/mini_httpd/APKBUILD
index e66dad215bd2..42d90d91970f 100644
--- a/main/mini_httpd/APKBUILD
+++ b/main/mini_httpd/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mini_httpd
pkgver=1.30
-pkgrel=2
+pkgrel=3
pkgdesc="Small forking webserver with ssl and ipv6 support"
url="http://www.acme.com/software/mini_httpd/"
arch="all"
@@ -10,7 +10,7 @@ pkgusers="minihttpd"
pkggroups="www-data"
# no tests/check provided by upstream
options="!check"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc $pkgname-openrc"
install="$pkgname.pre-install"
source="http://www.acme.com/software/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/main/monit/APKBUILD b/main/monit/APKBUILD
index 1627e49b3218..4b7baec8ebae 100644
--- a/main/monit/APKBUILD
+++ b/main/monit/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=monit
pkgver=5.29.0
-pkgrel=1
+pkgrel=2
pkgdesc="Managing and monitoring on a UNIX system"
url="https://mmonit.com/monit/"
arch="all"
license="AGPL-3.0-or-later WITH OpenSSL-Exception"
-makedepends="openssl-dev zlib-dev"
+makedepends="openssl1.1-compat-dev zlib-dev"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://mmonit.com/monit/dist/monit-$pkgver.tar.gz
fix-invalid-use-of-vfork.patch
diff --git a/main/mosh/APKBUILD b/main/mosh/APKBUILD
index a79f0eab49d6..6df3c8bfb5f4 100644
--- a/main/mosh/APKBUILD
+++ b/main/mosh/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=mosh
pkgver=1.3.2
-pkgrel=21
+pkgrel=22
pkgdesc="Mobile shell surviving disconnects with local echo and line editing"
options="!check" # emulation-cursor-motion.test fails
url="https://mosh.org"
@@ -10,7 +10,7 @@ arch="all !mips64"
license="GPL-3.0-or-later"
depends="$pkgname-client $pkgname-server"
checkdepends="tmux perl"
-makedepends="ncurses-dev zlib-dev openssl-dev perl-dev perl-io-tty
+makedepends="ncurses-dev zlib-dev openssl1.1-compat-dev perl-dev perl-io-tty
protobuf-dev automake autoconf libtool gzip"
subpackages="$pkgname-doc $pkgname-client $pkgname-server
$pkgname-bash-completion:bashcomp:noarch"
diff --git a/main/mtd-utils/APKBUILD b/main/mtd-utils/APKBUILD
index 78027ec4d59b..e3d4b61d0aec 100644
--- a/main/mtd-utils/APKBUILD
+++ b/main/mtd-utils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Olliver Schinagl <oliver@schinagl.nl>
pkgname=mtd-utils
pkgver=2.1.3
-pkgrel=1
+pkgrel=2
pkgdesc="Utilities for handling MTD devices, and for dealing with FTL, NFTL JFFS2, etc."
options="!check" # Tests fail on builder
url="http://www.linux-mtd.infradead.org/"
@@ -16,7 +16,7 @@ makedepends="
libtool
linux-headers
lzo-dev
- openssl-dev
+ openssl1.1-compat-dev
util-linux-dev
zlib-dev
zstd-dev
diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index b2e5b2be91b3..321b713f5ee9 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ngircd
pkgver=26.1
-pkgrel=1
+pkgrel=2
pkgdesc="Next Generation IRC Daemon"
url="https://ngircd.barton.de/"
arch="all"
license="GPL-2.0-or-later"
-makedepends="openssl-dev zlib-dev linux-pam-dev"
+makedepends="openssl1.1-compat-dev zlib-dev linux-pam-dev"
subpackages="$pkgname-doc $pkgname-openrc"
install="$pkgname.pre-install"
source="https://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.xz
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index 8a42ffe9417e..a0a46384c86b 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=nmap
pkgver=7.92
-pkgrel=1
+pkgrel=2
pkgdesc="network exploration tool and security/port scanner"
url="https://nmap.org"
arch="all"
license="custom"
-makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev libssh2-dev lua5.3-dev"
+makedepends="linux-headers openssl1.1-compat-dev libpcap-dev pcre-dev zlib-dev libssh2-dev lua5.3-dev"
options="!check" #FIXME: fails on armhf and aarch64
subpackages="
$pkgname-doc
diff --git a/main/nrpe/APKBUILD b/main/nrpe/APKBUILD
index 8bf938c7295c..375db5dfb767 100644
--- a/main/nrpe/APKBUILD
+++ b/main/nrpe/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
pkgname=nrpe
pkgver=4.0.3
-pkgrel=1
+pkgrel=2
pkgusers="nagios"
pkggroups="nagios"
pkgdesc="NRPE allows you to remotely execute Nagios plugins on other Linux/Unix machines."
url="http://www.nagios.org/download/addons"
arch="all"
license="GPL"
-makedepends="openssl-dev autoconf"
+makedepends="openssl1.1-compat-dev autoconf"
install="nrpe.pre-install"
subpackages="$pkgname-plugin"
source="https://downloads.sourceforge.net/nagios/nrpe-$pkgver.tar.gz
diff --git a/main/nsd/APKBUILD b/main/nsd/APKBUILD
index 18ebdeb89f6e..d7b4e4522d40 100644
--- a/main/nsd/APKBUILD
+++ b/main/nsd/APKBUILD
@@ -5,12 +5,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=nsd
pkgver=4.3.7
-pkgrel=2
+pkgrel=3
pkgdesc="Authoritative only, high performance and simple DNS server"
url="https://www.nlnetlabs.nl/projects/nsd"
arch="all"
license="BSD-3-Clause"
-makedepends="openssl-dev libevent-dev"
+makedepends="openssl1.1-compat-dev libevent-dev"
install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
pkgusers="nsd"
diff --git a/main/open-iscsi/APKBUILD b/main/open-iscsi/APKBUILD
index aeaf87b1668c..202d9130c8da 100644
--- a/main/open-iscsi/APKBUILD
+++ b/main/open-iscsi/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=open-iscsi
pkgver=2.1.5
-pkgrel=1
+pkgrel=2
pkgdesc="High performance, transport independent, multi-platform iSCSI initiator"
url="https://www.open-iscsi.com"
arch="all"
license="GPL-2.0-only"
-makedepends="autoconf automake kmod-dev libmount libtool linux-headers openssl-dev
+makedepends="autoconf automake kmod-dev libmount libtool linux-headers openssl1.1-compat-dev
open-isns-dev util-linux-dev"
options="!check"
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc"
diff --git a/main/open-isns/APKBUILD b/main/open-isns/APKBUILD
index 8bb92ad5fbbe..c730938b494a 100644
--- a/main/open-isns/APKBUILD
+++ b/main/open-isns/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=open-isns
pkgver=0.101
-pkgrel=1
+pkgrel=2
pkgdesc="iSNS server and client for Linux"
url="https://github.com/open-iscsi/open-isns"
arch="all"
license="LGPL-2.1-or-later"
-makedepends="autoconf automake openssl-dev musl-dev"
+makedepends="autoconf automake openssl1.1-compat-dev musl-dev"
options="!check"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lib"
source="$pkgname-$pkgver.tar.gz::https://github.com/open-iscsi/open-isns/archive/v$pkgver.tar.gz
diff --git a/main/partimage/APKBUILD b/main/partimage/APKBUILD
index a4c98001f317..64e7e3c8316c 100644
--- a/main/partimage/APKBUILD
+++ b/main/partimage/APKBUILD
@@ -1,14 +1,14 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=partimage
pkgver=0.6.9
-pkgrel=9
+pkgrel=10
pkgdesc="Saves partitions having a supported filesystem to an image file"
options="!check" # No testsuite
url="http://www.partimage.org"
arch="all"
license="GPL-2.0-or-later"
makedepends="linux-headers bzip2-dev newt-dev zlib-dev gettext-dev slang-dev
- openssl-dev autoconf automake libtool"
+ openssl1.1-compat-dev autoconf automake libtool"
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2
partimage-0.6.9-zlib-1.2.6.patch
diff --git a/main/perdition/APKBUILD b/main/perdition/APKBUILD
index 636681c0255c..23e8c55a6930 100644
--- a/main/perdition/APKBUILD
+++ b/main/perdition/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=perdition
pkgver=2.2
-pkgrel=2
+pkgrel=3
pkgdesc="A Mail retrieval proxy"
url="http://horms.net/projects/perdition/"
arch="all"
license="GPL-2.0-or-later"
-makedepends="gdbm-dev openssl-dev popt-dev vanessa_adt-dev vanessa_logger-dev
+makedepends="gdbm-dev openssl1.1-compat-dev popt-dev vanessa_adt-dev vanessa_logger-dev
vanessa_socket-dev"
install=$pkgname.pre-install
subpackages="$pkgname-doc $pkgname-openrc"
diff --git a/main/perl-crypt-openssl-random/APKBUILD b/main/perl-crypt-openssl-random/APKBUILD
index ea3a7acb47fc..86c58eed0e97 100644
--- a/main/perl-crypt-openssl-random/APKBUILD
+++ b/main/perl-crypt-openssl-random/APKBUILD
@@ -2,13 +2,13 @@
pkgname=perl-crypt-openssl-random
_pkgname=Crypt-OpenSSL-Random
pkgver=0.15
-pkgrel=8
+pkgrel=9
pkgdesc="RSA encoding and decoding, using the openSSL libraries"
url="https://metacpan.org/pod/Crypt::OpenSSL::Random"
arch="all"
license="Artistic-1.0 GPL+"
depends="perl"
-makedepends="perl-dev openssl-dev perl-crypt-openssl-guess"
+makedepends="perl-dev openssl1.1-compat-dev perl-crypt-openssl-guess"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/R/RU/RURBAN/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir"/$_pkgname-$pkgver
diff --git a/main/perl-crypt-openssl-rsa/APKBUILD b/main/perl-crypt-openssl-rsa/APKBUILD
index 2a248adf3851..751ad747d037 100644
--- a/main/perl-crypt-openssl-rsa/APKBUILD
+++ b/main/perl-crypt-openssl-rsa/APKBUILD
@@ -5,13 +5,13 @@ pkgname=perl-crypt-openssl-rsa
#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
_pkgreal=Crypt-OpenSSL-RSA
pkgver=0.32
-pkgrel=1
+pkgrel=2
pkgdesc="RSA encoding and decoding, using the openSSL libraries"
url="https://metacpan.org/release/Crypt-OpenSSL-RSA/"
arch="all"
license="GPL-1.0-or-later OR Artistic-1.0-Perl"
depends="perl perl-crypt-openssl-random"
-makedepends="perl-dev openssl-dev perl-crypt-openssl-guess"
+makedepends="perl-dev openssl1.1-compat-dev perl-crypt-openssl-guess"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-$pkgver.tar.gz
no-sslv23-padding.patch"
diff --git a/main/perl-crypt-ssleay/APKBUILD b/main/perl-crypt-ssleay/APKBUILD
index eed877fdc2fb..3b639fef2811 100644
--- a/main/perl-crypt-ssleay/APKBUILD
+++ b/main/perl-crypt-ssleay/APKBUILD
@@ -4,7 +4,7 @@
pkgname=perl-crypt-ssleay
_realname=Crypt-SSLeay
pkgver=0.72
-pkgrel=15
+pkgrel=16
pkgdesc="OpenSSL Support for LWP"
url="https://metacpan.org/release/Crypt-SSLeay/"
arch="all"
@@ -12,7 +12,7 @@ license="GPL PerlArtistic"
cpandepends=""
cpanmakedepends=""
depends="$cpandepends perl-path-class perl-try-tiny"
-makedepends="zlib-dev openssl-dev perl-dev $cpanmakedepends"
+makedepends="zlib-dev openssl1.1-compat-dev perl-dev $cpanmakedepends"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/N/NA/NANIS/$_realname-$pkgver.tar.gz
libressl.patch
diff --git a/main/perl-net-ssleay/APKBUILD b/main/perl-net-ssleay/APKBUILD
index 66d4d1973302..5a122b5e95cc 100644
--- a/main/perl-net-ssleay/APKBUILD
+++ b/main/perl-net-ssleay/APKBUILD
@@ -3,13 +3,13 @@
pkgname=perl-net-ssleay
_realname=Net-SSLeay
pkgver=1.90
-pkgrel=2
+pkgrel=3
pkgdesc="Perl extension for using OpenSSL"
url="https://metacpan.org/release/Net-SSLeay"
arch="all"
license="Artistic-2.0"
depends="perl"
-makedepends="perl-dev openssl-dev zlib-dev"
+makedepends="perl-dev openssl1.1-compat-dev zlib-dev"
checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-$pkgver.tar.gz"
diff --git a/main/ppp/APKBUILD b/main/ppp/APKBUILD
index 73928c97d58d..bbee2ac2c2d8 100644
--- a/main/ppp/APKBUILD
+++ b/main/ppp/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ppp
pkgver=2.4.9
-pkgrel=1
+pkgrel=2
pkgdesc="A daemon which implements the PPP protocol for dial-up networking"
url="https://ppp.samba.org/"
arch="all"
license="BSD and LGPL-2.0-or-later and GPL-2.0-or-later and Public-Domain"
-makedepends="bsd-compat-headers linux-headers openssl-dev libpcap-dev"
+makedepends="bsd-compat-headers linux-headers openssl1.1-compat-dev libpcap-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-chat $pkgname-radius
$pkgname-atm $pkgname-pppoe $pkgname-l2tp $pkgname-winbind
$pkgname-passprompt $pkgname-passwordfd $pkgname-minconn
diff --git a/main/rhash/APKBUILD b/main/rhash/APKBUILD
index d4bebe357821..f1ac46893d1e 100644
--- a/main/rhash/APKBUILD
+++ b/main/rhash/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Przemyslaw Pawelczyk <przemoc@zoho.com>
pkgname=rhash
pkgver=1.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="Utility for calculation and verification of hash sums and magnet links"
url="http://rhash.anz.ru"
arch="all"
license="0BSD"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
source="https://downloads.sourceforge.net/rhash/rhash-$pkgver-src.tar.gz
byteorder.patch"
diff --git a/main/sbsigntool/APKBUILD b/main/sbsigntool/APKBUILD
index 79d92cbddac1..5ee5f07cbf78 100644
--- a/main/sbsigntool/APKBUILD
+++ b/main/sbsigntool/APKBUILD
@@ -3,13 +3,13 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=sbsigntool
pkgver=0.9.4
-pkgrel=2
+pkgrel=3
_ccancommit=b1f28e17227f2320d07fe052a8a48942fe17caa5
pkgdesc="Secure Boot signing tools"
url="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/"
arch="all !armhf !s390x !ppc64le !mips !mips64" # limited by gnu-efi
license="GPL-3.0-only WITH OpenSSL-Exception"
-makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl-dev util-linux-dev"
+makedepends="autoconf automake bash binutils-dev gnu-efi-dev help2man openssl1.1-compat-dev util-linux-dev"
options="!check" # testsuite is not functional
subpackages="$pkgname-doc"
source="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git/snapshot/sbsigntools-$pkgver.tar.gz
diff --git a/main/sipp/APKBUILD b/main/sipp/APKBUILD
index 1f4b0d05ce30..a10e960a75b0 100644
--- a/main/sipp/APKBUILD
+++ b/main/sipp/APKBUILD
@@ -3,14 +3,14 @@
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=sipp
pkgver=3.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="A test tool / traffic generator for the SIP protocol"
url="https://github.com/SIPp/sipp"
arch="all"
license="GPL-2.0-or-later"
depends=""
depends_dev=""
-makedepends="linux-headers autoconf automake openssl-dev libpcap-dev ncurses-dev lksctp-tools-dev"
+makedepends="linux-headers autoconf automake openssl1.1-compat-dev libpcap-dev ncurses-dev lksctp-tools-dev"
install=""
subpackages=""
source="https://github.com/SIPp/sipp/releases/download/v$pkgver/sipp-$pkgver.tar.gz
diff --git a/main/sipsak/APKBUILD b/main/sipsak/APKBUILD
index e5b2e09d6e67..d2423262a8a9 100644
--- a/main/sipsak/APKBUILD
+++ b/main/sipsak/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=sipsak
pkgver=0.9.7
-pkgrel=1
+pkgrel=2
pkgdesc="SIP swiss army knife"
url="https://github.com/nils-ohlmeier/sipsak"
arch="all"
license="GPL-2.0-or-later"
-makedepends="openssl-dev c-ares-dev autoconf automake"
+makedepends="openssl1.1-compat-dev c-ares-dev autoconf automake"
subpackages="$pkgname-dbg $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/nils-ohlmeier/sipsak/archive/$pkgver.tar.gz
musl-fix-strcasestr.patch
diff --git a/main/smokeping/APKBUILD b/main/smokeping/APKBUILD
index 91ad20649d69..7199d774fbb1 100644
--- a/main/smokeping/APKBUILD
+++ b/main/smokeping/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=smokeping
pkgver=2.7.3
-pkgrel=6
+pkgrel=7
pkgdesc="Smokeping network latency monitoring"
pkgusers="smokeping"
pkggroups="smokeping"
@@ -41,7 +41,7 @@ depends="
ttf-dejavu
"
makedepends="
- openssl-dev
+ openssl1.1-compat-dev
perl-dev
perl-try-tiny
zlib-dev
diff --git a/main/socat/APKBUILD b/main/socat/APKBUILD
index 7067d85e4ba3..9aa1f22e38f6 100644
--- a/main/socat/APKBUILD
+++ b/main/socat/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=socat
pkgver=1.7.4.1
-pkgrel=2
+pkgrel=3
pkgdesc="Multipurpose relay for binary protocols"
# test 58 CHILDDEFAULT: child process default properties... FAILED:
# ./socat -t 0.1 -u exec:./procan -
@@ -10,7 +10,7 @@ options="!check"
url="http://www.dest-unreach.org/socat/"
arch="all"
license="GPL-2.0-only WITH OpenSSL-Exception"
-makedepends="openssl-dev readline-dev linux-headers"
+makedepends="openssl1.1-compat-dev readline-dev linux-headers"
checkdepends="bash"
subpackages="$pkgname-doc"
source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.bz2
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index b5ddc1a1ae52..79b8ea395033 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -3,14 +3,14 @@
pkgname=ssmtp
pkgver=2.64
-pkgrel=15
+pkgrel=16
pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
subpackages="$pkgname-doc"
arch="all"
url="https://packages.debian.org/stable/mail/ssmtp"
license="GPL-2.0"
depends=
-makedepends="openssl-dev autoconf"
+makedepends="openssl1.1-compat-dev autoconf"
options="!check"
source="https://deb.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
generate_config.patch
diff --git a/main/tarsnap/APKBUILD b/main/tarsnap/APKBUILD
index 6a74fbedb4fc..30295edddd99 100644
--- a/main/tarsnap/APKBUILD
+++ b/main/tarsnap/APKBUILD
@@ -3,12 +3,12 @@
# Maintainer:
pkgname=tarsnap
pkgver=1.0.39
-pkgrel=5
+pkgrel=6
pkgdesc="Online backups for the truly paranoid"
url="https://www.tarsnap.com/"
arch="x86_64 x86 ppc64le aarch64"
license="custom"
-makedepends="e2fsprogs-dev zlib-dev openssl-dev"
+makedepends="e2fsprogs-dev zlib-dev openssl1.1-compat-dev"
subpackages="$pkgname-doc"
source="https://www.tarsnap.com/download/$pkgname-autoconf-$pkgver.tgz"
builddir="$srcdir"/$pkgname-autoconf-$pkgver
diff --git a/main/tcl-tls/APKBUILD b/main/tcl-tls/APKBUILD
index cad1a9d9448a..782fec55f404 100644
--- a/main/tcl-tls/APKBUILD
+++ b/main/tcl-tls/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=tcl-tls
pkgver=1.7.22
-pkgrel=1
+pkgrel=2
pkgdesc="OpenSSL extension to Tcl"
url="https://core.tcl.tk/tcltls/"
arch="all"
license="TCL"
-makedepends="tcl-dev openssl-dev"
+makedepends="tcl-dev openssl1.1-compat-dev"
source="https://core.tcl.tk/tcltls/uv/tcltls-$pkgver.tar.gz"
builddir="$srcdir/tcltls-$pkgver"
diff --git a/main/tcpdump/APKBUILD b/main/tcpdump/APKBUILD
index 8437342ceaa0..d32cd58ee813 100644
--- a/main/tcpdump/APKBUILD
+++ b/main/tcpdump/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=tcpdump
pkgver=4.99.1
-pkgrel=2
+pkgrel=3
pkgdesc="A tool for network monitoring and data acquisition"
url="https://www.tcpdump.org/"
arch="all"
license="BSD-3-Clause"
-makedepends="libpcap-dev openssl-dev perl"
+makedepends="libpcap-dev openssl1.1-compat-dev perl"
subpackages="$pkgname-doc"
source="https://www.tcpdump.org/release/tcpdump-$pkgver.tar.gz
"
diff --git a/main/tcpflow/APKBUILD b/main/tcpflow/APKBUILD
index 717615ca9f8f..b654b96fff04 100644
--- a/main/tcpflow/APKBUILD
+++ b/main/tcpflow/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=tcpflow
pkgver=1.6.1
-pkgrel=3
+pkgrel=4
pkgdesc="A Tool for monitoring, capturing and storing TCP connections flows"
url="https://github.com/simsong/tcpflow"
arch="all"
license="GPL-3.0-only"
-makedepends="libpcap-dev zlib-dev boost-dev openssl-dev autoconf automake"
+makedepends="libpcap-dev zlib-dev boost-dev openssl1.1-compat-dev autoconf automake"
subpackages="$pkgname-doc"
source="https://fossies.org/linux/misc/tcpflow-$pkgver.tar.gz
"
diff --git a/main/tinc/APKBUILD b/main/tinc/APKBUILD
index baf0028febee..61033ae7fee3 100644
--- a/main/tinc/APKBUILD
+++ b/main/tinc/APKBUILD
@@ -2,12 +2,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=tinc
pkgver=1.0.36
-pkgrel=2
+pkgrel=3
pkgdesc="Virtual Private Network (VPN) daemon"
url="https://www.tinc-vpn.org"
arch="all"
license="GPL-2.0-or-later WITH OpenSSL-Exception"
-makedepends="zlib-dev lzo-dev openssl-dev linux-headers"
+makedepends="zlib-dev lzo-dev openssl1.1-compat-dev linux-headers"
subpackages="$pkgname-doc"
source="https://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
tincd.initd
diff --git a/main/umurmur/APKBUILD b/main/umurmur/APKBUILD
index 891e7a92e486..f7982916b13e 100644
--- a/main/umurmur/APKBUILD
+++ b/main/umurmur/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=umurmur
pkgver=0.2.20
-pkgrel=1
+pkgrel=2
pkgdesc="Minimalistic Mumble server primarily targeted to run on routers"
url="https://umurmur.net/"
arch="all"
license="BSD-3-Clause"
options="!check" # no test suite
-makedepends="libconfig-dev openssl-dev protobuf-c-dev autoconf automake"
+makedepends="libconfig-dev openssl1.1-compat-dev protobuf-c-dev autoconf automake"
install="$pkgname.post-install"
subpackages="$pkgname-openrc"
pkgusers="umurmur"
diff --git a/main/vde2/APKBUILD b/main/vde2/APKBUILD
index 576a131e9512..422aa605c581 100644
--- a/main/vde2/APKBUILD
+++ b/main/vde2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Michael Zhou <zhoumichaely@gmail.com>
pkgname=vde2
pkgver=2.3.2
-pkgrel=14
+pkgrel=15
pkgdesc="VDE: Virtual Distributed Ethernet. User mode networking for QEMU, UML, etc."
url="http://vde.sf.net"
arch="all"
@@ -9,7 +9,7 @@ options="!check" # No test suite.
license="GPL"
depends="openssl"
install="vde2.pre-install"
-makedepends="linux-headers openssl-dev libpcap-dev python3-dev"
+makedepends="linux-headers openssl1.1-compat-dev libpcap-dev python3-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
source="https://downloads.sourceforge.net/project/vde/vde2/$pkgver/vde2-$pkgver.tar.gz
musl-build-fix.patch
diff --git a/main/wget/APKBUILD b/main/wget/APKBUILD
index 880d70298b4e..6164f5d2eb9c 100644
--- a/main/wget/APKBUILD
+++ b/main/wget/APKBUILD
@@ -4,12 +4,12 @@
# Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
pkgname=wget
pkgver=1.21.2
-pkgrel=1
+pkgrel=2
pkgdesc="Network utility to retrieve files from the Web"
url="https://www.gnu.org/software/wget/wget.html"
arch="all"
license="GPL-3.0-or-later WITH OpenSSL-Exception"
-makedepends="libidn2-dev openssl-dev perl"
+makedepends="libidn2-dev openssl1.1-compat-dev perl"
checkdepends="perl-http-daemon"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/gnu/wget/wget-$pkgver.tar.gz
diff --git a/main/zfs/APKBUILD b/main/zfs/APKBUILD
index 16122a1c8d9d..7dcb490c20e7 100644
--- a/main/zfs/APKBUILD
+++ b/main/zfs/APKBUILD
@@ -2,13 +2,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=zfs
pkgver=2.0.3
-pkgrel=2
+pkgrel=3
pkgdesc="ZFS for Linux"
url="https://zfsonlinux.org"
arch="all !armhf !armv7"
license="CDDL-1.0"
provides="spl" # Mitigate upgrade conflicts
-depends_dev="attr-dev e2fsprogs-dev glib-dev libtirpc-dev openssl-dev util-linux-dev"
+depends_dev="attr-dev e2fsprogs-dev glib-dev libtirpc-dev openssl1.1-compat-dev util-linux-dev"
makedepends="$depends_dev automake autoconf libtool linux-headers python3-dev py3-cffi py3-setuptools"
options="!check" # need to be run on live system w/ ZFS loaded.
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-libs $pkgname-dracut::noarch
--
GitLab