From nobody Sat Sep 21 20:21:55 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 4XB0z83Mmzz5Xdf9; Sat, 21 Sep 2024 20:21:56 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XB0z80YgNz4Vg1; Sat, 21 Sep 2024 20:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726950116; 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=r2ejPrKQgcweLTZ80odOwqJ+BaKbgXjZdnVMbOHZLTs=; b=FnE15vArzTn/axL5GEFQYOau6r1Ole0D1Fz8tPed/RKxvvBulAWeZ3qXNSt2F+Uzo/Rzly K6+uO7VUVor8NXr60PCQPCg3lBBrdB5fLciG1RljiLPQAJ04Bjocg4br5C6/McWMCdzri9 MV46qka7m4zV8kLdX8JIsk41lTtABJIqhahzDRyEOcpklDfJpgOQHdjCqhbAdYeWzNMyx0 Q3WS3ukySwldnUDLm6gArFuJqyaHywWTyNNRNS6SGOJWDwgGZ/gXod7RE0ZsrOpUNKXhTy lou2ZYsrOK+6gMvai2bFtplq/VpxNjoXuw8qxx3+nj9P3PW7/723lw5EZZgVdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726950116; a=rsa-sha256; cv=none; b=E7P1sw80JAa3sh5HZ1lQyohdAvKvbSuSaEjrNbBGDtmcLkVkF3YIDpdkK/dfI/ZbtCU/TI U61cv8mx9iRj1CUpCPfKk091adxAn3tOWXBA8aYKDfXLtc00mvwh+iEqPV981AYvy+ClSM JFaSxPE+6MW6JEuHlmGoAHWFy9dFzialK8FCzsIWRvLuv3PnQwe0jZ94jJL17EL2hDoY48 gSsYNBgt+FWYAc/yAZHkiWCTR8G5J7wNqGm28LEuSUGNiS1RBtLuWG2iUiD3YO5A/NujyV jFhdjowaMDWLXLn3DuzMV/s/pjzx23X2Pylv4Czox8p5fMIw7740JqEIoJ/y8g== 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=1726950116; 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=r2ejPrKQgcweLTZ80odOwqJ+BaKbgXjZdnVMbOHZLTs=; b=ttUD3mT0f9hUQBwaBL4cpiyseFGc1BhPczgR71QUfhcCA4wJFPkmrbPXde469EvjQn0cPI IP5IKh6We3RLvuZ2YYln0zqjdPYcUOjKPxlor8wqFGUA8pAS5w6iBiz5p6yhgRWKVfklvS 9KhorXIUR0AB7z+LWIfbaCwyTwaO4cwOrWQyP58AqB5suHjm0Y29A3M2RZpLhHDDNHbRmy NwxGjBptWD/ZMKhD0VBaeX4R8E2xCoXO8wPG1SIRWB88EzBz007Cv1pjt0jglt5ZrtcSwr xDa81Qy/q9c+z3w+/+9EuIj0oy4kYDkY69oy9WUXW/hTmF5BpRlNVuSja/AFNQ== 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 4XB0z809VfznLy; Sat, 21 Sep 2024 20:21:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48LKLtPl054528; Sat, 21 Sep 2024 20:21:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48LKLtho054525; Sat, 21 Sep 2024 20:21:55 GMT (envelope-from git) Date: Sat, 21 Sep 2024 20:21:55 GMT Message-Id: <202409212021.48LKLtho054525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 3c3e93643347 - main - databases/valkey: Ensure valkeysentinal only starts if explicitly enabled 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c3e93643347fcfad33eb9ed763ef4d6df84f56c Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c3e93643347fcfad33eb9ed763ef4d6df84f56c commit 3c3e93643347fcfad33eb9ed763ef4d6df84f56c Author: Henry AuthorDate: 2024-09-20 12:01:08 +0000 Commit: Yasuhiro Kimura 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"