From owner-dev-commits-ports-all@freebsd.org Tue Apr 13 23:10:33 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B82C65F01D9; Tue, 13 Apr 2021 23:10:33 +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 4FKhCs4vy9z3kxK; Tue, 13 Apr 2021 23:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9B5D113479; Tue, 13 Apr 2021 23:10:33 +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 13DNAXuq014870; Tue, 13 Apr 2021 23:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13DNAXO0014869; Tue, 13 Apr 2021 23:10:33 GMT (envelope-from git) Date: Tue, 13 Apr 2021 23:10:33 GMT Message-Id: <202104132310.13DNAXO0014869@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: d94ae2c3c666 - main - dns/knot-resolver: Fix @sample use MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d94ae2c3c666fd3c26e4a5e572ad084d88a8b5f3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 23:10:33 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=d94ae2c3c666fd3c26e4a5e572ad084d88a8b5f3 commit d94ae2c3c666fd3c26e4a5e572ad084d88a8b5f3 Author: Kevin Bowling AuthorDate: 2021-04-13 23:07:49 +0000 Commit: Kevin Bowling CommitDate: 2021-04-13 23:07:49 +0000 dns/knot-resolver: Fix @sample use The port was not using the @sample functionality correctly, stage the correct sample config in post-install and fix the pkg-plist. PR: 254765 Reported by: Marcel Approved by: maintainer timeout --- dns/knot-resolver/Makefile | 4 +++- dns/knot-resolver/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile index 80fdb42dc661..96d479e76b9a 100644 --- a/dns/knot-resolver/Makefile +++ b/dns/knot-resolver/Makefile @@ -60,7 +60,7 @@ MESON_ARGS= --buildtype=release \ --prefix=${LOCALBASE} \ -Duser=${USERS} \ -Dgroup=${GROUPS} \ - -Dinstall_kresd_conf=enabled \ + -Dinstall_kresd_conf=disabled \ -Dclient=enabled \ -Dutils=enabled \ -Dkeyfile_default=${ETCDIR}/root.keys \ @@ -153,5 +153,7 @@ post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${STRIP_TGT}; \ fi .endfor + ${INSTALL_DATA} ${WRKSRC}/etc/config/config.personal \ + ${STAGEDIR}${ETCDIR}/kresd.conf.sample .include diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist index 2684bb39b90f..68b5268537ae 100644 --- a/dns/knot-resolver/pkg-plist +++ b/dns/knot-resolver/pkg-plist @@ -1,4 +1,4 @@ -@sample %%ETCDIR%%/kresd.conf +@sample %%ETCDIR%%/kresd.conf.sample %%ETCDIR%%/icann-ca.pem %%ETCDIR%%/root.hints include/libkres/api.h