git: 3c3e93643347 - main - databases/valkey: Ensure valkeysentinal only starts if explicitly enabled

From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Sat, 21 Sep 2024 20:21:55 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c3e93643347fcfad33eb9ed763ef4d6df84f56c

commit 3c3e93643347fcfad33eb9ed763ef4d6df84f56c
Author:     Henry <PopularMoment@protonmail.com>
AuthorDate: 2024-09-20 12:01:08 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-09-21 20:21:34 +0000

    databases/valkey: Ensure valkeysentinal only starts if explicitly enabled
    
    Incorrect variable in the valkeysentinal rc script can cause
    valkeysentinal to be started even if not explicitly enabled.
    
    PR:             281605
---
 databases/valkey/Makefile                | 1 +
 databases/valkey/files/valkeysentinel.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/databases/valkey/Makefile b/databases/valkey/Makefile
index a29e0112c01f..61227f0f3c91 100644
--- a/databases/valkey/Makefile
+++ b/databases/valkey/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	valkey
 DISTVERSION=	8.0.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	yasu@FreeBSD.org
diff --git a/databases/valkey/files/valkeysentinel.in b/databases/valkey/files/valkeysentinel.in
index ec940321b1cd..79b4956300a1 100644
--- a/databases/valkey/files/valkeysentinel.in
+++ b/databases/valkey/files/valkeysentinel.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="valkeysentinel"
-rcvar="$valkeysentinel_enable"
+rcvar="${name}_enable"
 
 command="/usr/local/bin/valkey-sentinel"
 pidfile="/var/run/valkey/valkey-sentinel.pid"