From nobody Mon Jan 22 08:15:42 2024 X-Original-To: dev-commits-ports-main@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 4TJNML6czHz57P6R; Mon, 22 Jan 2024 08:15:42 +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 4TJNML5wqdz4D9H; Mon, 22 Jan 2024 08:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705911342; 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=zPju8p5BWJzOM1Vc0U9i4RKxgcgXdmbwprUjYkBIeyg=; b=SFv1sA7Oj5tEotcTnqHibbXoBDnXbLsh+JJodW/kPTLjFjE6F4xfNcFdGwvR5dm16ainkR 9IkoQtbsrZTjCmQXg9WtSM/l0DkuUUNATnVwCvvvcMQ9ysZ8myhss3SYsjaM88SUapcSGp 81hLD5J4h7yN9Hz3Z4ckazNPSI/n+Xm3NPZBPnes0vZILlquefi5hfK76sbjbsgBSbDOrv CNcwbHxBIiz9su6GskRw8Pxdmfwp6qaTf7fKHGaCTdoAwjS28TXQr01G3hs8aObhBMqOQf LfK4gfV4ItRFW/A6YWPLUhoiZ+KNJz8dDt4DkhZ7DBZvopiJ+3cki2zcCjHc/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705911342; 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=zPju8p5BWJzOM1Vc0U9i4RKxgcgXdmbwprUjYkBIeyg=; b=djUDptO5S6CAtzsPo2ewlEsUYAgcyi7+HGbWm5pXaaCtJrWjup2SGnSIIL1yIX4WGi1lWt DY3RKvKc5KRqx4eKhfd2xtvFJR1H7Pj5AByb8rEzsdWJ5t+VjdGJ/AFhYFnh0mGO/c+cRy USeqtINOB6AFg8mCb4NkLwo+oh+2GEhcAal60K34mAj16s38yh1T0QPjGVERBdYHv18FNK bjsApAxney09APRwubIoZxEjFC7ZaryGRQ7hanS5f5pSA4u3twUjMXNx6h5UIL4I41XRxR sNO3jEwWyg46mNFT810pYx1nXaRNS84HgyTSUMarAqj6e9Ast+WNC+X6U2egRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705911342; a=rsa-sha256; cv=none; b=RvNI7oi53XG3YeSp+jE5vh97cRdHe4CspoDUNqqx+PFG0B9XQ4gXjQbeSMcbpsxLNEdND1 ba9bUgXb8IiU45ZWuW7av67MzO7Aizyho0fkeV51vbUQVYY/Cib9pMVFaJpoDYSd7pB2QH 9i56PYYIVDT3lz6p3K0haRFQLS6oshvIB759RCWsfMohyvlwGZxOXM1uALu+DsRu0M2UM5 F9zvlqfwDo8DEp5bu0FRknn/3rMlyDCrw6WLHDv45ngXt/5OGN5MTjwse/YKrc/2TeVJt3 x/7zviA5CVFGLF64qj8dCjROW4sa8iLEf2aJOu/87pJlF1hbJpwd7hQnfbReFw== 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 4TJNML50Ylzv5B; Mon, 22 Jan 2024 08:15:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40M8FgKO075819; Mon, 22 Jan 2024 08:15:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M8FggS075816; Mon, 22 Jan 2024 08:15:42 GMT (envelope-from git) Date: Mon, 22 Jan 2024 08:15:42 GMT Message-Id: <202401220815.40M8FggS075816@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 5d038a444a31 - main - dns/blocky: Enable logging in rc script List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d038a444a3187093fe185fc0f1ebd06596a6cf5 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d038a444a3187093fe185fc0f1ebd06596a6cf5 commit 5d038a444a3187093fe185fc0f1ebd06596a6cf5 Author: Nuno Teixeira AuthorDate: 2024-01-22 08:10:35 +0000 Commit: Nuno Teixeira CommitDate: 2024-01-22 08:15:32 +0000 dns/blocky: Enable logging in rc script - While here, move pkg-plist to PLIST_FILES PR: 276499 Reported by: rodrigo Pull Request: https://github.com/freebsd/freebsd-ports/pull/187 --- dns/blocky/Makefile | 4 ++++ dns/blocky/files/blocky.in | 3 ++- dns/blocky/pkg-plist | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dns/blocky/Makefile b/dns/blocky/Makefile index 45cac4b303ea..b69d19541e74 100644 --- a/dns/blocky/Makefile +++ b/dns/blocky/Makefile @@ -1,6 +1,7 @@ PORTNAME= blocky DISTVERSIONPREFIX= v DISTVERSION= 0.23 +PORTREVISION= 1 CATEGORIES= dns MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod @@ -26,6 +27,9 @@ GO_BUILDFLAGS= -ldflags "-w -s \ SUB_FILES= pkg-message +PLIST_FILES= "@sample etc/blocky-config.yml.sample" \ + sbin/blocky + post-install: ${INSTALL_DATA} ${FILESDIR}/blocky-config.yml.sample ${STAGEDIR}${PREFIX}/etc/blocky-config.yml.sample diff --git a/dns/blocky/files/blocky.in b/dns/blocky/files/blocky.in index 2b625f8be55d..13fb9fb0c13f 100644 --- a/dns/blocky/files/blocky.in +++ b/dns/blocky/files/blocky.in @@ -34,12 +34,13 @@ if [ -n "${blocky_user}" ] && [ -z "${blocky_group}" ]; then blocky_group=$(id -gn "${blocky_user}") fi +logfile="/var/log/${name}.log" pidfile="/var/run/${name}.pid" blocky_path="%%PREFIX%%/sbin/blocky" command="/usr/sbin/daemon" procname="/usr/local/sbin/blocky" -command_args="-c -f -p ${pidfile} ${blocky_path} \ +command_args="-c -f -o ${logfile} -p ${pidfile} ${blocky_path} \ -c ${blocky_config} ${blocky_flags}" start_precmd="blocky_precmd" diff --git a/dns/blocky/pkg-plist b/dns/blocky/pkg-plist deleted file mode 100644 index 55ea60866bc2..000000000000 --- a/dns/blocky/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -@sample etc/blocky-config.yml.sample -sbin/blocky