aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2020-11-12 13:22:32 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2020-11-12 13:22:32 +0000
commit6909f5d18b169310a966d4eb55360951067f0272 (patch)
tree0936904599e4daad22d88563935cfbea2783fefe
parente29f049bfbd7a94fa517edb5e9040cb8e0cafdb0 (diff)
community/yadifa: upgrade to 2.4.0
-rw-r--r--community/yadifa/APKBUILD10
-rw-r--r--community/yadifa/musl-fixes.patch45
2 files changed, 14 insertions, 41 deletions
diff --git a/community/yadifa/APKBUILD b/community/yadifa/APKBUILD
index b7eb60dbcfc..a14d584a106 100644
--- a/community/yadifa/APKBUILD
+++ b/community/yadifa/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=yadifa
-pkgver=2.3.10
-_buildnr=9729
+pkgver=2.4.0
+_buildnr=9809
pkgrel=0
pkgdesc="Lightweight authoritative Name Server with DNSSEC capabilities"
url="http://www.yadifa.eu"
arch="all"
license="BSD-3-Clause"
-makedepends="openssl-dev"
+makedepends="openssl-dev libexecinfo-dev"
install="$pkgname.post-install"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
source="http://cdn.yadifa.eu/sites/default/files/releases/yadifa-$pkgver-$_buildnr.tar.gz
@@ -48,7 +48,7 @@ package() {
mkdir -p "$pkgdir"/var/log/$pkgname
}
-sha512sums="e13b31a67798fb2486615ad2f902cc67d5d7b2bc2d165774294ccdfa07c47679884b5b410a08a95b0636bb1ac01ba9fc481ea0856d6e93d07f8a45b0a2928dd3 yadifa-2.3.10-9729.tar.gz
-dec2505a3d2f722a5d90cac94f29e01c91f29e8e6fc07d8ef3ff0ee070920164c72fc86b5ce578a5d016d1dade0b8540faded84a817caa4995a06333fd51f3f5 musl-fixes.patch
+sha512sums="ff3132fca20510261a56ce58a7754d7e1177b15c1ef99b53c60f7f527c27ad701462d276a4651ad6ccb521d26116929df8ca4beb559ecae13638df4ba96ae9c9 yadifa-2.4.0-9809.tar.gz
+3a438a2695b5e9c9b905c0839df78a531ffdaa29dbef12fa25224bfcbfae4f4a9ff2fa8db5b8f57ba21b1c1004b3bfc078a29261b59abcfd0c756ef59cde3a5e musl-fixes.patch
a3a65bf13f41838d9493facc2903d955aafd107a29d8a73d4ed021690e1e2c511f48915360a9490ccbf8d9573f8e9c3fca988cb6dd5e57546787384e2b2d075d yadifa.initd
eac74148b58d3b7472602542622616bd0ef441b191356a5b7fd06d17284c579139c1fde9b35fbb30a8214394863e31bed4c8521aff7b3f7ea831f14c2a3ccf01 yadifa.confd"
diff --git a/community/yadifa/musl-fixes.patch b/community/yadifa/musl-fixes.patch
index 09e81a8042e..be6c4f7403e 100644
--- a/community/yadifa/musl-fixes.patch
+++ b/community/yadifa/musl-fixes.patch
@@ -2,24 +2,6 @@ diff --git a/lib/dnscore/src/debug.c b/lib/dnscore/src/debug.c
index e3b6f8f..c52692a 100644
--- a/lib/dnscore/src/debug.c
+++ b/lib/dnscore/src/debug.c
-@@ -52,7 +52,7 @@
-
- #include "dnscore/dnscore-config.h"
-
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__GLIBC__) || defined(__APPLE__)
- #include <execinfo.h>
- #if HAS_BFD_DEBUG_SUPPORT
- #include <bfd.h>
-@@ -80,7 +80,7 @@
- #undef debug_stat
- #undef debug_mallocated
-
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__GLIBC__) || defined(__APPLE__)
- #define ZDB_DEBUG_STACKTRACE 1
- #else /* __FreeBSD__ or unknown */
- #define ZDB_DEBUG_STACKTRACE 0
@@ -596,7 +596,7 @@ debug_stacktraces_list_set_search(void* data, void* parm)
stacktrace
debug_stacktrace_get()
@@ -73,12 +55,12 @@ index e3b6f8f..c52692a 100644
+#if defined(__GLIBC__)
int n = backtrace(addresses, sizeof(addresses) / sizeof(void*));
-
-diff --git a/sbin/yadifad/signals.c b/sbin/yadifad/signals.c
-index bc83eaf..a4a5546 100644
---- a/sbin/yadifad/signals.c
-+++ b/sbin/yadifad/signals.c
-@@ -54,7 +54,7 @@
+
+diff --git a/lib/dnscore/src/signals.c b/lib/dnscore/src/signals.c
+index 5d42a09..c7bdb3c 100644
+--- a/lib/dnscore/src/signals.c
++++ b/lib/dnscore/src/signals.c
+@@ -55,7 +55,7 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -87,7 +69,7 @@ index bc83eaf..a4a5546 100644
#define _GNU_SOURCE 1
#include <execinfo.h>
#include <sys/mman.h>
-@@ -587,7 +587,7 @@ signal_handler(int signo, siginfo_t* info, void* context)
+@@ -694,7 +694,7 @@ signal_handler(int signo, siginfo_t* info, void* context)
log_err(filepath);
}
@@ -96,21 +78,12 @@ index bc83eaf..a4a5546 100644
void* buffer[MAXTRACE];
char** strings;
int n = backtrace(buffer, MAXTRACE);
-@@ -617,7 +617,7 @@ signal_handler(int signo, siginfo_t* info, void* context)
+@@ -724,7 +724,7 @@ signal_handler(int signo, siginfo_t* info, void* context)
log_err(filepath);
}
-#if __linux__
+#if __GLIBC__
ucontext_t* ucontext = (ucontext_t*)context;
+
/*
- filepath[0] = '\0';
-@@ -811,7 +811,7 @@ signal_handler(int signo, siginfo_t* info, void* context)
- log_err(filepath);
- }
-
--#if __linux__ && (defined(__x86_64__) || defined(__i386__)) && (_BSD_SOURCE || _SVID_SOURCE || _DEFAULT_SOURCE)
-+#if __GLIBC__ && (defined(__x86_64__) || defined(__i386__)) && (_BSD_SOURCE || _SVID_SOURCE || _DEFAULT_SOURCE)
- // dump more information about the memory address of the error
- #define PAGESIZE 4096
- #define LINESIZE 32