Date: Tue, 1 Mar 2022 09:30:17 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d012613d9fb2 - main - databases/redis-devel: Update to latest snapshot Message-ID: <202203010930.2219UHVI030252@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=d012613d9fb2cd4150eab73865aa3a63ec3bf4a9 commit d012613d9fb2cd4150eab73865aa3a63ec3bf4a9 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2022-03-01 08:40:07 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2022-03-01 08:53:09 +0000 databases/redis-devel: Update to latest snapshot * Pet portlint and portclippy * Tidy up Makefile with portfmt Changes: https://github.com/redis/redis/compare/6ca97da...4a45386 --- databases/redis-devel/Makefile | 92 +++++++++++----------- databases/redis-devel/distinfo | 6 +- .../files/extra-patch-deps_lua_src_lua__cjson.c | 4 +- .../redis-devel/files/extra-patch-src-Makefile.lua | 4 +- .../files/extra-patch-src-Makefile.luajit | 4 +- .../files/extra-patch-src-Makefile.luajit-or | 4 +- .../files/extra-patch-src-function_lua.c | 4 +- databases/redis-devel/files/patch-deps-Makefile | 4 +- .../redis-devel/files/patch-deps-hiredis-Makefile | 4 +- .../redis-devel/files/patch-deps-hiredis-net.c | 4 +- databases/redis-devel/files/patch-redis.conf | 4 +- 11 files changed, 65 insertions(+), 69 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index 53653ba6fb6d..ba72646ccb52 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -1,7 +1,7 @@ # Created by: Sergey Skvortsov <skv@protey.ru> PORTNAME= redis -PORTVERSION= 7.0.0.20220131 +DISTVERSION= 7.0.0.20220301 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -14,72 +14,68 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES+= compiler:c11 cpe gmake CPE_VENDOR= redislabs USE_GITHUB= yes -GH_TUPLE= redis:redis:6ca97da +GH_TUPLE= redis:redis:4a45386 -OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB -OPTIONS_RADIO= EXTLUA +MAKE_ENV= OPTIMIZATION= \ + V=yo + +OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB +OPTIONS_RADIO= EXTLUA OPTIONS_RADIO_EXTLUA= LUA LUAJIT LUAJITOR -OPTIONS_SUB= yes +OPTIONS_SUB= yes + JEMALLOC_DESC= Use jemalloc -LUA_DESC= Use lang/lua instead of builtin lua -LUAJIT_DESC= Use lang/luajit instead of builtin lua LUAJITOR_DESC= Use lang/luajit-openresty instead of builtin lua -TLS_DESC= Use TLS (openssl req.) +LUAJIT_DESC= Use lang/luajit instead of builtin lua +LUA_DESC= Use lang/lua instead of builtin lua TESTS_DESC= Install lang/tcl for redis unit tests +TLS_DESC= Use TLS (openssl req.) TRIB_DESC= Install redis-trib.rb (lang/ruby req.) -MAKE_ENV= V=yo OPTIMIZATION= - JEMALLOC_MAKE_ENV= USE_JEMALLOC=yes - -LUA_USES= lua:51 -LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua -LUA_VARS= _addflags=true - -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_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUAJITOR_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty +LUAJITOR_LIB_DEPENDS= libluajit-5.1.so:lang/luajit-openresty LUAJITOR_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit-or \ ${PATCHDIR}/extra-patch-src-function_lua.c \ ${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c -LUAJITOR_VARS= _addflags=true - -TESTS_USES= tcl:build - -TLS_USES= ssl -TLS_MAKE_ENV= BUILD_TLS=yes - +LUAJITOR_VARS= _ADDFLAGS=true +LUAJIT_BUILD_DEPENDS= ${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit +LUAJIT_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.luajit +LUAJIT_VARS= _ADDFLAGS=true +LUA_USES= lua:51 +LUA_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src-Makefile.lua +LUA_VARS= _ADDFLAGS=true +TESTS_USES= tcl:build +TLS_USES= ssl +TLS_MAKE_ENV= BUILD_TLS=yes TRIB_CATEGORIES= ruby -TRIB_USE= ruby=yes TRIB_RUN_DEPENDS= rubygem-redis>=2.2:databases/rubygem-redis +TRIB_USE= RUBY=yes .include <bsd.port.pre.mk> -.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*} +.if ${ARCH} == i386 && !${CFLAGS:M-march=*} # Needed for __atomic_fetch_add_8 USE_GCC= yes CFLAGS+= -march=i586 .endif .if defined(_ADDFLAGS) -CFLAGS= -fPIC -LDFLAGS= -Wl,-E +CFLAGS+= -fPIC +LDFLAGS+= -Wl,-E .endif LDFLAGS+= -lpthread -lm -lexecinfo -CONFLICTS?= redis5-5.* redis6-6.* redis-6.* +CONFLICTS?= redis-6.* redis5-5.* redis6-6.* USE_RC_SUBR= redis sentinel -BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb \ - redis-cli redis-sentinel redis-server +BIN_FILES= redis-benchmark redis-check-aof redis-check-rdb redis-cli \ + redis-sentinel redis-server -USERS= redis -GROUPS= redis +USERS= redis +GROUPS= redis REDIS_DBDIR?= /var/db/redis REDIS_RUNDIR?= /var/run/redis @@ -87,16 +83,16 @@ REDIS_LOGDIR?= /var/log/redis SUB_FILES= pkg-message SUB_LIST+= PORTNAME=${PORTNAME} \ - REDIS_USER=${USERS} \ - REDIS_DBDIR=${REDIS_DBDIR} \ - REDIS_LOGDIR=${REDIS_LOGDIR} \ - REDIS_RUNDIR=${REDIS_RUNDIR} + REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} \ + REDIS_USER=${USERS} -PLIST_SUB+= REDIS_USER=${USERS} \ - REDIS_GROUP=${GROUPS} \ - REDIS_LOGDIR=${REDIS_LOGDIR} \ - REDIS_DBDIR=${REDIS_DBDIR} \ - REDIS_RUNDIR=${REDIS_RUNDIR} +PLIST_SUB+= REDIS_DBDIR=${REDIS_DBDIR} \ + REDIS_GROUP=${GROUPS} \ + REDIS_LOGDIR=${REDIS_LOGDIR} \ + REDIS_RUNDIR=${REDIS_RUNDIR} \ + REDIS_USER=${USERS} post-patch: ${REINPLACE_CMD} '77s!malloc.h!stdlib.h!' ${WRKSRC}/src/zmalloc.h @@ -106,8 +102,8 @@ post-patch-JEMALLOC-on: post-patch-LUA-on: @cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/ -post-patch-LUAJIT-on: post-patch-LUA-on -post-patch-LUAJITOR-on: post-patch-LUA-on +post-patch-LUAJIT-on: post-patch-LUA-on +post-patch-LUAJITOR-on: post-patch-LUA-on post-build: ${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index 88b48dadb6ed..49d99ecfbae3 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643657761 -SHA256 (redis-redis-7.0.0.20220131-6ca97da_GH0.tar.gz) = df91b39beeed64fd65abf199a0a5c40b18609616c8c52806f0d964ba80ba920e -SIZE (redis-redis-7.0.0.20220131-6ca97da_GH0.tar.gz) = 2874928 +TIMESTAMP = 1646123532 +SHA256 (redis-redis-7.0.0.20220301-4a45386_GH0.tar.gz) = bf1943414dd9e5ffebfcc386acde24a6a3e860174d2190806621035d60275360 +SIZE (redis-redis-7.0.0.20220301-4a45386_GH0.tar.gz) = 2924689 diff --git a/databases/redis-devel/files/extra-patch-deps_lua_src_lua__cjson.c b/databases/redis-devel/files/extra-patch-deps_lua_src_lua__cjson.c index 847b70d25dea..32e322d0d490 100644 --- a/databases/redis-devel/files/extra-patch-deps_lua_src_lua__cjson.c +++ b/databases/redis-devel/files/extra-patch-deps_lua_src_lua__cjson.c @@ -1,5 +1,5 @@ ---- deps/lua/src/lua_cjson.c.orig 2019-12-08 07:56:31.419672000 -0500 -+++ deps/lua/src/lua_cjson.c 2019-12-08 07:56:52.389362000 -0500 +--- deps/lua/src/lua_cjson.c.orig 2019-12-08 12:56:31 UTC ++++ deps/lua/src/lua_cjson.c @@ -1299,7 +1299,7 @@ * * luaL_setfuncs() is used to create a module table where the functions have diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.lua b/databases/redis-devel/files/extra-patch-src-Makefile.lua index 8012dc4d76e6..d4108daab4fa 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.lua +++ b/databases/redis-devel/files/extra-patch-src-Makefile.lua @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2022-01-12 01:00:14.676138000 +0900 -+++ src/Makefile 2022-01-12 01:05:07.007928000 +0900 +--- src/Makefile.orig 2022-01-11 16:00:14 UTC ++++ src/Makefile @@ -16,7 +16,7 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.luajit b/databases/redis-devel/files/extra-patch-src-Makefile.luajit index 95727c600cb8..f1a28a56f953 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit +++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2022-01-12 01:09:20.385180000 +0900 -+++ src/Makefile 2022-01-12 01:11:45.772845000 +0900 +--- src/Makefile.orig 2022-01-11 16:09:20 UTC ++++ src/Makefile @@ -16,7 +16,7 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or b/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or index ab2aba5bbf68..5bdf59332b33 100644 --- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or +++ b/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2022-01-12 01:14:34.800218000 +0900 -+++ src/Makefile 2022-01-12 01:16:26.274158000 +0900 +--- src/Makefile.orig 2022-01-11 16:14:34 UTC ++++ src/Makefile @@ -16,7 +16,7 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') diff --git a/databases/redis-devel/files/extra-patch-src-function_lua.c b/databases/redis-devel/files/extra-patch-src-function_lua.c index 6e4fc624de52..29be5e28e8f5 100644 --- a/databases/redis-devel/files/extra-patch-src-function_lua.c +++ b/databases/redis-devel/files/extra-patch-src-function_lua.c @@ -1,5 +1,5 @@ ---- src/function_lua.c.orig 2022-01-31 19:49:57.000000000 +0900 -+++ src/function_lua.c 2022-02-01 05:03:43.442197000 +0900 +--- src/function_lua.c.orig 2022-01-31 10:49:57 UTC ++++ src/function_lua.c @@ -52,6 +52,10 @@ #define LIBRARY_API_NAME "__LIBRARY_API__" #define LOAD_TIMEOUT_MS 500 diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile index c937bacb715e..21331efe7d8a 100644 --- a/databases/redis-devel/files/patch-deps-Makefile +++ b/databases/redis-devel/files/patch-deps-Makefile @@ -1,5 +1,5 @@ ---- deps/Makefile.orig 2021-12-01 10:06:05.001367000 -0500 -+++ deps/Makefile 2021-12-01 10:08:16.372525000 -0500 +--- deps/Makefile.orig 2021-12-01 15:06:05 UTC ++++ deps/Makefile @@ -76,7 +76,7 @@ ifeq ($(LUA_DEBUG),yes) LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile index 9422ba8d3245..aec6b29a7b2e 100644 --- a/databases/redis-devel/files/patch-deps-hiredis-Makefile +++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile @@ -1,5 +1,5 @@ ---- deps/hiredis/Makefile.orig 2021-01-12 09:21:03.000000000 -0500 -+++ deps/hiredis/Makefile 2021-01-13 11:40:26.109827000 -0500 +--- deps/hiredis/Makefile.orig 2021-01-12 14:21:03 UTC ++++ deps/hiredis/Makefile @@ -21,7 +21,7 @@ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') diff --git a/databases/redis-devel/files/patch-deps-hiredis-net.c b/databases/redis-devel/files/patch-deps-hiredis-net.c index 3fd2b5996f97..0dfde3135238 100644 --- a/databases/redis-devel/files/patch-deps-hiredis-net.c +++ b/databases/redis-devel/files/patch-deps-hiredis-net.c @@ -1,5 +1,5 @@ ---- deps/hiredis/net.c.orig 2019-11-28 14:32:05.942453000 -0500 -+++ deps/hiredis/net.c 2019-11-28 14:39:08.326408000 -0500 +--- deps/hiredis/net.c.orig 2019-11-28 19:32:05 UTC ++++ deps/hiredis/net.c @@ -178,14 +178,34 @@ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); return REDIS_ERR; diff --git a/databases/redis-devel/files/patch-redis.conf b/databases/redis-devel/files/patch-redis.conf index f71797d9555e..a84973345b78 100644 --- a/databases/redis-devel/files/patch-redis.conf +++ b/databases/redis-devel/files/patch-redis.conf @@ -1,5 +1,5 @@ ---- redis.conf.orig 2021-01-12 09:21:03.000000000 -0500 -+++ redis.conf 2021-01-13 11:46:40.445746000 -0500 +--- redis.conf.orig 2021-01-12 14:21:03 UTC ++++ redis.conf 2021-01-13 @@ -244,7 +244,7 @@ # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203010930.2219UHVI030252>