Track upstream project rename in contrib/blocklistd

Upstream is now https://github.com/zoulasc/blocklist/. Rename the contrib directory and update Makefiles to match, in advance of the next vendor branch update. Sponsored by: The FreeBSD Foundation
brooksdavis · Nov 3, 2023 · 5f4c09d · 5f4c09d
1 parent 270f75c
commit 5f4c09d
Show file tree

Hide file tree

Showing 65 changed files with 14 additions and 14 deletions.
diff --git a/contrib/blacklist/Makefile → contrib/blocklist/Makefile b/contrib/blacklist/Makefile → contrib/blocklist/Makefile
diff --git a/contrib/blacklist/Makefile.inc → contrib/blocklist/Makefile.inc b/contrib/blacklist/Makefile.inc → contrib/blocklist/Makefile.inc
diff --git a/contrib/blacklist/README → contrib/blocklist/README b/contrib/blacklist/README → contrib/blocklist/README
diff --git a/contrib/blacklist/TODO → contrib/blocklist/TODO b/contrib/blacklist/TODO → contrib/blocklist/TODO
diff --git a/contrib/blacklist/bin/Makefile → contrib/blocklist/bin/Makefile b/contrib/blacklist/bin/Makefile → contrib/blocklist/bin/Makefile
diff --git a/contrib/blacklist/bin/blacklistctl.8 → contrib/blocklist/bin/blacklistctl.8 b/contrib/blacklist/bin/blacklistctl.8 → contrib/blocklist/bin/blacklistctl.8
diff --git a/contrib/blacklist/bin/blacklistctl.c → contrib/blocklist/bin/blacklistctl.c b/contrib/blacklist/bin/blacklistctl.c → contrib/blocklist/bin/blacklistctl.c
diff --git a/contrib/blacklist/bin/blacklistd.8 → contrib/blocklist/bin/blacklistd.8 b/contrib/blacklist/bin/blacklistd.8 → contrib/blocklist/bin/blacklistd.8
diff --git a/contrib/blacklist/bin/blacklistd.c → contrib/blocklist/bin/blacklistd.c b/contrib/blacklist/bin/blacklistd.c → contrib/blocklist/bin/blacklistd.c
diff --git a/contrib/blacklist/bin/blacklistd.conf.5 → contrib/blocklist/bin/blacklistd.conf.5 b/contrib/blacklist/bin/blacklistd.conf.5 → contrib/blocklist/bin/blacklistd.conf.5
diff --git a/contrib/blacklist/bin/conf.c → contrib/blocklist/bin/conf.c b/contrib/blacklist/bin/conf.c → contrib/blocklist/bin/conf.c
diff --git a/contrib/blacklist/bin/conf.h → contrib/blocklist/bin/conf.h b/contrib/blacklist/bin/conf.h → contrib/blocklist/bin/conf.h
diff --git a/contrib/blacklist/bin/internal.c → contrib/blocklist/bin/internal.c b/contrib/blacklist/bin/internal.c → contrib/blocklist/bin/internal.c
diff --git a/contrib/blacklist/bin/internal.h → contrib/blocklist/bin/internal.h b/contrib/blacklist/bin/internal.h → contrib/blocklist/bin/internal.h
diff --git a/contrib/blacklist/bin/run.c → contrib/blocklist/bin/run.c b/contrib/blacklist/bin/run.c → contrib/blocklist/bin/run.c
diff --git a/contrib/blacklist/bin/run.h → contrib/blocklist/bin/run.h b/contrib/blacklist/bin/run.h → contrib/blocklist/bin/run.h
diff --git a/contrib/blacklist/bin/state.c → contrib/blocklist/bin/state.c b/contrib/blacklist/bin/state.c → contrib/blocklist/bin/state.c
diff --git a/contrib/blacklist/bin/state.h → contrib/blocklist/bin/state.h b/contrib/blacklist/bin/state.h → contrib/blocklist/bin/state.h
diff --git a/contrib/blacklist/bin/support.c → contrib/blocklist/bin/support.c b/contrib/blacklist/bin/support.c → contrib/blocklist/bin/support.c
diff --git a/contrib/blacklist/bin/support.h → contrib/blocklist/bin/support.h b/contrib/blacklist/bin/support.h → contrib/blocklist/bin/support.h
diff --git a/contrib/blacklist/diff/ftpd.diff → contrib/blocklist/diff/ftpd.diff b/contrib/blacklist/diff/ftpd.diff → contrib/blocklist/diff/ftpd.diff
diff --git a/contrib/blacklist/diff/named.diff → contrib/blocklist/diff/named.diff b/contrib/blacklist/diff/named.diff → contrib/blocklist/diff/named.diff
diff --git a/contrib/blacklist/diff/proftpd.diff → contrib/blocklist/diff/proftpd.diff b/contrib/blacklist/diff/proftpd.diff → contrib/blocklist/diff/proftpd.diff
diff --git a/contrib/blacklist/diff/ssh.diff → contrib/blocklist/diff/ssh.diff b/contrib/blacklist/diff/ssh.diff → contrib/blocklist/diff/ssh.diff
diff --git a/contrib/blacklist/etc/Makefile → contrib/blocklist/etc/Makefile b/contrib/blacklist/etc/Makefile → contrib/blocklist/etc/Makefile
diff --git a/contrib/blacklist/etc/blacklistd.conf → contrib/blocklist/etc/blacklistd.conf b/contrib/blacklist/etc/blacklistd.conf → contrib/blocklist/etc/blacklistd.conf
diff --git a/contrib/blacklist/etc/npf.conf → contrib/blocklist/etc/npf.conf b/contrib/blacklist/etc/npf.conf → contrib/blocklist/etc/npf.conf
diff --git a/contrib/blacklist/etc/rc.d/Makefile → contrib/blocklist/etc/rc.d/Makefile b/contrib/blacklist/etc/rc.d/Makefile → contrib/blocklist/etc/rc.d/Makefile
diff --git a/contrib/blacklist/etc/rc.d/blacklistd → contrib/blocklist/etc/rc.d/blacklistd b/contrib/blacklist/etc/rc.d/blacklistd → contrib/blocklist/etc/rc.d/blacklistd
diff --git a/contrib/blacklist/include/Makefile → contrib/blocklist/include/Makefile b/contrib/blacklist/include/Makefile → contrib/blocklist/include/Makefile
diff --git a/contrib/blacklist/include/bl.h → contrib/blocklist/include/bl.h b/contrib/blacklist/include/bl.h → contrib/blocklist/include/bl.h
diff --git a/contrib/blacklist/include/blacklist.h → contrib/blocklist/include/blacklist.h b/contrib/blacklist/include/blacklist.h → contrib/blocklist/include/blacklist.h
diff --git a/contrib/blacklist/lib/Makefile → contrib/blocklist/lib/Makefile b/contrib/blacklist/lib/Makefile → contrib/blocklist/lib/Makefile
diff --git a/contrib/blacklist/lib/bl.c → contrib/blocklist/lib/bl.c b/contrib/blacklist/lib/bl.c → contrib/blocklist/lib/bl.c
diff --git a/contrib/blacklist/lib/blacklist.c → contrib/blocklist/lib/blacklist.c b/contrib/blacklist/lib/blacklist.c → contrib/blocklist/lib/blacklist.c
diff --git a/contrib/blacklist/lib/libblacklist.3 → contrib/blocklist/lib/libblacklist.3 b/contrib/blacklist/lib/libblacklist.3 → contrib/blocklist/lib/libblacklist.3
diff --git a/contrib/blacklist/lib/shlib_version → contrib/blocklist/lib/shlib_version b/contrib/blacklist/lib/shlib_version → contrib/blocklist/lib/shlib_version
diff --git a/contrib/blacklist/libexec/Makefile → contrib/blocklist/libexec/Makefile b/contrib/blacklist/libexec/Makefile → contrib/blocklist/libexec/Makefile
diff --git a/contrib/blacklist/libexec/blacklistd-helper → contrib/blocklist/libexec/blacklistd-helper b/contrib/blacklist/libexec/blacklistd-helper → contrib/blocklist/libexec/blacklistd-helper
diff --git a/contrib/blacklist/port/Makefile.am → contrib/blocklist/port/Makefile.am b/contrib/blacklist/port/Makefile.am → contrib/blocklist/port/Makefile.am
diff --git a/contrib/blacklist/port/_strtoi.h → contrib/blocklist/port/_strtoi.h b/contrib/blacklist/port/_strtoi.h → contrib/blocklist/port/_strtoi.h
diff --git a/contrib/blacklist/port/clock_gettime.c → contrib/blocklist/port/clock_gettime.c b/contrib/blacklist/port/clock_gettime.c → contrib/blocklist/port/clock_gettime.c
diff --git a/contrib/blacklist/port/config.h → contrib/blocklist/port/config.h b/contrib/blacklist/port/config.h → contrib/blocklist/port/config.h
diff --git a/contrib/blacklist/port/configure.ac → contrib/blocklist/port/configure.ac b/contrib/blacklist/port/configure.ac → contrib/blocklist/port/configure.ac
diff --git a/contrib/blacklist/port/fgetln.c → contrib/blocklist/port/fgetln.c b/contrib/blacklist/port/fgetln.c → contrib/blocklist/port/fgetln.c
diff --git a/contrib/blacklist/port/fparseln.c → contrib/blocklist/port/fparseln.c b/contrib/blacklist/port/fparseln.c → contrib/blocklist/port/fparseln.c
diff --git a/contrib/blacklist/port/getprogname.c → contrib/blocklist/port/getprogname.c b/contrib/blacklist/port/getprogname.c → contrib/blocklist/port/getprogname.c
diff --git a/contrib/blacklist/port/m4/.cvsignore → contrib/blocklist/port/m4/.cvsignore b/contrib/blacklist/port/m4/.cvsignore → contrib/blocklist/port/m4/.cvsignore
diff --git a/contrib/blacklist/port/pidfile.c → contrib/blocklist/port/pidfile.c b/contrib/blacklist/port/pidfile.c → contrib/blocklist/port/pidfile.c
diff --git a/contrib/blacklist/port/popenve.c → contrib/blocklist/port/popenve.c b/contrib/blacklist/port/popenve.c → contrib/blocklist/port/popenve.c
diff --git a/contrib/blacklist/port/port.h → contrib/blocklist/port/port.h b/contrib/blacklist/port/port.h → contrib/blocklist/port/port.h
diff --git a/contrib/blacklist/port/sockaddr_snprintf.c → contrib/blocklist/port/sockaddr_snprintf.c b/contrib/blacklist/port/sockaddr_snprintf.c → contrib/blocklist/port/sockaddr_snprintf.c
diff --git a/contrib/blacklist/port/strlcat.c → contrib/blocklist/port/strlcat.c b/contrib/blacklist/port/strlcat.c → contrib/blocklist/port/strlcat.c
diff --git a/contrib/blacklist/port/strlcpy.c → contrib/blocklist/port/strlcpy.c b/contrib/blacklist/port/strlcpy.c → contrib/blocklist/port/strlcpy.c
diff --git a/contrib/blacklist/port/strtoi.c → contrib/blocklist/port/strtoi.c b/contrib/blacklist/port/strtoi.c → contrib/blocklist/port/strtoi.c
diff --git a/contrib/blacklist/test/Makefile → contrib/blocklist/test/Makefile b/contrib/blacklist/test/Makefile → contrib/blocklist/test/Makefile
diff --git a/contrib/blacklist/test/cltest.c → contrib/blocklist/test/cltest.c b/contrib/blacklist/test/cltest.c → contrib/blocklist/test/cltest.c
diff --git a/contrib/blacklist/test/srvtest.c → contrib/blocklist/test/srvtest.c b/contrib/blacklist/test/srvtest.c → contrib/blocklist/test/srvtest.c
diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile
@@ -1,7 +1,7 @@
 
-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
@@ -11,7 +11,7 @@ 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

diff --git 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 <bsd.prog.mk>
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
@@ -10,7 +10,7 @@ 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

diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
@@ -23,7 +23,7 @@ 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}

diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
@@ -44,7 +44,7 @@ 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}

diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile
@@ -1,6 +1,6 @@
 
-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
 
@@ -12,7 +12,7 @@ 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 \

diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile
@@ -1,6 +1,6 @@
 
-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
 
@@ -13,7 +13,7 @@ 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 \