From 040d87a88c2e40b2d58604a06a316053a13fb054 Mon Sep 17 00:00:00 2001
From: Viktor G <viktor@netgate.com>
Date: Wed, 12 Aug 2020 18:11:07 +0300
Subject: [PATCH] BIND graceful shutdown. Fixes #10824

---
 dns/pfSense-pkg-bind/Makefile                     | 2 +-
 dns/pfSense-pkg-bind/files/usr/local/pkg/bind.inc | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dns/pfSense-pkg-bind/Makefile b/dns/pfSense-pkg-bind/Makefile
index 310c4b70ca1c..ad61ba212171 100644
--- a/dns/pfSense-pkg-bind/Makefile
+++ b/dns/pfSense-pkg-bind/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-bind
 PORTVERSION=	9.16
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	dns net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/dns/pfSense-pkg-bind/files/usr/local/pkg/bind.inc b/dns/pfSense-pkg-bind/files/usr/local/pkg/bind.inc
index d8dfd4799f5e..87868f73bbe3 100644
--- a/dns/pfSense-pkg-bind/files/usr/local/pkg/bind.inc
+++ b/dns/pfSense-pkg-bind/files/usr/local/pkg/bind.inc
@@ -904,6 +904,9 @@ function bind_write_rcfile() {
 		fi
 EOD;
 	$rc['stop'] = <<<EOD
+		{$BIND_LOCALBASE}/sbin/rndc -q -c "{$BIND_LOCALBASE}/etc/rndc.conf" sync -clean 2>/dev/null
+		{$BIND_LOCALBASE}/sbin/rndc -q -c "{$BIND_LOCALBASE}/etc/rndc.conf" stop -clean 2>/dev/null
+		sleep 5
 		/usr/bin/killall -TERM named 2>/dev/null
 		sleep 2
 EOD;
@@ -912,8 +915,11 @@ EOD;
 		if [ -z "`/bin/ps auxw | /usr/bin/grep "[n]amed " | /usr/bin/awk '{print $2}'`" ]; then
 			{$BIND_LOCALBASE}/sbin/named {$ip_version} -c /etc/namedb/named.conf -u bind -t /cf/named/
 		else
+			{$BIND_LOCALBASE}/sbin/rndc -q -c "{$BIND_LOCALBASE}/etc/rndc.conf" sync -clean 2>/dev/null
+			{$BIND_LOCALBASE}/sbin/rndc -q -c "{$BIND_LOCALBASE}/etc/rndc.conf" stop -clean 2>/dev/null
+			sleep 5
 			/usr/bin/killall -TERM named 2>/dev/null
-				sleep 3
+			sleep 3
 			{$BIND_LOCALBASE}/sbin/named {$ip_version} -c /etc/namedb/named.conf -u bind -t /cf/named/
 		fi
 EOD;