summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Krizek2019-03-05 16:13:24 +0100
committerTomas Krizek2019-03-05 16:13:24 +0100
commite9bbc06a81727d67a10dde08ca0d7a28fe8da48f (patch)
treed1a6e55e62d37094001a582f4768825433245377
parent274d555d91ac7e0dfc2527fc45bf577f52d74b30 (diff)
downloadaur-e9bbc06a81727d67a10dde08ca0d7a28fe8da48f.tar.gz
compatibility patch for Knot DNS 2.8
-rw-r--r--.SRCINFO6
-rw-r--r--01-compat-Knot-DNS-2.8.patch12
-rw-r--r--PKGBUILD16
3 files changed, 28 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 66159f63f8e..e88f458337f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = knot-resolver
pkgdesc = full caching DNS resolver implementation
pkgver = 3.2.1
- pkgrel = 1
+ pkgrel = 2
url = https://www.knot-resolver.cz/
install = install
arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = knot-resolver
depends = cmocka
depends = dnssec-anchors
depends = gnutls
- depends = knot>=2.7.2
+ depends = knot>=2.8
depends = libedit
depends = libsystemd
depends = libuv
@@ -22,7 +22,9 @@ pkgbase = knot-resolver
options = strip
backup = etc/knot-resolver/kresd.conf
source = https://secure.nic.cz/files/knot-resolver/knot-resolver-3.2.1.tar.xz
+ source = 01-compat-Knot-DNS-2.8.patch
sha256sums = d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b
+ sha256sums = SKIP
pkgname = knot-resolver
diff --git a/01-compat-Knot-DNS-2.8.patch b/01-compat-Knot-DNS-2.8.patch
new file mode 100644
index 00000000000..966846cad82
--- /dev/null
+++ b/01-compat-Knot-DNS-2.8.patch
@@ -0,0 +1,12 @@
+diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua
+index eeb8ff7c..4bf6d63b 100644
+--- a/daemon/lua/kres-gen.lua
++++ b/daemon/lua/kres-gen.lua
+@@ -394,6 +394,7 @@ struct zs_scanner {
+ _Bool automatic;
+ void (*record)(zs_scanner_t *);
+ void (*error)(zs_scanner_t *);
++ void (*comment)(zs_scanner_t *);
+ void *data;
+ } process;
+ struct {
diff --git a/PKGBUILD b/PKGBUILD
index 4a253e18a64..ee3e6dac5f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=knot-resolver
pkgver=3.2.1
-pkgrel=1
+pkgrel=2
pkgdesc='full caching DNS resolver implementation'
url='https://www.knot-resolver.cz/'
arch=('x86_64' 'armv7h')
@@ -14,7 +14,7 @@ install=install
depends=('cmocka'
'dnssec-anchors'
'gnutls'
- 'knot>=2.7.2'
+ 'knot>=2.8'
'libedit'
'libsystemd'
'libuv'
@@ -22,11 +22,19 @@ depends=('cmocka'
'lua51-sec'
'lua51-socket'
'luajit')
-source=("https://secure.nic.cz/files/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+source=("https://secure.nic.cz/files/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ "01-compat-Knot-DNS-2.8.patch")
_makevars="PREFIX=/usr SBINDIR=/usr/bin LIBDIR=/usr/lib INCLUDEDIR=/usr/include ETCDIR=/etc/knot-resolver KEYFILE_DEFAULT=/etc/trusted-key.key V=1"
-sha256sums=('d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b')
+sha256sums=('d1396888ec3a63f19dccdf2b7dbcb0d16a5d8642766824b47f4c21be90ce362b'
+ 'SKIP')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/01-compat-Knot-DNS-2.8.patch"
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"