[PATCH] unbound: Update to 1.6.4

[PATCH] unbound: Update to 1.6.4

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 3861 bytes --]

Hi, ("...back in town...") ;-)

For details see:
http://www.unbound.net/download.html

I had to remove the patch file: it wouldn't apply.

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 config/rootfiles/common/unbound                    |  2 +-
 lfs/unbound                                        |  5 +--
 ...ting-validator-permissive-mode-at-runtime.patch | 43 ----------------------
 3 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch

diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index ee4b7fd5c..5d33140c8 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
 #usr/lib/libunbound.la
 #usr/lib/libunbound.so
 usr/lib/libunbound.so.2
-usr/lib/libunbound.so.2.5.2
+usr/lib/libunbound.so.2.5.3
 usr/sbin/unbound
 usr/sbin/unbound-anchor
 usr/sbin/unbound-checkconf
diff --git a/lfs/unbound b/lfs/unbound
index 1270b35c3..5046f45f3 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.6.3
+VER        = 1.6.4
 
 THISAPP    = unbound-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d964d04c8d2b25f3271ac60fc630b654
+$(DL_FILE)_MD5 = ab6f7c07610907f1d87191c9ac2db87a
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(subst %,%_MD5,$(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/unbound-allow-setting-validator-permissive-mode-at-runtime.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
diff --git a/src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch b/src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch
deleted file mode 100644
index f476d0803..000000000
--- a/src/patches/unbound-allow-setting-validator-permissive-mode-at-runtime.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/validator/validator.c b/validator/validator.c
-index 676dcdf..7c19f3d 100644
---- a/validator/validator.c
-+++ b/validator/validator.c
-@@ -113,7 +113,7 @@ val_apply_cfg(struct module_env* env, struct val_env* val_env,
- 	int c;
- 	val_env->bogus_ttl = (uint32_t)cfg->bogus_ttl;
- 	val_env->clean_additional = cfg->val_clean_additional;
--	val_env->permissive_mode = cfg->val_permissive_mode;
-+	val_env->permissive_mode = &cfg->val_permissive_mode;
- 	if(!env->anchors)
- 		env->anchors = anchors_create();
- 	if(!env->anchors) {
-@@ -170,7 +170,6 @@ val_init(struct module_env* env, int id)
- 	}
- 	env->modinfo[id] = (void*)val_env;
- 	env->need_to_validate = 1;
--	val_env->permissive_mode = 0;
- 	lock_basic_init(&val_env->bogus_lock);
- 	lock_protect(&val_env->bogus_lock, &val_env->num_rrset_bogus,
- 		sizeof(val_env->num_rrset_bogus));
-@@ -2084,7 +2083,7 @@ processFinished(struct module_qstate* qstate, struct val_qstate* vq,
- 			}
- 		}
- 		/* If we are in permissive mode, bogus gets indeterminate */
--		if(ve->permissive_mode)
-+		if(*ve->permissive_mode)
- 			vq->orig_msg->rep->security = sec_status_indeterminate;
- 	}
- 
-diff --git a/validator/validator.h b/validator/validator.h
-index 23d3072..f8464b8 100644
---- a/validator/validator.h
-+++ b/validator/validator.h
-@@ -104,7 +104,7 @@ struct val_env {
- 	 * This allows an operator to run validation 'shadow' without
- 	 * hurting responses to clients.
- 	 */
--	int permissive_mode;
-+	int* permissive_mode;
- 
- 	/**
- 	 * Number of entries in the NSEC3 maximum iteration count table.
-- 
2.14.1