community/yadifa: upgrade to 2.2.4

2 files changed, 113 insertions, 27 deletions

diff --git a/community/yadifa/APKBUILD b/community/yadifa/APKBUILD
index 22ec1dd5d2..e23b8c1619 100644
--- a/community/yadifa/APKBUILD
+++ b/community/yadifa/APKBUILD
@@ -1,52 +1,48 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=yadifa
-pkgver=2.1.6
-_buildnr=5826
-pkgrel=1
+pkgver=2.2.4
+_buildnr=6924
+pkgrel=0
 pkgdesc="Lightweight authoritative Name Server with DNSSEC capabilities"
 url="http://www.yadifa.eu"
 arch="all"
 license="BSD-3"
-depends=""
-depends_dev="libressl-dev"
-makedepends="$depends_dev"
+makedepends="libressl-dev"
 install="$pkgname.post-install"
-options="libtool"
+options="!libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://cdn.yadifa.eu/sites/default/files/releases/$pkgname-$pkgver-$_buildnr.tar.gz
+	libressl-compat.patch
 	$pkgname.initd
 	$pkgname.confd"
 
-_builddir="$srcdir"/$pkgname-$pkgver-$_buildnr
+builddir="$srcdir"/$pkgname-$pkgver-$_buildnr
+
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sed -i -e "s/__linux__/__GLIBC__/g" lib/dnscore/src/tcp_io_stream.c
+	cd "$builddir"
 	sed -i -e "s/__linux__/__GLIBC__/g" lib/dnscore/src/debug.c
-	sed -i -e "s/__linux__/__GLIBC__/g" lib/dnscore/src/format.c
 	sed -i -e "s/__linux__/__GLIBC__/g" sbin/yadifad/signals.c
