main: switch some dependencies back to openssl 1.1 where they intersect other openssl 1.1 dependents

14 files changed, 28 insertions, 28 deletions

diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 4a5d2f828fe..045b23c646f 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cryptsetup
 pkgver=2.4.0 # XXX: remove automake/autoconf when upgrading to 2.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 url="https://gitlab.com/cryptsetup/cryptsetup"
 arch="all"
 license="GPL-2.0-or-later WITH OpenSSL-Exception"
 makedepends_build="automake autoconf bash coreutils"
-makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev
+makedepends_host="lvm2-dev openssl1.1-compat-dev popt-dev util-linux-dev
 	json-c-dev argon2-dev"
 makedepends="$makedepends_build $makedepends_host"
 checkdepends="device-mapper which sharutils"
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index adece947d15..7e7522848a3 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cyrus-sasl
 pkgver=2.1.27
-pkgrel=13
+pkgrel=14
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
 url="https://www.cyrusimap.org/sasl/"
 arch="all"
@@ -25,7 +25,7 @@ subpackages="
 # use heimdal to avoid circular dep: cyrus-sasl -> krb5 -> openldap -> cyrus-sasl
 makedepends="
 	gdbm-dev
-	openssl-dev
+	openssl1.1-compat-dev
 	heimdal-dev
 	py3-sphinx
 	sqlite-dev
diff --git a/main/freetds/APKBUILD b/main/freetds/APKBUILD
index ce35b39b905..8bc97e37497 100644
--- a/main/freetds/APKBUILD
+++ b/main/freetds/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=freetds
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Tabular Datastream Library"
 url="https://www.freetds.org/"
 arch="all"
 license="GPL-2.0-or-later OR LGPL-2.0-or-later"
-makedepends="openssl-dev linux-headers readline-dev unixodbc-dev"
+makedepends="openssl1.1-compat-dev linux-headers readline-dev unixodbc-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://www.freetds.org/files/stable/freetds-$pkgver.tar.bz2
 	fix-includes.patch
diff --git a/main/hiredis/APKBUILD b/main/hiredis/APKBUILD
index 2b513be5954..7d805d693cc 100644
--- a/main/hiredis/APKBUILD
+++ b/main/hiredis/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=hiredis
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Minimalistic C client library for Redis"
 url="https://github.com/redis/hiredis"
 arch="all"
 license="BSD-3-Clause"
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
 checkdepends="redis"
 subpackages="$pkgname-ssl $pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
diff --git a/main/imap/APKBUILD b/main/imap/APKBUILD
index 167fb0a1ece..39bdb367133 100644
--- a/main/imap/APKBUILD
+++ b/main/imap/APKBUILD
@@ -5,14 +5,14 @@
 # build it shared
 pkgname=imap
 pkgver=2007f
-pkgrel=12
+pkgrel=13
 pkgdesc="An IMAP/POP server"
 url="http://www.washington.edu/imap"
 arch="all"
 license="Apache-2.0"
 subpackages="$pkgname-dev c-client:cclient"
 depends=""
-makedepends="openssl-dev"
+makedepends="openssl1.1-compat-dev"
 source="http://ftp.ntua.gr/pub/net/mail/imap/imap-$pkgver.tar.gz
 	fix-linking.patch
 	c-client-2006k_KOLAB_Annotations.patch
diff --git a/main/krb5/APKBUILD b/main/krb5/APKBUILD
index 1f046134c08..9ba194818a8 100644
--- a/main/krb5/APKBUILD
+++ b/main/krb5/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=krb5
 pkgver=1.19.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Kerberos network authentication system"
 url="https://web.mit.edu/kerberos/www/"
 arch="all"
 license="MIT"
 depends="krb5-conf"
 depends_dev="e2fsprogs-dev"
-makedepends="$depends_dev libverto-dev openldap-dev openssl-dev
+makedepends="$depends_dev libverto-dev openldap-dev openssl1.1-compat-dev
 	keyutils-dev bison flex perl"
 options="suid"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-server
diff --git a/main/libarchive/APKBUILD b/main/libarchive/APKBUILD
index d1e3e42f4f5..8f5da1b3cd2 100644
--- a/main/libarchive/APKBUILD
+++ b/main/libarchive/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libarchive
 pkgver=3.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="library that can create and read several streaming archive formats"
 url="https://libarchive.org/"
 arch="all"
 license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain"
-makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev
+makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl1.1-compat-dev expat-dev
 	attr-dev zstd-dev"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-tools"
 source="https://libarchive.org/downloads/libarchive-$pkgver.tar.xz"
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index 3503874553b..427130ce328 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -3,14 +3,14 @@
 pkgname=libevent
 pkgver=2.1.12
 _pkgver=$pkgver-stable
-pkgrel=3
+pkgrel=4
 pkgdesc="An event notification library"
 url="https://libevent.org/"
 arch="all"
 license="BSD-3-Clause"
 options="!check" # regression tests failed
 depends_dev="python3"
-makedepends="$depends_dev openssl-dev"
+makedepends="$depends_dev openssl1.1-compat-dev"
 subpackages="$pkgname-static $pkgname-dev"
 source="https://github.com/libevent/libevent/releases/download/release-$_pkgver/libevent-$_pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$_pkgver"
