From nobody Sun Mar 05 07:02:22 2023 X-Original-To: dev-commits-ports-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 4PTt1p5mvdz3w7GR; Sun, 5 Mar 2023 07:02:22 +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 4PTt1p5CYgz3yB5; Sun, 5 Mar 2023 07:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677999742; 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=CuGLDvygNOIKU7UwtIe3kreQkZEGD8UxLG+EicxCrOg=; b=RKjJOCjLiTEuujoqgRU+NqGdnBGJZZFrIclEfCWzfBVqy1GvozjMnzUq6f8XvlNlRIgD/u ej9QG3ZD2bVo74Qd4gY8R7/yjkujXxol80iG8h9oRZt1TgOt3mb6SBGdyhlhPJvzKicgPp tZv4wgu5k438ZTaZ5WO6aMPQrIjqU/0RtQnDZH9TRNEXJ045S8VODj7uJ9pn3lWiz7pTjN 6YXooWym+FbQIw6qfTEDfQPUR3E91juWurU0nz6jFeItPaRS5zVAIYO8qpT3mOsi3vWtou TiSiMZpLMUDoWnpXjkQJ1OBpV5LFh4Kn+k4xUEpxs57sqGdaV+O8tuNLNItgVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677999742; 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=CuGLDvygNOIKU7UwtIe3kreQkZEGD8UxLG+EicxCrOg=; b=InRyyPWDIxrs6A25yY5IVDJ1RkXFa7Si1USog68wgjS2NkDq5M9axSLOZbSgg9vQIYEZmI MiMaFPVVgp5QezTl0YNr3ivT8/JJadzOBBYnE1Azzo6Hf6aoZVrjUMtakGe+TmQgI4D9AO MU9iZndsy4JAxu99ngKJkOoqAlgo/PGlv4VAJClbgHW/VVNCzagAi5QfTL+vAGw9cunOUy ryIzloKPq1w8uF7mkJBL2Fwr2+CfwG4mgdzeVVTuiJfHUKgJQkzAxLJZ9EFlIqytjpIeNd Kx2YQQi3DkLKjcOSvw1jN3N2zBCgfLtkPcR4l0sDWwmANKgYAs2BV2wwMsu1Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677999742; a=rsa-sha256; cv=none; b=hCjK84PbD6o5CyICq+7aFkBjWkT6QBc6u/gbe+HqmqDuc4CcYYDeBKoL80CkR+LuxWeLt2 Vhq8sZWzYpTFE8FQTQw1NDQ7SbjNJfLUJs6lum0AjG3oKHys/LJFe6XfzpT1q7p9A5aN7i CNDKmW6VkYmZpsfVJ72Kv8OWFTbevmTlFKORnHlunp5IRFdDJS1HIakXxoeftH7HpTbvx2 TsUhyKSee3zjLKKgGlZYLCz+nlHnQsGpS/2UGva5SlLgOSD8NVLV0WKcCx20DbcumIKORE RnADdgDzi13cgFrtxnfEKdf7uI5AILGuFaGbydVmWlt5/kGAdF4ihNvgr3gSOA== 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 4PTt1p4JpXz1BMx; Sun, 5 Mar 2023 07:02:22 +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 32572MCP025996; Sun, 5 Mar 2023 07:02:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32572MWF025983; Sun, 5 Mar 2023 07:02:22 GMT (envelope-from git) Date: Sun, 5 Mar 2023 07:02:22 GMT Message-Id: <202303050702.32572MWF025983@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: d65cd3c8c58f - 2023Q1 - sysutils/cbsd: Update to 13.1.24 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: d65cd3c8c58f5fe3f344e0d2b611cc675f9353ec Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=d65cd3c8c58f5fe3f344e0d2b611cc675f9353ec commit d65cd3c8c58f5fe3f344e0d2b611cc675f9353ec Author: Kirill Ponomarev AuthorDate: 2023-03-05 07:01:25 +0000 Commit: Kirill Ponomarev CommitDate: 2023-03-05 07:02:19 +0000 sysutils/cbsd: Update to 13.1.24 Changes: https://github.com/cbsd/cbsd/releases/tag/v13.1.24 (cherry picked from commit 21a1241f97d5e4401b5c72b1edffce69afd0f141) --- sysutils/cbsd/Makefile | 2 +- sysutils/cbsd/distinfo | 6 +++--- sysutils/cbsd/files/cbsd-statsd-hoster.in | 13 ++++++++++--- sysutils/cbsd/files/cbsdd.in | 9 +++++++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index 466beb26b480..6503954f6044 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,5 @@ PORTNAME= cbsd -DISTVERSION= 13.1.23 +DISTVERSION= 13.1.24 CATEGORIES= sysutils MAINTAINER= olevole@olevole.ru diff --git a/sysutils/cbsd/distinfo b/sysutils/cbsd/distinfo index e0f4bbb92e1d..0f0f8f9e6edd 100644 --- a/sysutils/cbsd/distinfo +++ b/sysutils/cbsd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676995850 -SHA256 (cbsd-cbsd-13.1.23_GH0.tar.gz) = c5c098c315fa310036ebf32c2ba05acdbcc808820a3da9bfa474064b2dca432f -SIZE (cbsd-cbsd-13.1.23_GH0.tar.gz) = 6497345 +TIMESTAMP = 1677920358 +SHA256 (cbsd-cbsd-13.1.24_GH0.tar.gz) = 7517e95f0dae287f6d62021863c3a5a6228fc7cd2297393c7e7e7cdb770bf841 +SIZE (cbsd-cbsd-13.1.24_GH0.tar.gz) = 6499073 diff --git a/sysutils/cbsd/files/cbsd-statsd-hoster.in b/sysutils/cbsd/files/cbsd-statsd-hoster.in index ae09eaae83ff..730898d63964 100644 --- a/sysutils/cbsd/files/cbsd-statsd-hoster.in +++ b/sysutils/cbsd/files/cbsd-statsd-hoster.in @@ -24,7 +24,11 @@ restart_cmd=${name}_restart extra_commands="restart" command="%%PREFIX%%/cbsd/tools/racct-hoster-statsd" -pidfile="/var/run/$name.pid" +pidfile="/var/run/${name}.pid" +daemon_pidfile="/var/run/${name}-daemon.pid" +daemon_logdir="/var/log/${name}" +daemon_logfile="${daemon_logdir}/cbsd-statsd-hoster.log" + command_args="&" pidfile=/var/run/racct-hoster-statsd.pid @@ -40,7 +44,7 @@ if [ ! -f ${subr} ]; then fi . ${globalconf} -. ${subr} +. ${subrdir}/nc.subr cbsd_statsd_hoster_start() { @@ -84,7 +88,10 @@ cbsd_statsd_hoster_start() ;; esac - exec env workdir=${cbsd_workdir} %%PREFIX%%/cbsd/tools/racct-hoster-statsd ${args} + [ ! -d ${daemon_logdir} ] && mkdir -p ${daemon_logdir} + touch ${daemon_logfile} + + /usr/sbin/daemon -f -R5 -p ${pidfile} -P ${daemon_pidfile} -o ${daemon_logfile} /usr/bin/env workdir=${cbsd_workdir} ${command} ${args} } cbsd_statsd_hoster_restart() diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in index 7508dd6632bc..cbde5558a692 100644 --- a/sysutils/cbsd/files/cbsdd.in +++ b/sysutils/cbsd/files/cbsdd.in @@ -17,6 +17,11 @@ load_rc_config $name export workdir="${cbsd_workdir}" export NO_CBSD_HISTORY=yes +# disable interactive question +export NOINTER=1 +# always answer 'no' +export ALWAYS_NO=1 + globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"} if [ ! -f ${globalconf} ]; then @@ -41,7 +46,7 @@ fi . ${globalconf} . ${mdtools} -. ${subr} +. ${subrdir}/nc.subr . ${localcbsdconf} @@ -92,7 +97,7 @@ cbsdd_stop() cbsdd_restart() { if [ -f "${pidfile}" ]; then - pkill -9 -f ${pidfile} > /dev/null 2>&1 + pkill -9 -F ${pidfile} > /dev/null 2>&1 /bin/rm -f ${pidfile} fi run_rc_command "start"