diff options
author | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-08-16 00:27:47 +0000 |
---|---|---|
committer | Yasuhiro Kimura <yasu@FreeBSD.org> | 2024-08-16 02:48:45 +0000 |
commit | 6bcc3e564860111e13797541f857e41a1f2749b3 (patch) | |
tree | 0bf559095a6271f7aecf7d0252d774405628156d | |
parent | e0fe408f52b9c4b2c46c196ceb88ce77379edd23 (diff) |
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
-rw-r--r-- | UPDATING | 23 | ||||
-rw-r--r-- | databases/redis/Makefile | 13 | ||||
-rw-r--r-- | databases/redis/distinfo | 6 | ||||
-rw-r--r-- | databases/redis/files/patch-src-mkreleasehdr.sh | 4 |
4 files changed, 37 insertions, 9 deletions
@@ -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 diff --git a/databases/redis/Makefile b/databases/redis/Makefile index ccd4f507cd88..a6730228079f 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -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/=/%%!/} \ diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 7885129471ae..a03928b891bd 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -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 diff --git a/databases/redis/files/patch-src-mkreleasehdr.sh b/databases/redis/files/patch-src-mkreleasehdr.sh index e48b3174d315..2a568628139d 100644 --- a/databases/redis/files/patch-src-mkreleasehdr.sh +++ b/databases/redis/files/patch-src-mkreleasehdr.sh @@ -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` |