mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-26 20:12:44 +00:00
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
This commit is contained in:
parent
270f75cf34
commit
5f4c09dd85
@ -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
|
||||
|
@ -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>
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
Loading…
Reference in New Issue
Block a user