X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbind;h=8b04037b7bebf1d5d32867cf1c7b2f0e5ec39300;hb=924b48c7890ef573c1400474ef92951fb9cf3ded;hp=908ce38241d005b01d0dc3c4359bdf8ac8bae3f3;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/bind b/lfs/bind
index 908ce38241..8b04037b7b 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -1,45 +1,40 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: bind,v 1.3.2.5 2005/04/13 23:52:04 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
+
 ###############################################################################
 # Definitions
 ###############################################################################
 
 include Config
 
-VER        = 9.2.5
+VER        = 9.11.4-P1
 
 THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = ftp://ftp.isc.org/isc/bind9/$(VER)
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+export CPPFLAGS = -DDIG_SIGCHASE
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -48,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 35a265fb97a068c066e22306ea32fd1f
+$(DL_FILE)_MD5 = b2c54d6c2003b693388041fd109e8b6b
 
 install : $(TARGET)
 
@@ -78,13 +73,23 @@ $(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
-	cd $(DIR_APP)/lib/isc && make
-	cd $(DIR_APP)/lib/dns && make
-	cd $(DIR_APP)/lib/lwres && make
-	cd $(DIR_APP)/bin/nsupdate && make
-	cd $(DIR_APP)/bin/dig && make
-	cd $(DIR_APP) && install -m 0755 bin/nsupdate/nsupdate /usr/bin
-	cd $(DIR_APP) && install -m 0755 bin/dig/host /usr/bin
+	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
+	cd $(DIR_APP) && make -C lib/isccfg
+	cd $(DIR_APP) && make -C lib/lwres
+	cd $(DIR_APP) && make -C bin/dig
+	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)