diff --git a/contrib/blacklist/Makefile b/contrib/blocklist/Makefile similarity index 100% rename from contrib/blacklist/Makefile rename to contrib/blocklist/Makefile diff --git a/contrib/blacklist/Makefile.inc b/contrib/blocklist/Makefile.inc similarity index 100% rename from contrib/blacklist/Makefile.inc rename to contrib/blocklist/Makefile.inc diff --git a/contrib/blacklist/README b/contrib/blocklist/README similarity index 100% rename from contrib/blacklist/README rename to contrib/blocklist/README diff --git a/contrib/blacklist/TODO b/contrib/blocklist/TODO similarity index 100% rename from contrib/blacklist/TODO rename to contrib/blocklist/TODO diff --git a/contrib/blacklist/bin/Makefile b/contrib/blocklist/bin/Makefile similarity index 100% rename from contrib/blacklist/bin/Makefile rename to contrib/blocklist/bin/Makefile diff --git a/contrib/blacklist/bin/blacklistctl.8 b/contrib/blocklist/bin/blacklistctl.8 similarity index 100% rename from contrib/blacklist/bin/blacklistctl.8 rename to contrib/blocklist/bin/blacklistctl.8 diff --git a/contrib/blacklist/bin/blacklistctl.c b/contrib/blocklist/bin/blacklistctl.c similarity index 100% rename from contrib/blacklist/bin/blacklistctl.c rename to contrib/blocklist/bin/blacklistctl.c diff --git a/contrib/blacklist/bin/blacklistd.8 b/contrib/blocklist/bin/blacklistd.8 similarity index 100% rename from contrib/blacklist/bin/blacklistd.8 rename to contrib/blocklist/bin/blacklistd.8 diff --git a/contrib/blacklist/bin/blacklistd.c b/contrib/blocklist/bin/blacklistd.c similarity index 100% rename from contrib/blacklist/bin/blacklistd.c rename to contrib/blocklist/bin/blacklistd.c diff --git a/contrib/blacklist/bin/blacklistd.conf.5 b/contrib/blocklist/bin/blacklistd.conf.5 similarity index 100% rename from contrib/blacklist/bin/blacklistd.conf.5 rename to contrib/blocklist/bin/blacklistd.conf.5 diff --git a/contrib/blacklist/bin/conf.c b/contrib/blocklist/bin/conf.c similarity index 100% rename from contrib/blacklist/bin/conf.c rename to contrib/blocklist/bin/conf.c diff --git a/contrib/blacklist/bin/conf.h b/contrib/blocklist/bin/conf.h similarity index 100% rename from contrib/blacklist/bin/conf.h rename to contrib/blocklist/bin/conf.h diff --git a/contrib/blacklist/bin/internal.c b/contrib/blocklist/bin/internal.c similarity index 100% rename from contrib/blacklist/bin/internal.c rename to contrib/blocklist/bin/internal.c diff --git a/contrib/blacklist/bin/internal.h b/contrib/blocklist/bin/internal.h similarity index 100% rename from contrib/blacklist/bin/internal.h rename to contrib/blocklist/bin/internal.h diff --git a/contrib/blacklist/bin/run.c b/contrib/blocklist/bin/run.c similarity index 100% rename from contrib/blacklist/bin/run.c rename to contrib/blocklist/bin/run.c diff --git a/contrib/blacklist/bin/run.h b/contrib/blocklist/bin/run.h similarity index 100% rename from contrib/blacklist/bin/run.h rename to contrib/blocklist/bin/run.h diff --git a/contrib/blacklist/bin/state.c b/contrib/blocklist/bin/state.c similarity index 100% rename from contrib/blacklist/bin/state.c rename to contrib/blocklist/bin/state.c diff --git a/contrib/blacklist/bin/state.h b/contrib/blocklist/bin/state.h similarity index 100% rename from contrib/blacklist/bin/state.h rename to contrib/blocklist/bin/state.h diff --git a/contrib/blacklist/bin/support.c b/contrib/blocklist/bin/support.c similarity index 100% rename from contrib/blacklist/bin/support.c rename to contrib/blocklist/bin/support.c diff --git a/contrib/blacklist/bin/support.h b/contrib/blocklist/bin/support.h similarity index 100% rename from contrib/blacklist/bin/support.h rename to contrib/blocklist/bin/support.h diff --git a/contrib/blacklist/diff/ftpd.diff b/contrib/blocklist/diff/ftpd.diff similarity index 100% rename from contrib/blacklist/diff/ftpd.diff rename to contrib/blocklist/diff/ftpd.diff diff --git a/contrib/blacklist/diff/named.diff b/contrib/blocklist/diff/named.diff similarity index 100% rename from contrib/blacklist/diff/named.diff rename to contrib/blocklist/diff/named.diff diff --git a/contrib/blacklist/diff/proftpd.diff b/contrib/blocklist/diff/proftpd.diff similarity index 100% rename from contrib/blacklist/diff/proftpd.diff rename to contrib/blocklist/diff/proftpd.diff diff --git a/contrib/blacklist/diff/ssh.diff b/contrib/blocklist/diff/ssh.diff similarity index 100% rename from contrib/blacklist/diff/ssh.diff rename to contrib/blocklist/diff/ssh.diff diff --git a/contrib/blacklist/etc/Makefile b/contrib/blocklist/etc/Makefile similarity index 100% rename from contrib/blacklist/etc/Makefile rename to contrib/blocklist/etc/Makefile diff --git a/contrib/blacklist/etc/blacklistd.conf b/contrib/blocklist/etc/blacklistd.conf similarity index 100% rename from contrib/blacklist/etc/blacklistd.conf rename to contrib/blocklist/etc/blacklistd.conf diff --git a/contrib/blacklist/etc/npf.conf b/contrib/blocklist/etc/npf.conf similarity index 100% rename from contrib/blacklist/etc/npf.conf rename to contrib/blocklist/etc/npf.conf diff --git a/contrib/blacklist/etc/rc.d/Makefile b/contrib/blocklist/etc/rc.d/Makefile similarity index 100% rename from contrib/blacklist/etc/rc.d/Makefile rename to contrib/blocklist/etc/rc.d/Makefile diff --git a/contrib/blacklist/etc/rc.d/blacklistd b/contrib/blocklist/etc/rc.d/blacklistd similarity index 100% rename from contrib/blacklist/etc/rc.d/blacklistd rename to contrib/blocklist/etc/rc.d/blacklistd diff --git a/contrib/blacklist/include/Makefile b/contrib/blocklist/include/Makefile similarity index 100% rename from contrib/blacklist/include/Makefile rename to contrib/blocklist/include/Makefile diff --git a/contrib/blacklist/include/bl.h b/contrib/blocklist/include/bl.h similarity index 100% rename from contrib/blacklist/include/bl.h rename to contrib/blocklist/include/bl.h diff --git a/contrib/blacklist/include/blacklist.h b/contrib/blocklist/include/blacklist.h similarity index 100% rename from contrib/blacklist/include/blacklist.h rename to contrib/blocklist/include/blacklist.h diff --git a/contrib/blacklist/lib/Makefile b/contrib/blocklist/lib/Makefile similarity index 100% rename from contrib/blacklist/lib/Makefile rename to contrib/blocklist/lib/Makefile diff --git a/contrib/blacklist/lib/bl.c b/contrib/blocklist/lib/bl.c similarity index 100% rename from contrib/blacklist/lib/bl.c rename to contrib/blocklist/lib/bl.c diff --git a/contrib/blacklist/lib/blacklist.c b/contrib/blocklist/lib/blacklist.c similarity index 100% rename from contrib/blacklist/lib/blacklist.c rename to contrib/blocklist/lib/blacklist.c diff --git a/contrib/blacklist/lib/libblacklist.3 b/contrib/blocklist/lib/libblacklist.3 similarity index 100% rename from contrib/blacklist/lib/libblacklist.3 rename to contrib/blocklist/lib/libblacklist.3 diff --git a/contrib/blacklist/lib/shlib_version b/contrib/blocklist/lib/shlib_version similarity index 100% rename from contrib/blacklist/lib/shlib_version rename to contrib/blocklist/lib/shlib_version diff --git a/contrib/blacklist/libexec/Makefile b/contrib/blocklist/libexec/Makefile similarity index 100% rename from contrib/blacklist/libexec/Makefile rename to contrib/blocklist/libexec/Makefile diff --git a/contrib/blacklist/libexec/blacklistd-helper b/contrib/blocklist/libexec/blacklistd-helper similarity index 100% rename from contrib/blacklist/libexec/blacklistd-helper rename to contrib/blocklist/libexec/blacklistd-helper diff --git a/contrib/blacklist/port/Makefile.am b/contrib/blocklist/port/Makefile.am similarity index 100% rename from contrib/blacklist/port/Makefile.am rename to contrib/blocklist/port/Makefile.am diff --git a/contrib/blacklist/port/_strtoi.h b/contrib/blocklist/port/_strtoi.h similarity index 100% rename from contrib/blacklist/port/_strtoi.h rename to contrib/blocklist/port/_strtoi.h diff --git a/contrib/blacklist/port/clock_gettime.c b/contrib/blocklist/port/clock_gettime.c similarity index 100% rename from contrib/blacklist/port/clock_gettime.c rename to contrib/blocklist/port/clock_gettime.c diff --git a/contrib/blacklist/port/config.h b/contrib/blocklist/port/config.h similarity index 100% rename from contrib/blacklist/port/config.h rename to contrib/blocklist/port/config.h diff --git a/contrib/blacklist/port/configure.ac b/contrib/blocklist/port/configure.ac similarity index 100% rename from contrib/blacklist/port/configure.ac rename to contrib/blocklist/port/configure.ac diff --git a/contrib/blacklist/port/fgetln.c b/contrib/blocklist/port/fgetln.c similarity index 100% rename from contrib/blacklist/port/fgetln.c rename to contrib/blocklist/port/fgetln.c diff --git a/contrib/blacklist/port/fparseln.c b/contrib/blocklist/port/fparseln.c similarity index 100% rename from contrib/blacklist/port/fparseln.c rename to contrib/blocklist/port/fparseln.c diff --git a/contrib/blacklist/port/getprogname.c b/contrib/blocklist/port/getprogname.c similarity index 100% rename from contrib/blacklist/port/getprogname.c rename to contrib/blocklist/port/getprogname.c diff --git a/contrib/blacklist/port/m4/.cvsignore b/contrib/blocklist/port/m4/.cvsignore similarity index 100% rename from contrib/blacklist/port/m4/.cvsignore rename to contrib/blocklist/port/m4/.cvsignore diff --git a/contrib/blacklist/port/pidfile.c b/contrib/blocklist/port/pidfile.c similarity index 100% rename from contrib/blacklist/port/pidfile.c rename to contrib/blocklist/port/pidfile.c diff --git a/contrib/blacklist/port/popenve.c b/contrib/blocklist/port/popenve.c similarity index 100% rename from contrib/blacklist/port/popenve.c rename to contrib/blocklist/port/popenve.c diff --git a/contrib/blacklist/port/port.h b/contrib/blocklist/port/port.h similarity index 100% rename from contrib/blacklist/port/port.h rename to contrib/blocklist/port/port.h diff --git a/contrib/blacklist/port/sockaddr_snprintf.c b/contrib/blocklist/port/sockaddr_snprintf.c similarity index 100% rename from contrib/blacklist/port/sockaddr_snprintf.c rename to contrib/blocklist/port/sockaddr_snprintf.c diff --git a/contrib/blacklist/port/strlcat.c b/contrib/blocklist/port/strlcat.c similarity index 100% rename from contrib/blacklist/port/strlcat.c rename to contrib/blocklist/port/strlcat.c diff --git a/contrib/blacklist/port/strlcpy.c b/contrib/blocklist/port/strlcpy.c similarity index 100% rename from contrib/blacklist/port/strlcpy.c rename to contrib/blocklist/port/strlcpy.c diff --git a/contrib/blacklist/port/strtoi.c b/contrib/blocklist/port/strtoi.c similarity index 100% rename from contrib/blacklist/port/strtoi.c rename to contrib/blocklist/port/strtoi.c diff --git a/contrib/blacklist/test/Makefile b/contrib/blocklist/test/Makefile similarity index 100% rename from contrib/blacklist/test/Makefile rename to contrib/blocklist/test/Makefile diff --git a/contrib/blacklist/test/cltest.c b/contrib/blocklist/test/cltest.c similarity index 100% rename from contrib/blacklist/test/cltest.c rename to contrib/blocklist/test/cltest.c diff --git a/contrib/blacklist/test/srvtest.c b/contrib/blocklist/test/srvtest.c similarity index 100% rename from contrib/blacklist/test/srvtest.c rename to contrib/blocklist/test/srvtest.c diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile index 932e186e3172..9d85d1eff82c 100644 --- a/lib/libblacklist/Makefile +++ b/lib/libblacklist/Makefile @@ -1,30 +1,30 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist -.PATH: ${BLACKLIST_DIR}/lib ${BLACKLIST_DIR}/include +.PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include PACKAGE= blocklist LIB= blacklist SHLIB_MAJOR= 0 LIBADD+= pthread CFLAGS.clang+=-Wno-thread-safety-analysis -CFLAGS+=-I${BLACKLIST_DIR}/include -I${BLACKLIST_DIR}/port \ +CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \ -D_REENTRANT -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \ -DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_GETPROGNAME \ -DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRUCT_SOCKADDR_SA_LEN SRCS= bl.c blacklist.c INCS= blacklist.h MAN= libblacklist.3 MLINKS= libblacklist.3 blacklist_open.3 \ libblacklist.3 blacklist_close.3 \ libblacklist.3 blacklist.3 \ libblacklist.3 blacklist_r.3 \ libblacklist.3 blacklist_sa.3 \ libblacklist.3 blacklist_sa_r.3 .include diff --git a/libexec/blacklistd-helper/Makefile b/libexec/blacklistd-helper/Makefile index a22ba37fc764..c0eb25489052 100644 --- a/libexec/blacklistd-helper/Makefile +++ b/libexec/blacklistd-helper/Makefile @@ -1,6 +1,6 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist -SCRIPTS= ${BLACKLIST_DIR}/libexec/blacklistd-helper +SCRIPTS= ${BLOCKLIST_DIR}/libexec/blacklistd-helper .include diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile index f0f797ad02db..c5b780c4e225 100644 --- a/libexec/fingerd/Makefile +++ b/libexec/fingerd/Makefile @@ -1,18 +1,18 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 .include PROG= fingerd LIBADD= util MAN= fingerd.8 WARNS?= 2 WFORMAT=0 .if ${MK_BLACKLIST_SUPPORT} != "no" -CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include +CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blocklist/include LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} .endif .include diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index aa02c545d81b..f58b675cf8e7 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,41 +1,41 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 .include PACKAGE= ftpd CONFS= ftpusers PROG= ftpd MAN= ftpd.8 ftpchroot.5 SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c CFLAGS+=-DSETPROCTITLE -DLOGIN_CAP -DVIRTUAL_HOSTING CFLAGS+=-I${.CURDIR} YFLAGS= WARNS?= 2 WFORMAT=0 LIBADD= crypt md util .PATH: ${SRCTOP}/bin/ls SRCS+= ls.c cmp.c print.c util.c CFLAGS+=-Dmain=ls_main -I${SRCTOP}/bin/ls LIBADD+= m .if ${MK_BLACKLIST_SUPPORT} != "no" -CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include +CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blocklist/include SRCS+= blacklist.c LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} .endif .if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 .endif .if ${MK_PAM_SUPPORT} != "no" CFLAGS+=-DUSE_PAM LIBADD+= pam .endif .include diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index fd9eacebe68d..c15bd773c77a 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,72 +1,72 @@ .include .include "${SRCTOP}/secure/ssh.mk" CONFS= moduli sshd_config CONFSDIR= /etc/ssh PROG= sshd SRCS= sshd.c auth-rhosts.c auth-passwd.c \ audit.c audit-bsm.c audit-linux.c platform.c \ sshpty.c sshlogin.c servconf.c serverloop.c \ auth.c auth2.c auth-options.c session.c \ auth2-chall.c groupaccess.c \ auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ auth2-none.c auth2-passwd.c auth2-pubkey.c auth2-pubkeyfile.c \ monitor.c monitor_wrap.c auth-krb5.c \ auth2-gss.c gss-serv.c gss-serv-krb5.c \ loginrec.c auth-pam.c auth-shadow.c auth-sia.c \ srclimit.c sftp-server.c sftp-common.c \ sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \ sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c \ sandbox-solaris.c uidswap.c PACKAGE= ssh # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c MAN= sshd.8 sshd_config.5 # Don't rebuild based on moduli.c moduli: .MADE # pam should always happen before ssh here for static linking LIBADD= pam ssh util .if ${MK_LDNS} != "no" CFLAGS+= -DHAVE_LDNS=1 #DPADD+= ${LIBLDNS} #LDADD+= -lldns .endif .if ${MK_AUDIT} != "no" CFLAGS+= -DUSE_BSM_AUDIT=1 -DHAVE_GETAUDIT_ADDR=1 LIBADD+= bsm .endif .if ${MK_BLACKLIST_SUPPORT} != "no" -CFLAGS+= -DUSE_BLACKLIST=1 -I${SRCTOP}/contrib/blacklist/include +CFLAGS+= -DUSE_BLACKLIST=1 -I${SRCTOP}/contrib/blocklist/include SRCS+= blacklist.c LIBADD+= blacklist LDFLAGS+=-L${LIBBLACKLISTDIR} .endif .if ${MK_GSSAPI} != "no" && ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h SRCS+= krb5_config.h LIBADD+= gssapi_krb5 gssapi krb5 .endif .if ${MK_TCP_WRAPPERS} != "no" CFLAGS+= -DLIBWRAP=1 LIBADD+= wrap .endif LIBADD+= crypto .if defined(LOCALBASE) CFLAGS+= -DXAUTH_PATH=\"${LOCALBASE}/bin/xauth\" .endif .include .PATH: ${SSHDIR} diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile index 1e4778bf0953..065c17843cee 100644 --- a/usr.sbin/blacklistctl/Makefile +++ b/usr.sbin/blacklistctl/Makefile @@ -1,23 +1,23 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist -.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist +.PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port PACKAGE= blocklist PROG= blacklistctl SRCS= blacklistctl.c conf.c state.c support.c internal.c \ sockaddr_snprintf.c pidfile.c strtoi.c popenve.c MAN= blacklistctl.8 LDFLAGS+=-L${LIBBLACKLISTDIR} LIBADD+= blacklist util -CFLAGS+=-I${BLACKLIST_DIR}/include -I${BLACKLIST_DIR}/port \ +CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \ -D_PATH_BLCONTROL=\"/usr/libexec/blacklistd-helper\" \ -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \ -DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_FPARSELN \ -DHAVE_GETPROGNAME -DHAVE_STRLCAT -DHAVE_STRLCPY \ -DHAVE_STRUCT_SOCKADDR_SA_LEN # CFLAGS+= -D_REENTRANT .include diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile index b6d1e236911e..92928ca3e60f 100644 --- a/usr.sbin/blacklistd/Makefile +++ b/usr.sbin/blacklistd/Makefile @@ -1,24 +1,24 @@ -BLACKLIST_DIR=${SRCTOP}/contrib/blacklist -.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist +.PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port PACKAGE= blocklist CONFS= blacklistd.conf PROG= blacklistd SRCS= blacklistd.c conf.c run.c state.c support.c internal.c \ sockaddr_snprintf.c pidfile.c strtoi.c popenve.c MAN= blacklistd.8 blacklistd.conf.5 LDFLAGS+=-L${LIBBLACKLISTDIR} LIBADD+= blacklist util -CFLAGS+=-I${BLACKLIST_DIR}/include -I${BLACKLIST_DIR}/port \ +CFLAGS+=-I${BLOCKLIST_DIR}/include -I${BLOCKLIST_DIR}/port \ -D_PATH_BLCONTROL=\"/usr/libexec/blacklistd-helper\" \ -DHAVE_CONFIG_H -DHAVE_DB_H -DHAVE_LIBUTIL_H \ -DHAVE_CLOCK_GETTIME -DHAVE_FGETLN -DHAVE_FPARSELN \ -DHAVE_GETPROGNAME -DHAVE_STRLCAT -DHAVE_STRLCPY \ -DHAVE_STRUCT_SOCKADDR_SA_LEN # CFLAGS+= -D_REENTRANT .include