+	default_prepare
 }
 
 build() {
-	cd "$_builddir"
-	./configure --prefix=/usr \
+	cd "$builddir"
+	./configure \
+		--prefix=/usr \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--sysconfdir=/etc/$pkgname \
 		--localstatedir=/var/yadifa \
 		--enable-dynamic-provisioning \
+		--enable-ctrl \
+		--enable-non-aa-axfr-support \
 		--enable-rrl
 	make
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -D -m 0755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -D -m 0755 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
@@ -56,12 +52,7 @@ package() {
 	mkdir -p  "$pkgdir"/var/log/$pkgname
 }
 
-md5sums="0d0a70da864e12a6f68eaf93e3bc4f42  yadifa-2.1.6-5826.tar.gz
-d953b0cc2d696dc67ffe24e89a1aa66c  yadifa.initd
-5440992593d8605cf9c638d0e59d7fc5  yadifa.confd"
-sha256sums="c42a4ca927d989f74ee8978b8122c22032d9460176bfcdafc1c371571803e642  yadifa-2.1.6-5826.tar.gz
-4012317e3e6ed95767c7b3ad05f9eda6e532788f95e6617aa135488693525eb3  yadifa.initd
-09ae43cadd2790cec47a904ded91dfad989b91108d1d6f0221ea171676c3de22  yadifa.confd"
-sha512sums="7c08a1a67d6adb3a3a8dc46cad0b72d85d2d70393b592d838237b83609c393674557e9c13a92fc9b8890449193ef5817d66950e04b6ad953f677bbb3052fa204  yadifa-2.1.6-5826.tar.gz
+sha512sums="3fa086d0d6fa5cbf92d1106e8f438658bc12a0d05a4422e05eb33763ee8a231b70aa39c0bbc9c935bb50cf347de41f62b66a21fe061487043096c087ab916ad1  yadifa-2.2.4-6924.tar.gz
+6d25115d91ca23928b2e96b6e9e18522442996e482bedc888a6e5f59ae4d276b32a521a0c990e7220064b26af772d7f986a479847f9b395cb79030b2cb31bcce  libressl-compat.patch
 a3a65bf13f41838d9493facc2903d955aafd107a29d8a73d4ed021690e1e2c511f48915360a9490ccbf8d9573f8e9c3fca988cb6dd5e57546787384e2b2d075d  yadifa.initd
 eac74148b58d3b7472602542622616bd0ef441b191356a5b7fd06d17284c579139c1fde9b35fbb30a8214394863e31bed4c8521aff7b3f7ea831f14c2a3ccf01  yadifa.confd"
diff --git a/community/yadifa/libressl-compat.patch b/community/yadifa/libressl-compat.patch
new file mode 100644
index 0000000000..4b2c19d15b
--- /dev/null
+++ b/community/yadifa/libressl-compat.patch
@@ -0,0 +1,95 @@
+From 553b9d7d2a3c7cf56d1f02d73eb37cbd5a29e9df Mon Sep 17 00:00:00 2001
+From: Bernard Spil <brnrd@FreeBSD.org>
+Date: Sat, 25 Feb 2017 12:32:24 +0100
+Subject: [PATCH] Fix build issues with LibreSSL
+
+ - Check LIBRESSL_VERSION_NUMBER in addition to OpenSSL > 1.1
+
+LibreSSL forked from OpenSSL 1.0.1f and does not have all features
+from 1.1.0.
+---
+ lib/dnscore/src/dnskey_dsa.c   | 4 ++--
+ lib/dnscore/src/dnskey_ecdsa.c | 2 +-
+ lib/dnscore/src/dnskey_rsa.c   | 2 +-
+ lib/dnscore/src/tsig.c         | 6 +++---
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/dnscore/src/dnskey_dsa.c b/lib/dnscore/src/dnskey_dsa.c
+index 43fe450..54b93f0 100644
+--- a/lib/dnscore/src/dnskey_dsa.c
++++ b/lib/dnscore/src/dnskey_dsa.c
+@@ -70,7 +70,7 @@
+ #error "OPENSSL_VERSION_NUMBER not defined"
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ /*
+  * Backward-compatible interface for 0.9.x
+@@ -226,7 +226,7 @@ dnskey_dsa_genkey(u32 size)
+     int err;
+     DSA* dsa;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     dsa = DSA_generate_parameters(size, NULL,0, NULL, NULL, NULL, NULL);
+ #else
+     dsa = DSA_new();
+diff --git a/lib/dnscore/src/dnskey_ecdsa.c b/lib/dnscore/src/dnskey_ecdsa.c
+index 1638c3b..1ed19d4 100644
+--- a/lib/dnscore/src/dnskey_ecdsa.c
++++ b/lib/dnscore/src/dnskey_ecdsa.c
+@@ -79,7 +79,7 @@
+ #define DNSKEY_ALGORITHM_ECDSAP256SHA256_NID NID_X9_62_prime256v1
+ #define DNSKEY_ALGORITHM_ECDSAP384SHA384_NID NID_secp384r1
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #define SSL_FIELD_GET(st_,f_) if(f_ != NULL) { *f_ = st_->f_; }
+ #define SSL_FIELD_SET(st_,f_) if(f_ != NULL) { BN_free(st_->f_); st_->f_ = f_; }
+diff --git a/lib/dnscore/src/dnskey_rsa.c b/lib/dnscore/src/dnskey_rsa.c
+index f52f84f..00529ea 100644
+--- a/lib/dnscore/src/dnskey_rsa.c
++++ b/lib/dnscore/src/dnskey_rsa.c
+@@ -64,7 +64,7 @@
+ 
+ #define MODULE_MSG_HANDLE g_system_logger
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ 
+ #define SSL_FIELD_GET(st_,f_) if(f_ != NULL) { *f_ = st_->f_; }
+ #define SSL_FIELD_SET(st_,f_) if(f_ != NULL) { BN_free(st_->f_); st_->f_ = f_; }
+diff --git a/lib/dnscore/src/tsig.c b/lib/dnscore/src/tsig.c
+index 21d7e9d..391e72a 100644
+--- a/lib/dnscore/src/tsig.c
++++ b/lib/dnscore/src/tsig.c
+@@ -233,7 +233,7 @@
+ tsig_hmac_t
+ tsig_hmac_allocate()
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L // ie: 0.9.x
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) // ie: 0.9.x
+     HMAC_CTX *hmac;
+     ZALLOC_OR_DIE(HMAC_CTX*, hmac, HMAC_CTX, GENERIC_TAG);
+     HMAC_CTX_init(hmac);
+@@ -257,7 +257,7 @@ tsig_hmac_free(tsig_hmac_t t)
+ {
+     HMAC_CTX *hmac = (HMAC_CTX*)t;
+     yassert(hmac != NULL);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     HMAC_CTX_cleanup(hmac);
+     ZFREE(t, HMAC_CTX);
+ #else
+@@ -268,7 +268,7 @@ tsig_hmac_free(tsig_hmac_t t)
+ void tsig_hmac_reset(tsig_hmac_t t)
+ {
+     HMAC_CTX *hmac = (HMAC_CTX*)t;
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+     HMAC_CTX_cleanup(hmac);
+     HMAC_CTX_init(hmac);
+ #else