diff --git a/databases/valkey/Makefile b/databases/valkey/Makefile index 8f13273fe697..a69ac10d0066 100644 --- a/databases/valkey/Makefile +++ b/databases/valkey/Makefile @@ -1,69 +1,69 @@ PORTNAME= valkey -DISTVERSION= 8.0.2 +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 diff --git a/databases/valkey/distinfo b/databases/valkey/distinfo index 5081c222dbee..2a7c032428b0 100644 --- a/databases/valkey/distinfo +++ b/databases/valkey/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1736296442 -SHA256 (valkey-io-valkey-8.0.2_GH0.tar.gz) = e052c45b3cbe512e24fdfdc3fd337f9f5e4b8f8b8713f349ba867b829c8ff11a -SIZE (valkey-io-valkey-8.0.2_GH0.tar.gz) = 3629598 +TIMESTAMP = 1743449721 +SHA256 (valkey-io-valkey-8.1.0_GH0.tar.gz) = 559274e81049326251fa5b1e1c64d46d3d4d605a691481e0819133ca1f1db44f +SIZE (valkey-io-valkey-8.1.0_GH0.tar.gz) = 3801322 diff --git a/databases/valkey/files/patch-valkey.conf b/databases/valkey/files/patch-valkey.conf index 87d03a4935ac..513df990df09 100644 --- a/databases/valkey/files/patch-valkey.conf +++ b/databases/valkey/files/patch-valkey.conf @@ -1,38 +1,38 @@ ---- valkey.conf.orig 2024-04-16 04:18:47 UTC +--- valkey.conf.orig 2025-03-31 19:55:59 UTC +++ valkey.conf -@@ -303,7 +303,7 @@ tcp-keepalive 300 +@@ -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: -@@ -335,7 +335,7 @@ daemonize no +@@ -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: -@@ -349,7 +349,7 @@ loglevel notice +@@ -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. -@@ -504,7 +504,7 @@ rdb-del-sync-files no - # The Append Only File will also be created inside this directory. - # - # Note that you must specify a directory here, not a file name. +@@ -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 #################################