Attachment #259227 for bug #285817

View | Details | Raw Unified | Return to bug 285817
Collapse All | Expand All




PORTNAME=	valkey
DISTVERSION=	8.1.0
CATEGORIES=	databases

MAINTAINER=	yasu@FreeBSD.org
COMMENT=	High-performance data structure server that primarily serves key/value workloads
WWW=		https://valkey.io/

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYING

USES=		gmake pkgconfig tcl:test
USE_GITHUB=	yes
GH_ACCOUNT=	valkey-io
USE_RC_SUBR=	valkey valkeysentinel

MAKE_ENV=	OPTIMIZATION= \
		V=1

LDFLAGS+=	-lpthread -lm -lexecinfo

SUB_FILES=	pkg-message
SUB_LIST+=	PORTNAME=${PORTNAME} \
		VALKEY_DBDIR=${VALKEY_DBDIR} \
		VALKEY_LOGDIR=${VALKEY_LOGDIR} \
		VALKEY_RUNDIR=${VALKEY_RUNDIR} \
		VALKEY_USER=${USERS}

USERS=		valkey
GROUPS=		valkey

PLIST_SUB+=	VALKEY_DBDIR=${VALKEY_DBDIR} \
		VALKEY_GROUP=${GROUPS} \
		VALKEY_LOGDIR=${VALKEY_LOGDIR} \
		VALKEY_RUNDIR=${VALKEY_RUNDIR} \
		VALKEY_USER=${USERS}

OPTIONS_DEFINE=		JEMALLOC TLS
OPTIONS_DEFAULT=	TLS
OPTIONS_SUB=		yes

JEMALLOC_DESC=	Use jemalloc
TLS_DESC=	Use TLS

JEMALLOC_MAKE_ENV=	MALLOC=jemalloc
TLS_USES=		ssl
TLS_MAKE_ENV=		BUILD_TLS=yes

VALKEY_DBDIR?=	/var/db/valkey
VALKEY_RUNDIR?=	/var/run/valkey
VALKEY_LOGDIR?=	/var/log/valkey

post-build:
	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${WRKSRC}/valkey.conf > ${WRKDIR}/valkey.conf
	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
		${WRKSRC}/sentinel.conf > ${WRKDIR}/valkey-sentinel.conf

post-install:
	${INSTALL_DATA} ${WRKDIR}/valkey.conf ${STAGEDIR}${PREFIX}/etc/valkey.conf.sample
	${INSTALL_DATA} ${WRKDIR}/valkey-sentinel.conf ${STAGEDIR}${PREFIX}/etc/valkey-sentinel.conf.sample
	${MKDIR} ${STAGEDIR}${VALKEY_LOGDIR} \
		${STAGEDIR}${VALKEY_DBDIR} \
		${STAGEDIR}${VALKEY_RUNDIR}

do-test:
	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/databases/valkey/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1736296442	1	TIMESTAMP = 1743449721
2	SHA256 (valkey-io-valkey-8.0.2_GH0.tar.gz) = e052c45b3cbe512e24fdfdc3fd337f9f5e4b8f8b8713f349ba867b829c8ff11a	2	SHA256 (valkey-io-valkey-8.1.0_GH0.tar.gz) = 559274e81049326251fa5b1e1c64d46d3d4d605a691481e0819133ca1f1db44f
3	SIZE (valkey-io-valkey-8.0.2_GH0.tar.gz) = 3629598	3	SIZE (valkey-io-valkey-8.1.0_GH0.tar.gz) = 3801322




--- valkey.conf.orig	2025-03-31 19:55:59 UTC
+++ valkey.conf
@@ -353,7 +353,7 @@ tcp-keepalive 300
 # By default the server does not run as a daemon. Use 'yes' if you need it.
 # Note that the server will write a pid file in /var/run/valkey.pid when daemonized.
 # When the server is supervised by upstart or systemd, this parameter has no impact.
-daemonize no
+daemonize yes
 
 # If you run the server from upstart or systemd, the server can interact with your
 # supervision tree. Options:
@@ -385,7 +385,7 @@ daemonize no
 #
 # Note that on modern Linux systems "/run/valkey.pid" is more conforming
 # and should be used instead.
-pidfile /var/run/valkey_6379.pid
+pidfile %%VALKEY_RUNDIR%%/valkey.pid
 
 # Specify the server verbosity level.
 # This can be one of:
@@ -416,7 +416,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # the server to log on the standard output. Note that if you use standard
 # output for logging but daemonize, logs will be sent to /dev/null
-logfile ""
+logfile %%VALKEY_LOGDIR%%/valkey.log
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.
@@ -606,7 +606,7 @@ rdb-del-sync-files no
 # Note that modifying 'dir' during runtime may have unexpected behavior,
 # for example when a child process is running, related file operations may
 # have unexpected effects.
-dir ./
+dir %%VALKEY_DBDIR%%/
 
 ################################# REPLICATION #################################
 