diff --git a/main/libwebsockets/APKBUILD b/main/libwebsockets/APKBUILD
index 20589a667fa..b0b45852142 100644
--- a/main/libwebsockets/APKBUILD
+++ b/main/libwebsockets/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libwebsockets
 pkgver=4.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="C library for lightweight websocket clients and servers"
 url="https://libwebsockets.org"
 arch="all"
 license="MIT"
 options="!check"
-makedepends="cmake linux-headers openssl-dev zlib-dev libuv-dev"
+makedepends="cmake linux-headers openssl1.1-compat-dev zlib-dev libuv-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-test:_test $pkgname-evlib_uv:_evlib"
 source="
 	libwebsockets-$pkgver.tar.gz::https://github.com/warmcat/libwebsockets/archive/v$pkgver.tar.gz
diff --git a/main/mosquitto/APKBUILD b/main/mosquitto/APKBUILD
index 814d4fa7ffb..ec3e72a831e 100644
--- a/main/mosquitto/APKBUILD
+++ b/main/mosquitto/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mosquitto
 pkgver=2.0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source MQTT broker"
 url="https://mosquitto.org/"
 arch="all"
@@ -10,7 +10,7 @@ license="EPL-1.0"
 replaces="mosquitto-utils"
 install="$pkgname.pre-install"
 options="!check" # FIXME: some of the tests are flaky
-makedepends="openssl-dev c-ares-dev util-linux-dev libwebsockets-dev libxslt cjson-dev"
+makedepends="openssl1.1-compat-dev c-ares-dev util-linux-dev libwebsockets-dev libxslt cjson-dev"
 checkdepends="python3 cunit-dev"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs++:_pp $pkgname-openrc
 	$pkgname-libs $pkgname-clients"
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 025e1b2de99..a56b14084a7 100644
--- a/main/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@alpinelinux.org>
 pkgname=net-snmp
 pkgver=5.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple Network Management Protocol"
 url="http://www.net-snmp.org/"
 arch="all"
@@ -10,7 +10,7 @@ license="Net-SNMP"
 depends_dev="openssl1.1-compat-dev"
 # we need perl-net-snmp and perl-tk in make depends for bootstrapping issues
 # net-snmp-gui subpackage has perl-net-snmp and perl-tk as depends
-makedepends="file perl-dev openssl-dev perl-net-snmp perl-tk linux-headers"
+makedepends="file perl-dev openssl1.1-compat-dev perl-net-snmp perl-tk linux-headers"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-libs $pkgname-agent-libs:alibs
 	$pkgname-perl:pl $pkgname-gui::noarch $pkgname-tools $pkgname-openrc"
 source="https://downloads.sourceforge.net/net-snmp/net-snmp-$pkgver.tar.gz
diff --git a/main/nghttp2/APKBUILD b/main/nghttp2/APKBUILD
index 74aa33415d0..1a3334a8486 100644
--- a/main/nghttp2/APKBUILD
+++ b/main/nghttp2/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=nghttp2
 pkgver=1.44.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Experimental HTTP/2 client, server and proxy"
 url="https://nghttp2.org"
 arch="all"
 license="MIT"
 makedepends_build="autoconf automake libtool"
-makedepends_host="libev-dev openssl-dev zlib-dev c-ares-dev cunit-dev"
+makedepends_host="libev-dev openssl1.1-compat-dev zlib-dev c-ares-dev cunit-dev"
 subpackages="$pkgname-static $pkgname-doc $pkgname-dev $pkgname-libs"
 source="https://github.com/nghttp2/nghttp2/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz
 	remove-mruby-tests.patch
diff --git a/main/sofia-sip/APKBUILD b/main/sofia-sip/APKBUILD
index 4e87dfeaac3..05b2462387b 100644
--- a/main/sofia-sip/APKBUILD
+++ b/main/sofia-sip/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=sofia-sip
 pkgver=1.13.4
-pkgrel=1
+pkgrel=2
 pkgdesc="RFC3261 compliant SIP User-Agent library"
 url="https://github.com/freeswitch/sofia-sip"
 arch="all"
 license="LGPL-2.1-only"
 options="!check" #tests are broken
 makedepends="automake autoconf libtool m4
-glib-dev openssl-dev lksctp-tools-dev"
+glib-dev openssl1.1-compat-dev lksctp-tools-dev"
 checkdepends="check-dev"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/freeswitch/sofia-sip/archive/v$pkgver.tar.gz"
diff --git a/main/spice/APKBUILD b/main/spice/APKBUILD
index e371bef6e2f..de2a16c7d9e 100644
--- a/main/spice/APKBUILD
+++ b/main/spice/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=spice
 pkgver=0.15.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Implements the SPICE protocol"
 url="http://www.spice-space.org/"
 arch="all"
@@ -13,7 +13,7 @@ makedepends="
 	glib-dev
 	gdk-pixbuf-dev
 	pixman-dev
-	openssl-dev
+	openssl1.1-compat-dev
 	libjpeg-turbo-dev
 	zlib-dev
 	opus-dev