[Midnightbsd-cvs] [MidnightBSD/src] 8ea44c: Rename blacklist to blocklist, following upstream ...

Lucas Holt noreply at github.com
Tue Sep 22 15:08:18 EDT 2026 

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 8ea44c495b9ef689eec35ee02121b5fcfd40fc50
      https://github.com/MidnightBSD/src/commit/8ea44c495b9ef689eec35ee02121b5fcfd40fc50
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2026-09-22 (Tue, 22 Sep 2026)

  Changed paths:
    M UPDATING
    R contrib/blacklist/Makefile
    R contrib/blacklist/Makefile.inc
    R contrib/blacklist/README
    R contrib/blacklist/TODO
    R contrib/blacklist/bin/Makefile
    R contrib/blacklist/bin/blacklistctl.8
    R contrib/blacklist/bin/blacklistctl.c
    R contrib/blacklist/bin/blacklistd.8
    R contrib/blacklist/bin/blacklistd.c
    R contrib/blacklist/bin/blacklistd.conf.5
    R contrib/blacklist/bin/conf.c
    R contrib/blacklist/bin/conf.h
    R contrib/blacklist/bin/internal.c
    R contrib/blacklist/bin/internal.h
    R contrib/blacklist/bin/run.c
    R contrib/blacklist/bin/run.h
    R contrib/blacklist/bin/state.c
    R contrib/blacklist/bin/state.h
    R contrib/blacklist/bin/support.c
    R contrib/blacklist/bin/support.h
    R contrib/blacklist/diff/ftpd.diff
    R contrib/blacklist/diff/named.diff
    R contrib/blacklist/diff/proftpd.diff
    R contrib/blacklist/diff/ssh.diff
    R contrib/blacklist/etc/Makefile
    R contrib/blacklist/etc/blacklistd.conf
    R contrib/blacklist/etc/npf.conf
    R contrib/blacklist/etc/rc.d/Makefile
    R contrib/blacklist/etc/rc.d/blacklistd
    R contrib/blacklist/include/Makefile
    R contrib/blacklist/include/bl.h
    R contrib/blacklist/include/blacklist.h
    R contrib/blacklist/lib/Makefile
    R contrib/blacklist/lib/bl.c
    R contrib/blacklist/lib/blacklist.c
    R contrib/blacklist/lib/libblacklist.3
    R contrib/blacklist/lib/shlib_version
    R contrib/blacklist/libexec/Makefile
    R contrib/blacklist/libexec/blacklistd-helper
    R contrib/blacklist/port/Makefile.am
    R contrib/blacklist/port/_strtoi.h
    R contrib/blacklist/port/clock_gettime.c
    R contrib/blacklist/port/config.h
    R contrib/blacklist/port/configure.ac
    R contrib/blacklist/port/fgetln.c
    R contrib/blacklist/port/fparseln.c
    R contrib/blacklist/port/getprogname.c
    R contrib/blacklist/port/m4/.cvsignore
    R contrib/blacklist/port/pidfile.c
    R contrib/blacklist/port/popenve.c
    R contrib/blacklist/port/port.h
    R contrib/blacklist/port/sockaddr_snprintf.c
    R contrib/blacklist/port/strlcat.c
    R contrib/blacklist/port/strlcpy.c
    R contrib/blacklist/port/strtoi.c
    R contrib/blacklist/test/Makefile
    R contrib/blacklist/test/cltest.c
    R contrib/blacklist/test/srvtest.c
    A contrib/blocklist/MIDNIGHTBSD-upgrade
    A contrib/blocklist/Makefile
    A contrib/blocklist/Makefile.inc
    A contrib/blocklist/README
    A contrib/blocklist/TODO
    A contrib/blocklist/bin/Makefile
    A contrib/blocklist/bin/blacklistctl.8
    A contrib/blocklist/bin/blacklistctl.c
    A contrib/blocklist/bin/blacklistd.8
    A contrib/blocklist/bin/blacklistd.c
    A contrib/blocklist/bin/blacklistd.conf.5
    A contrib/blocklist/bin/blocklistctl.8
    A contrib/blocklist/bin/blocklistctl.c
    A contrib/blocklist/bin/blocklistd.8
    A contrib/blocklist/bin/blocklistd.c
    A contrib/blocklist/bin/blocklistd.conf.5
    A contrib/blocklist/bin/conf.c
    A contrib/blocklist/bin/conf.h
    A contrib/blocklist/bin/internal.c
    A contrib/blocklist/bin/internal.h
    A contrib/blocklist/bin/old_internal.c
    A contrib/blocklist/bin/old_internal.h
    A contrib/blocklist/bin/run.c
    A contrib/blocklist/bin/run.h
    A contrib/blocklist/bin/state.c
    A contrib/blocklist/bin/state.h
    A contrib/blocklist/bin/support.c
    A contrib/blocklist/bin/support.h
    A contrib/blocklist/diff/ftpd.diff
    A contrib/blocklist/diff/named.diff
    A contrib/blocklist/diff/postfix.diff
    A contrib/blocklist/diff/proftpd.diff
    A contrib/blocklist/diff/ssh.diff
    A contrib/blocklist/etc/Makefile
    A contrib/blocklist/etc/blocklistd.conf
    A contrib/blocklist/etc/ipf.conf
    A contrib/blocklist/etc/npf.conf
    A contrib/blocklist/etc/rc.d/Makefile
    A contrib/blocklist/etc/rc.d/blocklistd
    A contrib/blocklist/include/Makefile
    A contrib/blocklist/include/bl.h
    A contrib/blocklist/include/blacklist.h
    A contrib/blocklist/include/blocklist.h
    A contrib/blocklist/include/old_bl.h
    A contrib/blocklist/lib/Makefile
    A contrib/blocklist/lib/bl.c
    A contrib/blocklist/lib/blacklist.c
    A contrib/blocklist/lib/blocklist.c
    A contrib/blocklist/lib/libblacklist.3
    A contrib/blocklist/lib/libblocklist.3
    A contrib/blocklist/lib/old_bl.c
    A contrib/blocklist/lib/shlib_version
    A contrib/blocklist/libexec/Makefile
    A contrib/blocklist/libexec/blocklistd-helper
    A contrib/blocklist/midnightbsd-changes.sh
    A contrib/blocklist/port/Makefile.am
    A contrib/blocklist/port/_strtoi.h
    A contrib/blocklist/port/clock_gettime.c
    A contrib/blocklist/port/config.h
    A contrib/blocklist/port/configure.ac
    A contrib/blocklist/port/fgetln.c
    A contrib/blocklist/port/fparseln.c
    A contrib/blocklist/port/getprogname.c
    A contrib/blocklist/port/m4/.cvsignore
    A contrib/blocklist/port/pidfile.c
    A contrib/blocklist/port/popenve.c
    A contrib/blocklist/port/port.h
    A contrib/blocklist/port/sockaddr_snprintf.c
    A contrib/blocklist/port/strlcat.c
    A contrib/blocklist/port/strlcpy.c
    A contrib/blocklist/port/strtoi.c
    A contrib/blocklist/port/vsyslog_r.c
    A contrib/blocklist/test/Makefile
    A contrib/blocklist/test/cltest.c
    A contrib/blocklist/test/srvtest.c
    M crypto/openssh/auth-pam.c
    M crypto/openssh/auth.c
    R crypto/openssh/blacklist.c
    R crypto/openssh/blacklist_client.h
    A crypto/openssh/blocklist.c
    A crypto/openssh/blocklist_client.h
    M crypto/openssh/monitor.c
    M crypto/openssh/servconf.c
    M crypto/openssh/servconf.h
    M crypto/openssh/sshd-session.c
    M crypto/openssh/sshd_config
    M crypto/openssh/sshd_config.5
    M lib/Makefile
    M lib/libblacklist/Makefile
    A lib/libblocklist/Makefile
    A lib/libblocklist/Makefile.depend
    M lib/libsysdecode/Makefile.depend
    M libexec/Makefile
    R libexec/blacklistd-helper/Makefile
    R libexec/blacklistd-helper/Makefile.depend
    A libexec/blocklistd-helper/Makefile
    A libexec/blocklistd-helper/Makefile.depend
    A libexec/blocklistd-helper/blacklistd-helper
    M libexec/fingerd/Makefile
    M libexec/fingerd/Makefile.depend.options
    M libexec/fingerd/fingerd.c
    M libexec/ftpd/Makefile
    M libexec/ftpd/Makefile.depend.options
    R libexec/ftpd/blacklist.c
    R libexec/ftpd/blacklist_client.h
    A libexec/ftpd/blocklist.c
    A libexec/ftpd/blocklist_client.h
    M libexec/ftpd/ftpd.8
    M libexec/ftpd/ftpd.c
    M libexec/rc/rc.conf
    M libexec/rc/rc.d/Makefile
    M libexec/rc/rc.d/blacklistd
    A libexec/rc/rc.d/blocklistd
    M secure/libexec/sshd-auth/Makefile
    M secure/libexec/sshd-session/Makefile
    M secure/usr.sbin/sshd/Makefile.depend.options
    M share/man/man5/src.conf.5
    M share/mk/bsd.libnames.mk
    M share/mk/local.dirdeps-options.mk
    M share/mk/src.libnames.mk
    M share/mk/src.opts.mk
    M targets/pseudo/userland/Makefile.depend
    M targets/pseudo/userland/lib/Makefile.depend
    M targets/pseudo/userland/libexec/Makefile.depend
    M tools/build/mk/OptionalObsoleteFiles.inc
    M tools/build/options/WITHOUT_BLACKLIST
    M tools/build/options/WITHOUT_BLACKLIST_SUPPORT
    A tools/build/options/WITHOUT_BLOCKLIST
    A tools/build/options/WITHOUT_BLOCKLIST_SUPPORT
    M usr.sbin/Makefile
    M usr.sbin/blacklistctl/Makefile
    M usr.sbin/blacklistctl/Makefile.depend
    M usr.sbin/blacklistd/Makefile
    M usr.sbin/blacklistd/Makefile.depend
    A usr.sbin/blocklistctl/Makefile
    A usr.sbin/blocklistctl/Makefile.depend
    A usr.sbin/blocklistd/Makefile
    A usr.sbin/blocklistd/Makefile.depend
    A usr.sbin/blocklistd/blocklistd.conf
    M usr.sbin/periodic/etc/security/520.pfdenied

  Log Message:
  -----------
  Rename blacklist to blocklist, following upstream (#517)

* Import blocklist 2026-04-09 (46419aa)

Upstream hash 46419aa7eea2cebc0cbc74c7b3aba8592cddc5bb.

Obtained from:	https://github.com/zoulasc/blocklist
AI-Assisted-by: Claude Fable 5.1
Signed-off-by: Lucas Holt <luke at foolishgames.com>

* Remove contrib/blacklist

Upstream renamed the project to blocklist; the replacement is imported
at contrib/blocklist in the next commit.

AI-Assisted-by: Claude Fable 5.1
Signed-off-by: Lucas Holt <luke at foolishgames.com>

* contrib/blocklist: local adaptations and compatibility sources

Apply the MidnightBSD changes (drop the Debian port, /usr/libexec
paths, SA_SIZE instead of RT_ROUNDUP, packet filter man page
cross-references) and record them in midnightbsd-changes.sh.  Add the
compatibility sources for the old blacklist names from FreeBSD so
lib/libblacklist, blacklistd and blacklistctl can keep being built
during the transition.  Describe the import procedure in
MIDNIGHTBSD-upgrade.

AI-Assisted-by: Claude Fable 5.1
Signed-off-by: Lucas Holt <luke at foolishgames.com>

* Rename blacklist to blocklist, following upstream

Build the library, daemon and control program from contrib/blocklist
under their new names: libblocklist(3), blocklistd(8) and
blocklistctl(8), with /etc/blocklistd.conf, the blocklistd rc script,
blocklistd_enable and blocklistd_flags in rc.conf, and the
blocklistd-helper script.  The build knobs are MK_BLOCKLIST and
MK_BLOCKLIST_SUPPORT.

Consumers move to the new API: sshd (UseBlocklist, with UseBlacklist
kept as an alias), ftpd and fingerd now include blocklist.h and call
blocklist_*(), and their client glue is renamed from blacklist.c to
blocklist.c.

The old names remain available during the transition, as FreeBSD did
in commit 7238317403b9: libblacklist, blacklistd, blacklistctl and
blacklistd-helper are built from the compatibility sources in
contrib/blocklist, the blacklistd rc script still starts the old
daemon but prints a warning, and WITHOUT_BLACKLIST and
WITHOUT_BLACKLIST_SUPPORT are wired to the blocklist options.
The periodic pf security check looks at both anchor names.

Note the rename in UPDATING.

Obtained from:	FreeBSD 7238317403b95a8e35cf0bc7cd66fbd78ecbe521
AI-Assisted-by: Claude Fable 5.1
Signed-off-by: Lucas Holt <luke at foolishgames.com>

---------

Signed-off-by: Lucas Holt <luke at foolishgames.com>



To unsubscribe from these emails, change your notification settings at https://github.com/MidnightBSD/src/settings/notifications

More information about the Midnightbsd-cvs mailing list