Commit 670bf5a8 authored by Ariadne Conill's avatar Ariadne Conill
Browse files

main: migrate to explicit openssl1.1-compat-dev dependency to support openssl 1.1 downgrade

parent 922792ef
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
# 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
......
......@@ -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
......
# 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
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
# 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
"
......
......@@ -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
......
......@@ -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
......
......@@ -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"
......
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment