From nobody Fri Aug 16 02:49:58 2024 X-Original-To: dev-commits-ports-main@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 4WlRKz3zYsz5Hk4r; Fri, 16 Aug 2024 02:49:59 +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 4WlRKz21yHz4cSV; Fri, 16 Aug 2024 02:49:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723776599; 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=8LCxMQV9UG8AEIJR3K/pQtZVFFMeaNH20J7yJJRfTEw=; b=BKdkbTbmx6FpSU9TTLlMQilFBixi1A4rok+JAVofIRfCQC5rG0aDu07ywigNt0mp9iFKWi 1Xpc6bTxcPk8yiyPy7rbqIv1kYBvpF57Y/BpXAWDCSg9fBun0RuV5ZjeJhh6d1ALMxQyW1 GC+GecxtcMOL9IZo0uTF9D9i3SxHTlfPkbB2yuIYvHKfjuWJuN2N3SdS/huEfuEf30mYxG z7Tid+c3gUwzg6kLb9H2zRLjwOFIsyK9okVnjeuWpyiMzDO1CtmEb8MuvTXPOoeYMFYaOA Fce6EjbnmUr3b3/HNg7RPv/HxFA2wcX5hp9j7HbaxbcRWn0nz72HlZCgMkNz3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723776599; a=rsa-sha256; cv=none; b=qjkcslA/YJL1rrpZ4pyfpVAiVEfuRMrZmF2iK5srYC0StwC37UuYSiUapmSDb+nJzaNRiG 8kEKk48blXlkEA9npglfmfjFzm471kQzWAe/VgOyYWC5H3wzjFNzGcbuCnPClzGsFLCi40 3sTd6e5SRoGgUjQjTCaSs1LbHB3wT+2ToixEtrWd39i8rbJP/B72iogtDkB7iBHlGQsceg SaMPyXKVyvtAkMwgdfdYHfD3egHoWqryprPooDxWX9sQYTPrI3ma0eqGPbDa+fsvKi8tYa PcypB3f4j+DS7dgbm64zEGVnbPLAX1cK4RlyY7YGjzRQVXz/46BpyZlpBMKc8g== 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=1723776599; 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=8LCxMQV9UG8AEIJR3K/pQtZVFFMeaNH20J7yJJRfTEw=; b=YYGztQxpjYRKmWsDbyGW2h6n3dFl3vw4rD5uRiP2NdrOaxiBoIQONmPtARhqsYD21ORUyZ lDZe4WGuqJh0bNiOAnLq66huZn0NOnLTi46Z2E3e59yvvQgr+EMj8R6WJlDaK2oCyrIrCo 3f8incMQpt3FyAeSl6ceOy2dLCWyMbMKSyLLUupZu6u4XyIYl3/xrLYFz0C0CCQPBVQU2B 4Kzf5/lI4fq5akrCwKEGXkx5woGlR5ku9P8MP0EyU76bFQE1dsoEl26i5NdlvyxMHZ77h1 DdgHOLLZi/Y83ZD5p3Ok8Wd6FiEgSTD1AcxEmMwiySfzCekh9asEbUnx4KSijw== 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 4WlRKz0LmlzpTw; Fri, 16 Aug 2024 02:49:59 +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 47G2nwCL070761; Fri, 16 Aug 2024 02:49:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47G2nwJF070758; Fri, 16 Aug 2024 02:49:58 GMT (envelope-from git) Date: Fri, 16 Aug 2024 02:49:58 GMT Message-Id: <202408160249.47G2nwJF070758@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: 6bcc3e564860 - main - databases/redis: Update to 7.4.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 6bcc3e564860111e13797541f857e41a1f2749b3 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=6bcc3e564860111e13797541f857e41a1f2749b3 commit 6bcc3e564860111e13797541f857e41a1f2749b3 Author: Yasuhiro Kimura AuthorDate: 2024-08-16 00:27:47 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-08-16 02:48:45 +0000 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 --- UPDATING | 23 +++++++++++++++++++++++ databases/redis/Makefile | 13 +++++++++---- databases/redis/distinfo | 6 +++--- databases/redis/files/patch-src-mkreleasehdr.sh | 4 ++-- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/UPDATING b/UPDATING index 26cdd2303ef6..dff39d004756 100644 --- a/UPDATING +++ b/UPDATING @@ -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`