From nobody Mon Apr 22 12:09:46 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 4VNPFR1YLXz5JwVK; Mon, 22 Apr 2024 12:09:47 +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 4VNPFR13r0z4X4D; Mon, 22 Apr 2024 12:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713787787; 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=FJndiucGFKfi6eg8dlrxeYgLMS77xkJu7AgP7CB3RXE=; b=CCGjtSVwDysSZaOhYudWqPtfpxsoS8Hjo5tZsY1YPwsDsDZNgYWpukddBZffVcHyzqdX1X cvoKB2AjuwLgYu/ZKEd+gE5YyPbdzzFcGKHxToHOLd0CYJdZzZCRgJXoW9vdQSqtx+6503 M9y9OtM5NduYNHLTRozmsm/lmXMRYzZKase5/+9xR+1UDLVRPT1semBdPLFPs5Pq20uuJW IEdhJu7uhw4h+tsRTXy7ZuUiosXPY+S1WM/D3t9Gc5oDpcPaP22HzkQKAdOi6/NW1Jt0wB RFR9PhTtsC0dAdkhw/lKwciefnQD85JDoCHDpHi7CZsboWGvJIYArt6JNcgfIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713787787; a=rsa-sha256; cv=none; b=vTsK5/UPGRaK7rDZsuwBZI6WxdAX9T9UzHO/wCuXBmK+okPiUPATONpkHBs6e6782MXsZ0 u8yYFnM3NSVABXmZeL5Kmi3/VWD+pKetALZcDNjtKLR6jhNWw8E6ZCnPt3B7LpUVO8P7ZY DFPR4SHMscHT519dvbkLfNteW01Vm/p5zAYBIK5YOqxcV6xRo7WkMsaJC1i4hUldZvNuCB E0Db0qEYq2Yqwvu9e+773uVX65tMzuHNDWUBXB2RGPZ5ABKLK8kROr3+TttbgAwNKFGfWd WoL7arTnU6hDqKl9Utv/krQd0gJV74+2u4qFudNp/x2Osg7Hjh0xC0l3ts5jRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713787787; 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=FJndiucGFKfi6eg8dlrxeYgLMS77xkJu7AgP7CB3RXE=; b=onH6FxJWQRj8ImbLwyU8rU1L/rLc/SaIPJgNS47kaFo6CMDDFrNjsm6KjNPKNHU2uPdTz3 31UhscTh7+j6TxUgZ8G80415yRlYlZkc9QpH+mOQmlWr2LsfweP276eRkQSd2caECWPZsg 5ODD1347saMt502sItuPVwj3R89nBTijzxJ+7QSDp1HIWGIWw+rwjCm3isN67tzay7ksJV Mlkf3WP8yg9PrIDzmx1M/+qmXhU0C7pDfq7/43igB0VYPZeTBuaVLllwJURx80XOH6tYGx Jnh/IL+wLQ2aBhNbSuasIr/AvXnle8i6kV0Ev03oCMoInbsKUfQWGrfIuLwOZg== 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 4VNPFR0fVvznRy; Mon, 22 Apr 2024 12:09:47 +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 43MC9kpJ053407; Mon, 22 Apr 2024 12:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MC9ki0053404; Mon, 22 Apr 2024 12:09:46 GMT (envelope-from git) Date: Mon, 22 Apr 2024 12:09:46 GMT Message-Id: <202404221209.43MC9ki0053404@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: e6531f199266 - main - net-mgmt/smokeping: Made pidfile configurable in the 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6531f199266caf266d67b45c983d16bcb9e7328 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=e6531f199266caf266d67b45c983d16bcb9e7328 commit e6531f199266caf266d67b45c983d16bcb9e7328 Author: Rodrigo Osorio AuthorDate: 2024-04-22 11:44:20 +0000 Commit: Rodrigo Osorio CommitDate: 2024-04-22 12:09:06 +0000 net-mgmt/smokeping: Made pidfile configurable in the rc script From this version if you use a custom pifile location configured in /etc/rc.conf with the smokeping_pidfile variable you don't need to update your smokeping rc.d file manually after each port upgrade anymore. The default behavior remains unchanged. Reported by: zi (private mail) --- net-mgmt/smokeping/Makefile | 2 +- net-mgmt/smokeping/files/smokeping.in | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile index 595446a054c6..d59273de8337 100644 --- a/net-mgmt/smokeping/Makefile +++ b/net-mgmt/smokeping/Makefile @@ -1,6 +1,6 @@ PORTNAME= smokeping PORTVERSION= 2.8.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt www MASTER_SITES= https://oss.oetiker.ch/smokeping/pub/ diff --git a/net-mgmt/smokeping/files/smokeping.in b/net-mgmt/smokeping/files/smokeping.in index 54162f708760..d125d643e62e 100644 --- a/net-mgmt/smokeping/files/smokeping.in +++ b/net-mgmt/smokeping/files/smokeping.in @@ -29,8 +29,9 @@ reload_cmd="smokeping_reload" stop_cmd="smokeping_stop" : ${smokeping_enable:=NO} -# pidfile is hardcoded in Smokeping.pm, not configurable -smokeping_pidfile="%%PREFIX%%/var/smokeping/pid" +# piddir is configured in %%PREFIX%%/etc/smokeping/config +# pid file name is "pid" and harcoded in Smokeping.pm, not configurable +: ${smokeping_pidfile="%%PREFIX%%/var/smokeping/pid"} : ${smokeping_logfile=/var/log/smokeping.log} : ${smokeping_user="%%USERS%%"} : ${smokeping_group="%%GROUPS%%"}