From nobody Sat Aug 19 01:45:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSM4h2HW6z4g3Lr; Sat, 19 Aug 2023 01:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSM4h1lY9z3Mg5; Sat, 19 Aug 2023 01:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692409508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQjGKTEPJ9C9B1s/ZMZ9JR53UstX9NzpKZrV9JkwLLU=; b=jeK0bhmFVsD8pljVNaZ1fQWWOTnGxOqSE1f7yvX3YGRtfeW4LrkgYW2LxuXK0Wv4MjCcQa CHD353asipu9kOQBn2SAyR8YePVjHagnIhR6UD2J3mrd2hSIW55DMaGbVMxzwa5UN4pFrS i3rlqh0pMH1MdQ1FfUyLyZMabQnwWxaBVKgoSfU+U83MnejPzWP9BRaO9xxwFt12+jQmDv 7aKk9FZyuw6D0CaE94E6IcdxZf36c5OM+v20E6sGlNty6ZAqyHFoRWuKWNVz4FBP58yV2Z UKHRo9ylbc2sy6r4J6pDqGjuNTKwTAtxJ7NKr/L1aLumoczftpBdjWh5FlGnaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692409508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQjGKTEPJ9C9B1s/ZMZ9JR53UstX9NzpKZrV9JkwLLU=; b=VBjDWGXRYbDwK6qTNPGOaZpdkIo7RLvQbFfCl8q23fXxd0Ln1ieSvmk8xGG8X/I1U8msY3 tAarIMAy1wzqunBUss6+J8wuocWn093d2KjNIEq/S30U7lT4vILkCC9q/hFUFc30zFq8CO ylnHN3saVtYZP2pIxoKVasIq9UjMpyK4XKfKpd3hXMf7Rmq2mdzStWqS9GPccv+hwa9QAV 9Pc+APcDPmjryj2PWfmamKuvNMuh6TpmSFBEHkVBQ8zQjrCQjbKdd5dI2CP34UoJXSSVhP 1OAcwXhvLYJCoFy379AyWZ5ai/eNsHnyIXID68ddX8aIEw84qdADW1TJqMEfHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692409508; a=rsa-sha256; cv=none; b=ZU72AFPUZlCBPjXnwpU3MsiBfP9CHwbcf8C/mp9jif+5VAzOFL0GsK1zMQ38zk1Mx8E/KM 5O+d0zfLhVnwplVGwWZ7wEDtP0VX247OpfamPbRVkDZm5VbfuFl2U4jugUZE8BTKurQM7p NKAqD2eMws+RHRBj+3B5iGBnrURx/FRs9h7PxNdxcdCmaTKLo/WT4pPU5gDd0p20PxB0TE qIyyn0IjCW3CVcSUMUsKFpgobaRzIeewnoft3Nt+AQTIICKWAXDm+jkpzBfcokVgZXxop0 Frr+e/sTshs5BikU0WS4hixqEDK28Od0zWuBHC70W9qqqPfMYVBhfCWTDfgWAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSM4h0jRVzffs; Sat, 19 Aug 2023 01:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J1j7Ee066910; Sat, 19 Aug 2023 01:45:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J1j7op066907; Sat, 19 Aug 2023 01:45:07 GMT (envelope-from git) Date: Sat, 19 Aug 2023 01:45:07 GMT Message-Id: <202308190145.37J1j7op066907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2ba1d4970a06 - main - unbound: Move config.h to lib directory. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ba1d4970a06a1660b46f6fd99351d154b295683 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba1d4970a06a1660b46f6fd99351d154b295683 commit 2ba1d4970a06a1660b46f6fd99351d154b295683 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-19 01:44:39 +0000 Commit: Dag-Erling Smørgrav 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