Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
Updating Information for MidnightBSD users.

20260922:
blacklistd has been renamed to blocklistd, following upstream.
The library is now libblocklist(3) with blocklist_*() functions,
the daemon and control program are blocklistd(8) and
blocklistctl(8), the configuration file is /etc/blocklistd.conf,
the rc.conf knobs are blocklistd_enable and blocklistd_flags, and
the sshd_config option is UseBlocklist. The build options are
WITH[OUT]_BLOCKLIST and WITH[OUT]_BLOCKLIST_SUPPORT.

The old names keep working for now: libblacklist, blacklistd,
blacklistctl, /etc/blacklistd.conf, the blacklistd rc script and
the old build options are all still provided, but they warn on
use and will be removed in a future release. Move your
configuration to the new names. Note that the last column of the
configuration file, formerly "disable", is now "duration".

20260922:
tcsh 6.24.16 (from 6.21.00). Adds $'...' strings with \x, \u, \U
and \c escapes, the :Q modifier, $?<, jobs -Z, CLICOLOR_FORCE and
Expand Down
21 changes: 0 additions & 21 deletions contrib/blacklist/TODO

This file was deleted.

15 changes: 0 additions & 15 deletions contrib/blacklist/bin/Makefile

This file was deleted.

216 changes: 0 additions & 216 deletions contrib/blacklist/diff/named.diff

This file was deleted.

10 changes: 0 additions & 10 deletions contrib/blacklist/etc/Makefile

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/blacklist/etc/rc.d/Makefile

This file was deleted.

19 changes: 0 additions & 19 deletions contrib/blacklist/lib/Makefile

This file was deleted.

6 changes: 0 additions & 6 deletions contrib/blacklist/libexec/Makefile

This file was deleted.

25 changes: 0 additions & 25 deletions contrib/blacklist/port/Makefile.am

This file was deleted.

38 changes: 38 additions & 0 deletions contrib/blocklist/MIDNIGHTBSD-upgrade
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
blocklist (formerly blacklist) from https://github.com/zoulasc/blocklist

Vendor branch: vendor/blocklist, tagged vendor/blocklist/YYYYMMDD after
the upstream commit date. Upstream has no releases; import HEAD.

To import a new snapshot:

1) git clone https://github.com/zoulasc/blocklist.git and note the
commit hash and date.
2) In this repository:
git fetch <clone> HEAD
c=$(git commit-tree FETCH_HEAD^{tree} -p vendor/blocklist \
-m "Import blocklist YYYY-MM-DD (shorthash)")
git branch -f vendor/blocklist $c
git tag vendor/blocklist/YYYYMMDD $c
3) On master:
git merge -X subtree=contrib/blocklist vendor/blocklist
4) Re-run sh midnightbsd-changes.sh in contrib/blocklist and check
that nothing else changed with
git diff vendor/blocklist HEAD:contrib/blocklist
5) If source files were added or removed, update lib/libblocklist,
usr.sbin/blocklistd and usr.sbin/blocklistctl.
6) Build world and test sshd(8) and fingerd(8) integration.

Files that are not upstream:

bin/blacklistctl.c bin/blacklistd.c bin/old_internal.[ch]
include/blacklist.h include/old_bl.h lib/blacklist.c lib/old_bl.c
bin/blacklistctl.8 bin/blacklistd.8 bin/blacklistd.conf.5 lib/libblacklist.3
Compatibility sources for the old blacklist names, taken from
FreeBSD. They build lib/libblacklist, usr.sbin/blacklistd and
usr.sbin/blacklistctl so existing configurations keep working
with a warning.
port/config.h
Wrapper that pulls in port/port.h; upstream generates this with
autoconf.
midnightbsd-changes.sh MIDNIGHTBSD-upgrade
This file and the change script.
2 changes: 1 addition & 1 deletion contrib/blacklist/Makefile → contrib/blocklist/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2015/01/22 17:49:41 christos Exp $
# $NetBSD: Makefile,v 1.1.1.1 2020/06/15 01:52:52 christos Exp $

SUBDIR = lib .WAIT include bin etc libexec

Expand Down
Loading
Loading