mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00
Code Issues Releases Activity

unbound: Move config.h to lib directory.

Browse Source 
It was originally in contrib, and moved to usr.sbin in 6692aa840c1f; I always thought lib would make more sense but never got around to moving it.

Reviewed by:	cy
Differential Revision:	https://reviews.freebsd.org/D41504
This commit is contained in:
Dag-Erling Smørgrav 2023-08-19 01:44:39 +00:00
parent 64e881f2db
commit 2ba1d4970a
7 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/unbound/freebsd-configure.sh
View File

@ -39,3 +39,4 @@ cd $unbound
--with-conf-file=/var/unbound/unbound.conf \
--with-run-dir=/var/unbound \
--with-username=unbound
mv config.h ../../lib/libunbound

3
lib/libunbound/Makefile
View File

@ -11,8 +11,7 @@ LIB= unbound
PRIVATELIB=
PACKAGE= unbound
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
CFLAGS+= -I${SRCTOP}/usr.sbin/unbound
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -I${.CURDIR}
CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L
SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \

0
usr.sbin/unbound/config.h → lib/libunbound/config.h
View File

3
usr.sbin/unbound/anchor/Makefile
View File

@ -2,6 +2,7 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
EXPATDIR= ${SRCTOP}/contrib/expat
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc
@ -9,7 +10,7 @@ EXPATDIR= ${SRCTOP}/contrib/expat
PROG= local-unbound-anchor
SRCS= unbound-anchor.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib
CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound bsdxml ssl crypto pthread
MAN= local-unbound-anchor.8

3
usr.sbin/unbound/checkconf/Makefile
View File

@ -2,13 +2,14 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
PROG= local-unbound-checkconf
SRCS= ub_event.c unbound-checkconf.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound pthread
MAN= local-unbound-checkconf.8

3
usr.sbin/unbound/control/Makefile
View File

@ -2,13 +2,14 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc
PROG= local-unbound-control
SRCS= ub_event.c unbound-control.c worker_cb.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound crypto ssl pthread
MAN= local-unbound-control.8

3
usr.sbin/unbound/daemon/Makefile
View File

@ -2,6 +2,7 @@
# Vendor sources and generated files
LDNSDIR= ${SRCTOP}/contrib/ldns
UNBOUNDDIR= ${SRCTOP}/contrib/unbound
LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound
.PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/shm_side ${UNBOUNDDIR}/doc
@ -9,7 +10,7 @@ PROG= local-unbound
SRCS= acl_list.c cachedump.c daemon.c remote.c shm_main.c stats.c \
ub_event.c unbound.c worker.c
CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR}
CFLAGS+= -I${.CURDIR:H} -I${.CURDIR}
CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR}
LIBADD= unbound util ssl crypto pthread
MAN= local-unbound.8 local-unbound.conf.5