From nobody Wed Mar 22 20:17:20 2023 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 4PhfsF0HD3z41Fbl; Wed, 22 Mar 2023 20:17:21 +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 4PhfsD52S4z4NHf; Wed, 22 Mar 2023 20:17:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516240; 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=kJHN+ZELvyjPws/usLA8nvek4MJDejpSGPYZcxfa0ns=; b=r8sQ3zdocODg5zDQNwr8hMw56G0eC9avorK5GKsNFSLUwKdktsptea4NB3O0P3x2O+5r54 LClC7nU7P61ijr8ffMDwIiYbUTKM+JtNF9fBMsD75ukPdqKqe6BulqfWM57U5QPKxW5GRj 2L47kn/1MfZTh0TDSnnGM1AhARy3lW8TYt3UorH5Xxg/uG0b2azaNU+7XeGPMQzPVb53m/ 2L1MJ1ctzj59gZb8bJN0FPMwjbxiPDEycoPZQMLdz11wuKm1S0z89cazwbq4RXaf37Z25i CI71SnO5EaCcB/e+Ut+DexKlIRF7dsyc0zYZRkqHv99Vfr7LNMjo+/ZyGWPe+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679516240; 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=kJHN+ZELvyjPws/usLA8nvek4MJDejpSGPYZcxfa0ns=; b=iCNEWmyP1a0YeKzNwiEmvRBT1UoQ2T5GX276zWjxfx/td6BoCaKGEo7siRKqNYIioB0seA saph9NT95PDcC3bRkA4niTXUJ2wYJflfOVhT5GOFi6HY9Iq5N1c33l2zRydkGoWYrFZUze +HIahNoDiW4uMy6FzpvEURrtj4uAuTq8TopF2DN/2wL1gpZ14vdxZHix/ysFFHebqguu3T KGCe7jihRflQBrCC8c8y4ltxCMYwnsyjU7M6GXsCsGhrurU9Qr2j2svj6ltR6mwJDSv3mk HtljIfNqKzQSwuC+z1Yl80PCpxUYv8ayqlL0IHFlQ2epaw0o+dpnHXTFgKdoCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679516240; a=rsa-sha256; cv=none; b=dwOCa+yLVjEHQMVMrg57NFv4WVX+cCscKYAXD7Zw48fPHXYrXXQnR+9kUcqYpgtyhgy7qW XFJUTMqz8n0iw9WHe+4TBjF/fN1xVyQdvUrzhM4O2k2eQc6xnMdCFPw7+DmS67u9gjfbaR IifMWFTGDhrAruSPDTuOQjLpnKA6xG4LQgDxiWnuQ4y6FEhSq87ABitOgX0k8OzeiDokNu 5DtgugefwqNW7arL89jwsJLecSJF8mv28MB2rbTpbzA7HsWVUdLMJgdvwP67GfMtx5mKqe eUzbH9FZnid0Rx+LSHKDR7ny2u+8cNKxqIoYWdC2bOQ4ZOYw1hwJsBTJrpth4w== 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 4PhfsD46q4z16ys; Wed, 22 Mar 2023 20:17:20 +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 32MKHKFf087205; Wed, 22 Mar 2023 20:17:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MKHKsi087204; Wed, 22 Mar 2023 20:17:20 GMT (envelope-from git) Date: Wed, 22 Mar 2023 20:17:20 GMT Message-Id: <202303222017.32MKHKsi087204@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: d2f15374931e - main - www/grafana9: fix rc.d script procname 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2f15374931e8b5c5c360a2ecd7794ff492d8d56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2f15374931e8b5c5c360a2ecd7794ff492d8d56 commit d2f15374931e8b5c5c360a2ecd7794ff492d8d56 Author: Dominik Banoviez AuthorDate: 2023-03-10 21:28:28 +0000 Commit: Robert Clausecker CommitDate: 2023-03-22 20:15:29 +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 --- 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 4c185ac781a5..06926f8c6b6f 100644 --- a/www/grafana9/Makefile +++ b/www/grafana9/Makefile @@ -1,4 +1,5 @@ PORTNAME= grafana +PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSION= 9.4.3 CATEGORIES= www diff --git a/www/grafana9/files/grafana.in b/www/grafana9/files/grafana.in index b3275ea9e337..8f13bdaf969b 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}"