aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2020-04-02 01:30:07 +0300
committerLeo <thinkabit.ukim@gmail.com>2020-04-02 00:16:14 +0000
commit04aca3c7d79634d481fe96ebe378fa83367732cb (patch)
tree811abb6b68e00ddeabe12643e9e62d18c61056d7 /testing
parentc7741951178fc57232a9aaf0565112eead94b7ef (diff)
downloadaports-04aca3c7d79634d481fe96ebe378fa83367732cb.tar.bz2
aports-04aca3c7d79634d481fe96ebe378fa83367732cb.tar.xz
testing/nftlb: upgrade to 0.6
* Patch against musl backtrace.
Diffstat (limited to 'testing')
-rw-r--r--testing/nftlb/APKBUILD8
-rw-r--r--testing/nftlb/musl-fixes.patch38
2 files changed, 43 insertions, 3 deletions
diff --git a/testing/nftlb/APKBUILD b/testing/nftlb/APKBUILD
index 2906a26b4d..578cb6a95f 100644
--- a/testing/nftlb/APKBUILD
+++ b/testing/nftlb/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=nftlb
-pkgver=0.5
+pkgver=0.6
pkgrel=0
pkgdesc="nftables load balancer"
url="https://github.com/zevenet/nftlb"
@@ -13,6 +13,7 @@ subpackages="$pkgname-openrc"
source="https://github.com/zevenet/nftlb/archive/v$pkgver/$pkgname-$pkgver.tar.gz
$pkgname.initd
$pkgname.confd
+ musl-fixes.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -43,6 +44,7 @@ package() {
install -m 0644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="af4c7efff084205630673c2c9959453aa701f0c235fd57a9990b6fdff09c7dc1e67963a913a1d36ac4d98dfebfcbeb798526ad7913146b368bee11c2296b7025 nftlb-0.5.tar.gz
+sha512sums="95b879cfc187fe94cc6876f4af3fe77795c1e0228850cfb38b95206685d9065076b6905d365da7ec5f92773cf8f72f6e441d9140d9b10b02eaf9b6c862c31006 nftlb-0.6.tar.gz
3e15dc73b21412d1504892ee1e550a00c895671069a32e9c80a38a7c68bc8988c44519bfb15f288e42a96047febfeb38eeffc534381d644f87ede859b23efe71 nftlb.initd
-9a4384fe295203a80489ea2a61f0c4b9b8b2ac1be51c506b4ab5c3c9e76818a0cd18f6b372323ea84dcd0437e1224cd9be339c9463c3c8042e6c3e74e73ae360 nftlb.confd"
+9a4384fe295203a80489ea2a61f0c4b9b8b2ac1be51c506b4ab5c3c9e76818a0cd18f6b372323ea84dcd0437e1224cd9be339c9463c3c8042e6c3e74e73ae360 nftlb.confd
+701f15a6325f129add27fc0ed96b73c20d6e8d4f46fee00079d42a9adfb740aac6a89cf7fefe9162c1542cd953d5b6fd8a5c7e0feeb323d2520fcf8dff8512ab musl-fixes.patch"
diff --git a/testing/nftlb/musl-fixes.patch b/testing/nftlb/musl-fixes.patch
new file mode 100644
index 0000000000..da20a63fe7
--- /dev/null
+++ b/testing/nftlb/musl-fixes.patch
@@ -0,0 +1,38 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -26,7 +26,9 @@
+ #include <syslog.h>
+ #include <errno.h>
+ #include <unistd.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+
+ #include "config.h"
+ #include "objects.h"
+@@ -85,6 +87,7 @@
+ exit(EXIT_SUCCESS);
+ }
+
++#ifdef HAVE_EXECINFO_H
+ static void nftlb_trace() {
+ void *buffer[255];
+ char **str;
+@@ -106,6 +109,7 @@
+
+ exit(EXIT_FAILURE);
+ }
++#endif
+
+ int main(int argc, char *argv[])
+ {
+@@ -157,8 +161,7 @@
+
+ if (signal(SIGINT, nftlb_sighandler) == SIG_ERR ||
+ signal(SIGTERM, nftlb_sighandler) == SIG_ERR ||
+- signal(SIGPIPE, SIG_IGN) == SIG_ERR ||
+- signal(SIGSEGV, nftlb_trace) == SIG_ERR) {
++ signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+ fprintf(stderr, "Error assigning signals\n");
+ syslog(LOG_ERR, "Error assigning signals");
+ return EXIT_FAILURE;