From nobody Mon Sep 16 00:15:52 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 4X6QRs3Bvqz5VsVC; Mon, 16 Sep 2024 00:15:53 +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 4X6QRs04p3z4Z2m; Mon, 16 Sep 2024 00:15:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726445753; 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=2aRyNOeXJwZLCxR5ZDxw/UKtVVPOsxqiMoGCJ9f6xGo=; b=U9wCuJ3ihRVg5a1Km6a6stI5iO2yR0sxiuuF3X5N2rZryZzchoPipihbM9aabq1Y89yddx 28HjkysyeVAx9KuxAzlLNR77hs8FcLTWomr36cepwVzFI+ew8EPcinTBCvLOFThKJXAK+X H/JiEH20if7lSF/zVjs7dZu5zF/XEFaDWT2U3t6r82X2Y9wre0RITuh0viVbYYPwLxfL43 ZOVx4kqMuF7IYSI3ea6TwuQaHemgoHhPV3D/oBGRq3tk+2B7FIW3mpfl1QD22Y0yYHDlez FvxHfC4BZwXPPOswUzFMNidyEtUWq53Twc4/unq1YKUJywIPN76Og7ZvpAstLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726445753; a=rsa-sha256; cv=none; b=GArqdlBRKpQ7we4bhP5BkQ+7jQ9w1jqRY3NLksL9noEG8h7Em3ZZWsJSyQPSO5vaIgQ7f7 HCLKDKhTQs/YA+JseezuXqrUzGD9X3S9Ftw2OzH5xomAaZc+0V2rKUYI6rEAjFtNMezIj7 flye3lnf6nQgh2dLTaTbDCI0SN7zdeCQ/Tc2sdi1UmTa5yLDJDnsRXKyfvYa8NKjDf+WTP xiSbULpLrd64/Th2BVeOLuWdMTk5GPpu9zm9PtwEaGI3I/eMoG5xOiyJIA8iVAH1XXDTFt RjM2S/JuSLm6lqet6wlRYYVe6OcfRB+q7az5BRvXee20cfuYS0zZc8C1jmnung== 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=1726445753; 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=2aRyNOeXJwZLCxR5ZDxw/UKtVVPOsxqiMoGCJ9f6xGo=; b=Lv4xXANK1sTrRIdS0S9z672LQusjFBypKEMzHm8jLL7PLlAEqsv0kBr8aeaW4q71OBaGxt glO0dXQyQ/fj7UtVnbNXGfH26JOry/P/hPiGb/PnvnJJ6/Fg2segTf+W8dZOE6lTGjVWjl lqP90BpaCy4VYfCFl6Ce89+TJ887aKH3ThpIKw6JfYwnnrJgEnvDyyqGFdhzhk0p6LTUJ/ JBp1d6w6H5L6pzRoeASIyRj4QY99DqqFyetdzRf57vWYlMozwOx1sCdpagV1usdFHUXzZI jez7SqSmeximzhPOZ81OgIzzhP4xIglbH30Y7Lm12Vp7AnCdNXf8RByvpAueBA== 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 4X6QRr2wWMzY0q; Mon, 16 Sep 2024 00:15:52 +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 48G0FqH7009777; Mon, 16 Sep 2024 00:15:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48G0Fq4O009774; Mon, 16 Sep 2024 00:15:52 GMT (envelope-from git) Date: Mon, 16 Sep 2024 00:15:52 GMT Message-Id: <202409160015.48G0Fq4O009774@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: b29027bac8ef - main - databases/valkey: Update to 8.0.0 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: b29027bac8ef4c3416f328be938a69c496284705 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=b29027bac8ef4c3416f328be938a69c496284705 commit b29027bac8ef4c3416f328be938a69c496284705 Author: Yasuhiro Kimura AuthorDate: 2024-09-16 00:13:45 +0000 Commit: Yasuhiro Kimura 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`