diff --git a/net/knot/Makefile b/net/knot/Makefile index 4ef28d1b6..675d1dad1 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=knot -PKG_VERSION:=2.6.8 +PKG_VERSION:=2.7.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-dns/ -PKG_HASH:=0daee8efd6262f10c54ee6f5fb99ca4d0f72e275513ec0902032af594cac1b15 +PKG_HASH:=8717c0f34e441e96bc32bc93b48333ea9c094c5075f91575e40ac30fcf6692df PKG_MAINTAINER:=Daniel Salzman -PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD MIT OLDAP-2.8 +PKG_LICENSE:=GPL-3.0 LGPL-2.0 0BSD BSD-3-Clause OLDAP-2.8 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_FIXUP:=autoreconf @@ -161,10 +161,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) - $(MAKE) -C $(PKG_BUILD_DIR)/libtap check - $(MAKE) -C $(PKG_BUILD_DIR)/src/dnssec/tests check-compile $(MAKE) -C $(PKG_BUILD_DIR)/tests check-compile - $(MAKE) -C $(PKG_BUILD_DIR)/src/zscanner check-compile endef define Build/InstallDev @@ -174,11 +171,11 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/libknot $(CP) $(PKG_INSTALL_DIR)/usr/include/libknot/* $(1)/usr/include/libknot/ - $(INSTALL_DIR) $(1)/usr/include/dnssec - $(CP) $(PKG_INSTALL_DIR)/usr/include/dnssec/* $(1)/usr/include/dnssec/ + $(INSTALL_DIR) $(1)/usr/include/libdnssec + $(CP) $(PKG_INSTALL_DIR)/usr/include/libdnssec/* $(1)/usr/include/libdnssec/ - $(INSTALL_DIR) $(1)/usr/include/zscanner - $(CP) $(PKG_INSTALL_DIR)/usr/include/zscanner/* $(1)/usr/include/zscanner/ + $(INSTALL_DIR) $(1)/usr/include/libzscanner + $(CP) $(PKG_INSTALL_DIR)/usr/include/libzscanner/* $(1)/usr/include/libzscanner/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/ @@ -238,25 +235,17 @@ define Package/knot-tests/install $(INSTALL_BIN) ./files/runtests.sh $(1)/usr/share/knot/ $(INSTALL_DIR) $(1)/usr/share/knot/tap - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libtap/runtests $(1)/usr/share/knot/tap/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/libtap/tap/libtap.sh $(1)/usr/share/knot/tap/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tests/tap/runtests $(1)/usr/share/knot/tap/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tests/tap/libtap.sh $(1)/usr/share/knot/tap/ $(INSTALL_DIR) $(1)/usr/share/knot/tests - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/.libs/zscanner-tool $(1)/usr/share/knot/tests/ - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/zscanner/tests/unittests $(1)/usr/share/knot/tests/test_zscanner - $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/zscanner/tests/TESTS $(1)/usr/share/knot/tests/ - cp -a $(PKG_BUILD_DIR)/src/zscanner/tests/data $(1)/usr/share/knot/tests/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tests/libzscanner/.libs/zscanner-tool $(1)/usr/share/knot/tests/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/tests/libzscanner/test_zscanner $(1)/usr/share/knot/tests/ + $(INSTALL_DATA) $(PKG_BUILD_DIR)/tests/libzscanner/TESTS $(1)/usr/share/knot/tests/ + cp -a $(PKG_BUILD_DIR)/tests/libzscanner/data $(1)/usr/share/knot/tests/ - find $(PKG_BUILD_DIR)/src/dnssec/tests -maxdepth 1 -executable -type f | \ - xargs -I{} basename {} | \ - xargs -I{} $(INSTALL_BIN) -T $(PKG_BUILD_DIR)/src/dnssec/tests/{} $(1)/usr/share/knot/tests/dnssec_test_{} - - find $(PKG_BUILD_DIR)/tests/.libs -maxdepth 1 -executable -type f | \ - xargs -I{} basename {} | \ - xargs -I{} $(INSTALL_BIN) -T $(PKG_BUILD_DIR)/tests/.libs/{} $(1)/usr/share/knot/tests/{} - - for module in contrib libknot modules utils; do \ + for module in contrib knot libdnssec libknot modules utils; do \ find $(PKG_BUILD_DIR)/tests/$$$${module}/.libs -maxdepth 1 -executable -type f | \ xargs -I{} basename {} | \ xargs -I{} $(INSTALL_BIN) -T $(PKG_BUILD_DIR)/tests/$$$${module}/.libs/{} \ diff --git a/net/knot/patches/01_zscanner_tests.patch b/net/knot/patches/01_zscanner_tests.patch index 7ea4cfdd8..fff1ec30c 100644 --- a/net/knot/patches/01_zscanner_tests.patch +++ b/net/knot/patches/01_zscanner_tests.patch @@ -1,17 +1,17 @@ -diff --git a/src/zscanner/tests/unittests.in b/src/zscanner/tests/unittests.in -index 9a4af53..f9b45bf 100644 ---- a/src/zscanner/tests/unittests.in -+++ b/src/zscanner/tests/unittests.in +diff --git a/tests/libzscanner/test_zscanner.in b/tests/libzscanner/test_zscanner.in +index 2c0c27526..72b2124c7 100644 +--- a/tests/libzscanner/test_zscanner.in ++++ b/tests/libzscanner/test_zscanner.in @@ -1,15 +1,14 @@ #!/bin/sh --SOURCE=@top_srcdir@/src/zscanner/tests --BUILD=@top_builddir@/src/zscanner/tests +-SOURCE=@top_srcdir@/tests/libzscanner +-BUILD=@top_builddir@/tests/libzscanner +SOURCE="." +BUILD="/tmp/knot-test" +mkdir -p "$BUILD" --. @top_srcdir@/libtap/tap/libtap.sh +-. @top_srcdir@/tests/tap/libtap.sh - -cd "$BUILD" +. ../tap/libtap.sh @@ -19,7 +19,7 @@ index 9a4af53..f9b45bf 100644 TMPDIR=$(test_tmpdir) TESTS_DIR="$SOURCE"/data -ZSCANNER_TOOL="$BUILD"/zscanner-tool -+ZSCANNER_TOOL=./zscanner-tool ++ZSCANNER_TOOL="$SOURCE"/zscanner-tool - plan 71 + plan 80 diff --git a/net/knot/patches/02_knot.conf.patch b/net/knot/patches/02_knot.conf.patch index 54ad80b75..8c626690e 100644 --- a/net/knot/patches/02_knot.conf.patch +++ b/net/knot/patches/02_knot.conf.patch @@ -1,24 +1,13 @@ diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in -index e07c8a7..8e057b0 100644 +index 10302f958..75082f537 100644 --- a/samples/knot.sample.conf.in +++ b/samples/knot.sample.conf.in -@@ -9,7 +9,7 @@ server: - # Listen on all configured IPv6 interfaces. - listen: ::@53 - # User for running the server. -- # user: knot:knot -+ user: knot:knot - - log: - # Log info and more serious events to syslog. -@@ -33,7 +33,9 @@ acl: - # action: notify - - template: --# - id: default -+ - id: default -+ max-journal-db-size: 20M -+ max-timer-db-size: 5M - # storage: "@storage_dir@" +@@ -30,6 +30,8 @@ template: + - id: default + storage: "@storage_dir@" + file: "%s.zone" ++ max-journal-db-size: 20M ++ max-timer-db-size: 5M zone: + # # Master zone