diff options
Diffstat (limited to 'main/haproxy/APKBUILD')
| -rw-r--r-- | main/haproxy/APKBUILD | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD index 35508d1813a..bbcfa4ba334 100644 --- a/main/haproxy/APKBUILD +++ b/main/haproxy/APKBUILD @@ -4,7 +4,7 @@ pkgname=haproxy # NOTE: Upgrade only to LTS versions announced on upstream site url! # Using LTS versions is easier to keep it in good shape for stable releases -pkgver=2.4.12 +pkgver=2.8.9 _pkgmajorver=${pkgver%.*} pkgrel=0 pkgdesc="A TCP/HTTP reverse proxy for high availability environments" @@ -12,13 +12,11 @@ url="https://www.haproxy.org/" arch="all" 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 openssl1.1-compat-dev linux-headers lua$_luaver-dev zlib-dev" +options="!check" # FIXME: depends on vtest +makedepends="pcre2-dev openssl-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 - haproxy-openssl-3.patch haproxy.initd haproxy.cfg" @@ -27,11 +25,11 @@ source="https://www.haproxy.org/download/$_pkgmajorver/src/haproxy-$pkgver.tar.g # - CVE-2020-11100 build() { - case "$CARCH" in mips|mipsel*|riscv64) _carchflags="ADDLIB=-latomic";; esac make \ $_carchflags \ TARGET=linux-musl \ - USE_PCRE=1 \ + USE_PCRE2=1 \ + USE_PCRE2_JIT=1 \ USE_OPENSSL=1 \ USE_ZLIB=1 \ USE_LUA=1 \ @@ -59,8 +57,7 @@ package() { } sha512sums=" -bb5cf9894cab051f96c067203842e7d6277bc02c825061e483b7678ca6e70d01fc3f6d57e9cc9243b57feac97967b09467e463c7dd7ab44700a7af2087a559b6 haproxy-2.4.12.tar.gz -f766b2e9f9e2e4d236e571e7d7dfc59e864d5e6e7fe8008275d4ad9665e3b519e2ae9833c1c2f41f7af12cfd2c1b17a7620caa80426086fd4020dc5527465854 haproxy-openssl-3.patch +087dfe318bd56c3b1e834975277a35f5ebf434fdc4d342a78a24e8bec2f1d5a07d958383581eae6277754cd138e69f465e1d8fe6f1eae2f94f14a9914082bb7f haproxy-2.8.9.tar.gz 4aa8fc812079baf1d17cf9484a9b44568c3dd94f35243a57a4a7868e7f88146a4e94c80ea8ab86f1b08a524567e269a3ec119b67fc679f6bd0d9f1c70ce4f080 haproxy.initd 26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f haproxy.cfg " |