From 33d78f165de327f378f4fbc1fa671d1dbeb50ef8 Mon Sep 17 00:00:00 2001 From: Ariadne Conill <ariadne@dereferenced.org> Date: Mon, 13 Sep 2021 09:01:17 -0600 Subject: [PATCH] community: move packages which depend on openssl with openssl 1.1 dependencies to openssl 1.1 This has to be done because otherwise OpenSSL 3 and OpenSSL 1.1 might get mixed together, which will cause problems if done in a single process. --- community/accel-ppp/APKBUILD | 2 +- community/aircrack-ng/APKBUILD | 2 +- community/ausweisapp2/APKBUILD | 2 +- community/bitcoin/APKBUILD | 2 +- community/borgbackup/APKBUILD | 2 +- community/fractal/APKBUILD | 2 +- community/gitui/APKBUILD | 2 +- community/gnome-podcasts/APKBUILD | 2 +- community/gnome-shortwave/APKBUILD | 2 +- community/h2o/APKBUILD | 2 +- community/hexchat/APKBUILD | 2 +- community/kasts/APKBUILD | 2 +- community/keepalived/APKBUILD | 2 +- community/libcoap/APKBUILD | 2 +- community/libimobiledevice/APKBUILD | 2 +- community/libtorrent-rasterbar/APKBUILD | 2 +- community/namecoin/APKBUILD | 2 +- community/nheko/APKBUILD | 2 +- community/ntpsec/APKBUILD | 2 +- community/openconnect/APKBUILD | 2 +- community/openipmi/APKBUILD | 2 +- community/openvswitch/APKBUILD | 2 +- community/ossec-hids-agent/APKBUILD | 2 +- community/ossec-hids-local/APKBUILD | 2 +- community/ossec-hids-server/APKBUILD | 2 +- community/pdns-recursor/APKBUILD | 2 +- community/php7-pecl-event/APKBUILD | 2 +- community/php7-pecl-mongodb/APKBUILD | 2 +- community/php8-pecl-event/APKBUILD | 2 +- community/php8-pecl-mongodb/APKBUILD | 2 +- community/py3-grpcio/APKBUILD | 2 +- community/py3-scrypt/APKBUILD | 2 +- community/quassel/APKBUILD | 2 +- community/ruby-eventmachine/APKBUILD | 2 +- community/s2geometry/APKBUILD | 2 +- community/starship/APKBUILD | 2 +- community/sylpheed/APKBUILD | 2 +- community/telegram-desktop/APKBUILD | 2 +- community/tinyfugue/APKBUILD | 2 +- community/tpm2-tss-engine/APKBUILD | 2 +- community/unit/APKBUILD | 2 +- community/znc/APKBUILD | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/community/accel-ppp/APKBUILD b/community/accel-ppp/APKBUILD index c0964480e681..9b117a2abb2e 100644 --- a/community/accel-ppp/APKBUILD +++ b/community/accel-ppp/APKBUILD @@ -9,7 +9,7 @@ pkgdesc="PPtP/L2TP/PPPoE/SSTP server for Linux" url="https://accel-ppp.org/" arch="all" license="GPL-2.0-or-later" -makedepends="cmake lua5.4-dev openssl-dev pcre-dev net-snmp-dev linux-headers +makedepends="cmake lua5.4-dev openssl1.1-compat-dev pcre-dev net-snmp-dev linux-headers libucontext-dev" subpackages="$pkgname-doc $pkgname-openrc" source="accel-ppp-$_pkgver.tar.gz::https://github.com/accel-ppp/accel-ppp/archive/refs/tags/$_pkgver.tar.gz diff --git a/community/aircrack-ng/APKBUILD b/community/aircrack-ng/APKBUILD index d2a8c6d24641..7ea4560e0caa 100644 --- a/community/aircrack-ng/APKBUILD +++ b/community/aircrack-ng/APKBUILD @@ -9,7 +9,7 @@ url="http://www.aircrack-ng.org" arch="all !s390x !mips !mips64" # tests fails on big-endian license="GPL-2.0-or-later" depends="ethtool wireless-tools iw sqlite grep" -makedepends="autoconf automake libnl3-dev libpcap-dev openssl-dev libtool +makedepends="autoconf automake libnl3-dev libpcap-dev openssl1.1-compat-dev libtool linux-headers pcre-dev python3-dev sqlite-dev zlib-dev" checkdepends="coreutils" subpackages="$pkgname-doc" diff --git a/community/ausweisapp2/APKBUILD b/community/ausweisapp2/APKBUILD index 8c0b1632255f..493012bf6ca1 100644 --- a/community/ausweisapp2/APKBUILD +++ b/community/ausweisapp2/APKBUILD @@ -8,7 +8,7 @@ url="https://www.ausweisapp.bund.de/" arch="all !armhf" # missing qt5-qtquickcontrols2 license="EUPL-1.2" depends="pcsc-lite pcsc-cyberjack ccid acsccid" -makedepends="cmake pkgconf pcsc-lite-dev http-parser-dev openssl-dev +makedepends="cmake pkgconf pcsc-lite-dev http-parser-dev openssl1.1-compat-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qtwebsockets-dev qt5-qttools-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev" subpackages="$pkgname-doc" diff --git a/community/bitcoin/APKBUILD b/community/bitcoin/APKBUILD index a383384d0242..38550449c97a 100644 --- a/community/bitcoin/APKBUILD +++ b/community/bitcoin/APKBUILD @@ -10,7 +10,7 @@ url="https://www.bitcoin.org/" # https://gitlab.alpinelinux.org/alpine/aports/-/issues/12327#note_137460 arch="all !armhf !x86 !mips64" license="MIT" -makedepends="autoconf automake libtool boost-dev openssl-dev miniupnpc-dev +makedepends="autoconf automake libtool boost-dev openssl1.1-compat-dev miniupnpc-dev qt5-qtbase-dev qt5-qttools-dev protobuf-dev libqrencode-dev libevent-dev chrpath zeromq-dev" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-install" subpackages="$pkgname-dev $pkgname-qt $pkgname-cli $pkgname-tx $pkgname-tests $pkgname-bench diff --git a/community/borgbackup/APKBUILD b/community/borgbackup/APKBUILD index 32de7002ec4a..011b5abd1870 100644 --- a/community/borgbackup/APKBUILD +++ b/community/borgbackup/APKBUILD @@ -10,7 +10,7 @@ url="https://www.borgbackup.org/" arch="all !s390x !mips !mips64" # limited by py3-pyzmq license="BSD-3-Clause" depends="python3 py3-pyzmq" -makedepends="python3-dev lz4-dev acl-dev attr-dev openssl-dev linux-headers +makedepends="python3-dev lz4-dev acl-dev attr-dev openssl1.1-compat-dev linux-headers py3-setuptools py3-setuptools_scm" checkdepends="py3-pytest py3-pytest-benchmark" subpackages=" diff --git a/community/fractal/APKBUILD b/community/fractal/APKBUILD index 3385ff703c70..438a8352550f 100644 --- a/community/fractal/APKBUILD +++ b/community/fractal/APKBUILD @@ -8,7 +8,7 @@ url="https://wiki.gnome.org/Apps/Fractal" arch="x86_64 x86 armhf armv7 aarch64 ppc64le" # limited by Rust license="GPL-3.0-or-later" depends="dbus:org.freedesktop.Secrets xdg-utils" -makedepends="meson gtk+3.0-dev dbus-dev openssl-dev gspell-dev libhandy-dev +makedepends="meson gtk+3.0-dev dbus-dev openssl1.1-compat-dev gspell-dev libhandy-dev gtksourceview4-dev gstreamer-dev gst-plugins-base-dev gst-plugins-bad-dev gst-editing-services-dev glib-dev cargo gmp-dev gst-plugins-good-gtk" options="!check" # no tests diff --git a/community/gitui/APKBUILD b/community/gitui/APKBUILD index 7bc8012f4d4b..2398e635e7cd 100644 --- a/community/gitui/APKBUILD +++ b/community/gitui/APKBUILD @@ -11,7 +11,7 @@ pkgdesc="Blazing fast terminal client for git" url="https://github.com/extrawurst/gitui" arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust/cargo license="MIT" -makedepends="cargo libgit2-dev oniguruma-dev openssl-dev zlib-dev" +makedepends="cargo libgit2-dev oniguruma-dev openssl1.1-compat-dev zlib-dev" source="https://github.com/extrawurst/gitui/archive/v$pkgver/$pkgname-$pkgver.tar.gz use-system-openssl.patch use-oniguruma.patch diff --git a/community/gnome-podcasts/APKBUILD b/community/gnome-podcasts/APKBUILD index d02a41fa0e06..8952a16393df 100644 --- a/community/gnome-podcasts/APKBUILD +++ b/community/gnome-podcasts/APKBUILD @@ -11,7 +11,7 @@ url="https://wiki.gnome.org/Apps/Podcasts" arch="all !s390x !mips64 !armv7 !riscv64" license="GPL-3.0-or-later" depends="gst-plugins-base gst-plugins-bad gst-plugins-good" -makedepends="meson gtk+3.0-dev gstreamer-dev libhandy1-dev sqlite-dev openssl-dev +makedepends="meson gtk+3.0-dev gstreamer-dev libhandy1-dev sqlite-dev openssl1.1-compat-dev dbus-dev gst-plugins-base-dev gst-plugins-bad-dev cargo bash" checkdepends="desktop-file-utils appstream-glib xvfb-run" options="!check" # needs the thing to be installed first diff --git a/community/gnome-shortwave/APKBUILD b/community/gnome-shortwave/APKBUILD index c85b8a0db1ec..d36576b1e758 100644 --- a/community/gnome-shortwave/APKBUILD +++ b/community/gnome-shortwave/APKBUILD @@ -10,7 +10,7 @@ arch="all !s390x !mips64 !riscv64" license="GPL-3.0-only" depends="gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good gstreamer" makedepends="meson gettext cargo glib-dev gtk+3.0-dev libhandy-dev gstreamer-dev - openssl-dev sqlite-dev gst-plugins-base-dev gst-plugins-bad-dev" + openssl1.1-compat-dev sqlite-dev gst-plugins-base-dev gst-plugins-bad-dev" checkdepends="appstream-glib desktop-file-utils" source="https://gitlab.gnome.org/World/Shortwave/uploads/df12909bb42afbff933e45da0f220eb4/shortwave-$pkgver.tar.xz" subpackages="$pkgname-lang" diff --git a/community/h2o/APKBUILD b/community/h2o/APKBUILD index 3a4e19a6c7cf..ba7f1fe49337 100644 --- a/community/h2o/APKBUILD +++ b/community/h2o/APKBUILD @@ -10,7 +10,7 @@ arch="all !s390x !mips64 !mips64el" depends="perl openssl" license="MIT" options="!check" # various tests fails -makedepends="cmake ruby-dev bison zlib-dev wslay-dev openssl-dev libuv-dev yaml-dev" +makedepends="cmake ruby-dev bison zlib-dev wslay-dev openssl1.1-compat-dev libuv-dev yaml-dev" checkdepends="perl-test-harness-utils perl-test-tcp perl-test-simple perl-json perl-path-tiny perl-scope-guard perl-test-exception perl-protocol-http2 perl-test-requires perl-hash-multivalue perl-plack perl-lwp-protocol-https perl-http-headers-fast perl-cookie-baker perl-http-entity-parser perl-starlet perl-fcgi-procmanager perl-cgi perl-fcgi nodejs wget" install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" diff --git a/community/hexchat/APKBUILD b/community/hexchat/APKBUILD index cbff64f9eed0..230eb6654c0c 100644 --- a/community/hexchat/APKBUILD +++ b/community/hexchat/APKBUILD @@ -7,7 +7,7 @@ url="https://hexchat.github.io" arch="all !armhf !armv7" license="GPL-2.0-or-later" makedepends="dbus-glib-dev gtk+2.0-dev iso-codes libnotify-dev libproxy-dev - openssl-dev libsexy-dev libxml2-dev lua5.4-dev meson python3-dev" + openssl1.1-compat-dev libsexy-dev libxml2-dev lua5.4-dev meson python3-dev" subpackages="$pkgname-doc $pkgname-lang $pkgname-python:_python" source="https://dl.hexchat.net/hexchat/hexchat-$pkgver.tar.xz force-meson-build-order.patch diff --git a/community/kasts/APKBUILD b/community/kasts/APKBUILD index 433053fda9b1..9e215fcc6d96 100644 --- a/community/kasts/APKBUILD +++ b/community/kasts/APKBUILD @@ -19,7 +19,7 @@ makedepends=" ki18n-dev kirigami2-dev syndication-dev - openssl-dev + openssl1.1-compat-dev qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtmultimedia-dev diff --git a/community/keepalived/APKBUILD b/community/keepalived/APKBUILD index e4fae3a68cbb..c0f382b170c5 100644 --- a/community/keepalived/APKBUILD +++ b/community/keepalived/APKBUILD @@ -9,7 +9,7 @@ url="https://www.keepalived.org/" arch="all !mips64" # testsuite segfaults on mips64 license="GPL-2.0-only" depends="$pkgname-common !$pkgname-snmp" -makedepends="openssl-dev popt-dev linux-headers net-snmp-dev libnl3-dev +makedepends="openssl1.1-compat-dev popt-dev linux-headers net-snmp-dev libnl3-dev libnfnetlink-dev automake autoconf" install="$pkgname.post-upgrade" subpackages="$pkgname-doc $pkgname-sample-config:samples:noarch diff --git a/community/libcoap/APKBUILD b/community/libcoap/APKBUILD index 6d82a9c21266..4564f78b8e4c 100644 --- a/community/libcoap/APKBUILD +++ b/community/libcoap/APKBUILD @@ -8,7 +8,7 @@ url="https://libcoap.net/" # armhf: t_error_response9 segfaults, TODO: investigate. arch="all !armhf" license="BSD-2-Clause" -makedepends="automake autoconf libtool asciidoc openssl-dev cunit-dev" +makedepends="automake autoconf libtool asciidoc openssl1.1-compat-dev cunit-dev" subpackages="$pkgname-dev $pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://github.com/obgm/libcoap/archive/v$pkgver.tar.gz" diff --git a/community/libimobiledevice/APKBUILD b/community/libimobiledevice/APKBUILD index 8b6a5134d014..49dad96acb8c 100644 --- a/community/libimobiledevice/APKBUILD +++ b/community/libimobiledevice/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Library that talks iPhone and iPod Touch protocols on Linux" url="https://libimobiledevice.org" arch="all" license="LGPL-2.1-or-later" -makedepends="openssl-dev libusbmuxd-dev libplist-dev python3-dev cython" +makedepends="openssl1.1-compat-dev libusbmuxd-dev libplist-dev python3-dev cython" subpackages="$pkgname-dev $pkgname-doc $pkgname-progs $pkgname-python" source="https://github.com/libimobiledevice/libimobiledevice/releases/download/$pkgver/libimobiledevice-$pkgver.tar.bz2" diff --git a/community/libtorrent-rasterbar/APKBUILD b/community/libtorrent-rasterbar/APKBUILD index b7b703683d59..02b19a73f7af 100644 --- a/community/libtorrent-rasterbar/APKBUILD +++ b/community/libtorrent-rasterbar/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Feature complete C++ bittorrent implementation" url="https://www.rasterbar.com/products/libtorrent" arch="all !armv7 !aarch64 !x86" # on aarch64 and x86 failed to build license="BSD-3-Clause" -depends_dev="boost-build boost-dev openssl-dev python3-dev py3-setuptools automake autoconf" +depends_dev="boost-build boost-dev openssl1.1-compat-dev python3-dev py3-setuptools automake autoconf" makedepends="$depends_dev linux-headers" subpackages="py3-$pkgname:_py3 $pkgname-static $pkgname-dev" source=" diff --git a/community/namecoin/APKBUILD b/community/namecoin/APKBUILD index 166aee9f316f..8ce1dbca2f01 100644 --- a/community/namecoin/APKBUILD +++ b/community/namecoin/APKBUILD @@ -9,7 +9,7 @@ url="https://www.namecoin.org/" #s390x,mips: Missing packages arch="all !s390x !mips !mips64 !x86" license="MIT" -makedepends="$depends_dev autoconf automake libtool boost-dev openssl-dev +makedepends="$depends_dev autoconf automake libtool boost-dev openssl1.1-compat-dev miniupnpc-dev qt5-qtbase-dev qt5-qttools-dev protobuf-dev libqrencode-dev libevent-dev chrpath" install="$pkgname.post-install $pkgname.pre-install" diff --git a/community/nheko/APKBUILD b/community/nheko/APKBUILD index 1d45e9c5f835..2351e7e3418d 100644 --- a/community/nheko/APKBUILD +++ b/community/nheko/APKBUILD @@ -41,7 +41,7 @@ makedepends=" qt5-qtquickcontrols2-dev qt5-qtkeychain-dev zlib-dev - openssl-dev + openssl1.1-compat-dev olm-dev nlohmann-json cmark-dev diff --git a/community/ntpsec/APKBUILD b/community/ntpsec/APKBUILD index 93a8ce286f34..38e5fa792aef 100644 --- a/community/ntpsec/APKBUILD +++ b/community/ntpsec/APKBUILD @@ -8,7 +8,7 @@ url="https://www.ntpsec.org/" arch="all" license="BSD-2-Clause" depends="bash busybox python3 py3-gpsd" -makedepends="python3-dev bison asciidoc openssl-dev linux-headers" +makedepends="python3-dev bison asciidoc openssl1.1-compat-dev linux-headers" subpackages="$pkgname-doc $pkgname-dev" source="https://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz" diff --git a/community/openconnect/APKBUILD b/community/openconnect/APKBUILD index 727264793587..b9eff39062b8 100644 --- a/community/openconnect/APKBUILD +++ b/community/openconnect/APKBUILD @@ -8,7 +8,7 @@ url="https://www.infradead.org/openconnect/" arch="all" license="LGPL-2.1-or-later" depends="vpnc iproute2" -makedepends="autoconf automake intltool openssl-dev libxml2-dev +makedepends="autoconf automake intltool openssl1.1-compat-dev libxml2-dev krb5-dev lz4-dev libproxy-dev linux-headers stoken-dev pcsc-lite-dev oath-toolkit-dev python3-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc $pkgname-bash-completion" diff --git a/community/openipmi/APKBUILD b/community/openipmi/APKBUILD index 4e41b9feffec..f9b70ae4b39e 100644 --- a/community/openipmi/APKBUILD +++ b/community/openipmi/APKBUILD @@ -7,7 +7,7 @@ url="https://sourceforge.net/projects/openipmi/" arch="all" license="LGPL-2.0-or-later and GPL-2.0-or-later or BSD-3-Clause" makedepends="libedit-dev readline-dev popt-dev glib-dev net-snmp-dev ncurses-dev - openssl-dev linux-headers" + openssl1.1-compat-dev linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-lanserv $pkgname-libs" source="https://downloads.sourceforge.net/openipmi/OpenIPMI-$pkgver.tar.gz" builddir="$srcdir"/OpenIPMI-$pkgver diff --git a/community/openvswitch/APKBUILD b/community/openvswitch/APKBUILD index 8c0cc0cee4b3..16f6dc358c09 100644 --- a/community/openvswitch/APKBUILD +++ b/community/openvswitch/APKBUILD @@ -8,7 +8,7 @@ url="http://openvswitch.org/" arch="all" license="Apache-2.0" options="!check" # FIXME: no point in running tests if we ignore result -depends_dev="openssl-dev" +depends_dev="openssl1.1-compat-dev" makedepends="$depends_dev perl linux-headers bash libcap-ng-dev python3 python3-dev py3-six py3-twisted autoconf automake libtool" subpackages="$pkgname-doc $pkgname-dbg $pkgname-dev diff --git a/community/ossec-hids-agent/APKBUILD b/community/ossec-hids-agent/APKBUILD index f20beb853b5e..106c5bc5696a 100644 --- a/community/ossec-hids-agent/APKBUILD +++ b/community/ossec-hids-agent/APKBUILD @@ -9,7 +9,7 @@ url="https://www.ossec.net/" arch="all !aarch64 !armhf !armv7 !s390x" license="GPL-2.0-only WITH openssl-exception" depends="inotify-tools procps ossec-hids-openrc" -makedepends="linux-headers bsd-compat-headers openssl-dev \ +makedepends="linux-headers bsd-compat-headers openssl1.1-compat-dev \ libevent-dev inotify-tools-dev findutils file zlib-dev pcre2-dev \ lua5.3-dev geoip-dev czmq-dev" checkdepends="check-dev subunit-dev" diff --git a/community/ossec-hids-local/APKBUILD b/community/ossec-hids-local/APKBUILD index bb5b01b83bdf..5273f569b4bf 100644 --- a/community/ossec-hids-local/APKBUILD +++ b/community/ossec-hids-local/APKBUILD @@ -9,7 +9,7 @@ url="https://www.ossec.net/" arch="all !aarch64 !armhf !armv7 !s390x" license="GPL-2.0-only WITH openssl-exception" depends="inotify-tools procps ossec-hids-openrc" -makedepends="linux-headers bsd-compat-headers openssl-dev \ +makedepends="linux-headers bsd-compat-headers openssl1.1-compat-dev \ libevent-dev inotify-tools-dev findutils file zlib-dev pcre2-dev \ sqlite-dev lua5.3-dev geoip-dev czmq-dev" checkdepends="check-dev subunit-dev" diff --git a/community/ossec-hids-server/APKBUILD b/community/ossec-hids-server/APKBUILD index 5ba7ddbe0171..ae3258521350 100644 --- a/community/ossec-hids-server/APKBUILD +++ b/community/ossec-hids-server/APKBUILD @@ -9,7 +9,7 @@ url="https://www.ossec.net/" arch="all !aarch64 !armhf !armv7 !s390x" license="GPL-2.0-only WITH openssl-exception" depends="inotify-tools procps ossec-hids-openrc" -makedepends="linux-headers bsd-compat-headers openssl-dev \ +makedepends="linux-headers bsd-compat-headers openssl1.1-compat-dev \ libevent-dev inotify-tools-dev findutils file zlib-dev pcre2-dev \ sqlite-dev lua5.3-dev geoip-dev czmq-dev" checkdepends="check-dev subunit-dev" diff --git a/community/pdns-recursor/APKBUILD b/community/pdns-recursor/APKBUILD index 760fc86e3363..87aeb85727f4 100644 --- a/community/pdns-recursor/APKBUILD +++ b/community/pdns-recursor/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="PowerDNS Recursive Server" url="https://www.powerdns.com/" arch="all !s390x !mips64" # broken context license="GPL-2.0-only WITH OpenSSL-Exception" -makedepends="autoconf automake libtool boost-dev openssl-dev libsodium-dev lua5.3-dev +makedepends="autoconf automake libtool boost-dev openssl1.1-compat-dev libsodium-dev lua5.3-dev net-snmp-dev" install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-openrc" diff --git a/community/php7-pecl-event/APKBUILD b/community/php7-pecl-event/APKBUILD index 5343f5c98cce..561077b0158d 100644 --- a/community/php7-pecl-event/APKBUILD +++ b/community/php7-pecl-event/APKBUILD @@ -9,7 +9,7 @@ url="https://pecl.php.net/package/event" arch="all" license="PHP-3.01" depends="php7-sockets" -makedepends="php7-dev libevent-dev openssl-dev pkgconf" +makedepends="php7-dev libevent-dev openssl1.1-compat-dev pkgconf" source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz" builddir="$srcdir/$_extname-$pkgver" provides="php7-event=$pkgver-r$pkgrel" # for backward compatibility diff --git a/community/php7-pecl-mongodb/APKBUILD b/community/php7-pecl-mongodb/APKBUILD index 11fe278f1428..d5f1cb3d0c4d 100644 --- a/community/php7-pecl-mongodb/APKBUILD +++ b/community/php7-pecl-mongodb/APKBUILD @@ -9,7 +9,7 @@ url="https://pecl.php.net/package/mongodb" arch="all" license="Apache-2.0" depends="php7-json" -makedepends="cyrus-sasl-dev icu-dev openssl-dev php7-dev snappy-dev" +makedepends="cyrus-sasl-dev icu-dev openssl1.1-compat-dev php7-dev snappy-dev" source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz" builddir="$srcdir"/$_extname-$pkgver provides="php7-mongodb=$pkgver-r$pkgrel" # for backward compatibility diff --git a/community/php8-pecl-event/APKBUILD b/community/php8-pecl-event/APKBUILD index cf176f123ec3..38c4ef34918a 100644 --- a/community/php8-pecl-event/APKBUILD +++ b/community/php8-pecl-event/APKBUILD @@ -9,7 +9,7 @@ url="https://pecl.php.net/package/event" arch="all" license="PHP-3.01" depends="php8-sockets" -makedepends="php8-dev libevent-dev openssl-dev pkgconf" +makedepends="php8-dev libevent-dev openssl1.1-compat-dev pkgconf" source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz" builddir="$srcdir/$_extname-$pkgver" diff --git a/community/php8-pecl-mongodb/APKBUILD b/community/php8-pecl-mongodb/APKBUILD index 0f6466e92c0f..228ee34f42f7 100644 --- a/community/php8-pecl-mongodb/APKBUILD +++ b/community/php8-pecl-mongodb/APKBUILD @@ -9,7 +9,7 @@ url="https://pecl.php.net/package/mongodb" arch="all" license="Apache-2.0" depends="php8-common" -makedepends="cyrus-sasl-dev icu-dev openssl-dev php8-dev snappy-dev" +makedepends="cyrus-sasl-dev icu-dev openssl1.1-compat-dev php8-dev snappy-dev" source="php-pecl-$_extname-$pkgver.tgz::https://pecl.php.net/get/$_extname-$pkgver.tgz" builddir="$srcdir"/$_extname-$pkgver provides="php8-mongodb=$pkgver-r$pkgrel" # for backward compatibility diff --git a/community/py3-grpcio/APKBUILD b/community/py3-grpcio/APKBUILD index d26ae7d0769a..3624d8758b70 100644 --- a/community/py3-grpcio/APKBUILD +++ b/community/py3-grpcio/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="gRPC Python HTTP/2-based RPC framework" url="https://grpc.io" arch="all !ppc64le" # no ppc64le -needs UnscaledCycleClock::Frequency() license="Apache-2.0" -makedepends="python3-dev py3-setuptools py3-six cython zlib-dev openssl-dev +makedepends="python3-dev py3-setuptools py3-six cython zlib-dev openssl1.1-compat-dev c-ares-dev linux-headers" options="!check" # tests depend upon bazel _abseil_cpp_rev=df3ea785d8c30a9503321a3d35ee7d35808f190d diff --git a/community/py3-scrypt/APKBUILD b/community/py3-scrypt/APKBUILD index 3bee490e0c66..f6658d5760fd 100644 --- a/community/py3-scrypt/APKBUILD +++ b/community/py3-scrypt/APKBUILD @@ -8,7 +8,7 @@ url="https://pypi.org/project/scrypt/" arch="all" license="BSD-2-Clause" depends="python3" -makedepends="python3-dev openssl-dev py3-setuptools" +makedepends="python3-dev openssl1.1-compat-dev py3-setuptools" source="https://files.pythonhosted.org/packages/source/s/scrypt/scrypt-$pkgver.tar.gz" builddir="$srcdir/scrypt-$pkgver" diff --git a/community/quassel/APKBUILD b/community/quassel/APKBUILD index de613b0f1695..483a431b5f32 100644 --- a/community/quassel/APKBUILD +++ b/community/quassel/APKBUILD @@ -17,7 +17,7 @@ depends_client="$pkgname-common" depends_mono="$pkgname-common" depends_server="$pkgname-common qt5-qtbase-postgresql qt5-qtbase-sqlite" depends_server_openrc="" -makedepends="cmake dbus-dev icu-dev openldap-dev openssl-dev +makedepends="cmake dbus-dev icu-dev openldap-dev openssl1.1-compat-dev qca-dev qt5-qtbase-dev qt5-qtscript-dev zlib-dev " source="https://www.quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2 diff --git a/community/ruby-eventmachine/APKBUILD b/community/ruby-eventmachine/APKBUILD index 4da80c9bb0b4..a1890dd9717b 100644 --- a/community/ruby-eventmachine/APKBUILD +++ b/community/ruby-eventmachine/APKBUILD @@ -9,7 +9,7 @@ url="https://github.com/eventmachine/eventmachine" arch="all" license="Ruby OR GPL-2.0-or-later" checkdepends="ruby-test-unit" -makedepends="openssl-dev ruby-dev" +makedepends="openssl1.1-compat-dev ruby-dev" source="https://github.com/eventmachine/eventmachine/archive/v$pkgver/$pkgname-$pkgver.tar.gz 0001-OpenSSL-1.1.0-test-updates.patch 0002-Update-runtime-files-for-TLS13-no-SSL-OpenSSL-lib-info.patch diff --git a/community/s2geometry/APKBUILD b/community/s2geometry/APKBUILD index 68f54ce85c45..d63cf7d29062 100644 --- a/community/s2geometry/APKBUILD +++ b/community/s2geometry/APKBUILD @@ -10,7 +10,7 @@ license="Apache-2.0" makedepends=" cmake gtest-dev - openssl-dev + openssl1.1-compat-dev python3-dev swig " diff --git a/community/starship/APKBUILD b/community/starship/APKBUILD index 3bcc1a7dff70..5decb20ffdd9 100644 --- a/community/starship/APKBUILD +++ b/community/starship/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="The minimal, blazing-fast, and infinitely customizable prompt for any s url="https://starship.rs" arch="x86_64 armv7 armhf aarch64 x86 ppc64le" # limited by rust/cargo license="ISC" -makedepends="cargo libgit2-dev openssl-dev zlib-dev" +makedepends="cargo libgit2-dev openssl1.1-compat-dev zlib-dev" source="https://github.com/starship/starship/archive/v$pkgver/$pkgname-$pkgver.tar.gz minimize-size.patch " diff --git a/community/sylpheed/APKBUILD b/community/sylpheed/APKBUILD index 6b2b58c5bb11..541715fdb0e9 100644 --- a/community/sylpheed/APKBUILD +++ b/community/sylpheed/APKBUILD @@ -8,7 +8,7 @@ arch="all" license="GPL-3.0-only" # TODO: Replace gnupg with specific gnupg subpackages that sylpheed really needs. depends="pinentry-gtk gnupg" -makedepends="gtk+-dev openldap-dev openssl-dev gpgme-dev" +makedepends="gtk+-dev openldap-dev openssl1.1-compat-dev gpgme-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://osdn.net/dl/sylpheed/$pkgname-$pkgver.tar.xz" diff --git a/community/telegram-desktop/APKBUILD b/community/telegram-desktop/APKBUILD index cddf98417609..1fcee4e501f1 100644 --- a/community/telegram-desktop/APKBUILD +++ b/community/telegram-desktop/APKBUILD @@ -32,7 +32,7 @@ makedepends=" lz4-dev minizip-dev openal-soft-dev - openssl-dev + openssl1.1-compat-dev opus-dev portaudio-dev pulseaudio-dev diff --git a/community/tinyfugue/APKBUILD b/community/tinyfugue/APKBUILD index 2353085188df..23f45b7366b7 100644 --- a/community/tinyfugue/APKBUILD +++ b/community/tinyfugue/APKBUILD @@ -8,7 +8,7 @@ url="https://github.com/ingwarsw/tinyfugue" arch="all" options="!check" # no testsuite license="GPL-2.0-or-later" -makedepends="openssl-dev ncurses-dev pcre-dev icu-dev python3-dev" +makedepends="openssl1.1-compat-dev ncurses-dev pcre-dev icu-dev python3-dev" source="$pkgname-$pkgver.tar.gz::https://github.com/ingwarsw/tinyfugue/archive/refs/tags/$pkgver.tar.gz 0001-Add-DESTDIR-support.patch 0003-Minor-man-page-fixes.patch diff --git a/community/tpm2-tss-engine/APKBUILD b/community/tpm2-tss-engine/APKBUILD index 5df2517b3e59..7dcbf235ad08 100644 --- a/community/tpm2-tss-engine/APKBUILD +++ b/community/tpm2-tss-engine/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="tpm2tss engine for openssl" url="https://github.com/tpm2-software/tpm2-tss-engine/" arch="all" license="BSD-2-Clause" -makedepends="tpm2-tss-dev openssl-dev doxygen linux-headers" +makedepends="tpm2-tss-dev openssl1.1-compat-dev doxygen linux-headers" subpackages=" $pkgname-dev $pkgname-doc diff --git a/community/unit/APKBUILD b/community/unit/APKBUILD index 40ee423e780b..7fa4238a8c05 100644 --- a/community/unit/APKBUILD +++ b/community/unit/APKBUILD @@ -9,7 +9,7 @@ url="https://unit.nginx.org/" arch="all" license="Apache-2.0" _phpver=7 -makedepends="perl-dev php$_phpver-dev php$_phpver-embed python3-dev ruby-dev openssl-dev" +makedepends="perl-dev php$_phpver-dev php$_phpver-embed python3-dev ruby-dev openssl1.1-compat-dev" install="$pkgname.pre-install" subpackages="$pkgname-openrc" source="https://unit.nginx.org/download/unit-$pkgver.tar.gz diff --git a/community/znc/APKBUILD b/community/znc/APKBUILD index 304bf05cc8c8..179fbae1d9d2 100644 --- a/community/znc/APKBUILD +++ b/community/znc/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Advanced IRC bouncer" url="https://wiki.znc.in/ZNC" arch="all" license="Apache-2.0" -makedepends="perl-dev openssl-dev cyrus-sasl-dev c-ares-dev swig +makedepends="perl-dev openssl1.1-compat-dev cyrus-sasl-dev c-ares-dev swig gettext-dev tcl-dev autoconf automake python3-dev icu-dev" pkgusers="$pkgname" pkggroups="$pkgusers" -- GitLab