From nobody Wed Mar 22 20:19:06 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 4PhfvG6XlYz41GD6; Wed, 22 Mar 2023 20:19:06 +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 4PhfvG62NSz4PWG; Wed, 22 Mar 2023 20:19:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516346; 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=5LFG0L4IZzCeIhqQSPRwIglwZa+jsRFDDKwOCBCIfac=; b=XjW9+UybU6pqwEmNU4JDtFl+YrsxN1/YByEJCboF+nIF2lDNk6S/l9dYVz3Pn+137rKBRy VQt6MN0U1jJloSSbsIw64giycm5Cdx+2DBg5HtUR1vnlGElyimsgEl+XGHnKB+prnBCAwd wOKe+wbagfSpAyjIixvmAvnNhOGrgFaaiZoVd+T3Uq9L7f1oGbnYfzCrrIX8KKclEMCWF4 8jZ2/lBc6ZeFtesu0OwRlvd9TjLEcpmeyfy4/Vh4IZ1UqpwLcbNBMtM8xxW4e9CVeNm1B6 R+OkqWOiUtjZoVDgdYcmV8rtflNkWt3vns1TmBKWv5xMw37MpAg9nNku/64+Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516346; 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=5LFG0L4IZzCeIhqQSPRwIglwZa+jsRFDDKwOCBCIfac=; b=DkpJSNMS1fPXkdji7K3+4a+WgcLAw+fUPI5hdWV9nFpFiscU55RZZsFWS88tS8HBtgAEPX BL9NUKT7TdV2Ft1cF5fteWNbBf898lMeFESrtFJ+XxV6ddUpEMLXX8269V2Bok+uQYszJR 56N5oexjGYa9M0IsrT7JroUO/LNQ52S2aOMGmwi0GuTSxUte1ieQEiEHkhrHGDoINLyoZL sF392NemCqFBtHbdI9WPVWJr9YOYPvo8hjtwK9h+k1doQaH6Pcsi2wZVTqh70asAvdJBDE X160xeeZ7ipWliIevvEiV5PSZHVOamWOrV3ACja1TEZdcYT8OP7OO0wlxVwe4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679516346; a=rsa-sha256; cv=none; b=Ef8t6aobQr8qGFRsfijgk6XaDTjZ6YbH3oMipAUaUcotqkBgK7ivooGpbhdedhGoqsinBT ZIuVq8TS5rElKZmq+9jRkhrucP8penPtAaUkEZLAqr+7b4Zi9OWq/pDgRqO9I4zn/WsULD /2Jp98YX0xp41cPwdIgNSq7c7fUgHaJhdV0Bal6urJBiQQXLXbK/U22HwVrVeCUkGdJvuU Gb9E009jKxPYW9CVHfiIsdudmdC5XqLP4Su+KjHa+N8uBq/4bco66J4rcC4sUKfLGSqi2U upubVvAW86SuKgHZbG9znavGXLBjf1X8ICFfjB30gPd6c78tK3ioBdwQ24/rdQ== 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 4PhfvG56CQz172B; Wed, 22 Mar 2023 20:19:06 +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 32MKJ6Om087758; Wed, 22 Mar 2023 20:19:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MKJ6Bg087757; Wed, 22 Mar 2023 20:19:06 GMT (envelope-from git) Date: Wed, 22 Mar 2023 20:19:06 GMT Message-Id: <202303222019.32MKJ6Bg087757@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 889b2ceda43f - 2023Q1 - www/grafana9: fix rc.d script procname 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 889b2ceda43f9459cf339ede384eb744ce4f6075 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=889b2ceda43f9459cf339ede384eb744ce4f6075 commit 889b2ceda43f9459cf339ede384eb744ce4f6075 Author: Dominik Banoviez AuthorDate: 2023-03-10 21:28:28 +0000 Commit: Robert Clausecker CommitDate: 2023-03-22 20:19:06 +0000 www/grafana9: fix rc.d script procname Grafana switched to a unified binary, changing `grafana-server` to be a wrapper script that executes `grafana server` in its place. This patch fixes `procname` in the rc.d script, so that rc.d's process name checking doesn't fail / the service gets properly reported as running. PR: 270098 MFH: 2023Q1 (cherry picked from commit d2f15374931e8b5c5c360a2ecd7794ff492d8d56) --- www/grafana9/Makefile | 1 + www/grafana9/files/grafana.in | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/www/grafana9/Makefile b/www/grafana9/Makefile index f2a3f20af986..57c9dd128b95 100644 --- a/www/grafana9/Makefile +++ b/www/grafana9/Makefile @@ -1,4 +1,5 @@ PORTNAME= grafana +PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSION= 9.3.8 PORTREVISION= 1 diff --git a/www/grafana9/files/grafana.in b/www/grafana9/files/grafana.in index d6c7df4bcae1..16abea5b3db0 100644 --- a/www/grafana9/files/grafana.in +++ b/www/grafana9/files/grafana.in @@ -57,10 +57,10 @@ fi pidfile="/var/run/${name}/${name}.pid" required_files="${grafana_config}" -procname="%%PREFIX%%/bin/grafana-server" +procname="%%PREFIX%%/bin/grafana" command="/usr/sbin/daemon" command_args="-f ${grafana_syslog_output_flags} -p ${pidfile} -t ${name} \ - /usr/bin/env ${grafana_env} ${procname} \ + /usr/bin/env ${grafana_env} ${procname} server \ -config=${grafana_config} \ -homepath=${grafana_homepath} \ ${grafana_args}"