X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Funbound;h=ac0c8fd57a0396461ca782967bb1433d60cc37ef;hp=5065048efe71ab5f00f8447c63cd88048cbea957;hb=ba5dccd0081de56edc7218239f2266243baf3c51;hpb=0fbd7c3c81ca0740cf8e6f4c47253ff4dd48e7df

diff --git a/lfs/unbound b/lfs/unbound
index 5065048efe..ac0c8fd57a 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.5.9
+VER        = 1.7.1
 
 THISAPP    = unbound-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0cefa62c1690b4db18583db84bff00e3
+$(DL_FILE)_MD5 = e3614d9746e1fd45f191a2b88ad8df04
 
 install : $(TARGET)
 
@@ -77,14 +77,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 			--with-pidfile=/var/run/unbound.pid \
 			--with-rootkey-file=/var/lib/unbound/root.key \
 			--disable-static \
-			--with-libevent
+			--with-libevent \
+			--enable-event-api \
+			ac_cv_func_getentropy=no
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	# add ipfire config
-	mkdir -pv /etc/unbound/blocklists
-	mv -v /etc/unbound/unbound.conf /etc/unbound/unbound_org.conf
-	install -v -m 644 $(DIR_SRC)/config/unbound/*.conf /etc/unbound/
-	install -v -m 644 $(DIR_SRC)/config/unbound/root.hints /etc/unbound/
+
+	# Install configuration
+	install -v -m 644 $(DIR_SRC)/config/unbound/unbound.conf \
+		/etc/unbound/unbound.conf
+	touch /etc/unbound/{dhcp-leases,forward}.conf
+	-mkdir -pv /etc/unbound/local.d
+
+	# Install root hints
+	install -v -m 644 $(DIR_SRC)/config/unbound/root.hints \
+		/etc/unbound/root.hints
 
 	# Install DHCP leases bridge
 	install -v -m 755 $(DIR_SRC)/config/unbound/unbound-dhcp-leases-bridge \