[prev in list] [next in list] [prev in thread] [next in thread]
List: ipfire-scm
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fd0b2742bf217cbacacd4725a2bd9ad4
From: Michael Tremer <git () ipfire ! org>
Date: 2019-03-20 19:02:02
Message-ID: 20190320190203.DFBAF84FDB0 () people01 ! i ! ipfire ! org
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf (commit)
via aac6015042e28730982d643425f768f46dc9c603 (commit)
via 5b8ff1ccb6506942485ff221e13d163691109a6c (commit)
from af2dc11c921062608c4537368885eb195f54c177 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fd0b2742bf217cbacacd4725a2bd9ad4ec1b6aaf
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon Mar 18 04:38:41 2019 +0000
dnsdist: Update to 1.3.3
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit aac6015042e28730982d643425f768f46dc9c603
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon Mar 18 02:54:37 2019 +0000
dnsdist: Install some symlinks to start the service
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 5b8ff1ccb6506942485ff221e13d163691109a6c
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon Mar 18 02:54:15 2019 +0000
dnsdist: Add backup include
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/dnsdist | 1 +
config/rootfiles/packages/dnsdist | 3 ++-
lfs/dnsdist | 20 +++++++++++++++-----
src/initscripts/packages/dnsdist | 3 ++-
src/paks/{bird => dnsdist}/install.sh | 11 +++--------
src/paks/{nginx => dnsdist}/uninstall.sh | 8 ++++++--
src/paks/{apcupsd => dnsdist}/update.sh | 0
7 files changed, 29 insertions(+), 17 deletions(-)
create mode 100644 config/backup/includes/dnsdist
copy src/paks/{bird => dnsdist}/install.sh (89%)
copy src/paks/{nginx => dnsdist}/uninstall.sh (97%)
copy src/paks/{apcupsd => dnsdist}/update.sh (100%)
Difference in files:
diff --git a/config/backup/includes/dnsdist b/config/backup/includes/dnsdist
new file mode 100644
index 000000000..8d9b82584
--- /dev/null
+++ b/config/backup/includes/dnsdist
@@ -0,0 +1 @@
+/etc/dnsdist.conf
diff --git a/config/rootfiles/packages/dnsdist b/config/rootfiles/packages/dnsdist
index ba7381f34..3ccb1260c 100644
--- a/config/rootfiles/packages/dnsdist
+++ b/config/rootfiles/packages/dnsdist
@@ -1,3 +1,4 @@
+etc/rc.d/init.d/dnsdist
usr/bin/dnsdist
#usr/share/man/man1/dnsdist.1
-etc/rc.d/init.d/dnsdist
+var/ipfire/backup/addons/includes/dnsdist
diff --git a/lfs/dnsdist b/lfs/dnsdist
index 3e10c9eb2..5963c5acd 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,13 +80,23 @@ $(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
#install initscripts
$(call INSTALL_INITSCRIPT,dnsdist)
+ install -v -m 644 $(DIR_SRC)/config/backup/includes/dnsdist \
+ /var/ipfire/backup/addons/includes/dnsdist
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/initscripts/packages/dnsdist b/src/initscripts/packages/dnsdist
index 03e6ab81b..a70bd3806 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)
diff --git a/src/paks/dnsdist/install.sh b/src/paks/dnsdist/install.sh
new file mode 100644
index 000000000..74966d643
--- /dev/null
+++ b/src/paks/dnsdist/install.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_files
+
+restore_backup "${NAME}"
+
+start_service "${NAME}"
+
+# Enable autostart
+ln -sf ../init.d/dnsdist /etc/rc.d/rc0.d/K25dnsdist
+ln -sf ../init.d/dnsdist /etc/rc.d/rc3.d/S35dnsdist
+ln -sf ../init.d/dnsdist /etc/rc.d/rc6.d/K25dnsdist
diff --git a/src/paks/dnsdist/uninstall.sh b/src/paks/dnsdist/uninstall.sh
new file mode 100644
index 000000000..966c525c4
--- /dev/null
+++ b/src/paks/dnsdist/uninstall.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+extract_backup_includes
+
+stop_service ${NAME}
+
+make_backup ${NAME}
+
+remove_files
+
+rm -rfv /etc/rc.d/rc*.d/*dnsdist
diff --git a/src/paks/dnsdist/update.sh b/src/paks/dnsdist/update.sh
new file mode 100644
index 000000000..89c40d0d7
--- /dev/null
+++ b/src/paks/dnsdist/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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 #
+# (at your option) any later version. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
hooks/post-receive
--
IPFire 2.x development tree
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
https://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic