From nobody Fri Oct 25 03:29:50 2024 X-Original-To: dev-commits-src-all@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 4XZSvf3VjRz5bCLm; Fri, 25 Oct 2024 03:29:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XZSvf2n6Rz4cFg; Fri, 25 Oct 2024 03:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826990; 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=jmHx0FGVpei4lvBmz+U3GBGEA+iHNaEwfD8Jz0sfEJY=; b=QdmlE0uw7gQDbAlzCpzId0pWwDcUsqo8ylXQzNjKzaWplPmlnI218WXKHg08mY9aC2JDM2 2tgSshYv/+9OH4ofZr+rsQPV0icOBV/kn9KZmKyviuz0RnCvrzvOjGe+jPPbaAJdfxApHC SCLGRR3068GHI4aAMTiWbuoIO5Nd05RVBw1rcLAAtOT3lDQPxmyHjBVO3+BbNgBiBb9ALP N1neXVgHfeXghYyEusdJzwIsArXBMSSg/3GRN6E8hJ2WSu/9E4fYYKvIaVRCmPXQ5WABX+ WUHsDAdvtt1Qj4oM5WIx0WCqSSvQjYP4Q7/0LQM39BA5Tk9kBe4R9yLDfQVD6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729826990; 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=jmHx0FGVpei4lvBmz+U3GBGEA+iHNaEwfD8Jz0sfEJY=; b=dVHuOEodz0+CNMFo/nZKx2c9ORqy7Y89BNABmCb/AEcqSnuBh2D1p+TKYJiDgF5+WwpKil pvPI8LRAm2AW7j/9QA7M/Vs6TiOOzA4bkmwc4f+dHhYePIggSr/px44K0rcWElp/UgfNkP vR71xHLKScqh/7lY3a/jN6lq3YuT4Y0ISsjAKKxPfeSfGLJS7N80MMLIB5NWABhNnI1Z/9 Zw2/jzzauRoIxOuZhapEH2Br7+tOZx0jVo1+lLv+xEld6CUEoVXHpHpdyrzYALyU+MZD8+ zVKZ9k+bTJOAMcExnjC8XiL1N4ZSw1c3684vCZVQqh4W2H3oQwDhirBHkLjBYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729826990; a=rsa-sha256; cv=none; b=SDedPpM91eqRsePIj324m3do9857oH87XBJOzEUzCwJ6yvUZz8b2Gn0I8H5jUklm3/zBon tyDkU9x6FNJz+sxjXCQp8uai2wIglROZ1SZbUJaKqmMzTPvXhMKr5z9lXDXHVEq+0H1Lfw Eexc/xIOegRXUI9XblGXY4hFs506ZNpIOPkJxV5QRE+ZezauJrn1XNxhNCFYR3Y2EFt603 ddi09e6/Jtt6mvZ6f2g6fUb/4SvcwdsDtZIbUmSQ6aYkq5o6egFwz8RMKBZlFYeh7gCE9n eknSaV311Of8YrueylV5SqtuZS2s1FaDLQeHFRNYpRcZ2bYEMiEs2rZFqcP/Ew== 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 4XZSvf2NzWz18sw; Fri, 25 Oct 2024 03:29:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49P3ToTD030618; Fri, 25 Oct 2024 03:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49P3ToAx030615; Fri, 25 Oct 2024 03:29:50 GMT (envelope-from git) Date: Fri, 25 Oct 2024 03:29:50 GMT Message-Id: <202410250329.49P3ToAx030615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: c78cc265cd39 - stable/13 - unbound: Move config.h to lib directory. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c78cc265cd39e4b2622b6b39169e01aec6e4d09e Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c78cc265cd39e4b2622b6b39169e01aec6e4d09e commit c78cc265cd39e4b2622b6b39169e01aec6e4d09e Author: Dag-Erling Smørgrav AuthorDate: 2023-08-19 01:44:39 +0000 Commit: Cy Schubert CommitDate: 2024-10-25 03:29:15 +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 (cherry picked from commit 2ba1d4970a06a1660b46f6fd99351d154b295683) --- 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 64261ebad998..a82cc1be4e45 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} SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \ configlexer.l configparser.y context.c dname.c dns.c dns64.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