Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

knot-resolver: update to version 5.7.4 #24998

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions net/knot-resolver/Config.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
menu "Configuration"
config PACKAGE_knot-resolver_dnstap
bool "Build with dnstap support"
default y
help
knot-resolver dnstap module supports logging DNS responses
to a unix socket in dnstap format using fstrm framing library.
This logging is useful if you need effectivelly log all
DNS traffic.
The unix socket and the socket reader must be present before
starting resolver instances.
endmenu
if PACKAGE_knot-resolver

config KNOT_RESOLVER_DNSTAP
bool "Build with dnstap support"
default y
help
knot-resolver dnstap module supports logging DNS responses
to a unix socket in dnstap format using fstrm framing library.
This logging is useful if you need effectivelly log all
DNS traffic.
The unix socket and the socket reader must be present before
starting resolver instances.
endif
17 changes: 11 additions & 6 deletions net/knot-resolver/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2015-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
# Copyright (C) 2015-2024 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
Expand All @@ -10,17 +10,22 @@ PKG_RELRO_FULL:=0
include $(TOPDIR)/rules.mk

PKG_NAME:=knot-resolver
PKG_VERSION:=5.7.1
PKG_VERSION:=5.7.4
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://secure.nic.cz/files/knot-resolver
PKG_HASH:=da14b415c61d53747a991f12d6209367ef826a13dc6bf4eeaf5d88760294c3a2
PKG_HASH:=6b6da6ecf06828041afad44dfa227781f0ae34ad183a667008509355d18bd9c8

PKG_MAINTAINER:=Jan Pavlinec <[email protected]>
PKG_LICENSE:=GPL-3.0-later
PKG_LICENSE_FILES:=COPYING

PKG_CONFIG_DEPENDS := \
CONFIG_KNOT_RESOLVER_DNSTAP

PKG_BUILD_DEPENDS += KNOT_RESOLVER_DNSTAP:libprotobuf

include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/meson.mk

Expand All @@ -40,8 +45,8 @@ define Package/knot-resolver
+libstdcpp \
+libnghttp2 \
+lmdb \
PACKAGE_knot-resolver_dnstap:libfstrm \
PACKAGE_knot-resolver_dnstap:libprotobuf-c
KNOT_RESOLVER_DNSTAP:libfstrm \
KNOT_RESOLVER_DNSTAP:libprotobuf-c
USERID:=kresd=3536:kresd=3536
endef

Expand All @@ -55,7 +60,7 @@ define Package/knot-resolver/config
endef

MESON_ARGS+= \
$(if $(CONFIG_PACKAGE_knot-resolver_dnstap), -Ddnstap=enabled,-Ddnstap=disabled) \
$(if $(CONFIG_KNOT_RESOLVER_DNSTAP), -Ddnstap=enabled,-Ddnstap=disabled) \
-Dcapng=disabled \
-Dclient=disabled \
-Dconfig_tests=disabled \
Expand Down
Loading