[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8ba78662899d1c445ceaeb4e5e7a3238dd75b339

[Michael Tremer <git@ipfire.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  8ba78662899d1c445ceaeb4e5e7a3238dd75b339 (commit)
      from  0f2c82ad7f6f3e55a67a9c09cb2cb4af15219c91 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8ba78662899d1c445ceaeb4e5e7a3238dd75b339
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Wed Jul 8 10:42:57 2026 +0000

    knot-resolver: Update to 6.4.0
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/knot-resolver              | 14 ++++----
 lfs/knot-resolver                                  |  5 ++-
 ...resolver-6.3-policy-add-flag-to-force-TCP.patch | 37 ----------------------
 3 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 src/patches/knot-resolver-6.3-policy-add-flag-to-force-TCP.patch

Difference in files:
diff --git a/config/rootfiles/common/knot-resolver b/config/rootfiles/common/knot-resolver
index a64cfd4ad..9d5a83460 100644
--- a/config/rootfiles/common/knot-resolver
+++ b/config/rootfiles/common/knot-resolver
@@ -109,13 +109,13 @@ usr/lib/knot-resolver/zonefile.lua
 usr/lib/libkres.so.9
 #usr/lib/pkgconfig/libkres.pc
 usr/lib/python3.10/site-packages/knot_resolver
-usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info
-usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info/PKG-INFO
-usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info/SOURCES.txt
-usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info/dependency_links.txt
-usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info/entry_points.txt
-usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info/requires.txt
-usr/lib/python3.10/site-packages/knot_resolver-6.3.0-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/knot_resolver-6.4.0-py3.10.egg-info
+usr/lib/python3.10/site-packages/knot_resolver-6.4.0-py3.10.egg-info/PKG-INFO
+usr/lib/python3.10/site-packages/knot_resolver-6.4.0-py3.10.egg-info/SOURCES.txt
+usr/lib/python3.10/site-packages/knot_resolver-6.4.0-py3.10.egg-info/dependency_links.txt
+usr/lib/python3.10/site-packages/knot_resolver-6.4.0-py3.10.egg-info/entry_points.txt
+usr/lib/python3.10/site-packages/knot_resolver-6.4.0-py3.10.egg-info/requires.txt
+usr/lib/python3.10/site-packages/knot_resolver-6.4.0-py3.10.egg-info/top_level.txt
 #usr/lib/python3.10/site-packages/knot_resolver/__init__.py
 #usr/lib/python3.10/site-packages/knot_resolver/client
 #usr/lib/python3.10/site-packages/knot_resolver/client/__init__.py
diff --git a/lfs/knot-resolver b/lfs/knot-resolver
index 6bcfd6820..14ce5eb7c 100644
--- a/lfs/knot-resolver
+++ b/lfs/knot-resolver
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 6.3.0
+VER        = 6.4.0
 
 THISAPP    = knot-resolver-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 5745be9d031d58e7a9175d29307fb7453b76a6ef65a3b9970b9e5c256a38b2f13e5f4eb5bd126c44e4263b5dbebef2f5addf9c495c80e4a8d4ebe5c2169c0a9c
+$(DL_FILE)_BLAKE2 = dbe67ea0ad3484aba912406f960568c2c92630910863eaf33aeba9b15dce0279810a7df8844aa7d5617f1055de957445042a80c7479972f185bbfff457e96e1d
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/knot-resolver-6.3-policy-add-flag-to-force-TCP.patch
 	cd $(DIR_APP) && meson setup \
 		--prefix=/usr \
 		-Duser=knot-resolver \
diff --git a/src/patches/knot-resolver-6.3-policy-add-flag-to-force-TCP.patch b/src/patches/knot-resolver-6.3-policy-add-flag-to-force-TCP.patch
deleted file mode 100644
index f19d5d3bb..000000000
--- a/src/patches/knot-resolver-6.3-policy-add-flag-to-force-TCP.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5a936de58bc68f6004f6beb5abbb7b7724c6320f Mon Sep 17 00:00:00 2001
-From: Michael Tremer <michael.tremer@ipfire.org>
-Date: Wed, 27 May 2026 11:41:27 +0000
-Subject: [PATCH] policy: Add flag to force TCP as transport
-
-This is already implemented in the backend, but the flag has not been
-exposed. This patch adds the flag so that any forwarders will be
-connected to using TCP.
-
-Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
----
- modules/policy/policy.lua | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules/policy/policy.lua b/modules/policy/policy.lua
-index 77fa29a71..88e235a8b 100644
---- a/modules/policy/policy.lua
-+++ b/modules/policy/policy.lua
-@@ -914,6 +914,7 @@ Throws lua exceptions when detecting something fishy.
-       i.e. we trust their DNSSEC validation.
-     - for auths this inserts a negative trust anchor
-       Beware that setting .set_insecure() *later* would override that.
-+  .tcp to force transport over TCP
- \param targets same format as policy.TLS_FORWARD() except that `tls = true`
-                can be specified for each address (defaults to false)
- --]]
-@@ -924,6 +925,7 @@ function policy.rule_forward_add(subtree, options, targets)
- 			{
- 				is_nods = options.dnssec == false,
- 				is_auth = options.auth,
-+				is_tcp  = options.tcp
- 			},
- 			targets_3
- 		) == 0)
--- 
-2.47.3
-


hooks/post-receive
--
IPFire 2.x development tree