From nobody Tue Feb 28 13:38:13 2023 X-Original-To: dev-commits-src-branches@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 4PQz2t3wJ4z3vT85; Tue, 28 Feb 2023 13:38:14 +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 4PQz2t0nb1z4DYY; Tue, 28 Feb 2023 13:38:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591494; 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=bTlo11FHaJVc+f1NJJJsZ49O5wrxELYZfDzJO66Gy7w=; b=Os1UuiOxAvSTVX0DOQR0l8NPOHBenAe0Vmqim9Dsf427/OaqCNsX3/wc45R0QleYBKSfdK am/1XPgZWfzU9MPbNO4Td4U4KznhPAZ60dK3uvJ880xCLLHgi+h8rJM5ljldn4E3xusmrJ Sn41lFMTTWWOiq87EwAE4n7Q3OhixNXtxhAOknKqbLOtS8U8PHZD9b9Sj6/+o4c1KMkKw2 dstbA+yHGOTHgCTpQOwrH4hMr7Fgcz9Hp1unOUpYT8SBpvhjtK200LREK6qTBxuHa6Fbex tKFij5vBFVFrKcPZ/N7zVo0s6EkWaOrQXyftcbFhI1dz23ZHkqVjliC0JE30GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677591494; 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=bTlo11FHaJVc+f1NJJJsZ49O5wrxELYZfDzJO66Gy7w=; b=Po5XgEgJcnVeEcmYBKqSRlZ93HJQk9nY7ukSUz/a8q+C4Mjwwpqvf5rQygpA9LDZQZl2DX QTvFCbIh14sWxWuBhKye+Qi6nVj9/48tDRv6NB1u1bkXEpjfYQgV7CuYNO475WhBPnhFb2 SdeEWFAZ93uCSpYMr9sVus4bwD4CIPbCJE/RTtjdvZYbsRDzBwdqLv5iJhVFXy37B12gS/ 1mda1Feh8iObBfNMt7VSAGPc8D5z0jCi03sz/hl0cdn/lAyKl4E4SVx4mRX+kpJWr6rOzj Wa4W+o+5BlhELPzlUD7rDfa+5aJKPDsSOoadz42Xs6GSB+URXLnXsfF99SamUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677591494; a=rsa-sha256; cv=none; b=WAiTLlhe/76MjBSe+4XU5RvVx78O+Bj+UqOmPv9WBa4FM+1P/pKhihGl42a5gw4U4sWEu3 KwVgbZftBEaLZTKVULpaILMrFMMNNKtdYv9SX+0/nFru2ZeoADdWJQg2TetbuVGjzrNWxA 1JIBQQnJkj7v5DhyHQE5b7SljygDO9fg0CdOb3imzF0qMTt84LrcTFORKM1zJjpfWCsgyK wlnWD0VtOKVDXwxoYvJbmFv6H50mXaCVaoJvdHngrsUcSWyYurj/N/OSuybrbRYKGK14kN B5pjpzeNFFM/oxn8xq4nIt3jMBy+BPnjsEJjLvNMc7WMViRYCE7yWlI06s2Dxg== 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 4PQz2s66DTz17w8; Tue, 28 Feb 2023 13:38:13 +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 31SDcDfN041326; Tue, 28 Feb 2023 13:38:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31SDcDdw041325; Tue, 28 Feb 2023 13:38:13 GMT (envelope-from git) Date: Tue, 28 Feb 2023 13:38:13 GMT Message-Id: <202302281338.31SDcDdw041325@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: fb2147e30f97 - releng/13.2 - unbound: Fix config file path List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: fb2147e30f970a6d4329dd6d7efcb99461698c8f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=fb2147e30f970a6d4329dd6d7efcb99461698c8f commit fb2147e30f970a6d4329dd6d7efcb99461698c8f Author: Juraj Lutter AuthorDate: 2023-01-17 17:25:47 +0000 Commit: Cy Schubert CommitDate: 2023-02-28 13:37:55 +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 Approved by: re (cperciva) Reviewed by: zlei Approved by: zlei Differential Revision: https://reviews.freebsd.org/D38106 Fixes: 1838dec31895fd4752fa8631322ab93be0705a66 (cherry picked from commit 1d577bedbae80ced38ccb834e6835e5fd98bc411) (cherry picked from commit e0c3f2a1e2961b5e4813399bf2a4bea467d2c301) --- 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 */