Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Sep 2024 00:15:52 GMT
From:      Yasuhiro Kimura <yasu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: b29027bac8ef - main - databases/valkey: Update to 8.0.0
Message-ID:  <202409160015.48G0Fq4O009774@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu:

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

commit b29027bac8ef4c3416f328be938a69c496284705
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2024-09-16 00:13:45 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2024-09-16 00:15:29 +0000

    databases/valkey: Update to 8.0.0
    
    ChangeLog:      https://github.com/valkey-io/valkey/releases/tag/8.0.0
---
 databases/valkey/Makefile                        |  2 +-
 databases/valkey/distinfo                        |  6 ++--
 databases/valkey/files/patch-src-Makefile        | 36 ++++++++++++------------
 databases/valkey/files/patch-src-mkreleasehdr.sh |  4 +--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/databases/valkey/Makefile b/databases/valkey/Makefile
index 27fef77bfaca..a29e0112c01f 100644
--- a/databases/valkey/Makefile
+++ b/databases/valkey/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	valkey
-DISTVERSION=	7.2.6
+DISTVERSION=	8.0.0
 CATEGORIES=	databases
 
 MAINTAINER=	yasu@FreeBSD.org
diff --git a/databases/valkey/distinfo b/databases/valkey/distinfo
index a7fa1bd0e194..e85d170a51b2 100644
--- a/databases/valkey/distinfo
+++ b/databases/valkey/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723768525
-SHA256 (valkey-io-valkey-7.2.6_GH0.tar.gz) = 5272f244deecd5655d805aabc71c84a7c7699bc4fa009dd7fc550806a042d512
-SIZE (valkey-io-valkey-7.2.6_GH0.tar.gz) = 3427423
+TIMESTAMP = 1726444870
+SHA256 (valkey-io-valkey-8.0.0_GH0.tar.gz) = f87fef2ba81ae4bce891b874fba58cfde2d19370a3bcac20f0e17498b33c33c0
+SIZE (valkey-io-valkey-8.0.0_GH0.tar.gz) = 3624237
diff --git a/databases/valkey/files/patch-src-Makefile b/databases/valkey/files/patch-src-Makefile
index 37d215714f74..483fe6891dbb 100644
--- a/databases/valkey/files/patch-src-Makefile
+++ b/databases/valkey/files/patch-src-Makefile
@@ -1,6 +1,6 @@
---- src/Makefile.orig	2024-04-16 04:18:47 UTC
+--- src/Makefile.orig	2024-08-01 15:59:43 UTC
 +++ src/Makefile
-@@ -55,8 +55,8 @@ endif
+@@ -61,8 +61,8 @@ endif
  	STD+=-std=c99
  endif
  
@@ -11,15 +11,15 @@
  INSTALL=install
  PKG_CONFIG?=pkg-config
  
-@@ -127,7 +127,6 @@ FINAL_LIBS=-lm
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(SERVER_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(SERVER_LDFLAGS) $(DEBUG)
+@@ -145,7 +145,6 @@ FINAL_LIBS=-lm
+ endif
+ FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG)
  FINAL_LIBS=-lm
 -DEBUG=-g -ggdb
  
  # Linux ARM32 needs -latomic at linking time
  ifneq (,$(findstring armv,$(uname_M)))
-@@ -166,6 +165,11 @@ else
+@@ -189,6 +188,11 @@ else
  	OPENSSL_PREFIX?=/usr/local/opt/openssl
  endif
  else
@@ -31,7 +31,7 @@
  ifeq ($(uname_S),AIX)
          # AIX
          FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -225,6 +229,7 @@ endif
+@@ -248,6 +252,7 @@ endif
  endif
  endif
  endif
@@ -39,16 +39,16 @@
  
  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))
+@@ -624,12 +629,6 @@ install: all
+ 	@ln -sf $(SERVER_NAME) $(INSTALL_BIN)/$(ENGINE_CHECK_RDB_NAME)
+ 	@ln -sf $(SERVER_NAME) $(INSTALL_BIN)/$(ENGINE_CHECK_AOF_NAME)
+ 	@ln -sf $(SERVER_NAME) $(INSTALL_BIN)/$(ENGINE_SENTINEL_NAME)
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(SERVER_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_CLI_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_BENCHMARK_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_CHECK_RDB_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_CHECK_AOF_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(ENGINE_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)}
+ 	@rm -f $(INSTALL_BIN)/{$(SERVER_NAME),$(ENGINE_BENCHMARK_NAME),$(ENGINE_CLI_NAME),$(ENGINE_CHECK_RDB_NAME),$(ENGINE_CHECK_AOF_NAME),$(ENGINE_SENTINEL_NAME)}
diff --git a/databases/valkey/files/patch-src-mkreleasehdr.sh b/databases/valkey/files/patch-src-mkreleasehdr.sh
index 90c25249469d..b4dd26bd81ec 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-04-16 04:18:47 UTC
+--- src/mkreleasehdr.sh.orig	2024-08-01 15:59:43 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 2> /dev/null | wc -l`
+-GIT_DIRTY=`git diff --no-ext-diff -- ../src ../deps 2> /dev/null | wc -l`
 +GIT_SHA1="00000000"
 +GIT_DIRTY="0"
  BUILD_ID=`uname -n`"-"`date +%s`



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409160015.48G0Fq4O009774>