From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 18 Mar 2019 04:38:41 +0000 (+0000)
Subject: dnsdist: Update to 1.3.3
X-Git-Tag: v2.23-core131~92
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf

dnsdist: Update to 1.3.3

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/dnsdist b/lfs/dnsdist
index e49b0fb4e3..5963c5acd5 100644
--- a/lfs/dnsdist
+++ b/lfs/dnsdist
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.0.498gac688af
+VER        = 1.3.3
 
 THISAPP    = dnsdist-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,11 +33,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
 PROG       = dnsdist
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
-MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 512)))
+MAX_PARALLELISM = $(shell echo $$(( $(SYSTEM_MEMORY) / 1024)))
 
 ###############################################################################
 # Top-level Rules
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b1bc53b3a35aef7006b74086919847bf
+$(DL_FILE)_MD5 = 6bbcdf5296ac5303e88d779d1d57a4df
 
 install : $(TARGET)
 
@@ -80,7 +80,14 @@ $(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) && ./configure --prefix=/usr --sysconfdir=/etc
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--enable-openssl \
+		--disable-gnutls \
+		--with-lua \
+		--without-net-snmp
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
diff --git a/src/initscripts/packages/dnsdist b/src/initscripts/packages/dnsdist
index 03e6ab81bd..a70bd38067 100644
--- a/src/initscripts/packages/dnsdist
+++ b/src/initscripts/packages/dnsdist
@@ -14,7 +14,8 @@
 case "${1}" in
 	start)
 		boot_mesg "Starting dnsdist..."
-		loadproc /usr/bin/dnsdist -d ${ARGS}
+		/usr/bin/dnsdist --supervised ${ARGS} >/dev/null &
+		evaluate_retval
 		;;
 
 	stop)