Date: Sat, 19 Aug 2023 01:45:07 GMT From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 2ba1d4970a06 - main - unbound: Move config.h to lib directory. Message-ID: <202308190145.37J1j7op066907@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba1d4970a06a1660b46f6fd99351d154b295683 commit 2ba1d4970a06a1660b46f6fd99351d154b295683 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2023-08-19 01:44:39 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2023-08-19 01:44:58 +0000 unbound: Move config.h to lib directory. 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 --- contrib/unbound/freebsd-configure.sh | 1 + lib/libunbound/Makefile | 3 +-- {usr.sbin/unbound => lib/libunbound}/config.h | 0 usr.sbin/unbound/anchor/Makefile | 3 ++- usr.sbin/unbound/checkconf/Makefile | 3 ++- usr.sbin/unbound/control/Makefile | 3 ++- usr.sbin/unbound/daemon/Makefile | 3 ++- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/unbound/freebsd-configure.sh b/contrib/unbound/freebsd-configure.sh index 7169bbcce732..cd45d4716320 100755 --- a/contrib/unbound/freebsd-configure.sh +++ b/contrib/unbound/freebsd-configure.sh @@ -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 diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile index 2b792d3ade2b..e6f095a09d10 100644 --- a/lib/libunbound/Makefile +++ b/lib/libunbound/Makefile @@ -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 \ diff --git a/usr.sbin/unbound/config.h b/lib/libunbound/config.h similarity index 100% rename from usr.sbin/unbound/config.h rename to lib/libunbound/config.h diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile index 01a7c53c8ae8..91ae1090415a 100644 --- a/usr.sbin/unbound/anchor/Makefile +++ b/usr.sbin/unbound/anchor/Makefile @@ -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 diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile index 264f3b829fc4..c8d8397225b0 100644 --- a/usr.sbin/unbound/checkconf/Makefile +++ b/usr.sbin/unbound/checkconf/Makefile @@ -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 diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile index b5340c0bca67..ad5f7eb21f09 100644 --- a/usr.sbin/unbound/control/Makefile +++ b/usr.sbin/unbound/control/Makefile @@ -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 diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile index ad0f5b2fb245..28b451aa5061 100644 --- a/usr.sbin/unbound/daemon/Makefile +++ b/usr.sbin/unbound/daemon/Makefile @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308190145.37J1j7op066907>