From nobody Tue Feb 14 18:35:16 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 4PGVJ43D9kz3ppwq; Tue, 14 Feb 2023 18:35:16 +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 4PGVJ42Kxjz3mkq; Tue, 14 Feb 2023 18:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676399716; 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=IFFBQkaSYt7kDehJpRUN+JWtQiI9Yxu4jqhvTyLRUXA=; b=X+TyMsB0e/qEruQmDsFRkW4Te55oVKrxn84IGYlil64ka211PHRZgyYdLGafGdRDDlcuxQ iwjBwPlE9clgI8V3jQDgEyEAcqKX7IwCMf+yWp8IuI+oAXDqG6/cCmrBYF5O9t3jnBZgUD CHAeZUH5I8pT625Svs4zRyQ6eRwY2NHSTDsWLJsJwEbft0+XNNOWaJG8LDGynqGO0O9Pki C0Yhtqz5TrVC45WJl0NNgNQxrz0/9Z0Cq2BjL1kaN6DhQUmema36GtQP9k+8I0wHm+eNPl 1ZMAR674U7x+BILfKttQznq+85WF85P+oMxJfqyTPHRkr2OZpJElm1pL3FJozw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676399716; 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=IFFBQkaSYt7kDehJpRUN+JWtQiI9Yxu4jqhvTyLRUXA=; b=PgO4MUypiax5U8inaU9KkSaFDfEHpEVOSjxEA3kBRqw+z42HlIwWZJ3xGoXLUWABmUzlbM zDY0zpGXqVRVjrUeuNAG8xwvOi8Fl/80YDZNFk6N2jpHKWx6iYpeOA8UeRFMmfERN2zhr5 AamPG/+Jfq/X3D+ieS2CKYUUQ57aLSivHvUIPliS6X1tDWtrhb7Nvln11/EDRTM2OHgQ6m umreHp966oHZpsGRD815LX1bnqg8n6aMYFYQfOJiEqCUK+66wYzwGp8F2xsRpIkDUPeyWc +6iKCVS/3E4iu9iHvAz/PBzHM2u3a9jkiMCP8LN0djmLV/lXqq8RyCPJ6+mzcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676399716; a=rsa-sha256; cv=none; b=lK/sDWUqgGq5GGoFdkeWzsRhBe+TLqQ7ZJA7ip29sbtfZ6+2cxJ3zOf/0+/MLHnifnRuzA tEohLNdgBX28HW3msdAET2ChDongfdzg/HFi7TvOMZkazeAVVk95OmjgbySI3hoGWh8cpA r/SOauWoOad1d6mtRHeml25wRgOW1okqwTZ/+eHNBhvjdFRNhbv62REdtOYJPVRFnWVV6q gttHoG56/MCG6d3g92lZ2oQ+MIrmVDSBvaZ4L9rQxvj9CeXjAQ6EK3+ze+m6UbCoJMicLM kmZTXLFDR0asLrPlOKp9CZ6Burc99Wg3UObY9rFoMNhQ6MRylqGrzX6KGZMpZA== 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 4PGVJ41QSBz18Pd; Tue, 14 Feb 2023 18:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31EIZGD0002280; Tue, 14 Feb 2023 18:35:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EIZGkl002279; Tue, 14 Feb 2023 18:35:16 GMT (envelope-from git) Date: Tue, 14 Feb 2023 18:35:16 GMT Message-Id: <202302141835.31EIZGkl002279@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: 98dce7bf87f1 - stable/12 - unbound: Fix config file path 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 98dce7bf87f1c2c8235c6eaed69e8861e2b006d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=98dce7bf87f1c2c8235c6eaed69e8861e2b006d4 commit 98dce7bf87f1c2c8235c6eaed69e8861e2b006d4 Author: Juraj Lutter AuthorDate: 2023-01-17 17:25:47 +0000 Commit: Cy Schubert CommitDate: 2023-02-14 18:34:39 +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 (cherry picked from commit 1d577bedbae80ced38ccb834e6835e5fd98bc411) --- 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-dnscrypt --disable-dnstap --enable-ecdsa --disable-event-api --enable-gost --with-libevent --disable-subnet --disable-tfo-client --disable-tfo-server --with-pthreads--prefix=/usr --localstatedir=/var/unbound --mandir=/usr/share/man --build=freebsd" /* Pathname to the Unbound configuration file */ -#define CONFIGFILE "/usr/local/etc/unbound/unbound.conf" +#define CONFIGFILE "/var/unbound/unbound.conf" /* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work */