Attachment 233556 Details for Bug 263623 – Patch file

[patch] Patch file

databases_redis.2022Q2.patch (text/plain), 2.78 KB, created by Yasuhiro Kimura on 2022-04-28 02:36:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-04-28 02:36:38 UTC

Size: 2.78 KB

patch

obsolete

>From a0e8bf8d458f98595c3b7ebee7004ee5f1c29282 Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Thu, 28 Apr 2022 11:02:29 +0900
>Subject: [PATCH] databases/redis: Update to 6.2.7
>
>* On main branch this port is updated to 7.0.0 and it includes
>  security fix. But marging it to quarterly branch isn't proper as it
>  is major update and there may be incompatibility issue. Upstream
>  also released new version of 6.2 series and it also includes same
>  security fix. So update to the latter.
>* Mark BROKEN if any of external lua library options are
>  enabled. Upstream add new APIs to bundled lua library and use them
>  in source code of redis. This makes it impossible to compile and
>  link redis with external lua libraries. According to the commit
>  message of upstream repository they took the code of new API from
>  the repository of lua. It means linking with external lua libraries
>  may get possible again if they are updated. So mark BROKEN rather
>  than remove these options.
>
>ChangeLog:	https://github.com/redis/redis/releases/tag/6.2.7
>Security:	cc42db1c-c65f-11ec-ad96-0800270512f4
>---
> databases/redis/Makefile | 5 ++++-
> databases/redis/distinfo | 6 +++---
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/databases/redis/Makefile b/databases/redis/Makefile
>index 46939f33b844..c46092680e95 100644
>--- a/databases/redis/Makefile
>+++ b/databases/redis/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Sergey Skvortsov <skv@protey.ru>
> 
> PORTNAME=	redis
>-PORTVERSION=	6.2.6
>+PORTVERSION=	6.2.7
> CATEGORIES=	databases
> MASTER_SITES=	https://download.redis.io/releases/
> 
>@@ -31,15 +31,18 @@ MAKE_ENV=	V=yo OPTIMIZATION=
> 
> JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
> 
>+LUA_BROKEN=		Fails to link
> LUA_USES=		lua:51
> LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
> LUA_VARS=		_addflags=true
> 
>+LUAJIT_BROKEN=		Fails to link
> LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
> LUAJIT_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
> LUAJIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit
> LUAJIT_VARS=		_addflags=true
> 
>+LUAJITOR_BROKEN=	Fails to link
> LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
> LUAJITOR_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty
> LUAJITOR_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
>diff --git a/databases/redis/distinfo b/databases/redis/distinfo
>index d335fe124752..6207ae9ac69d 100644
>--- a/databases/redis/distinfo
>+++ b/databases/redis/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1633405476
>-SHA256 (redis-6.2.6.tar.gz) = 5b2b8b7a50111ef395bf1c1d5be11e6e167ac018125055daa8b5c2317ae131ab
>-SIZE (redis-6.2.6.tar.gz) = 2476542
>+TIMESTAMP = 1651110960
>+SHA256 (redis-6.2.7.tar.gz) = b7a79cc3b46d3c6eb52fa37dde34a4a60824079ebdfb3abfbbfa035947c55319
>+SIZE (redis-6.2.7.tar.gz) = 2487287
>-- 
>2.36.0
>

Flags:

yasu: maintainer-approval+

Actions: View | Diff

Attachments on bug 263623: 233556