From 5f9b8c70fe3086eb9c9792940d8c1d79cb418adc Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 29 Jun 2023 09:20:04 +0200
Subject: [PATCH] unbound: cleanup old files

---
 plist                                         | 1 -
 src/etc/unbound.opnsense.d/miscellaneous.conf | 1 -
 src/opnsense/scripts/unbound/start.sh         | 3 ---
 src/www/interfaces.php                        | 2 +-
 4 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 src/etc/unbound.opnsense.d/miscellaneous.conf

diff --git a/plist b/plist
index 363dfbb29..d3bfc00f9 100644
--- a/plist
+++ b/plist
@@ -147,7 +147,6 @@
 /usr/local/etc/ssl/opnsense.cnf
 /usr/local/etc/strongswan.opnsense.d/README
 /usr/local/etc/unbound.opnsense.d/README
-/usr/local/etc/unbound.opnsense.d/miscellaneous.conf
 /usr/local/libexec/opnsense-auth
 /usr/local/opnsense/contrib/IXR/IXR_Library.php
 /usr/local/opnsense/contrib/base32/Base32.php
diff --git a/src/etc/unbound.opnsense.d/miscellaneous.conf b/src/etc/unbound.opnsense.d/miscellaneous.conf
deleted file mode 100644
index b526292fc..000000000
--- a/src/etc/unbound.opnsense.d/miscellaneous.conf
+++ /dev/null
@@ -1 +0,0 @@
-# obsolete include file, last used in 22.7
diff --git a/src/opnsense/scripts/unbound/start.sh b/src/opnsense/scripts/unbound/start.sh
index c7a342c28..04b7691b9 100755
--- a/src/opnsense/scripts/unbound/start.sh
+++ b/src/opnsense/scripts/unbound/start.sh
@@ -58,9 +58,6 @@ for FILE in $(find /usr/local/etc/unbound.opnsense.d -depth 1 -name '*.conf'); d
 	cp ${FILE} /var/unbound/etc/
 done
 
-# XXX remove obsolete file, last used in 22.7
-rm -f /usr/local/etc/unbound.opnsense.d/dnsbl.conf
-
 chown -R unbound:unbound /var/unbound
 
 /usr/local/sbin/unbound -c /var/unbound/unbound.conf
diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index e54642b43..1e3edf718 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -1949,7 +1949,7 @@ include("head.inc");
                                   'MAC address in the following format: xx:xx:xx:xx:xx:xx or leave blank if unsure. ' .
                                   'This may only be required e.g. with certain cable connections on a WAN interface.') ?><br />
                               <?= gettext('When used on a single VLAN interface the setting "Promiscuous mode" is required for this to work. ' .
-                                  'Alternatively, the parent interface MAC can be spoofed applying the MAC it to all attached VLAN children automatically.') ?><br />
+                                  'Alternatively, the parent interface MAC can be spoofed applying the MAC address to all attached VLAN children automatically.') ?><br />
 <?php
                               $ip = getenv('REMOTE_ADDR');
                               $mac = `/usr/sbin/arp -an | grep {$ip} | cut -d" " -f4`;