aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2024-05-10 20:48:53 +0000
committerCy Schubert <cy@FreeBSD.org>2024-05-10 20:48:53 +0000
commitc2a80056864d6eda0398fd127dc0ae515b39752b (patch)
tree92e6196ae61df0fa7e4db654f78dfd837cc41826 /contrib
parent5a33598e88ad8fbc0affa74dee0a2d8cc4010fbc (diff)
downloadsrc-c2a80056864d6eda0398fd127dc0ae515b39752b.tar.gz
src-c2a80056864d6eda0398fd127dc0ae515b39752b.zip
unbound: Vendor import 1.20.0vendor/unbound/1.20.0vendor/unbound
Release notes at https://www.nlnetlabs.nl/news/2024/May/08/unbound-1.20.0-released/ Security: The DNSBomb vulnerability CVE-2024-33655
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/rc_d_unbound9
-rw-r--r--contrib/unbound.init1
-rw-r--r--contrib/unbound.init_fedora1
-rw-r--r--contrib/unbound.init_yocto1
4 files changed, 12 insertions, 0 deletions
diff --git a/contrib/rc_d_unbound b/contrib/rc_d_unbound
index 56516147f230..9d98c5e059ae 100755
--- a/contrib/rc_d_unbound
+++ b/contrib/rc_d_unbound
@@ -22,4 +22,13 @@ pidfile=${unbound_pidfile:-"/usr/local/etc/unbound/unbound.pid"}
command_args=${unbound_flags:-"-c /usr/local/etc/unbound/unbound.conf"}
extra_commands="reload"
+if test "$1" = "stop" ; then
+ run_rc_command "$1"
+ ret=$?
+ if test $ret -eq 0; then
+ rm -f "$pidfile"
+ fi
+ exit $ret
+fi
+
run_rc_command "$1"
diff --git a/contrib/unbound.init b/contrib/unbound.init
index c5bb52bb4d69..70ab0134e827 100644
--- a/contrib/unbound.init
+++ b/contrib/unbound.init
@@ -75,6 +75,7 @@ stop() {
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
+ [ $retval -eq 0 ] && rm -f $pidfile
if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
umount ${rootdir}/dev/log >/dev/null 2>&1
fi;
diff --git a/contrib/unbound.init_fedora b/contrib/unbound.init_fedora
index 989440341989..75856777fb8f 100644
--- a/contrib/unbound.init_fedora
+++ b/contrib/unbound.init_fedora
@@ -58,6 +58,7 @@ stop() {
killproc -p $pidfile unbound
retval=$?
[ $retval -eq 0 ] && rm -f $lockfile
+ [ $retval -eq 0 ] && rm -f $pidfile
for mountfile in /dev/log /dev/urandom /etc/localtime /etc/resolv.conf /var/run/unbound
do
if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}''${mountfile}'' /proc/mounts; then
diff --git a/contrib/unbound.init_yocto b/contrib/unbound.init_yocto
index 4eba752bc55c..e1a812448274 100644
--- a/contrib/unbound.init_yocto
+++ b/contrib/unbound.init_yocto
@@ -75,6 +75,7 @@ stop() {
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
+ [ $retval -eq 0 ] && rm -f $pidfile
if egrep -q '^/[^[:space:]]+[[:space:]]+'${rootdir}'/dev/log' /proc/mounts; then
umount ${rootdir}/dev/log >/dev/null 2>&1
fi;