From nobody Wed Jan 18 14:53:53 2023 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 4Nxpg92tD6z2v7FF; Wed, 18 Jan 2023 14:53:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta001.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Nxpg90bY2z4TVQ; Wed, 18 Jan 2023 14:53:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4002a.ext.cloudfilter.net ([10.228.9.250]) by cmsmtp with ESMTP id I5fPpAou4c9C4I9p6pRdKB; Wed, 18 Jan 2023 14:53:56 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id I9p4ph8KoyAOeI9p5pWBML; Wed, 18 Jan 2023 14:53:56 +0000 X-Authority-Analysis: v=2.4 cv=e5oV9Il/ c=1 sm=1 tr=0 ts=63c80804 a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=RvmDmJFTN0MA:10 a=iKhvJSA4AAAA:8 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=xs_zb_Srkt0rRL9ledgA:9 a=CjuIK1q_8ugA:10 a=odh9cflL3HIXMm4fY7Wr:22 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id EFE4510AD; Wed, 18 Jan 2023 06:53:53 -0800 (PST) Received: by slippy.cwsent.com (Postfix, from userid 1000) id DCA42134; Wed, 18 Jan 2023 06:53:53 -0800 (PST) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: rgrimes@freebsd.org cc: Juraj Lutter , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1d577bedbae8 - main - unbound: Fix config file path In-reply-to: <202301181335.30IDZYr6009976@gndrsh.dnsmgr.net> References: <202301181335.30IDZYr6009976@gndrsh.dnsmgr.net> Comments: In-reply-to "Rodney W. Grimes" message dated "Wed, 18 Jan 2023 05:35:34 -0800." 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 18 Jan 2023 06:53:53 -0800 Message-Id: <20230118145353.DCA42134@slippy.cwsent.com> X-CMAE-Envelope: MS4xfBxEidjHClkzOA3nu4p0jhXLdo9qyf18gY3mKm7hkxajXaKt6YhRjg+sQB4+rVD/dbQJu0JZFZ3FSTznkHB0mA2bDbTH2BEQRsu9bCEHI5fNXlb3qBe9 lWB/WSjuR7RJ7i732NrOql8fK/IV5Pf3rN06Pc747w0c7LGbA4wIPF9I23CKvYLrCLmfav9HTzlMaprXw9LvU09Rh6bWUrORd7FvakjLocwNeuittKyv9nAA VaRrQI17jc3f0G4DUdnum/nIi4v9QpXpagPNhQi9H0FbPKtAXVsfbc6h8cmuNV4LWAKoFIuSZAvmsO714+obeWwmG86m737Sr2nu3iHUFpbrPhLLsbGGnLfF rYnYrk2i X-Rspamd-Queue-Id: 4Nxpg90bY2z4TVQ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message <202301181335.30IDZYr6009976@gndrsh.dnsmgr.net>, "Rodney W. Grimes" writes: > > The branch main has been updated by otis (ports committer): > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1d577bedbae80ced38ccb834e6835e > 5fd98bc411 > > > > commit 1d577bedbae80ced38ccb834e6835e5fd98bc411 > > Author: Juraj Lutter > > AuthorDate: 2023-01-17 17:25:47 +0000 > > Commit: Juraj Lutter > > CommitDate: 2023-01-18 07:50:07 +0000 > > > > unbound: Fix config file path > > > > Commit 1838dec31895fd4752fa8631322ab93be0705a66 changed the > > config file path to /usr/local/etc/unbound/unbound.conf which > > is wrong for unbound in base. > > > > Reported by: Ihor Antonov > > Reviewed by: zlei > > Approved by: zlei > > Differential Revision: https://reviews.freebsd.org/D38106 > > > > Fixes: 1838dec31895fd4752fa8631322ab93be0705a66 > > MFC after: 1 month > > X-MFC with: 1838dec31895fd4752fa8631322ab93be0705a66 > > --- > > usr.sbin/unbound/config.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/usr.sbin/unbound/config.h b/usr.sbin/unbound/config.h > > index bd36bb7573f8..2068cbfe7295 100644 > > --- a/usr.sbin/unbound/config.h > > +++ b/usr.sbin/unbound/config.h > > @@ -21,7 +21,7 @@ > > #define CONFCMDLINE "--with-ssl=/usr --with-libexpat=/usr --disable-dnscry > pt --disable-dnstap --enable-ecdsa --disable-event-api --enable-gost --with-l > ibevent --disable-subnet --disable-tfo-client --disable-tfo-server --with-pth > reads--prefix=/usr --localstatedir=/var/unbound --mandir=/usr/share/man --bui > ld=freebsd" > > > > /* Pathname to the Unbound configuration file */ > > -#define CONFIGFILE "/usr/local/etc/unbound/unbound.conf" > > +#define CONFIGFILE "/var/unbound/unbound.conf" > > Should this redirect through the /etc/unbound symbolic link? > > For example if I have modified the /etc/unbound -> ../var/unbound > symbolic link /etc/unbound -> ../nodedata/etc/unbound your change > is going to cause me to scratch my head why unbound is not reading > my config file. > > Further it appears as if local-unbound.conf refers to the > /etc/unbound path and does not mention /var/unbound. > > And an existing bug that may no longer be present is why do all > the manpages installed have a local- prefix on them, but the > binaries are installed without that? It also appears as if there > is some @foo_path@ stuff in the man pages that should of been > fixed up by the installer process to use the values compiled in. That was my mistake I missed changing it back after generating a new config.h and fixed by otis@ in 1d577bedbae8. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0