From nobody Wed Jan 18 15:34:09 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 4NxqYj2f93z2y9gB; Wed, 18 Jan 2023 15:34:17 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4NxqYj0S7lz4XLy; Wed, 18 Jan 2023 15:34:16 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Authentication-Results: mx1.freebsd.org; none Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 30IFY9TK010385; Wed, 18 Jan 2023 07:34:09 -0800 (PST) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 30IFY9Au010384; Wed, 18 Jan 2023 07:34:09 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202301181534.30IFY9Au010384@gndrsh.dnsmgr.net> Subject: Re: git: 1d577bedbae8 - main - unbound: Fix config file path In-Reply-To: <20230118145353.DCA42134@slippy.cwsent.com> To: Cy Schubert Date: Wed, 18 Jan 2023 07:34:09 -0800 (PST) CC: rgrimes@freebsd.org, Juraj Lutter , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4NxqYj0S7lz4XLy X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, 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. No, otis fixed it thus: -#define CONFIGFILE "/usr/local/etc/unbound/unbound.conf" +#define CONFIGFILE "/var/unbound/unbound.conf" I am suggesting that it should be #define CONFIGFILE "/etc/unbound/unbound.conf" ALL base system configuration files *should* be relative to /etc, not /var. > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=0 > > > > -- Rod Grimes rgrimes@freebsd.org