diff options
| author | tcely <tcely@users.noreply.github.com> | 2019-03-06 10:00:47 -0500 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-03-27 20:09:41 +0000 |
| commit | e67e546684946711bb2248ae598fa622f3bcdddd (patch) | |
| tree | aa224f16d01d776c39b87a7d9ed618f380f67e18 /testing | |
| parent | e08629ecd5f5fab2e097de7c3f72ce8882b5218e (diff) | |
| download | aports-e67e546684946711bb2248ae598fa622f3bcdddd.tar.bz2 aports-e67e546684946711bb2248ae598fa622f3bcdddd.tar.xz | |
testing/knot-resolver: patch for knot-2.8.0 breaking change
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/knot-resolver/APKBUILD | 9 | ||||
| -rw-r--r-- | testing/knot-resolver/knot-2.8.0-compat.patch | 25 |
2 files changed, 29 insertions, 5 deletions
diff --git a/testing/knot-resolver/APKBUILD b/testing/knot-resolver/APKBUILD index 85c6913622..b64edfbdf0 100644 --- a/testing/knot-resolver/APKBUILD +++ b/testing/knot-resolver/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: tcely <knot-resolver+aports@tcely.33mail.com> pkgname=knot-resolver pkgver=3.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="Minimalistic caching DNS resolver implementation" url="https://www.knot-resolver.cz/" # luajit is not available for disabled arches @@ -14,7 +14,7 @@ depends="lua5.1-sec lua5.1-socket" depends_dnstap="" depends_dnstap_dev="fstrm-dev protobuf-c-dev" depends_http="$pkgname lua5.1-http" -depends_dev="knot-dev>=2.7.2 libedit-dev libuv-dev luajit-dev $depends_dnstap_dev" +depends_dev="knot-dev>=2.8.0 libedit-dev libuv-dev luajit-dev $depends_dnstap_dev" makedepends="$depends_dev bash dnssec-root vim" checkdepends="cmocka-dev" install="$pkgname.pre-install" @@ -23,6 +23,7 @@ source="https://secure.nic.cz/files/$pkgname/$pkgname-$pkgver.tar.xz $pkgname.initd $pkgname.confd $pkgname.logrotate + knot-2.8.0-compat.patch config" # secfixes: @@ -33,17 +34,14 @@ _flags="PREFIX=/usr ETCDIR=/etc/$pkgname" build() { - cd "$builddir" make $_flags } check() { - cd "$builddir" make $_flags -j1 check } package() { - cd "$builddir" make $_flags DESTDIR="$pkgdir" install cd "$pkgdir" @@ -88,4 +86,5 @@ sha512sums="2ed79176183a685bf6365081706e68e4add05965a5f53a6f38ae4a5c204d29952eaf 0e9b947ed0fe39a600ba8fe3cdeacf07521cdd6c371007dd15524f67c75ea024994a8c11820d70c57ef180c90f492eae69ef167152ad84c24a47c885710a7974 knot-resolver.initd 9d0d629405df243dc0f782abd6fcaaaf13fbce78d881f7ce213cfd2a55cfbfd87af2ba976061bf7b5d3d055edec98b42632395390f2a469648c27f96124997a6 knot-resolver.confd 688aeacb0c1f21c7e532533b402e67068897217713fb668636df7533000b493981ddfa0497f8dba7da7c804ee4ab8d587a4f52155b4e2bf1f4025d2588d314bb knot-resolver.logrotate +ea10749307aa23341daf7bb77652300b8c78537fc2fa7c084d3e1e618b0ee11873c056b328bd760673d8fdf45c2f3106861fcf0ac4e8090643516419062fcf0f knot-2.8.0-compat.patch 913a557dde84e9dac7c7300ab093285865fa57f3875fc357e680f04a0e85af6610a0e33da6262431cbb06a2c5a115952e742e48c8568d4eb82182906170b4a73 config" diff --git a/testing/knot-resolver/knot-2.8.0-compat.patch b/testing/knot-resolver/knot-2.8.0-compat.patch new file mode 100644 index 0000000000..05363468f2 --- /dev/null +++ b/testing/knot-resolver/knot-2.8.0-compat.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile b/Makefile +index 82221e99156d6042e22d2ecbae6558c41c1253c7..145555a4d8bfac4d052bef1074b092ab39ef168a 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,7 @@ lint-lua: $(patsubst %.lua.in,%.lua,$(wildcard */*/*.lua.in)) + .PHONY: all install check clean doc info lint + + # Dependencies +-KNOT_MINVER := 2.7.2 ++KNOT_MINVER := 2.8.0 + $(eval $(call find_lib,libknot,$(KNOT_MINVER),yes)) + $(eval $(call find_lib,libdnssec,$(KNOT_MINVER),yes)) + $(eval $(call find_lib,libzscanner,$(KNOT_MINVER),yes)) +diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua +index 5e40a610283f60456763859cac45139cfd29f74f..3d5345f7b68870d34297f7729d8a26a9264277d1 100644 +--- a/daemon/lua/kres-gen.lua ++++ b/daemon/lua/kres-gen.lua +@@ -395,6 +395,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 { |