databases/redis: Update to 7.4.0

* Update license information. Since 7.4 upstream distributes source
  files under dual license of Redis Source Available License
  v2 (RSALv2) and Server Side Public License v1 (SSPLv1).
* Add entry to UPDATING.

ChangeLog:	https://github.com/redis/redis/releases/tag/7.4.0
This commit is contained in:
Yasuhiro Kimura 2024-08-16 09:27:47 +09:00
parent e0fe408f52
commit 6bcc3e5648
4 changed files with 37 additions and 9 deletions

View file

@ -5,6 +5,29 @@ 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.
20240816:
AFFECTS: users of databases/redis
AUTHOR: yasu@FreeBSD.org
The databases/redis port has been updated to 7.4. Users wanting to
stay on 7.2 can replace databases/redis with databases/redis72 with
one of the following commands.
If you use pkg with binary packages:
# pkg set -o databases/redis:databases/redis72
# pkg upgrade
If you use portmaster:
# portmaster -o databases/redis72 databases/redis
If you use portupgrade:
# portupgrade -o databases/redis72 databases/redis
Keep in mind license term has changed with Redis 7.4. Now it is
distributed under dual license of Redis Source Available License v2
(RSALv2) and Server Side Public License v1 (SSPLv1). If you don't
want to accept either of them, then Valkey (database/vulkey) may be
alternative for you. It is fork of Redis 7.2 and distributed under
3-clause BSD license that is same as Redis 7.2 and before.
20240815:
AFFECTS: users of devel/subversion-lts and devel/subversion
AUTHOR: michaelo@FreeBSD.org

View file

@ -1,5 +1,5 @@
PORTNAME= redis
DISTVERSION= 7.2.5
DISTVERSION= 7.4.0
CATEGORIES= databases
MASTER_SITES= https://download.redis.io/releases/
@ -7,8 +7,13 @@ MAINTAINER= yasu@FreeBSD.org
COMMENT= Persistent key-value database with built-in net interface
WWW= https://redis.io/
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
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
USES= compiler:c11 cpe gmake tcl:test
CPE_VENDOR= redislabs
@ -56,7 +61,7 @@ REDIS_RUNDIR?= /var/run/redis
REDIS_LOGDIR?= /var/log/redis
post-patch-JEMALLOC-on:
@${REINPLACE_CMD} '69s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
@${REINPLACE_CMD} '78s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
post-build:
${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1716165213
SHA256 (redis-7.2.5.tar.gz) = 5981179706f8391f03be91d951acafaeda91af7fac56beffb2701963103e423d
SIZE (redis-7.2.5.tar.gz) = 3386454
TIMESTAMP = 1723767589
SHA256 (redis-7.4.0.tar.gz) = 57b47c2c6682636d697dbf5d66d8d495b4e653afc9cd32b7adf9da3e433b8aaf
SIZE (redis-7.4.0.tar.gz) = 3525325

View file

@ -1,9 +1,9 @@
--- src/mkreleasehdr.sh.orig 2019-11-22 16:54:22 UTC
--- src/mkreleasehdr.sh.orig 2024-06-06 11:03:20 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`