aboutsummaryrefslogtreecommitdiff
path: root/lib/libblacklist
diff options
context:
space:
mode:
authorJose Luis Duran <jlduran@FreeBSD.org>2025-10-12 17:14:27 +0000
committerJose Luis Duran <jlduran@FreeBSD.org>2025-10-14 00:53:16 +0000
commit7f6f2139eef9f9fc263977c847c6dbf235a1b1b7 (patch)
treee3978404e436786fedd53875596afa99acec5c96 /lib/libblacklist
parenta719ef67e8ed2cbae5f397d2a4680a02495b79ab (diff)
blocklist: Rename blacklist to blocklist
Follow up upstream rename from blacklist to blocklist. - Old names and rc scripts are still valid, but emitting an ugly warning - Old firewall rules and anchor names should work, but emitting an ugly warning - Old MK_BLACKLIST* knobs are wired to the new ones Although care has been taken not to break current configurations, this is a large patch containing mostly duplicated code. If issues arise, it will be swiftly reverted. Reviewed by: ivy (pkgbase) Approved by: emaste (mentor) MFC after: 2 days Relnotes: yes (cherry picked from commit 7238317403b95a8e35cf0bc7cd66fbd78ecbe521)
Diffstat (limited to 'lib/libblacklist')
-rw-r--r--lib/libblacklist/Makefile22
1 files changed, 12 insertions, 10 deletions
diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile
index bfd9edb9614c..07c770883eab 100644
--- a/lib/libblacklist/Makefile
+++ b/lib/libblacklist/Makefile
@@ -1,6 +1,6 @@
BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist
-.PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include
+.PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include ${BLOCKLIST_DIR}/port
PACKAGE= blocklist
LIB= blacklist
@@ -13,17 +13,19 @@ CFLAGS.clang+=-Wno-thread-safety-analysis
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
+ -DHAVE_STRLCAT -DHAVE_STRLCPY -DHAVE_STRUCT_SOCKADDR_SA_LEN \
+ -DHAVE_SYS_CDEFS_H
-SRCS= bl.c blacklist.c
+SRCS= old_bl.c blacklist.c vsyslog_r.c
INCS= blacklist.h
-MAN= libblacklist.3
+MAN= libblocklist.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
+MLINKS+=libblocklist.3 libblacklist.3 \
+ libblocklist.3 blacklist_open.3 \
+ libblocklist.3 blacklist_close.3 \
+ libblocklist.3 blacklist.3 \
+ libblocklist.3 blacklist_r.3 \
+ libblocklist.3 blacklist_sa.3 \
+ libblocklist.3 blacklist_sa_r.3
.include <bsd.lib.mk>