From nobody Fri May 02 13:09:47 2025 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 4Zprqb6rJdz5vhP4; Fri, 02 May 2025 13:09:47 +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 4Zprqb5nJ3z3Pyy; Fri, 02 May 2025 13:09:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746191387; 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=xcR2fH1cPwBKWZQBar/JZcVgy7lyo+9SAkpkKJBoKAI=; b=yCa7Rhpc2/TgG9fLcFZzeB6Cyj46qTyaLZD33FegicZHQED50Uw+SVwJ8FVbgU6xVyOO+W CLjRjvHQ1hbiN5FnWtn9fqqp1yEAleo9n7gusP0x5I/wuHYa8Z6IR2R/1nC+fgq5ZAtbNG DvyJpgD+f93Oqkk8w8tqfXDv2zVnKX2Lq5epaxz0rkCeVNKknkrQJtxkbrOqZPK336fFEd Dp/mO904X66C0ndOU8X7fB3/71VarjmyUBwt8KPTqTUYXtGXMo/Oss6JkwpUNIUaNeX2tx oReX79zvPd0OwX1i4Xn6ST0EP1D6WMHLkteeeU45xaJo/ftjNjYSKD/2FtkBdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746191387; 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=xcR2fH1cPwBKWZQBar/JZcVgy7lyo+9SAkpkKJBoKAI=; b=mpgdJGRhty14iW0uwmuod4iYf4HvT6bMZGtUEYxDmeAxm88jB44UD+gBHnI+qrfcu/C/t8 CpEDmXhtU6yi06CnfcQmccd1ICuyqVioEPNDC8If702rHjMc6VhzOSdaJd6YZp2s99CgvO lxBZoif07kaSDcoWWU5xi2keH0F0FpZRCN1GKtBLj6Pp+tHsIizfNg4DHMBixtq7teuYI2 8vpMqIJUpB7MshNlGXuJBuFT++4CELHpAC+IX5V/U+TAULe3oD80/9lRo6CSoS9p4VXTTJ XHd27W+SGvxqiJcD4Z7moQPvmBrKZp/uwCvoRm3Do2i6mFPbJvDm3wloyp/IxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746191387; a=rsa-sha256; cv=none; b=upOxHc2ZM0wss2VeNyS9ytU/gOpqWVjZ46gKwWgXyw6HccywgwXVAjK+CTBS0BBbUJCGN9 cqxRVKNq85P3VP3Ze1HQoB/Eo3nhRYJcger/+8JBX84iNbjmf+AnedPblNq4+4c2VOB5Bz IhwIjtDptmF+LlvbVdGr/czU4mG413PaOYZ5b47sFBWWjQsBMXACEsWpMuOV7qed2S9GL5 R8ZnIoz7JOaRjRX27VJQ38lHtLisKjyYTbN6mNG0vQT1L1gRHSVDoDaJsumHeinUuloqlF +0kwWJX1eiSK0pTqqsNjD4jt0HR9H49G7vaEaZ/IE6vSyvAHZVhjBuwzEFVFtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zprqb5MpPz1D5C; Fri, 02 May 2025 13:09:47 +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 542D9lmC099868; Fri, 2 May 2025 13:09:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 542D9l0m099865; Fri, 2 May 2025 13:09:47 GMT (envelope-from git) Date: Fri, 2 May 2025 13:09:47 GMT Message-Id: <202505021309.542D9l0m099865@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: db935a52efe6 - main - databases/redis: 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: db935a52efe689c18afa98357f2dc228014d003d Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=db935a52efe689c18afa98357f2dc228014d003d commit db935a52efe689c18afa98357f2dc228014d003d Author: Yasuhiro Kimura AuthorDate: 2025-05-02 12:39:24 +0000 Commit: Yasuhiro Kimura CommitDate: 2025-05-02 13:07:57 +0000 databases/redis: Update to 8.0.0 * Update license information. Since 8.0 redis is distributed under triple license of (a) the Redis Source Available License v2 (RSALv2) or (b) the Server Side Public License v1 (SSPLv1) or (c) the GNU Affero General Public License v3 (AGPLv3). * Add entry to UPDATING. ChangeLog: https://github.com/redis/redis/releases/tag/8.0.0 --- UPDATING | 21 +++++++++++++++++++++ databases/redis/Makefile | 16 ++++++++-------- databases/redis/distinfo | 6 +++--- databases/redis/files/patch-src-Makefile | 28 ++++++++++++++-------------- 4 files changed, 46 insertions(+), 25 deletions(-) diff --git a/UPDATING b/UPDATING index 8d68f48b407b..edb22bfde624 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,27 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20250502: + AFFECTS: users of databases/redis + AUTHOR: yasu@FreeBSD.org + + The databases/redis port has been updated to 8.0. Users wanting to + stay on 7.4 can replace databases/redis with databases/redis74 with + one of the following commands. + + If you use pkg with binary packages: + # pkg set -o databases/redis:databases/redis74 + # pkg upgrade + If you use portmaster: + # portmaster -o databases/redis74 databases/redis + If you use portupgrade: + # portupgrade -o databases/redis74 databases/redis + + Keep in mind license term has changed with Redis 8.0. Now it is + distributed under triple license of Redis Source Available License + v2 (RSALv2), Server Side Public License v1 (SSPLv1) and GNU Affero + General Public License v3 (AGPLv3). + 20250408: AFFECTS: users of linux_base-c7 and any Linux application in Ports AUTHOR: arrowd@FreeBSD.org diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 62ae1ddf0594..3ce925bb3346 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,5 +1,5 @@ PORTNAME= redis -DISTVERSION= 7.4.3 +DISTVERSION= 8.0.0 CATEGORIES= databases MASTER_SITES= https://download.redis.io/releases/ @@ -7,13 +7,13 @@ MAINTAINER= yasu@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface WWW= https://redis.io/ -LICENSE= RSALv2 SSPLv1 -LICENSE_COMB= dual -LICENSE_NAME_RSALv2= Redis Source Available License v2 -LICENSE_NAME_SSPLv1= Server Side Public License v1 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LICENSE_PERMS_RSALv2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE= AGPLv3 RSALv2 SSPLv1 +LICENSE_COMB= dual +LICENSE_NAME_RSALv2= Redis Source Available License v2 +LICENSE_NAME_SSPLv1= Server Side Public License v1 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_PERMS_RSALv2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE_PERMS_SSPLv1= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= compiler:c11 cpe gmake tcl:test CPE_VENDOR= redislabs diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 6d3c2716a02b..ba097311a171 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745481453 -SHA256 (redis-7.4.3.tar.gz) = e1807d7c0f824f4c5450244ef50c1e596b8d09b35d03a83f4e018fb7316acf45 -SIZE (redis-7.4.3.tar.gz) = 3530739 +TIMESTAMP = 1746189281 +SHA256 (redis-8.0.0.tar.gz) = cf395665ba5fcecc4ef7aed1d8ab19c268619d98595827565c82344160171262 +SIZE (redis-8.0.0.tar.gz) = 3824488 diff --git a/databases/redis/files/patch-src-Makefile b/databases/redis/files/patch-src-Makefile index 6b3ed47b68be..63339db6505a 100644 --- a/databases/redis/files/patch-src-Makefile +++ b/databases/redis/files/patch-src-Makefile @@ -1,25 +1,25 @@ ---- src/Makefile.orig 2019-11-29 16:35:59 UTC +--- src/Makefile.orig 2025-05-02 11:15:06 UTC +++ src/Makefile -@@ -29,7 +29,7 @@ endif - WARN=-Wall -W -Wno-missing-field-initializers - OPT=$(OPTIMIZATION) +@@ -67,7 +67,7 @@ endif + STD+=-std=c99 + endif -PREFIX?=/usr/local +PREFIX:=$(PREFIX) INSTALL_BIN=$(PREFIX)/bin INSTALL=install - -@@ -75,7 +75,6 @@ endif + PKG_CONFIG?=pkg-config +@@ -131,7 +131,6 @@ FINAL_LIBS=-lm -lstdc++ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm + FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) + FINAL_LIBS=-lm -lstdc++ -DEBUG=-g -ggdb - # Linux ARM needs -latomic at linking time - ifneq (,$(filter aarch64 armv,$(uname_M))) -@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin) - OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include - OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib + # Linux ARM32 needs -latomic at linking time + ifneq (,$(findstring armv,$(uname_M))) +@@ -170,6 +169,11 @@ else + OPENSSL_PREFIX?=/usr/local/opt/openssl + endif else +ifeq ($(uname_S),FreeBSD) + # FreeBSD @@ -29,7 +29,7 @@ ifeq ($(uname_S),AIX) # AIX FINAL_LDFLAGS+= -Wl,-bexpall -@@ -131,6 +135,7 @@ else +@@ -219,6 +223,7 @@ else # All the other OSes (notably Linux) FINAL_LDFLAGS+= -rdynamic FINAL_LIBS+=-ldl -pthread -lrt