From nobody Sun Apr 21 02:29:16 2024 X-Original-To: dev-commits-ports-all@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 4VMXQ45Zx0z5HC1f; Sun, 21 Apr 2024 02:29:16 +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 4VMXQ44vn5z45QH; Sun, 21 Apr 2024 02:29:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713666556; 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=us/wPzAAwwyE5bLx7ian72y1tWLkR6OiCYJSjhafdYo=; b=J00/uzJN4nbslz33tU4m2k7e4igttEyLrBB0mv8b8WOW1j6Y8VtmlE+CXRRg0x0E4EKFKf 5egJLUaakmcbX/siDqNnR9vOCp5NgaNhH2bs4WVhwlypZ6Nm+rjn53nT84hqK4t+BmoJBx YXk0tade9r1bH9muniZHr8zmntHGUVwsZ44vXHOPMt6mN8oE0oMHz3muNChuX3EjFEVJgj E2Gg57EcbbyB6kCgtBY0GkDASh3FeU9K4ZEH6LRJzotJLywUnM/UBfkYtBuxfTfwiVPs0L 1ViycgI3nM2/gejdn2Fm3HXw3CFpkU2DkDgWMAvtYxHbjJNXdLEmD5witGemNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713666556; a=rsa-sha256; cv=none; b=IE4ogcXVAfrI/klr/2QwoeuZdzlYbyfbCM6USFxbg6nd75DOEEE576+ycmLV/wIAzGIaKa ZnRYwpZQL+rCty2M0LM9zuC3hGwZRCAudKc3mkORVnFez0VNpwtpsGB+Mv5jfwW+N9rUpl n+58+H9KUwcHn63KcU2LOjifHbc3PlzoCNHH1b2ZFFTjj1fjTtGJ8p9LO3PwucNbYuZDcn J/q546tv0Bf4VB5eIC0FqWLpmPykpVkvSP54WyEFqrBrxvBD+BGRPFHvd+DaNXpz/Xz8NW t/7us6BBuV0K8THWhvGztNkTWMkWLFKG7mTiye9AZ1ISdFt6OllbY2Xt9+hr/g== 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=1713666556; 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=us/wPzAAwwyE5bLx7ian72y1tWLkR6OiCYJSjhafdYo=; b=kAtobq8d8mUSW92vfj57PnJ9kGcn/4eLiVsBvE3J4EZumAvZ+wv7eEtFH5aCLmqbidnLiw wkZHjaDzgumvL6vw/Plnh6diSSVH50+OuZERAuF52MnkYo+lsXWn07/UCa4x+Q1LJkLa/7 EOg8lgMf3rGGG+daQdxSzDM+R9CjBg8Fc2HYATRhbNP1dQvwaxFFTSFTdsvinoqacnt+J8 vhlSSNsdn1oeW2XV7+cgnZv+u5vu/znOmMMO8s0EF0hd+0OjL+WrgIIqRn9CQUNV4hiyiR xWlwdZsHd5OodDtOOT6ogdMefL9mAZ5xE+Zp7/W1sqFKjrG8DRWWliGXSG+Zsg== 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 4VMXQ44QJ8z12Yn; Sun, 21 Apr 2024 02:29:16 +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 43L2TGZG029216; Sun, 21 Apr 2024 02:29:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43L2TG96029214; Sun, 21 Apr 2024 02:29:16 GMT (envelope-from git) Date: Sun, 21 Apr 2024 02:29:16 GMT Message-Id: <202404210229.43L2TG96029214@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: e5026aa4df56 - main - databases/valkey: Update to 7.2.5, first stable release of valkey List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: e5026aa4df56e8b8644908d38ccf9c81f245ea83 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=e5026aa4df56e8b8644908d38ccf9c81f245ea83 commit e5026aa4df56e8b8644908d38ccf9c81f245ea83 Author: Yasuhiro Kimura AuthorDate: 2024-04-21 02:28:15 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-04-21 02:28:16 +0000 databases/valkey: Update to 7.2.5, first stable release of valkey * Use 'install' target of Makefile in source tree to install binaries. * Add pkgconfig to USES. * Enable portscout check. ReleaseNotes: https://github.com/valkey-io/valkey/blob/7.2.5/00-RELEASENOTES PR: 278466 Reported by: Mohamed Akram --- databases/valkey/Makefile | 14 +++----- databases/valkey/distinfo | 6 ++-- databases/valkey/files/patch-sentinel.conf | 12 +++---- databases/valkey/files/patch-src-Makefile | 37 +++++++++++++++------- databases/valkey/files/patch-src-mkreleasehdr.sh | 4 +-- .../files/{patch-redis.conf => patch-valkey.conf} | 26 +++++++-------- 6 files changed, 54 insertions(+), 45 deletions(-) diff --git a/databases/valkey/Makefile b/databases/valkey/Makefile index 860a061d7c6d..e498f13a9237 100644 --- a/databases/valkey/Makefile +++ b/databases/valkey/Makefile @@ -1,5 +1,5 @@ PORTNAME= valkey -DISTVERSION= g20240402 +DISTVERSION= 7.2.5 CATEGORIES= databases MAINTAINER= yasu@FreeBSD.org @@ -9,10 +9,9 @@ WWW= https://valkey.io/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -USES+= gmake tcl:test +USES= gmake pkgconfig tcl:test USE_GITHUB= yes GH_ACCOUNT= valkey-io -GH_TAGNAME= 0ba2f1b14 USE_RC_SUBR= valkey valkeysentinel MAKE_ENV= OPTIMIZATION= \ @@ -20,7 +19,6 @@ MAKE_ENV= OPTIMIZATION= \ LDFLAGS+= -lpthread -lm -lexecinfo -PORTSCOUT= ignore:1 SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} \ VALKEY_DBDIR=${VALKEY_DBDIR} \ @@ -48,21 +46,17 @@ JEMALLOC_MAKE_ENV= MALLOC=jemalloc TLS_USES= ssl TLS_MAKE_ENV= BUILD_TLS=yes -BIN_FILES= valkey-benchmark valkey-check-aof valkey-check-rdb valkey-cli \ - valkey-sentinel valkey-server - 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}/redis.conf > ${WRKDIR}/valkey.conf + ${WRKSRC}/valkey.conf > ${WRKDIR}/valkey.conf ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ ${WRKSRC}/sentinel.conf > ${WRKDIR}/valkey-sentinel.conf -do-install: - ${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/ +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} \ diff --git a/databases/valkey/distinfo b/databases/valkey/distinfo index b3c31618a17a..ff9c571ed2c6 100644 --- a/databases/valkey/distinfo +++ b/databases/valkey/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1712041530 -SHA256 (valkey-io-valkey-g20240402-0ba2f1b14_GH0.tar.gz) = 134eb1521ab2b1dfd9d8f30208b6c4261621e5d05218825881d2cc53cf1bfefb -SIZE (valkey-io-valkey-g20240402-0ba2f1b14_GH0.tar.gz) = 3474270 +TIMESTAMP = 1713663446 +SHA256 (valkey-io-valkey-7.2.5_GH0.tar.gz) = c7c7a758edabe7693b3692db58fe5328130036b06224df64ab1f0c12fe265a76 +SIZE (valkey-io-valkey-7.2.5_GH0.tar.gz) = 3420515 diff --git a/databases/valkey/files/patch-sentinel.conf b/databases/valkey/files/patch-sentinel.conf index d02120641775..8f26502b8146 100644 --- a/databases/valkey/files/patch-sentinel.conf +++ b/databases/valkey/files/patch-sentinel.conf @@ -1,16 +1,16 @@ ---- sentinel.conf.orig 2024-04-01 02:56:24 UTC +--- sentinel.conf.orig 2024-04-16 04:18:47 UTC +++ sentinel.conf @@ -12,12 +12,12 @@ port 26379 - # By default Redis Sentinel does not run as a daemon. Use 'yes' if you need it. - # Note that Redis will write a pid file in /var/run/redis-sentinel.pid when + # By default Valkey Sentinel does not run as a daemon. Use 'yes' if you need it. + # Note that Valkey will write a pid file in /var/run/valkey-sentinel.pid when # daemonized. -daemonize no +daemonize yes - # When running daemonized, Redis Sentinel writes a pid file in - # /var/run/redis-sentinel.pid by default. You can specify a custom pid file + # When running daemonized, Valkey Sentinel writes a pid file in + # /var/run/valkey-sentinel.pid by default. You can specify a custom pid file # location here. --pidfile /var/run/redis-sentinel.pid +-pidfile /var/run/valkey-sentinel.pid +pidfile %%VALKEY_RUNDIR%%/valkey-sentinel.pid # Specify the server verbosity level. diff --git a/databases/valkey/files/patch-src-Makefile b/databases/valkey/files/patch-src-Makefile index 20997e2d3b04..37d215714f74 100644 --- a/databases/valkey/files/patch-src-Makefile +++ b/databases/valkey/files/patch-src-Makefile @@ -1,23 +1,25 @@ ---- src/Makefile.orig 2024-04-01 02:56:24 UTC +--- src/Makefile.orig 2024-04-16 04:18:47 UTC +++ src/Makefile -@@ -61,7 +61,7 @@ endif +@@ -55,8 +55,8 @@ endif STD+=-std=c99 endif -PREFIX?=/usr/local +-INSTALL_BIN=$(PREFIX)/bin +PREFIX:=$(PREFIX) - INSTALL_BIN=$(PREFIX)/bin ++INSTALL_BIN=$(DESTDIR)$(PREFIX)/bin INSTALL=install PKG_CONFIG?=pkg-config -@@ -133,7 +133,6 @@ FINAL_LIBS=-lm + +@@ -127,7 +127,6 @@ FINAL_LIBS=-lm FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(SERVER_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG) + FINAL_LDFLAGS=$(LDFLAGS) $(SERVER_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm -DEBUG=-g -ggdb # Linux ARM32 needs -latomic at linking time ifneq (,$(findstring armv,$(uname_M))) -@@ -172,6 +171,11 @@ else +@@ -166,6 +165,11 @@ else OPENSSL_PREFIX?=/usr/local/opt/openssl endif else @@ -29,11 +31,24 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -221,6 +225,7 @@ else - # All the other OSes (notably Linux) - FINAL_LDFLAGS+= -rdynamic - FINAL_LIBS+=-ldl -pthread -lrt -+endif +@@ -225,6 +229,7 @@ endif endif endif endif ++endif + + ifdef OPENSSL_PREFIX + OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include +@@ -541,12 +546,6 @@ install: all + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) +- $(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_SERVER_NAME),$(INSTALL_BIN)) +- $(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_CLI_NAME),$(INSTALL_BIN)) +- $(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_BENCHMARK_NAME),$(INSTALL_BIN)) +- $(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_CHECK_RDB_NAME),$(INSTALL_BIN)) +- $(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_CHECK_AOF_NAME),$(INSTALL_BIN)) +- $(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_SENTINEL_NAME),$(INSTALL_BIN)) + + uninstall: + rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)} diff --git a/databases/valkey/files/patch-src-mkreleasehdr.sh b/databases/valkey/files/patch-src-mkreleasehdr.sh index 65920da3a3ff..90c25249469d 100644 --- a/databases/valkey/files/patch-src-mkreleasehdr.sh +++ b/databases/valkey/files/patch-src-mkreleasehdr.sh @@ -1,9 +1,9 @@ ---- src/mkreleasehdr.sh.orig 2024-01-27 09:11:53 UTC +--- src/mkreleasehdr.sh.orig 2024-04-16 04:18:47 UTC +++ src/mkreleasehdr.sh @@ -1,6 +1,6 @@ #!/bin/sh -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` --GIT_DIRTY=`git diff --no-ext-diff -- ../src ../deps 2> /dev/null | wc -l` +-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l` +GIT_SHA1="00000000" +GIT_DIRTY="0" BUILD_ID=`uname -n`"-"`date +%s` diff --git a/databases/valkey/files/patch-redis.conf b/databases/valkey/files/patch-valkey.conf similarity index 52% rename from databases/valkey/files/patch-redis.conf rename to databases/valkey/files/patch-valkey.conf index 4dcc57584424..87d03a4935ac 100644 --- a/databases/valkey/files/patch-redis.conf +++ b/databases/valkey/files/patch-valkey.conf @@ -1,33 +1,33 @@ ---- redis.conf.orig 2024-04-01 02:56:24 UTC -+++ redis.conf -@@ -307,7 +307,7 @@ tcp-keepalive 300 - # By default Redis does not run as a daemon. Use 'yes' if you need it. - # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. - # When Redis is supervised by upstart or systemd, this parameter has no impact. +--- valkey.conf.orig 2024-04-16 04:18:47 UTC ++++ valkey.conf +@@ -303,7 +303,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 Redis from upstart or systemd, Redis can interact with your + # If you run the server from upstart or systemd, the server can interact with your # supervision tree. Options: -@@ -339,7 +339,7 @@ daemonize no +@@ -335,7 +335,7 @@ daemonize no # - # Note that on modern Linux systems "/run/redis.pid" is more conforming + # Note that on modern Linux systems "/run/valkey.pid" is more conforming # and should be used instead. --pidfile /var/run/redis_6379.pid +-pidfile /var/run/valkey_6379.pid +pidfile %%VALKEY_RUNDIR%%/valkey.pid # Specify the server verbosity level. # This can be one of: -@@ -353,7 +353,7 @@ loglevel notice +@@ -349,7 +349,7 @@ loglevel notice # Specify the log file name. Also the empty string can be used to force - # Redis to log on the standard output. Note that if you use standard + # 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. -@@ -508,7 +508,7 @@ rdb-del-sync-files no +@@ -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.