Module Name: src
Committed By: christos
Date: Mon Jun 15 01:57:33 UTC 2020
Modified Files:
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/dist: pfilter.c
src/distrib/sets/lists/base: mi shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/debug: mi shl.mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/doc: 3RDPARTY CHANGES
src/etc/defaults: rc.conf
src/etc/mtree: NetBSD.dist.base special
src/external/bsd: Makefile
src/external/ibm-public/postfix/dist/src/smtpd: pfilter.c
src/external/ibm-public/postfix/libexec/smtpd: Makefile
src/external/mpl/bind: Makefile.inc
src/external/mpl/bind/dist/lib/ns: pfilter.c
src/lib: Makefile
src/libexec/ftpd: Makefile pfilter.c
src/share/mk: bsd.README bsd.prog.mk
Removed Files:
src/external/bsd/blacklist: Makefile Makefile.inc README TODO
src/external/bsd/blacklist/bin: Makefile blacklistctl.8 blacklistctl.c
blacklistd.8 blacklistd.c blacklistd.conf.5 conf.c conf.h
internal.c internal.h run.c run.h state.c state.h support.c
support.h
src/external/bsd/blacklist/diff: ftpd.diff named.diff postfix.diff
proftpd.diff ssh.diff
src/external/bsd/blacklist/etc: Makefile blacklistd.conf npf.conf
src/external/bsd/blacklist/etc/rc.d: Makefile blacklistd
src/external/bsd/blacklist/include: Makefile bl.h blacklist.h
src/external/bsd/blacklist/lib: Makefile bl.c blacklist.c
libblacklist.3 shlib_version
src/external/bsd/blacklist/libexec: Makefile blacklistd-helper
src/external/bsd/blacklist/port: Makefile.am _strtoi.h clock_gettime.c
configure.ac fgetln.c fparseln.c getprogname.c pidfile.c popenve.c
port.h sockaddr_snprintf.c strlcat.c strlcpy.c strtoi.c
src/external/bsd/blacklist/port/m4: .cvsignore
src/external/bsd/blacklist/test: Makefile cltest.c srvtest.c
Log Message:
Rename blacklist -> blocklist
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/pfilter.c
cvs rdiff -u -r1.1250 -r1.1251 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.892 -r1.893 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2335 -r1.2336 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.334 -r1.335 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.315 -r1.316 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.254 -r1.255 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.259 -r1.260 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1691 -r1.1692 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1729 -r1.1730 src/doc/3RDPARTY
cvs rdiff -u -r1.2701 -r1.2702 src/doc/CHANGES
cvs rdiff -u -r1.157 -r1.158 src/etc/defaults/rc.conf
cvs rdiff -u -r1.218 -r1.219 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.168 -r1.169 src/etc/mtree/special
cvs rdiff -u -r1.70 -r1.71 src/external/bsd/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/blacklist/Makefile
cvs rdiff -u -r1.3 -r0 src/external/bsd/blacklist/Makefile.inc
cvs rdiff -u -r1.8 -r0 src/external/bsd/blacklist/README
cvs rdiff -u -r1.7 -r0 src/external/bsd/blacklist/TODO
cvs rdiff -u -r1.11 -r0 src/external/bsd/blacklist/bin/Makefile
cvs rdiff -u -r1.9 -r0 src/external/bsd/blacklist/bin/blacklistctl.8
cvs rdiff -u -r1.23 -r0 src/external/bsd/blacklist/bin/blacklistctl.c
cvs rdiff -u -r1.24 -r0 src/external/bsd/blacklist/bin/blacklistd.8
cvs rdiff -u -r1.43 -r0 src/external/bsd/blacklist/bin/blacklistd.c
cvs rdiff -u -r1.10 -r0 src/external/bsd/blacklist/bin/blacklistd.conf.5 \
src/external/bsd/blacklist/bin/support.c
cvs rdiff -u -r1.31 -r0 src/external/bsd/blacklist/bin/conf.c
cvs rdiff -u -r1.6 -r0 src/external/bsd/blacklist/bin/conf.h
cvs rdiff -u -r1.5 -r0 src/external/bsd/blacklist/bin/internal.c \
src/external/bsd/blacklist/bin/run.h \
src/external/bsd/blacklist/bin/state.h
cvs rdiff -u -r1.14 -r0 src/external/bsd/blacklist/bin/internal.h
cvs rdiff -u -r1.15 -r0 src/external/bsd/blacklist/bin/run.c
cvs rdiff -u -r1.19 -r0 src/external/bsd/blacklist/bin/state.c
cvs rdiff -u -r1.7 -r0 src/external/bsd/blacklist/bin/support.h
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/diff/ftpd.diff \
src/external/bsd/blacklist/diff/postfix.diff
cvs rdiff -u -r1.6 -r0 src/external/bsd/blacklist/diff/named.diff
cvs rdiff -u -r1.3 -r0 src/external/bsd/blacklist/diff/proftpd.diff
cvs rdiff -u -r1.10 -r0 src/external/bsd/blacklist/diff/ssh.diff
cvs rdiff -u -r1.3 -r0 src/external/bsd/blacklist/etc/Makefile
cvs rdiff -u -r1.6 -r0 src/external/bsd/blacklist/etc/blacklistd.conf
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/etc/npf.conf
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/etc/rc.d/Makefile
cvs rdiff -u -r1.2 -r0 src/external/bsd/blacklist/etc/rc.d/blacklistd
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/include/Makefile
cvs rdiff -u -r1.14 -r0 src/external/bsd/blacklist/include/bl.h
cvs rdiff -u -r1.4 -r0 src/external/bsd/blacklist/include/blacklist.h
cvs rdiff -u -r1.7 -r0 src/external/bsd/blacklist/lib/Makefile \
src/external/bsd/blacklist/lib/blacklist.c
cvs rdiff -u -r1.31 -r0 src/external/bsd/blacklist/lib/bl.c
cvs rdiff -u -r1.11 -r0 src/external/bsd/blacklist/lib/libblacklist.3
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/lib/shlib_version
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/libexec/Makefile
cvs rdiff -u -r1.12 -r0 src/external/bsd/blacklist/libexec/blacklistd-helper
cvs rdiff -u -r1.6 -r0 src/external/bsd/blacklist/port/Makefile.am
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/port/_strtoi.h \
src/external/bsd/blacklist/port/fgetln.c \
src/external/bsd/blacklist/port/fparseln.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/blacklist/port/clock_gettime.c \
src/external/bsd/blacklist/port/pidfile.c \
src/external/bsd/blacklist/port/popenve.c \
src/external/bsd/blacklist/port/strlcat.c \
src/external/bsd/blacklist/port/strlcpy.c
cvs rdiff -u -r1.7 -r0 src/external/bsd/blacklist/port/configure.ac
cvs rdiff -u -r1.4 -r0 src/external/bsd/blacklist/port/getprogname.c
cvs rdiff -u -r1.8 -r0 src/external/bsd/blacklist/port/port.h
cvs rdiff -u -r1.11 -r0 src/external/bsd/blacklist/port/sockaddr_snprintf.c
cvs rdiff -u -r1.3 -r0 src/external/bsd/blacklist/port/strtoi.c
cvs rdiff -u -r1.1 -r0 src/external/bsd/blacklist/port/m4/.cvsignore
cvs rdiff -u -r1.3 -r0 src/external/bsd/blacklist/test/Makefile
cvs rdiff -u -r1.6 -r0 src/external/bsd/blacklist/test/cltest.c
cvs rdiff -u -r1.10 -r0 src/external/bsd/blacklist/test/srvtest.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/dist/src/smtpd/pfilter.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/ibm-public/postfix/libexec/smtpd/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mpl/bind/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/mpl/bind/dist/lib/ns/pfilter.c
cvs rdiff -u -r1.283 -r1.284 src/lib/Makefile
cvs rdiff -u -r1.67 -r1.68 src/libexec/ftpd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/libexec/ftpd/pfilter.c
cvs rdiff -u -r1.406 -r1.407 src/share/mk/bsd.README
cvs rdiff -u -r1.330 -r1.331 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.21 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.22
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.21 Sun Mar 1 15:59:53 2020
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Jun 14 21:57:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/03/01 20:59:53 christos Exp $
+# $NetBSD: Makefile,v 1.22 2020/06/15 01:57:29 christos Exp $
.include <bsd.own.mk>
@@ -67,8 +67,8 @@ DPADD+= ${LIBWRAP}
.ifdef CRUNCHEDPROG
CPPFLAGS+=-DSMALL
.else
-LDADD+= -lblacklist
-DPADD+= ${LIBBLACKLIST}
+LDADD+= -lblocklist
+DPADD+= ${LIBBLOCKLIST}
.endif
COPTS.sshlogin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
Index: src/crypto/external/bsd/openssh/dist/pfilter.c
diff -u src/crypto/external/bsd/openssh/dist/pfilter.c:1.7 src/crypto/external/bsd/openssh/dist/pfilter.c:1.8
--- src/crypto/external/bsd/openssh/dist/pfilter.c:1.7 Sat Apr 20 13:16:40 2019
+++ src/crypto/external/bsd/openssh/dist/pfilter.c Sun Jun 14 21:57:29 2020
@@ -1,24 +1,24 @@
-/* $NetBSD: pfilter.c,v 1.7 2019/04/20 17:16:40 christos Exp $ */
+/* $NetBSD: pfilter.c,v 1.8 2020/06/15 01:57:29 christos Exp $ */
#include "namespace.h"
#include "includes.h"
#include "ssh.h"
#include "packet.h"
#include "log.h"
#include "pfilter.h"
-#include <blacklist.h>
+#include <blocklist.h>
#ifndef SMALL
-static struct blacklist *blstate;
+static struct blocklist *blstate;
#endif
#include "includes.h"
-__RCSID("$NetBSD: pfilter.c,v 1.7 2019/04/20 17:16:40 christos Exp $");
+__RCSID("$NetBSD: pfilter.c,v 1.8 2020/06/15 01:57:29 christos Exp $");
void
pfilter_init()
{
#ifndef SMALL
- blstate = blacklist_open();
+ blstate = blocklist_open();
#endif
}
@@ -38,9 +38,9 @@ pfilter_notify(int a)
// XXX: 3?
fd = ssh_packet_connection_is_on_socket(the_active_state) ?
ssh_packet_get_connection_in(the_active_state) : 3;
- (void)blacklist_r(blstate, a, fd, "ssh");
+ (void)blocklist_r(blstate, a, fd, "ssh");
if (a == 0) {
- blacklist_close(blstate);
+ blocklist_close(blstate);
blstate = NULL;
}
#else
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1250 src/distrib/sets/lists/base/mi:1.1251
--- src/distrib/sets/lists/base/mi:1.1250 Thu Jun 4 10:08:16 2020
+++ src/distrib/sets/lists/base/mi Sun Jun 14 21:57:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1250 2020/06/04 14:08:16 roy Exp $
+# $NetBSD: mi,v 1.1251 2020/06/15 01:57:29 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -471,7 +471,8 @@
./libdata/firmware/zyd/zyd-zd1211 base-firmware-root firmware
./libdata/firmware/zyd/zyd-zd1211b base-firmware-root firmware
./libexec base-sys-root
-./libexec/blacklistd-helper base-sysutil-root
+./libexec/blacklistd-helper base-obsolete obsolete
+./libexec/blocklistd-helper base-sysutil-root
./libexec/devpubd-hooks base-sysutil-root
./libexec/devpubd-hooks/01-makedev base-sysutil-root
./libexec/devpubd-hooks/02-wedgenames base-sysutil-root
@@ -504,8 +505,10 @@
./sbin/atactl base-sysutil-root
./sbin/badsect base-sysutil-root
./sbin/bioctl base-sysutil-root
-./sbin/blacklistctl base-sysutil-root
-./sbin/blacklistd base-sysutil-root
+./sbin/blacklistctl base-obsolete obsolete
+./sbin/blocklistctl base-sysutil-root
+./sbin/blacklistd base-obsolete obsolete
+./sbin/blocklistd base-sysutil-root
./sbin/brconfig base-netutil-root
./sbin/canconfig base-netutil-root
./sbin/ccdconfig base-sysutil-root
@@ -2280,9 +2283,12 @@
./usr/share/examples base-sys-share
./usr/share/examples/amd base-amd-examples
./usr/share/examples/apm base-sys-examples
-./usr/share/examples/blacklist base-sys-examples
-./usr/share/examples/blacklist/blacklistd.conf base-sys-examples
-./usr/share/examples/blacklist/npf.conf base-sys-examples
+./usr/share/examples/blacklist base-obsolete obsolete
+./usr/share/examples/blacklist/blacklistd.conf base-obsolete obsolete
+./usr/share/examples/blacklist/npf.conf base-obsolete obsolete
+./usr/share/examples/blocklist base-sys-examples
+./usr/share/examples/blocklist/blocklistd.conf base-sys-examples
+./usr/share/examples/blocklist/npf.conf base-sys-examples
./usr/share/examples/dhcp base-dhcpd-examples
./usr/share/examples/dhcpcd base-dhcpcd-examples
./usr/share/examples/dhcpcd/hooks base-dhcpcd-examples
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.892 src/distrib/sets/lists/base/shl.mi:1.893
--- src/distrib/sets/lists/base/shl.mi:1.892 Sun Jun 14 20:39:03 2020
+++ src/distrib/sets/lists/base/shl.mi Sun Jun 14 21:57:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.892 2020/06/15 00:39:03 christos Exp $
+# $NetBSD: shl.mi,v 1.893 2020/06/15 01:57:29 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -16,9 +16,12 @@
./lib/libavl.so base-zfs-shlib dynamicroot,zfs
./lib/libavl.so.0 base-zfs-shlib dynamicroot,zfs
./lib/libavl.so.0.0 base-zfs-shlib dynamicroot,zfs
-./lib/libblacklist.so base-sys-shlib dynamicroot
-./lib/libblacklist.so.0 base-sys-shlib dynamicroot
-./lib/libblacklist.so.0.0 base-sys-shlib dynamicroot
+./lib/libblacklist.so base-obsolete obsolete
+./lib/libblacklist.so.0 base-obsolete obsolete
+./lib/libblacklist.so.0.0 base-obsolete obsolete
+./lib/libblocklist.so base-sys-shlib dynamicroot
+./lib/libblocklist.so.0 base-sys-shlib dynamicroot
+./lib/libblocklist.so.0.0 base-sys-shlib dynamicroot
./lib/libc.so base-sys-shlib dynamicroot
./lib/libc.so.12 base-sys-shlib dynamicroot
./lib/libc.so.12.217 base-sys-shlib dynamicroot
@@ -229,9 +232,12 @@
./usr/lib/libbind9.so base-bind-shlib compatfile
./usr/lib/libbind9.so.14 base-bind-shlib compatfile
./usr/lib/libbind9.so.14.0 base-bind-shlib compatfile
-./usr/lib/libblacklist.so base-sys-shlib compatfile
-./usr/lib/libblacklist.so.0 base-sys-shlib compatfile
-./usr/lib/libblacklist.so.0.0 base-sys-shlib compatfile
+./usr/lib/libblacklist.so base-obsolete obsolete
+./usr/lib/libblacklist.so.0 base-obsolete obsolete
+./usr/lib/libblacklist.so.0.0 base-obsolete obsolete
+./usr/lib/libblocklist.so base-sys-shlib compatfile
+./usr/lib/libblocklist.so.0 base-sys-shlib compatfile
+./usr/lib/libblocklist.so.0.0 base-sys-shlib compatfile
./usr/lib/libbluetooth.so base-sys-shlib compatfile
./usr/lib/libbluetooth.so.4 base-sys-shlib compatfile
./usr/lib/libbluetooth.so.4.2 base-sys-shlib compatfile
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2335 src/distrib/sets/lists/comp/mi:1.2336
--- src/distrib/sets/lists/comp/mi:1.2335 Tue Jun 9 17:50:32 2020
+++ src/distrib/sets/lists/comp/mi Sun Jun 14 21:57:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2335 2020/06/09 21:50:32 kamil Exp $
+# $NetBSD: mi,v 1.2336 2020/06/15 01:57:29 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -204,7 +204,8 @@
./usr/include/bfd/bfd.h comp-obsolete obsolete
./usr/include/bfd/libiberty.h comp-obsolete obsolete
./usr/include/bitstring.h comp-c-include
-./usr/include/blacklist.h comp-c-include
+./usr/include/blacklist.h comp-obsolete obsolete
+./usr/include/blocklist.h comp-c-include
./usr/include/bluetooth.h comp-c-include
./usr/include/bm.h comp-c-include
./usr/include/bozohttpd.h comp-c-include
@@ -3438,8 +3439,10 @@
./usr/lib/libbfd.a comp-obsolete obsolete
./usr/lib/libbind9.a comp-bind-lib compatfile
./usr/lib/libbind9_p.a comp-bind-proflib compatfile,profile
-./usr/lib/libblacklist.a comp-c-lib compatfile
-./usr/lib/libblacklist_p.a comp-c-proflib compatfile,profile
+./usr/lib/libblacklist.a comp-obsolete obsolete
+./usr/lib/libblacklist_p.a comp-obsolete obsolete
+./usr/lib/libblocklist.a comp-c-lib compatfile
+./usr/lib/libblocklist_p.a comp-c-proflib compatfile,profile
./usr/lib/libbluetooth.a comp-c-lib compatfile
./usr/lib/libbluetooth_p.a comp-c-proflib compatfile,profile
./usr/lib/libbozohttpd.a comp-c-lib compatfile
@@ -3967,7 +3970,8 @@
./usr/libdata/lint/llib-larchive.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lasn1.ln comp-krb5-lintlib lint,kerberos
./usr/libdata/lint/llib-lbind9.ln comp-bind-lintlib lint
-./usr/libdata/lint/llib-lblacklist.ln comp-c-lintlib lint
+./usr/libdata/lint/llib-lblacklist.ln comp-obsolete obsolete
+./usr/libdata/lint/llib-lblocklist.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lbluetooth.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lbozohttpd.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lbsdmalloc.ln comp-c-lintlib lint
@@ -6136,12 +6140,18 @@
./usr/share/man/cat3/bitstring.0 comp-c-catman .cat
./usr/share/man/cat3/bkgd.0 comp-c-catman .cat
./usr/share/man/cat3/bkgdset.0 comp-c-catman .cat
-./usr/share/man/cat3/blacklist.0 comp-c-catman .cat
-./usr/share/man/cat3/blacklist_close.0 comp-c-catman .cat
-./usr/share/man/cat3/blacklist_open.0 comp-c-catman .cat
-./usr/share/man/cat3/blacklist_r.0 comp-c-catman .cat
-./usr/share/man/cat3/blacklist_sa.0 comp-c-catman .cat
-./usr/share/man/cat3/blacklist_sa_r.0 comp-c-catman .cat
+./usr/share/man/cat3/blacklist.0 comp-obsolete obsolete
+./usr/share/man/cat3/blacklist_close.0 comp-obsolete obsolete
+./usr/share/man/cat3/blacklist_open.0 comp-obsolete obsolete
+./usr/share/man/cat3/blacklist_r.0 comp-obsolete obsolete
+./usr/share/man/cat3/blacklist_sa.0 comp-obsolete obsolete
+./usr/share/man/cat3/blacklist_sa_r.0 comp-obsolete obsolete
+./usr/share/man/cat3/blocklist.0 comp-c-catman .cat
+./usr/share/man/cat3/blocklist_close.0 comp-c-catman .cat
+./usr/share/man/cat3/blocklist_open.0 comp-c-catman .cat
+./usr/share/man/cat3/blocklist_r.0 comp-c-catman .cat
+./usr/share/man/cat3/blocklist_sa.0 comp-c-catman .cat
+./usr/share/man/cat3/blocklist_sa_r.0 comp-c-catman .cat
./usr/share/man/cat3/blowfish.0 comp-obsolete obsolete
./usr/share/man/cat3/bluetooth.0 comp-c-catman .cat
./usr/share/man/cat3/bm.0 comp-c-catman .cat
@@ -8467,7 +8477,8 @@
./usr/share/man/cat3/libarchive.0 comp-c-catman .cat
./usr/share/man/cat3/libarchive_changes.0 comp-c-catman .cat
./usr/share/man/cat3/libarchive_internals.0 comp-c-catman .cat
-./usr/share/man/cat3/libblacklist.0 comp-c-catman .cat
+./usr/share/man/cat3/libblacklist.0 comp-obsolete obsolete
+./usr/share/man/cat3/libblocklist.0 comp-c-catman .cat
./usr/share/man/cat3/libiscsi.0 comp-c-catman iscsi,.cat
./usr/share/man/cat3/libmagic.0 comp-c-catman .cat
./usr/share/man/cat3/libmj.0 comp-c-catman .cat
@@ -14419,12 +14430,18 @@
./usr/share/man/html3/bitstring.html comp-c-htmlman html
./usr/share/man/html3/bkgd.html comp-c-htmlman html
./usr/share/man/html3/bkgdset.html comp-c-htmlman html
-./usr/share/man/html3/blacklist.html comp-c-htmlman html
-./usr/share/man/html3/blacklist_close.html comp-c-htmlman html
-./usr/share/man/html3/blacklist_open.html comp-c-htmlman html
-./usr/share/man/html3/blacklist_r.html comp-c-htmlman html
-./usr/share/man/html3/blacklist_sa.html comp-c-htmlman html
-./usr/share/man/html3/blacklist_sa_r.html comp-c-htmlman html
+./usr/share/man/html3/blacklist.html comp-obsolete obsolete
+./usr/share/man/html3/blacklist_close.html comp-obsolete obsolete
+./usr/share/man/html3/blacklist_open.html comp-obsolete obsolete
+./usr/share/man/html3/blacklist_r.html comp-obsolete obsolete
+./usr/share/man/html3/blacklist_sa.html comp-obsolete obsolete
+./usr/share/man/html3/blacklist_sa_r.html comp-obsolete obsolete
+./usr/share/man/html3/blocklist.html comp-c-htmlman html
+./usr/share/man/html3/blocklist_close.html comp-c-htmlman html
+./usr/share/man/html3/blocklist_open.html comp-c-htmlman html
+./usr/share/man/html3/blocklist_r.html comp-c-htmlman html
+./usr/share/man/html3/blocklist_sa.html comp-c-htmlman html
+./usr/share/man/html3/blocklist_sa_r.html comp-c-htmlman html
./usr/share/man/html3/bluetooth.html comp-c-htmlman html
./usr/share/man/html3/bm.html comp-c-htmlman html
./usr/share/man/html3/bm_comp.html comp-c-htmlman html
@@ -16684,7 +16701,8 @@
./usr/share/man/html3/libarchive.html comp-c-htmlman html
./usr/share/man/html3/libarchive_changes.html comp-c-htmlman html
./usr/share/man/html3/libarchive_internals.html comp-c-htmlman html
-./usr/share/man/html3/libblacklist.html comp-c-htmlman html
+./usr/share/man/html3/libblacklist.html comp-obsolete obsolete
+./usr/share/man/html3/libblocklist.html comp-c-htmlman html
./usr/share/man/html3/libiscsi.html comp-c-htmlman iscsi,html
./usr/share/man/html3/libmagic.html comp-c-htmlman html
./usr/share/man/html3/libmj.html comp-c-htmlman html
@@ -22539,12 +22557,18 @@
./usr/share/man/man3/bitstring.3 comp-c-man .man
./usr/share/man/man3/bkgd.3 comp-c-man .man
./usr/share/man/man3/bkgdset.3 comp-c-man .man
-./usr/share/man/man3/blacklist.3 comp-c-man .man
-./usr/share/man/man3/blacklist_close.3 comp-c-man .man
-./usr/share/man/man3/blacklist_open.3 comp-c-man .man
-./usr/share/man/man3/blacklist_r.3 comp-c-man .man
-./usr/share/man/man3/blacklist_sa.3 comp-c-man .man
-./usr/share/man/man3/blacklist_sa_r.3 comp-c-man .man
+./usr/share/man/man3/blacklist.3 comp-obsolete obsolete
+./usr/share/man/man3/blacklist_close.3 comp-obsolete obsolete
+./usr/share/man/man3/blacklist_open.3 comp-obsolete obsolete
+./usr/share/man/man3/blacklist_r.3 comp-obsolete obsolete
+./usr/share/man/man3/blacklist_sa.3 comp-obsolete obsolete
+./usr/share/man/man3/blacklist_sa_r.3 comp-obsolete obsolete
+./usr/share/man/man3/blocklist.3 comp-c-man .man
+./usr/share/man/man3/blocklist_close.3 comp-c-man .man
+./usr/share/man/man3/blocklist_open.3 comp-c-man .man
+./usr/share/man/man3/blocklist_r.3 comp-c-man .man
+./usr/share/man/man3/blocklist_sa.3 comp-c-man .man
+./usr/share/man/man3/blocklist_sa_r.3 comp-c-man .man
./usr/share/man/man3/blowfish.3 comp-obsolete obsolete
./usr/share/man/man3/bluetooth.3 comp-c-man .man
./usr/share/man/man3/bm.3 comp-c-man .man
@@ -24882,7 +24906,8 @@
./usr/share/man/man3/libarchive.3 comp-c-man .man
./usr/share/man/man3/libarchive_changes.3 comp-c-man .man
./usr/share/man/man3/libarchive_internals.3 comp-c-man .man
-./usr/share/man/man3/libblacklist.3 comp-c-man .man
+./usr/share/man/man3/libblacklist.3 comp-obsolete obsolete
+./usr/share/man/man3/libblocklist.3 comp-c-man .man
./usr/share/man/man3/libiscsi.3 comp-c-man iscsi,.man
./usr/share/man/man3/libmagic.3 comp-c-man .man
./usr/share/man/man3/libmj.3 comp-c-man .man
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.334 src/distrib/sets/lists/comp/shl.mi:1.335
--- src/distrib/sets/lists/comp/shl.mi:1.334 Sat May 30 16:47:58 2020
+++ src/distrib/sets/lists/comp/shl.mi Sun Jun 14 21:57:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.334 2020/05/30 20:47:58 christos Exp $
+# $NetBSD: shl.mi,v 1.335 2020/06/15 01:57:29 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -14,7 +14,8 @@
./usr/lib/libatf_pic.a comp-obsolete obsolete
./usr/lib/libavl_pic.a comp-zfs-piclib compatfile,picinstall,zfs
./usr/lib/libbind9_pic.a comp-bind-piclib compatfile,picinstall
-./usr/lib/libblacklist_pic.a comp-c-piclib compatfile,picinstall
+./usr/lib/libblacklist_pic.a comp-obsolete obsolete
+./usr/lib/libblocklist_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libbluetooth_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libbozohttpd_pic.a comp-c-piclib compatfile,picinstall
./usr/lib/libbsdmalloc_pic.a comp-c-piclib compatfile,picinstall
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.315 src/distrib/sets/lists/debug/mi:1.316
--- src/distrib/sets/lists/debug/mi:1.315 Tue Jun 9 17:50:32 2020
+++ src/distrib/sets/lists/debug/mi Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.315 2020/06/09 21:50:32 kamil Exp $
+# $NetBSD: mi,v 1.316 2020/06/15 01:57:30 christos Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -32,7 +32,8 @@
./usr/lib/libatf-c_g.a comp-c-debuglib debuglib,compatfile,atf
./usr/lib/libavl_g.a comp-c-debuglib debuglib,compatfile,zfs
./usr/lib/libbind9_g.a comp-c-debuglib debuglib,compatfile
-./usr/lib/libblacklist_g.a comp-c-debuglib debuglib,compatfile
+./usr/lib/libblacklist_g.a comp-obsolete obsolete
+./usr/lib/libblocklist_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libbluetooth_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libbozohttpd_g.a comp-c-debuglib debuglib,compatfile
./usr/lib/libbsdmalloc_g.a comp-c-debuglib debuglib,compatfile
@@ -319,8 +320,10 @@
./usr/libdata/debug/sbin/atactl.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/badsect.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/bioctl.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/blacklistctl.debug comp-sysutil-debug debug
-./usr/libdata/debug/sbin/blacklistd.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/blacklistctl.debug comp-obsolete obsolete
+./usr/libdata/debug/sbin/blacklistd.debug comp-obsolete obsolete
+./usr/libdata/debug/sbin/blocklistctl.debug comp-sysutil-debug debug
+./usr/libdata/debug/sbin/blocklistd.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/brconfig.debug comp-netutil-debug debug
./usr/libdata/debug/sbin/canconfig.debug comp-netutil-debug debug
./usr/libdata/debug/sbin/ccdconfig.debug comp-sysutil-debug debug
Index: src/distrib/sets/lists/debug/shl.mi
diff -u src/distrib/sets/lists/debug/shl.mi:1.254 src/distrib/sets/lists/debug/shl.mi:1.255
--- src/distrib/sets/lists/debug/shl.mi:1.254 Sun Jun 14 20:39:03 2020
+++ src/distrib/sets/lists/debug/shl.mi Sun Jun 14 21:57:30 2020
@@ -1,8 +1,9 @@
-# $NetBSD: shl.mi,v 1.254 2020/06/15 00:39:03 christos Exp $
+# $NetBSD: shl.mi,v 1.255 2020/06/15 01:57:30 christos Exp $
./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils
./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir
./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs
-./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot
+./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-obsolete obsolete
+./usr/libdata/debug/lib/libblocklist.so.0.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libc.so.12.217.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot
./usr/libdata/debug/lib/libcrypto.so.12.0.debug comp-sys-debug debug,dynamicroot,openssl=10
@@ -76,7 +77,8 @@
./usr/libdata/debug/usr/lib/libbfd.so.16.0.debug comp-sys-debug debug,compatfile,binutils=231
./usr/libdata/debug/usr/lib/libbfd.so.17.0.debug comp-sys-debug debug,compatfile,binutils=234
./usr/libdata/debug/usr/lib/libbind9.so.14.0.debug comp-bind-debug debug,compatfile
-./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug comp-sys-debug debug,compatfile
+./usr/libdata/debug/usr/lib/libblacklist.so.0.0.debug comp-obsolete obsolete
+./usr/libdata/debug/usr/lib/libblocklist.so.0.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libbluetooth.so.4.2.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libbozohttpd.so.0.0.debug comp-sys-debug debug,compatfile
./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compatfile
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.259 src/distrib/sets/lists/etc/mi:1.260
--- src/distrib/sets/lists/etc/mi:1.259 Sun Sep 15 15:38:08 2019
+++ src/distrib/sets/lists/etc/mi Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.259 2019/09/15 19:38:08 brad Exp $
+# $NetBSD: mi,v 1.260 2020/06/15 01:57:30 christos Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked "obsolete"; they should just be removed from
@@ -188,7 +188,8 @@
./etc/rc.d/automount etc-sys-rc
./etc/rc.d/automountd etc-sys-rc
./etc/rc.d/autounmountd etc-sys-rc
-./etc/rc.d/blacklistd etc-sys-rc
+./etc/rc.d/blacklistd etc-obsolete obsolete
+./etc/rc.d/blocklistd etc-sys-rc
./etc/rc.d/bluetooth etc-sys-rc
./etc/rc.d/bootconf.sh etc-sys-rc
./etc/rc.d/bootparams etc-bootserver-rc
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1691 src/distrib/sets/lists/man/mi:1.1692
--- src/distrib/sets/lists/man/mi:1.1691 Tue May 19 02:26:37 2020
+++ src/distrib/sets/lists/man/mi Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1691 2020/05/19 06:26:37 jdc Exp $
+# $NetBSD: mi,v 1.1692 2020/06/15 01:57:30 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2115,7 +2115,8 @@
./usr/share/man/cat5/audit-packages.conf.0 man-obsolete obsolete
./usr/share/man/cat5/auto_master.0 man-sysutil-catman .cat
./usr/share/man/cat5/autofs.0 man-sysutil-catman .cat
-./usr/share/man/cat5/blacklistd.conf.0 man-sysutil-catman .cat
+./usr/share/man/cat5/blacklistd.conf.0 man-obsolete obsolete
+./usr/share/man/cat5/blocklistd.conf.0 man-sysutil-catman .cat
./usr/share/man/cat5/bluetooth.conf.0 man-obsolete obsolete
./usr/share/man/cat5/body_checks.0 man-postfix-catman postfix,.cat
./usr/share/man/cat5/boot.cfg.0 man-sys-catman .cat
@@ -2440,8 +2441,10 @@
./usr/share/man/cat8/bebox/MAKEDEV.0 man-obsolete obsolete
./usr/share/man/cat8/bebox/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/bioctl.0 man-sysutil-catman .cat
-./usr/share/man/cat8/blacklistctl.0 man-sysutil-catman .cat
-./usr/share/man/cat8/blacklistd.0 man-sysutil-catman .cat
+./usr/share/man/cat8/blacklistctl.0 man-obsolete obsolete
+./usr/share/man/cat8/blacklistd.0 man-obsolete obsolete
+./usr/share/man/cat8/blocklistctl.0 man-sysutil-catman .cat
+./usr/share/man/cat8/blocklistd.0 man-sysutil-catman .cat
./usr/share/man/cat8/boot.0 man-sysutil-catman .cat
./usr/share/man/cat8/bootparamd.0 man-bootserver-catman .cat
./usr/share/man/cat8/bootpd.0 man-bootserver-catman .cat
@@ -5237,7 +5240,8 @@
./usr/share/man/html5/audit-packages.conf.html man-obsolete obsolete
./usr/share/man/html5/auto_master.html man-sysutil-htmlman html
./usr/share/man/html5/autofs.html man-sysutil-htmlman html
-./usr/share/man/html5/blacklistd.conf.html man-sysutil-htmlman html
+./usr/share/man/html5/blacklistd.conf.html man-obsolete obsolete
+./usr/share/man/html5/blocklistd.conf.html man-sysutil-htmlman html
./usr/share/man/html5/body_checks.html man-postfix-htmlman postfix,html
./usr/share/man/html5/boot.cfg.html man-sys-htmlman html
./usr/share/man/html5/bootparams.html man-bootserver-htmlman html
@@ -5511,8 +5515,10 @@
./usr/share/man/html8/bad144.html man-sysutil-htmlman html
./usr/share/man/html8/badsect.html man-sysutil-htmlman html
./usr/share/man/html8/bioctl.html man-sysutil-htmlman html
-./usr/share/man/html8/blacklistctl.html man-sysutil-htmlman html
-./usr/share/man/html8/blacklistd.html man-sysutil-htmlman html
+./usr/share/man/html8/blacklistctl.html man-obsolete obsolete
+./usr/share/man/html8/blacklistd.html man-obsolete obsolete
+./usr/share/man/html8/blocklistctl.html man-sysutil-htmlman html
+./usr/share/man/html8/blocklistd.html man-sysutil-htmlman html
./usr/share/man/html8/boot.html man-sysutil-htmlman html
./usr/share/man/html8/bootparamd.html man-bootserver-htmlman html
./usr/share/man/html8/bootpd.html man-bootserver-htmlman html
@@ -8291,7 +8297,8 @@
./usr/share/man/man5/audit-packages.conf.5 man-obsolete obsolete
./usr/share/man/man5/auto_master.5 man-sysutil-man .man
./usr/share/man/man5/autofs.5 man-sysutil-man .man
-./usr/share/man/man5/blacklistd.conf.5 man-sysutil-man .man
+./usr/share/man/man5/blacklistd.conf.5 man-obsolete obsolete
+./usr/share/man/man5/blocklistd.conf.5 man-sysutil-man .man
./usr/share/man/man5/bluetooth.conf.5 man-obsolete obsolete
./usr/share/man/man5/body_checks.5 man-postfix-man postfix,.man
./usr/share/man/man5/boot.cfg.5 man-sys-man .man
@@ -8615,8 +8622,10 @@
./usr/share/man/man8/bebox/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/bebox/makedev.8 man-obsolete obsolete
./usr/share/man/man8/bioctl.8 man-sysutil-man .man
-./usr/share/man/man8/blacklistctl.8 man-sysutil-man .man
-./usr/share/man/man8/blacklistd.8 man-sysutil-man .man
+./usr/share/man/man8/blacklistctl.8 man-obsolete obsolete
+./usr/share/man/man8/blacklistd.8 man-obsolete obsolete
+./usr/share/man/man8/blocklistctl.8 man-sysutil-man .man
+./usr/share/man/man8/blocklistd.8 man-sysutil-man .man
./usr/share/man/man8/boot.8 man-sysutil-man .man
./usr/share/man/man8/bootparamd.8 man-bootserver-man .man
./usr/share/man/man8/bootpd.8 man-bootserver-man .man
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1729 src/doc/3RDPARTY:1.1730
--- src/doc/3RDPARTY:1.1729 Sun Jun 14 20:40:14 2020
+++ src/doc/3RDPARTY Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1729 2020/06/15 00:40:14 christos Exp $
+# $NetBSD: 3RDPARTY,v 1.1730 2020/06/15 01:57:30 christos Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -138,6 +138,19 @@ Build bind to generate the include files
Then binclude4netbsd script to import into src/external/bsd/bind/include.
The libc and include parts of the resolver are now part of libbind.
+Package: blocklist
+Version: current-2020-06-14
+Current Vers: current-2020-06-14
+Maintainer: Christos Zoulas <[email protected]>
+Archive Site: https://github.com/zoulasc/blocklist
+Home Page: https://github.com/zoulasc/blocklist
+Date: 2020-06-13
+Mailing List: [email protected]
+Responsible: christos
+License: BSD-like (2-clause)
+Location: external/bsd/blocklist
+Notes:
+
Package: libuv
Version: 1.38.0
Current Vers: 1.38.0
Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2701 src/doc/CHANGES:1.2702
--- src/doc/CHANGES:1.2701 Sun Jun 14 20:40:14 2020
+++ src/doc/CHANGES Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2701 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2702 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -219,3 +219,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
dhcpcd: Import version 9.1.1 [roy 20200604]
inet6: in-kernel Router Advertisment handling removed. [roy 20200612]
file(1): Upgraded to 5.39. [christos 20200614]
+ blocklist: import current version [christos 20200614]
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.157 src/etc/defaults/rc.conf:1.158
--- src/etc/defaults/rc.conf:1.157 Fri Jun 5 13:10:44 2020
+++ src/etc/defaults/rc.conf Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.157 2020/06/05 17:10:44 christos Exp $
+# $NetBSD: rc.conf,v 1.158 2020/06/15 01:57:30 christos Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -389,8 +389,8 @@ makemandb=YES
# Disable Simultaneous Multi-Threading
smtoff=NO
-# blacklist daemon, needs npf
-blacklistd=NO
+# blocklist daemon, needs npf
+blocklistd=NO
# IPv6 address selection policy
ip6addrctl=NO
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.218 src/etc/mtree/NetBSD.dist.base:1.219
--- src/etc/mtree/NetBSD.dist.base:1.218 Sun May 31 08:58:09 2020
+++ src/etc/mtree/NetBSD.dist.base Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.218 2020/05/31 12:58:09 roy Exp $
+# $NetBSD: NetBSD.dist.base,v 1.219 2020/06/15 01:57:30 christos Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -377,7 +377,7 @@
./usr/share/examples/asm
./usr/share/examples/asm/hello
./usr/share/examples/atf
-./usr/share/examples/blacklist
+./usr/share/examples/blocklist
./usr/share/examples/dhcp
./usr/share/examples/dhcpcd
./usr/share/examples/dhcpcd/hooks
Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.168 src/etc/mtree/special:1.169
--- src/etc/mtree/special:1.168 Sun May 31 08:58:09 2020
+++ src/etc/mtree/special Sun Jun 14 21:57:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: special,v 1.168 2020/05/31 12:58:09 roy Exp $
+# $NetBSD: special,v 1.169 2020/06/15 01:57:30 christos Exp $
# @(#)special 8.2 (Berkeley) 1/23/94
#
# This file may be overwritten on upgrades.
@@ -37,7 +37,7 @@
./etc/autofs/special_media type=file mode=0755
./etc/autofs/special_noauto type=file mode=0755
./etc/autofs/special_null type=file mode=0755
-./etc/blacklistd.conf type=file mode=0644 optional
+./etc/blocklistd.conf type=file mode=0644 optional
./etc/bluetooth type=dir mode=0755
./etc/bluetooth/btattach.conf type=file mode=0644
./etc/bluetooth/btdevctl.conf type=file mode=0644
Index: src/external/bsd/Makefile
diff -u src/external/bsd/Makefile:1.70 src/external/bsd/Makefile:1.71
--- src/external/bsd/Makefile:1.70 Sat Apr 4 11:39:13 2020
+++ src/external/bsd/Makefile Sun Jun 14 21:57:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2020/04/04 15:39:13 jdolecek Exp $
+# $NetBSD: Makefile,v 1.71 2020/06/15 01:57:31 christos Exp $
.include <bsd.own.mk>
@@ -44,6 +44,6 @@ SUBDIR+= librtld_db
SUBDIR+= unbound
.endif
-SUBDIR+= blacklist pdisk nvi ppp libnv
+SUBDIR+= blocklist pdisk nvi ppp libnv
.include <bsd.subdir.mk>
Index: src/external/ibm-public/postfix/dist/src/smtpd/pfilter.c
diff -u src/external/ibm-public/postfix/dist/src/smtpd/pfilter.c:1.1 src/external/ibm-public/postfix/dist/src/smtpd/pfilter.c:1.2
--- src/external/ibm-public/postfix/dist/src/smtpd/pfilter.c:1.1 Wed Jan 31 22:29:41 2018
+++ src/external/ibm-public/postfix/dist/src/smtpd/pfilter.c Sun Jun 14 21:57:31 2020
@@ -1,19 +1,19 @@
#include "pfilter.h"
#include <stdio.h> /* for NULL */
-#include <blacklist.h>
+#include <blocklist.h>
-static struct blacklist *blstate;
+static struct blocklist *blstate;
void
pfilter_notify(int a, int fd)
{
if (blstate == NULL)
- blstate = blacklist_open();
+ blstate = blocklist_open();
if (blstate == NULL)
return;
- (void)blacklist_r(blstate, a, fd, "smtpd");
+ (void)blocklist_r(blstate, a, fd, "smtpd");
if (a == 0) {
- blacklist_close(blstate);
+ blocklist_close(blstate);
blstate = NULL;
}
}
Index: src/external/ibm-public/postfix/libexec/smtpd/Makefile
diff -u src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.8 src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.9
--- src/external/ibm-public/postfix/libexec/smtpd/Makefile:1.8 Wed Mar 18 15:05:23 2020
+++ src/external/ibm-public/postfix/libexec/smtpd/Makefile Sun Jun 14 21:57:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/03/18 19:05:23 christos Exp $
+# $NetBSD: Makefile,v 1.9 2020/06/15 01:57:31 christos Exp $
NOMAN= # defined
@@ -31,8 +31,8 @@ smtpd_xforward.c
DPADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
LDADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
-DPADD+= ${LIBBLACKLIST}
-LDADD+= -lblacklist
+DPADD+= ${LIBBLOCKLIST}
+LDADD+= -lblocklist
DPADD+= ${LIBPTLS} ${LIBSSL} ${LIBCRYPTO}
LDADD+= ${LIBPTLS} -lssl -lcrypto
Index: src/external/mpl/bind/Makefile.inc
diff -u src/external/mpl/bind/Makefile.inc:1.8 src/external/mpl/bind/Makefile.inc:1.9
--- src/external/mpl/bind/Makefile.inc:1.8 Sat May 30 16:47:59 2020
+++ src/external/mpl/bind/Makefile.inc Sun Jun 14 21:57:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2020/05/30 20:47:59 christos Exp $
+# $NetBSD: Makefile.inc,v 1.9 2020/06/15 01:57:31 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -90,8 +90,8 @@ CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE
#CPPFLAGS+= -DUSE_MEMIMPREGISTER -DUSE_APPIMPREGISTER -DUSE_SOCKETIMPREGISTER \
# -DUSE_TIMERIMPREGISTER
-LDADD+=-lblacklist
-DPADD+=${LIBBLACKLIST}
+LDADD+=-lblocklist
+DPADD+=${LIBBLOCKLIST}
.if ${NAMED_USE_PTHREADS} == "yes"
# XXX: Not ready yet
Index: src/external/mpl/bind/dist/lib/ns/pfilter.c
diff -u src/external/mpl/bind/dist/lib/ns/pfilter.c:1.2 src/external/mpl/bind/dist/lib/ns/pfilter.c:1.3
--- src/external/mpl/bind/dist/lib/ns/pfilter.c:1.2 Sun May 24 15:46:29 2020
+++ src/external/mpl/bind/dist/lib/ns/pfilter.c Sun Jun 14 21:57:31 2020
@@ -4,11 +4,11 @@
#include <ns/types.h>
#include <ns/client.h>
-#include <blacklist.h>
+#include <blocklist.h>
#include <ns/pfilter.h>
-static struct blacklist *blstate;
+static struct blocklist *blstate;
static int blenable;
void
@@ -27,7 +27,7 @@ pfilter_notify(isc_result_t res, ns_clie
return;
if (blstate == NULL)
- blstate = blacklist_open();
+ blstate = blocklist_open();
if (blstate == NULL)
return;
@@ -38,7 +38,7 @@ pfilter_notify(isc_result_t res, ns_clie
if ((fd = isc_nmhandle_getfd(client->handle)) == -1)
return;
- blacklist_sa_r(blstate,
+ blocklist_sa_r(blstate,
res != ISC_R_SUCCESS, fd,
&client->peeraddr.type.sa, client->peeraddr.length, msg);
}
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.283 src/lib/Makefile:1.284
--- src/lib/Makefile:1.283 Sun May 24 15:29:36 2020
+++ src/lib/Makefile Sun Jun 14 21:57:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.283 2020/05/24 19:29:36 christos Exp $
+# $NetBSD: Makefile,v 1.284 2020/06/15 01:57:31 christos Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -119,7 +119,7 @@ SUBDIR+= ../external/cddl/osnet/l
SUBDIR+= ../external/public-domain/xz/lib # depends on libpthread
SUBDIR+= ../crypto/external/bsd/netpgp/libmj
SUBDIR+= ../crypto/external/bsd/netpgp/lib/verify # depends on libz
-SUBDIR+= ../external/bsd/blacklist/lib # depends on libpthread
+SUBDIR+= ../external/bsd/blocklist/lib # depends on libpthread
SUBDIR+= ../external/bsd/elftoolchain/lib/libdwarf # depends on libelf
SUBDIR+= ../external/mit/lua/lib # depends on libm
SUBDIR+= libcurses # depends on libterminfo
Index: src/libexec/ftpd/Makefile
diff -u src/libexec/ftpd/Makefile:1.67 src/libexec/ftpd/Makefile:1.68
--- src/libexec/ftpd/Makefile:1.67 Tue Oct 15 14:29:21 2019
+++ src/libexec/ftpd/Makefile Sun Jun 14 21:57:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/10/15 18:29:21 christos Exp $
+# $NetBSD: Makefile,v 1.68 2020/06/15 01:57:31 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.own.mk>
@@ -12,8 +12,8 @@ MAN= ftpd.conf.5 ftpusers.5 ftpd.8
MLINKS= ftpusers.5 ftpchroot.5
SRCS+= pfilter.c
-LDADD+= -lblacklist
-DPADD+= ${LIBBLACKLIST}
+LDADD+= -lblocklist
+DPADD+= ${LIBBLOCKLIST}
.if defined(NO_INTERNAL_LS)
CPPFLAGS+=-DNO_INTERNAL_LS
Index: src/libexec/ftpd/pfilter.c
diff -u src/libexec/ftpd/pfilter.c:1.2 src/libexec/ftpd/pfilter.c:1.3
--- src/libexec/ftpd/pfilter.c:1.2 Tue Jan 29 18:19:30 2019
+++ src/libexec/ftpd/pfilter.c Sun Jun 14 21:57:31 2020
@@ -1,16 +1,16 @@
#include <stdio.h>
#include <unistd.h>
-#include <blacklist.h>
+#include <blocklist.h>
#include "pfilter.h"
-static struct blacklist *blstate;
+static struct blocklist *blstate;
void
pfilter_open(void)
{
if (blstate == NULL)
- blstate = blacklist_open();
+ blstate = blocklist_open();
}
void
@@ -21,5 +21,5 @@ pfilter_notify(int what, const char *msg
if (blstate == NULL)
return;
- blacklist_r(blstate, what, STDIN_FILENO, msg);
+ blocklist_r(blstate, what, STDIN_FILENO, msg);
}
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.406 src/share/mk/bsd.README:1.407
--- src/share/mk/bsd.README:1.406 Mon Jun 1 10:39:14 2020
+++ src/share/mk/bsd.README Sun Jun 14 21:57:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.406 2020/06/01 14:39:14 christos Exp $
+# $NetBSD: bsd.README,v 1.407 2020/06/15 01:57:31 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1664,6 +1664,7 @@ DPADD Additional dependencies for the p
LIBATF_C?= ${DESTDIR}/usr/lib/libatf-c.a
LIBATF_CXX?= ${DESTDIR}/usr/lib/libatf-c++.a
LIBBIND9?= ${DESTDIR}/usr/lib/libbind9.a
+ LIBBLOCKLIST?= ${DESTDIR}/usr/lib/libblocklist.a
LIBBLUETOOTH?= ${DESTDIR}/usr/lib/libbluetooth.a
LIBBSDMALLOC?= ${DESTDIR}/usr/lib/libbsdmalloc.a
LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.330 src/share/mk/bsd.prog.mk:1.331
--- src/share/mk/bsd.prog.mk:1.330 Sat May 30 16:47:59 2020
+++ src/share/mk/bsd.prog.mk Sun Jun 14 21:57:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.330 2020/05/30 20:47:59 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.331 2020/06/15 01:57:31 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -112,6 +112,7 @@ _LIBLIST=\
atf_c \
atf_cxx \
bind9 \
+ blocklist \
bluetooth \
bsdmalloc \
bz2 \
