Update knot to 2.1.0-4; fix nettle-3.2 compilation and add pkg-config to makedepends

3 files changed, 54 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8bbd879c8011..02e495854f4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jan 21 09:59:26 UTC 2016
+# Fri Feb  5 14:58:39 UTC 2016
 pkgbase = knot
 	pkgdesc = high-performance authoritative-only DNS server
 	pkgver = 2.1.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.knot-dns.cz/
 	install = install
 	arch = i686
@@ -12,7 +12,8 @@ pkgbase = knot
 	makedepends = autoconf>=2.65
 	makedepends = libtool
 	makedepends = flex>=2.5.3
-	makedepends = bison>=2.3
+	makedepends = bison>=2.3,
+	makedepends = pkg-config
 	depends = liburcu>=0.5.4
 	depends = gnutls>=3.0
 	depends = zlib
@@ -21,9 +22,11 @@ pkgbase = knot
 	source = https://secure.nic.cz/files/knot-dns/knot-2.1.0.tar.xz
 	source = knot.service
 	source = knot.tmpfiles
+	source = nettle-3.2.patch
 	sha256sums = 1f6ea98da000386bf86e015655a9ec974d361b62711caf06b55f3d9bb2aa85a9
 	sha256sums = caa870a9c93c57c6311f9e8fb5685a9179bb9839a27a30cc1712c91df0d15090
 	sha256sums = 592ffb904b697b8c09ab95b3874ad00637333f1805ab2ab0ee50b4f484108ee2
+	sha256sums = 568f8d0e4a535b23ac3c00c62957ab3ec99b64a69c6f5d5613cb4b8caedd45e6
 
 pkgname = knot
 
diff --git a/PKGBUILD b/PKGBUILD
index 6526f8474a80..0664dfb1a51d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,27 @@
 srcname=knot
 pkgname=${srcname}
 pkgver=2.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc='high-performance authoritative-only DNS server'
 url='https://www.knot-dns.cz/'
 arch=('i686' 'x86_64')
 license=('GPL3')
 install=install
 depends=('liburcu>=0.5.4' 'gnutls>=3.0' 'zlib' 'lmdb' 'jansson')
-makedepends=('autoconf>=2.65' 'libtool' 'flex>=2.5.3' 'bison>=2.3')
+makedepends=('autoconf>=2.65' 'libtool' 'flex>=2.5.3' 'bison>=2.3', 'pkg-config')
 source=("https://secure.nic.cz/files/knot-dns/${srcname}-${pkgver}.tar.xz"
         'knot.service'
-        'knot.tmpfiles')
+        'knot.tmpfiles'
+	'nettle-3.2.patch')
 sha256sums=('1f6ea98da000386bf86e015655a9ec974d361b62711caf06b55f3d9bb2aa85a9'
             'caa870a9c93c57c6311f9e8fb5685a9179bb9839a27a30cc1712c91df0d15090'
-            '592ffb904b697b8c09ab95b3874ad00637333f1805ab2ab0ee50b4f484108ee2')
+            '592ffb904b697b8c09ab95b3874ad00637333f1805ab2ab0ee50b4f484108ee2'
+	    '568f8d0e4a535b23ac3c00c62957ab3ec99b64a69c6f5d5613cb4b8caedd45e6')
+
+prepare() {
+	cd "${srcdir}"/${pkgname}-${pkgver}
+	patch -Np1 -i ../nettle-3.2.patch
+}
 
 build() {
 	cd "${srcdir}/${srcname}-${pkgver}"
@@ -49,8 +56,3 @@ package() {
 	install -Dm 644 "${srcdir}/knot.service" "${pkgdir}/usr/lib/systemd/system/knot.service"
 	install -Dm 644 "${srcdir}/knot.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/knot.conf"
 }
-
-check() {
-	cd "${srcdir}/${srcname}-${pkgver}"
-	make check
-}
diff --git a/nettle-3.2.patch b/nettle-3.2.patch
new file mode 100644
index 000000000000..f1fd4415dfad
--- /dev/null
+++ b/nettle-3.2.patch
@@ -0,0 +1,37 @@
+diff --git a/src/dnssec/lib/binary.c b/src/dnssec/lib/binary.c
+index 454dc5a..f462006 100644
+--- a/src/dnssec/lib/binary.c
++++ b/src/dnssec/lib/binary.c
+@@ -15,25 +15,21 @@
+ */
+ 
+ #include <assert.h>
+-#include <nettle/base64.h>
+ #include <string.h>
++#include <nettle/base64.h>
++#ifdef HAVE_NETTLE_VERSION_H
++#include <nettle/version.h>
++#endif
+ 
+ #include "binary.h"
+ #include "error.h"
+ #include "shared.h"
+ 
+-typedef
+-#ifdef HAVE_NETTLE_VERSION_H
+-	#include <nettle/version.h>
+-	#if NETTLE_VERSION_MAJOR >= 3
+-		size_t
+-	#else
+-		unsigned
+-	#endif
++#if NETTLE_VERSION_MAJOR >= 3
++typedef size_t nettle_len;
+ #else
+-	unsigned
++typedef unsigned nettle_len;
+ #endif
+-nettle_len;
+ 
+ static size_t base64_decode_raw(const uint8_t *src, size_t src_len,
+ 				uint8_t *dst, size_t dst_max_size)