From 2c405584b852dc49806a7547511a88e2fd229b93 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 2 May 2014 12:17:03 +0200
Subject: [PATCH] bind: Update to 9.9.5.

Enable DNSSEC.
---
 config/bind/trusted-key.key  |  1 +
 config/rootfiles/common/bind |  9 +++++----
 lfs/bind                     | 16 +++++++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 config/bind/trusted-key.key

diff --git a/config/bind/trusted-key.key b/config/bind/trusted-key.key
new file mode 100644
index 0000000000..ea07836252
--- /dev/null
+++ b/config/bind/trusted-key.key
@@ -0,0 +1 @@
+. 3600 IN DNSKEY 257 3 8 AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjFFVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoXbfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaDX6RS6CXpoY68LsvPVjR0ZSwzz1apAzvN9dlzEheX7ICJBBtuA6G3LQpzW5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relSQageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulqQxA+Uk1ihz0=
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index df668534b9..303c5b8287 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -1,8 +1,9 @@
+etc/trusted-key.key
 usr/bin/dig
 usr/bin/host
 usr/bin/nslookup
 usr/bin/nsupdate
-#usr/man/man1/dig.1
-#usr/man/man1/host.1
-#usr/man/man1/nslookup.1
-#usr/man/man8/nsupdate.8
+#usr/share/man/man1/dig.1
+#usr/share/man/man1/host.1
+#usr/share/man/man1/nslookup.1
+#usr/share/man/man1/nsupdate.1
diff --git a/lfs/bind b/lfs/bind
index 0223358822..36b234058f 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 9.3.2
+VER        = 9.9.5
 
 THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,6 +33,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+export CPPFLAGS = -DDIG_SIGCHASE
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -41,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 55e709501a7780233c36e25ccd15ece2
+$(DL_FILE)_MD5 = e676c65cad5234617ee22f48e328c24e
 
 install : $(TARGET)
 
@@ -71,7 +73,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --disable-ipv6
+	cd $(DIR_APP) && STD_CDEFINES="$(CPPFLAGS)" \
+		./configure \
+			--prefix=/usr \
+			--disable-static \
+			--disable-openssl-version-check
 	cd $(DIR_APP) && make -C lib/dns
 	cd $(DIR_APP) && make -C lib/isc
 	cd $(DIR_APP) && make -C lib/bind9
@@ -81,5 +87,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make -C bin/dig install
 	cd $(DIR_APP) && make -C bin/nsupdate
 	cd $(DIR_APP) && make -C bin/nsupdate install
+
+	install -v -m 644 $(DIR_SRC)/config/bind/trusted-key.key \
+		/etc/trusted-key.key
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.39.2