Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/share/mk Rename blacklist -> blocklist
details: https://anonhg.NetBSD.org/src/rev/547898e02788
branches: trunk
changeset: 934648:547898e02788
user: christos <christos%NetBSD.org@localhost>
date: Mon Jun 15 01:57:29 2020 +0000
description:
Rename blacklist -> blocklist
diffstat:
crypto/external/bsd/openssh/bin/sshd/Makefile | 6 +-
crypto/external/bsd/openssh/dist/pfilter.c | 14 +-
distrib/sets/lists/base/mi | 20 +-
distrib/sets/lists/base/shl.mi | 20 +-
distrib/sets/lists/comp/mi | 77 +-
distrib/sets/lists/comp/shl.mi | 5 +-
distrib/sets/lists/debug/mi | 11 +-
distrib/sets/lists/debug/shl.mi | 8 +-
distrib/sets/lists/etc/mi | 5 +-
distrib/sets/lists/man/mi | 29 +-
doc/3RDPARTY | 15 +-
doc/CHANGES | 3 +-
etc/defaults/rc.conf | 6 +-
etc/mtree/NetBSD.dist.base | 4 +-
etc/mtree/special | 4 +-
external/bsd/Makefile | 4 +-
external/bsd/blacklist/Makefile | 5 -
external/bsd/blacklist/Makefile.inc | 10 -
external/bsd/blacklist/README | 113 -
external/bsd/blacklist/TODO | 21 -
external/bsd/blacklist/bin/Makefile | 15 -
external/bsd/blacklist/bin/blacklistctl.8 | 86 -
external/bsd/blacklist/bin/blacklistctl.c | 168 --
external/bsd/blacklist/bin/blacklistd.8 | 284 ----
external/bsd/blacklist/bin/blacklistd.c | 576 --------
external/bsd/blacklist/bin/blacklistd.conf.5 | 229 ---
external/bsd/blacklist/bin/conf.c | 1223 ------------------
external/bsd/blacklist/bin/conf.h | 65 -
external/bsd/blacklist/bin/internal.c | 48 -
external/bsd/blacklist/bin/internal.h | 57 -
external/bsd/blacklist/bin/run.c | 156 --
external/bsd/blacklist/bin/run.h | 41 -
external/bsd/blacklist/bin/state.c | 235 ---
external/bsd/blacklist/bin/state.h | 62 -
external/bsd/blacklist/bin/support.c | 161 --
external/bsd/blacklist/bin/support.h | 44 -
external/bsd/blacklist/diff/ftpd.diff | 91 -
external/bsd/blacklist/diff/named.diff | 216 ---
external/bsd/blacklist/diff/postfix.diff | 82 -
external/bsd/blacklist/diff/proftpd.diff | 124 -
external/bsd/blacklist/diff/ssh.diff | 150 --
external/bsd/blacklist/etc/Makefile | 10 -
external/bsd/blacklist/etc/blacklistd.conf | 14 -
external/bsd/blacklist/etc/npf.conf | 15 -
external/bsd/blacklist/etc/rc.d/Makefile | 6 -
external/bsd/blacklist/etc/rc.d/blacklistd | 57 -
external/bsd/blacklist/include/Makefile | 10 -
external/bsd/blacklist/include/bl.h | 78 -
external/bsd/blacklist/include/blacklist.h | 55 -
external/bsd/blacklist/lib/Makefile | 19 -
external/bsd/blacklist/lib/bl.c | 526 -------
external/bsd/blacklist/lib/blacklist.c | 108 -
external/bsd/blacklist/lib/libblacklist.3 | 167 --
external/bsd/blacklist/lib/shlib_version | 2 -
external/bsd/blacklist/libexec/Makefile | 6 -
external/bsd/blacklist/libexec/blacklistd-helper | 129 -
external/bsd/blacklist/port/Makefile.am | 25 -
external/bsd/blacklist/port/_strtoi.h | 93 -
external/bsd/blacklist/port/clock_gettime.c | 17 -
external/bsd/blacklist/port/configure.ac | 91 -
external/bsd/blacklist/port/fgetln.c | 106 -
external/bsd/blacklist/port/fparseln.c | 236 ---
external/bsd/blacklist/port/getprogname.c | 24 -
external/bsd/blacklist/port/m4/.cvsignore | 1 -
external/bsd/blacklist/port/pidfile.c | 183 --
external/bsd/blacklist/port/popenve.c | 274 ----
external/bsd/blacklist/port/port.h | 86 -
external/bsd/blacklist/port/sockaddr_snprintf.c | 383 -----
external/bsd/blacklist/port/strlcat.c | 96 -
external/bsd/blacklist/port/strlcpy.c | 78 -
external/bsd/blacklist/port/strtoi.c | 61 -
external/bsd/blacklist/test/Makefile | 12 -
external/bsd/blacklist/test/cltest.c | 136 --
external/bsd/blacklist/test/srvtest.c | 220 ---
external/ibm-public/postfix/dist/src/smtpd/pfilter.c | 10 +-
external/ibm-public/postfix/libexec/smtpd/Makefile | 6 +-
external/mpl/bind/Makefile.inc | 6 +-
external/mpl/bind/dist/lib/ns/pfilter.c | 8 +-
lib/Makefile | 4 +-
libexec/ftpd/Makefile | 6 +-
libexec/ftpd/pfilter.c | 8 +-
share/mk/bsd.README | 3 +-
share/mk/bsd.prog.mk | 3 +-
83 files changed, 177 insertions(+), 7694 deletions(-)
diffs (truncated from 8613 to 300 lines):
diff -r 3647b18de944 -r 547898e02788 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile Mon Jun 15 01:52:52 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile Mon Jun 15 01:57:29 2020 +0000
@@ -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 @@
.ifdef CRUNCHEDPROG
CPPFLAGS+=-DSMALL
.else
-LDADD+= -lblacklist
-DPADD+= ${LIBBLACKLIST}
+LDADD+= -lblocklist
+DPADD+= ${LIBBLOCKLIST}
.endif
COPTS.sshlogin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
diff -r 3647b18de944 -r 547898e02788 crypto/external/bsd/openssh/dist/pfilter.c
--- a/crypto/external/bsd/openssh/dist/pfilter.c Mon Jun 15 01:52:52 2020 +0000
+++ b/crypto/external/bsd/openssh/dist/pfilter.c Mon Jun 15 01:57:29 2020 +0000
@@ -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 @@
// 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
diff -r 3647b18de944 -r 547898e02788 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Mon Jun 15 01:52:52 2020 +0000
+++ b/distrib/sets/lists/base/mi Mon Jun 15 01:57:29 2020 +0000
@@ -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
diff -r 3647b18de944 -r 547898e02788 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Mon Jun 15 01:52:52 2020 +0000
+++ b/distrib/sets/lists/base/shl.mi Mon Jun 15 01:57:29 2020 +0000
@@ -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
diff -r 3647b18de944 -r 547898e02788 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi Mon Jun 15 01:52:52 2020 +0000
+++ b/distrib/sets/lists/comp/mi Mon Jun 15 01:57:29 2020 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index