blocklist: Rename blacklist to blocklist

Follow up upstream rename from blacklist to blocklist.

- Old names and rc scripts are still valid, but emitting an ugly warning
- Old firewall rules and anchor names should work, but emitting an ugly
  warning
- Old MK_BLACKLIST* knobs are wired to the new ones

Although care has been taken not to break current configurations, this
is a large patch containing mostly duplicated code.  If issues arise, it
will be swiftly reverted.

Reviewed by:	ivy (pkgbase)
Approved by:	emaste (mentor)
MFC after:	2 days
Relnotes:	yes

(cherry picked from commit 7238317403b95a8e35cf0bc7cd66fbd78ecbe521)

1 files changed, 5 insertions, 3 deletions

diff --git a/release/packages/ucl/blocklist-all.ucl b/release/packages/ucl/blocklist-all.ucl
index 92f304ac9151..273df85fc22b 100644
--- a/release/packages/ucl/blocklist-all.ucl
+++ b/release/packages/ucl/blocklist-all.ucl
@@ -19,12 +19,14 @@
 comment = "Network blocklist daemon"
 
 desc = <<EOD
-The blacklistd(8) daemon monitors failed access attempts from remote network
+The blocklistd(8) daemon monitors failed access attempts from remote network
 locations and automatically blocks the originating network address using the
 system packet filter.
 
-blacklistd(8) relies on each network daemon to report access attempts, so
-only daemons which have had blacklist support added will work.
+blocklistd(8) relies on each network daemon to report access attempts, so
+only daemons which have had blocklist support added will work.
+
+The blocklistd(8) daemon was previously named blacklistd(8).
 EOD
 
 annotations {