Merge branch 'dnsmasq-dnssec' into next

2026-04-28 11:43:25 +02:00 · 2014-07-08 10:52:36 +02:00
parent 9cf4a7f418 b66edc18d7
commit 281f18fcb9
11 changed files with 736 additions and 27 deletions
--- 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)
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -24,14 +24,16 @@

 include Config

-VER        = 2.45
+VER        = 2.71

 THISAPP    = dnsmasq-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

+COPTS      = -DHAVE_ISC_READER
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = b7956e15c9766e05b3eca3ce88fdb616
+$(DL_FILE)_MD5 = 9e2e4d59c75e71ee3ca817ff0f9be69e

 install : $(TARGET)

@@ -69,13 +71,18 @@ $(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) && sed -i -e 's|/usr/local|/usr|g' Makefile
-	cd $(DIR_APP)/src && sed -i \
-		-e 's|^\/\* #define HAVE_ISC_READER .*$$|#define HAVE_ISC_READER\n#define NO_IPV6|' \
-		-e 's|^#define HAVE_TFTP *$$|//#define HAVE_TFTP|' \
-		-e 's/^#define CHUSER .*$$/#define CHUSER "dnsmasq"/' config.h
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-2.71-use-nettle-with-minigmp.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-2.71-support-nettle-3.0.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-2.70-Add-support-to-read-ISC-DHCP-lease-file.patch
+	cd $(DIR_APP) && sed -i src/config.h \
+		-e 's|/\* #define HAVE_IDN \*/|#define HAVE_IDN|g' \
+		-e 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' \
+		-e 's|#define HAVE_DHCP|//#define HAVE_DHCP|g' \
+		-e 's|#define HAVE_DHCP6|//#define HAVE_DHCP6|g' \
+		-e 's|#define HAVE_TFTP|//#define HAVE_TFTP|g'
+
+	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" COPTS="$(COPTS)" $(MAKETUNING)
+	cd $(DIR_APP) && make PREFIX=/usr install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/nettle
+++ b/lfs/nettle
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 3.0
+
+THISAPP    = nettle-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = f64b1bf1e774b7ae6e507318e340250e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--enable-shared
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)