- 

Return to bug 285817

Lines 1-69 Link Here

(-)b/databases/valkey/Makefile (-1 / +1 lines)
1	PORTNAME= valkey	1	PORTNAME= valkey
2	DISTVERSION= 8.0.2	2	DISTVERSION= 8.1.0
3	CATEGORIES= databases	3	CATEGORIES= databases
4		4
5	MAINTAINER= yasu@FreeBSD.org	5	MAINTAINER= yasu@FreeBSD.org
6	COMMENT= High-performance data structure server that primarily serves key/value workloads	6	COMMENT= High-performance data structure server that primarily serves key/value workloads
7	WWW= https://valkey.io/	7	WWW= https://valkey.io/
8		8
9	LICENSE= BSD3CLAUSE	9	LICENSE= BSD3CLAUSE
10	LICENSE_FILE= ${WRKSRC}/COPYING	10	LICENSE_FILE= ${WRKSRC}/COPYING
11		11
12	USES= gmake pkgconfig tcl:test	12	USES= gmake pkgconfig tcl:test
13	USE_GITHUB= yes	13	USE_GITHUB= yes
14	GH_ACCOUNT= valkey-io	14	GH_ACCOUNT= valkey-io
15	USE_RC_SUBR= valkey valkeysentinel	15	USE_RC_SUBR= valkey valkeysentinel
16		16
17	MAKE_ENV= OPTIMIZATION= \	17	MAKE_ENV= OPTIMIZATION= \
18	V=1	18	V=1
19		19
20	LDFLAGS+= -lpthread -lm -lexecinfo	20	LDFLAGS+= -lpthread -lm -lexecinfo
21		21
22	SUB_FILES= pkg-message	22	SUB_FILES= pkg-message
23	SUB_LIST+= PORTNAME=${PORTNAME} \	23	SUB_LIST+= PORTNAME=${PORTNAME} \
24	VALKEY_DBDIR=${VALKEY_DBDIR} \	24	VALKEY_DBDIR=${VALKEY_DBDIR} \
25	VALKEY_LOGDIR=${VALKEY_LOGDIR} \	25	VALKEY_LOGDIR=${VALKEY_LOGDIR} \
26	VALKEY_RUNDIR=${VALKEY_RUNDIR} \	26	VALKEY_RUNDIR=${VALKEY_RUNDIR} \
27	VALKEY_USER=${USERS}	27	VALKEY_USER=${USERS}
28		28
29	USERS= valkey	29	USERS= valkey
30	GROUPS= valkey	30	GROUPS= valkey
31		31
32	PLIST_SUB+= VALKEY_DBDIR=${VALKEY_DBDIR} \	32	PLIST_SUB+= VALKEY_DBDIR=${VALKEY_DBDIR} \
33	VALKEY_GROUP=${GROUPS} \	33	VALKEY_GROUP=${GROUPS} \
34	VALKEY_LOGDIR=${VALKEY_LOGDIR} \	34	VALKEY_LOGDIR=${VALKEY_LOGDIR} \
35	VALKEY_RUNDIR=${VALKEY_RUNDIR} \	35	VALKEY_RUNDIR=${VALKEY_RUNDIR} \
36	VALKEY_USER=${USERS}	36	VALKEY_USER=${USERS}
37		37
38	OPTIONS_DEFINE= JEMALLOC TLS	38	OPTIONS_DEFINE= JEMALLOC TLS
39	OPTIONS_DEFAULT= TLS	39	OPTIONS_DEFAULT= TLS
40	OPTIONS_SUB= yes	40	OPTIONS_SUB= yes
41		41
42	JEMALLOC_DESC= Use jemalloc	42	JEMALLOC_DESC= Use jemalloc
43	TLS_DESC= Use TLS	43	TLS_DESC= Use TLS
44		44
45	JEMALLOC_MAKE_ENV= MALLOC=jemalloc	45	JEMALLOC_MAKE_ENV= MALLOC=jemalloc
46	TLS_USES= ssl	46	TLS_USES= ssl
47	TLS_MAKE_ENV= BUILD_TLS=yes	47	TLS_MAKE_ENV= BUILD_TLS=yes
48		48
49	VALKEY_DBDIR?= /var/db/valkey	49	VALKEY_DBDIR?= /var/db/valkey
50	VALKEY_RUNDIR?= /var/run/valkey	50	VALKEY_RUNDIR?= /var/run/valkey
51	VALKEY_LOGDIR?= /var/log/valkey	51	VALKEY_LOGDIR?= /var/log/valkey
52		52
53	post-build:	53	post-build:
54	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \	54	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
55	${WRKSRC}/valkey.conf > ${WRKDIR}/valkey.conf	55	${WRKSRC}/valkey.conf > ${WRKDIR}/valkey.conf
56	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \	56	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
57	${WRKSRC}/sentinel.conf > ${WRKDIR}/valkey-sentinel.conf	57	${WRKSRC}/sentinel.conf > ${WRKDIR}/valkey-sentinel.conf
58		58
59	post-install:	59	post-install:
60	${INSTALL_DATA} ${WRKDIR}/valkey.conf ${STAGEDIR}${PREFIX}/etc/valkey.conf.sample	60	${INSTALL_DATA} ${WRKDIR}/valkey.conf ${STAGEDIR}${PREFIX}/etc/valkey.conf.sample
61	${INSTALL_DATA} ${WRKDIR}/valkey-sentinel.conf ${STAGEDIR}${PREFIX}/etc/valkey-sentinel.conf.sample	61	${INSTALL_DATA} ${WRKDIR}/valkey-sentinel.conf ${STAGEDIR}${PREFIX}/etc/valkey-sentinel.conf.sample
62	${MKDIR} ${STAGEDIR}${VALKEY_LOGDIR} \	62	${MKDIR} ${STAGEDIR}${VALKEY_LOGDIR} \
63	${STAGEDIR}${VALKEY_DBDIR} \	63	${STAGEDIR}${VALKEY_DBDIR} \
64	${STAGEDIR}${VALKEY_RUNDIR}	64	${STAGEDIR}${VALKEY_RUNDIR}
65		65
66	do-test:	66	do-test:
67	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl	67	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
68		68
69	.include <bsd.port.mk>	69	.include <bsd.port.mk>

Lines 1-38 Link Here

(-)b/databases/valkey/files/patch-valkey.conf (-9 / +8 lines)
1	--- valkey.conf.orig 2024-04-16 04:18:47 UTC	1	--- valkey.conf.orig 2025-03-31 19:55:59 UTC
2	+++ valkey.conf	2	+++ valkey.conf
3	@@ -303,7 +303,7 @@ tcp-keepalive 300	3	@@ -353,7 +353,7 @@ tcp-keepalive 300
4	# By default the server does not run as a daemon. Use 'yes' if you need it.	4	# By default the server does not run as a daemon. Use 'yes' if you need it.
5	# Note that the server will write a pid file in /var/run/valkey.pid when daemonized.	5	# Note that the server will write a pid file in /var/run/valkey.pid when daemonized.
6	# When the server is supervised by upstart or systemd, this parameter has no impact.	6	# When the server is supervised by upstart or systemd, this parameter has no impact.
7	-daemonize no	7	-daemonize no
8	+daemonize yes	8	+daemonize yes
9		9
10	# If you run the server from upstart or systemd, the server can interact with your	10	# If you run the server from upstart or systemd, the server can interact with your
11	# supervision tree. Options:	11	# supervision tree. Options:
12	@@ -335,7 +335,7 @@ daemonize no	12	@@ -385,7 +385,7 @@ daemonize no
13	#	13	#
14	# Note that on modern Linux systems "/run/valkey.pid" is more conforming	14	# Note that on modern Linux systems "/run/valkey.pid" is more conforming
15	# and should be used instead.	15	# and should be used instead.
16	-pidfile /var/run/valkey_6379.pid	16	-pidfile /var/run/valkey_6379.pid
17	+pidfile %%VALKEY_RUNDIR%%/valkey.pid	17	+pidfile %%VALKEY_RUNDIR%%/valkey.pid
18		18
19	# Specify the server verbosity level.	19	# Specify the server verbosity level.
20	# This can be one of:	20	# This can be one of:
21	@@ -349,7 +349,7 @@ loglevel notice	21	@@ -416,7 +416,7 @@ loglevel notice
22	# Specify the log file name. Also the empty string can be used to force	22	# Specify the log file name. Also the empty string can be used to force
23	# the server to log on the standard output. Note that if you use standard	23	# the server to log on the standard output. Note that if you use standard
24	# output for logging but daemonize, logs will be sent to /dev/null	24	# output for logging but daemonize, logs will be sent to /dev/null
25	-logfile ""	25	-logfile ""
26	+logfile %%VALKEY_LOGDIR%%/valkey.log	26	+logfile %%VALKEY_LOGDIR%%/valkey.log
27		27
28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,	28	# To enable logging to the system logger, just set 'syslog-enabled' to yes,
29	# and optionally update the other syslog parameters to suit your needs.	29	# and optionally update the other syslog parameters to suit your needs.
30	@@ -504,7 +504,7 @@ rdb-del-sync-files no	30	@@ -606,7 +606,7 @@ rdb-del-sync-files no
31	# The Append Only File will also be created inside this directory.	31	# Note that modifying 'dir' during runtime may have unexpected behavior,
32	#	32	# for example when a child process is running, related file operations may
33	# Note that you must specify a directory here, not a file name.	33	# have unexpected effects.
34	-dir ./	34	-dir ./
35	+dir %%VALKEY_DBDIR%%/	35	+dir %%VALKEY_DBDIR%%/
36		36
37	################################# REPLICATION #################################	37	################################# REPLICATION #################################
38		38
39	-