git: db935a52efe6 - main - databases/redis: Update to 8.0.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Fri, 02 May 2025 13:09:47 UTC
The branch main has been updated by yasu:

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

commit db935a52efe689c18afa98357f2dc228014d003d
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2025-05-02 12:39:24 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
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