Attachment 217189 Details for Bug 246770 – Updated patch file

[patch] Updated patch file

databases_redis.patch (text/plain), 28.11 KB, created by Yasuhiro Kimura on 2020-08-13 10:16:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2020-08-13 10:16:25 UTC

Size: 28.11 KB

patch

obsolete

>Index: UPDATING
>===================================================================
>--- UPDATING	(revision 544765)
>+++ UPDATING	(working copy)
>@@ -5,6 +5,20 @@
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20200813:
>+  AFFECTS: users of databases/redis
>+  AUTHOR: osa@FreeBSD.org
>+
>+  The databases/redis port has been updated to the new stable release 6.0.
>+  Users wanting to stay on 5.0 can replace databases/redis with
>+  databases/redis5 with one of the following commands:
>+
>+  # pkg install databases/redis5
>+    or
>+  # portmaster -o databases/redis5 databases/redis
>+    or
>+  # portupgrade -o databases/redis5 databases/redis
>+
> 20200811:
>   AFFECTS: users of *-emacs26-* packages
>   AUTHOR: jrm@FreeBSD.org
>Index: databases/Makefile
>===================================================================
>--- databases/Makefile	(revision 544765)
>+++ databases/Makefile	(working copy)
>@@ -849,6 +849,7 @@
>     SUBDIR += redis
>     SUBDIR += redis-devel
>     SUBDIR += redis4
>+    SUBDIR += redis5
>     SUBDIR += redis_exporter
>     SUBDIR += redisdesktopmanager
>     SUBDIR += retcl
>Index: databases/redis/Makefile
>===================================================================
>--- databases/redis/Makefile	(revision 544765)
>+++ databases/redis/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	redis
>-PORTVERSION=	5.0.9
>+PORTVERSION=	6.0.6
> CATEGORIES=	databases
> MASTER_SITES=	http://download.redis.io/releases/
> 
>@@ -12,7 +12,9 @@
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-OPTIONS_DEFINE=	JEMALLOC TESTS TRIB
>+USES+=		compiler:c11 gmake
>+
>+OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
> OPTIONS_RADIO=	EXTLUA
> OPTIONS_RADIO_EXTLUA=	LUA LUAJIT LUAJITOR
> OPTIONS_SUB=	yes
>@@ -19,59 +21,55 @@
> 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-openjit instead of builtin lua
>+LUAJITOR_DESC=	Use lang/luajit-openresty instead of builtin lua
>+TLS_DESC=	Use TLS (openssl req.)
> TESTS_DESC=	Install lang/tcl for redis unit tests
> TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
> 
>-USES+=		compiler:c11 gmake
>-MAKE_ENV=	"V=yo"
>+MAKE_ENV=	V=yo OPTIMIZATION=
> 
>-.include <bsd.port.options.mk>
>+JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
> 
>-.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
>-# Needed for __atomic_fetch_add_8
>-USE_GCC=	yes
>-CFLAGS+=	-march=i586
>-.endif
>+LUA_USES=		lua:51
>+LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
>+LUA_VARS=		_addflags=true
> 
>-.if ${PORT_OPTIONS:MJEMALLOC}
>-MAKE_ENV+=	"USE_JEMALLOC=yes"
>-.endif
>+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
> 
>-.if ${PORT_OPTIONS:MTRIB}
>-CATEGORIES+=	ruby
>-USE_RUBY=	yes
>-RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
>-.endif
>+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 \
>+			${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
>+LUAJITOR_VARS=		_addflags=true
> 
>-.if ${PORT_OPTIONS:MLUA}
>-USES+=		lua:51
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
>-.endif
>+TESTS_USES=	tcl:build
> 
>-.if ${PORT_OPTIONS:MLUAJIT}
>-LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit
>-.endif
>+TLS_USES=	ssl
>+TLS_MAKE_ENV=	BUILD_TLS=yes
> 
>-.if ${PORT_OPTIONS:MLUAJITOR}
>-LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit-openresty
>-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
>-		${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
>-.endif
>+TRIB_CATEGORIES=	ruby
>+TRIB_USE=		ruby=yes
>+TRIB_RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
> 
>-.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR}
>-CFLAGS+=	-fPIC
>-LDFLAGS+=	-Wl,-E
>+.include <bsd.port.pre.mk>
>+
>+.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
>+# Needed for __atomic_fetch_add_8
>+USE_GCC=	yes
>+CFLAGS+=	-march=i586
> .endif
> 
>-.if ${PORT_OPTIONS:MTESTS}
>-USES+=		tcl:build
>+.if defined(_addflags)
>+CFLAGS=		-fPIC
>+LDFLAGS=	-Wl,-E
> .endif
> 
> LDFLAGS+=	-lpthread -lm -lexecinfo
> 
>-CONFLICTS?=	redis4-4.* redis-devel-5.*
>+CONFLICTS?=	redis4 redis5 redes-devel
> 
> USE_RC_SUBR=	redis sentinel
> BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
>@@ -97,15 +95,13 @@
> 	REDIS_DBDIR=${REDIS_DBDIR} \
> 	REDIS_RUNDIR=${REDIS_RUNDIR}
> 
>-.include <bsd.port.pre.mk>
>+post-patch-JEMALLOC-on:
>+	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
> 
>-post-patch:
>-.if ${PORT_OPTIONS:MJEMALLOC}
>-	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
>-.endif
>-.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR}
>+post-patch-LUA-on:
> 	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
>-.endif
>+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/=/%%!/} \
>@@ -113,9 +109,6 @@
> 
> do-install:
> 	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
>-.if ${PORT_OPTIONS:MTRIB}
>-	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
>-.endif
> 	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
> 	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
> 	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
>@@ -122,6 +115,9 @@
> 		${STAGEDIR}${REDIS_DBDIR} \
> 		${STAGEDIR}${REDIS_RUNDIR}
> 
>+do-install-TRIB-on:
>+	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
>+
> do-test:
> 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
> 
>Index: databases/redis/distinfo
>===================================================================
>--- databases/redis/distinfo	(revision 544765)
>+++ databases/redis/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1587224146
>-SHA256 (redis-5.0.9.tar.gz) = 53d0ae164cd33536c3d4b720ae9a128ea6166ebf04ff1add3b85f1242090cb85
>-SIZE (redis-5.0.9.tar.gz) = 1986574
>+TIMESTAMP = 1595276314
>+SHA256 (redis-6.0.6.tar.gz) = 12ad49b163af5ef39466e8d2f7d212a58172116e5b441eebecb4e6ca22363d94
>+SIZE (redis-6.0.6.tar.gz) = 2228781
>Index: databases/redis/files/extra-patch-src-Makefile.lua
>===================================================================
>--- databases/redis/files/extra-patch-src-Makefile.lua	(revision 544765)
>+++ databases/redis/files/extra-patch-src-Makefile.lua	(working copy)
>@@ -1,5 +1,5 @@
>---- src/Makefile.orig	2018-10-18 18:09:43.930566000 -0400
>-+++ src/Makefile	2018-10-18 18:10:32.562125000 -0400
>+--- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
>++++ src/Makefile	2020-05-16 12:20:46.728148000 -0400
> @@ -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')
>@@ -9,7 +9,7 @@
>  NODEPS:=clean distclean
>  
>  # Default settings
>-@@ -63,8 +63,8 @@
>+@@ -73,8 +73,8 @@
>  # Override default settings if possible
>  -include .make-settings
>  
>@@ -18,9 +18,9 @@
> +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
> +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
>  FINAL_LIBS=-lm
>+ DEBUG=-g -ggdb
>  
>- ifeq ($(uname_S),SunOS)
>-@@ -112,7 +112,7 @@
>+@@ -149,7 +149,7 @@
>  endif
>  endif
>  # Include paths to dependencies
>@@ -27,10 +27,10 @@
> -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
> +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
>  
>- ifeq ($(MALLOC),tcmalloc)
>- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
>-@@ -130,6 +130,9 @@
>- 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
>+ # Determine systemd support and/or build preference (defaulting to auto-detection)
>+ BUILD_WITH_SYSTEMD=no
>+@@ -197,6 +197,9 @@
>+     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
>  endif
>  
> +FINAL_CFLAGS+=-I${PREFIX}/include/lua51
>@@ -39,15 +39,15 @@
>  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
>  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
>  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
>-@@ -150,6 +153,7 @@
>+@@ -217,6 +220,7 @@
>  REDIS_SERVER_NAME=redis-server
>  REDIS_SENTINEL_NAME=redis-sentinel
>- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
>+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o
> +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
>  REDIS_CLI_NAME=redis-cli
>- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
>+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o
>  REDIS_BENCHMARK_NAME=redis-benchmark
>-@@ -201,7 +205,7 @@
>+@@ -268,7 +272,7 @@
>  
>  # redis-server
>  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
>Index: databases/redis/files/extra-patch-src-Makefile.luajit
>===================================================================
>--- databases/redis/files/extra-patch-src-Makefile.luajit	(revision 544765)
>+++ databases/redis/files/extra-patch-src-Makefile.luajit	(working copy)
>@@ -1,5 +1,5 @@
>---- src/Makefile.orig	2018-10-18 18:11:24.649811000 -0400
>-+++ src/Makefile	2018-10-18 18:11:35.160523000 -0400
>+--- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
>++++ src/Makefile	2020-05-16 12:25:33.461058000 -0400
> @@ -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')
>@@ -9,7 +9,7 @@
>  NODEPS:=clean distclean
>  
>  # Default settings
>-@@ -63,8 +63,8 @@
>+@@ -73,8 +73,8 @@
>  # Override default settings if possible
>  -include .make-settings
>  
>@@ -18,9 +18,9 @@
> +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
> +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
>  FINAL_LIBS=-lm
>+ DEBUG=-g -ggdb
>  
>- ifeq ($(uname_S),SunOS)
>-@@ -112,7 +112,7 @@
>+@@ -149,7 +149,7 @@
>  endif
>  endif
>  # Include paths to dependencies
>@@ -27,10 +27,10 @@
> -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
> +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
>  
>- ifeq ($(MALLOC),tcmalloc)
>- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
>-@@ -130,6 +130,9 @@
>- 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
>+ # Determine systemd support and/or build preference (defaulting to auto-detection)
>+ BUILD_WITH_SYSTEMD=no
>+@@ -197,6 +197,9 @@
>+     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
>  endif
>  
> +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
>@@ -39,15 +39,15 @@
>  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
>  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
>  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
>-@@ -150,6 +153,7 @@
>+@@ -217,6 +220,7 @@
>  REDIS_SERVER_NAME=redis-server
>  REDIS_SENTINEL_NAME=redis-sentinel
>- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
>+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o
> +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
>  REDIS_CLI_NAME=redis-cli
>- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
>+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o
>  REDIS_BENCHMARK_NAME=redis-benchmark
>-@@ -201,7 +205,7 @@
>+@@ -268,7 +272,7 @@
>  
>  # redis-server
>  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
>Index: databases/redis/files/extra-patch-src-Makefile.luajit-or
>===================================================================
>--- databases/redis/files/extra-patch-src-Makefile.luajit-or	(revision 544765)
>+++ databases/redis/files/extra-patch-src-Makefile.luajit-or	(working copy)
>@@ -1,5 +1,5 @@
>---- src/Makefile.orig	2019-11-19 12:05:52.000000000 -0500
>-+++ src/Makefile	2019-12-11 19:44:38.238797000 -0500
>+--- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
>++++ src/Makefile	2020-05-16 12:22:56.630826000 -0400
> @@ -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')
>@@ -9,7 +9,7 @@
>  NODEPS:=clean distclean
>  
>  # Default settings
>-@@ -72,8 +72,8 @@
>+@@ -73,8 +73,8 @@
>  # Override default settings if possible
>  -include .make-settings
>  
>@@ -20,7 +20,7 @@
>  FINAL_LIBS=-lm
>  DEBUG=-g -ggdb
>  
>-@@ -127,7 +127,7 @@
>+@@ -149,7 +149,7 @@
>  endif
>  endif
>  # Include paths to dependencies
>@@ -27,10 +27,10 @@
> -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
> +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
>  
>- ifeq ($(MALLOC),tcmalloc)
>- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
>-@@ -145,6 +145,9 @@
>- 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
>+ # Determine systemd support and/or build preference (defaulting to auto-detection)
>+ BUILD_WITH_SYSTEMD=no
>+@@ -197,6 +197,9 @@
>+     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
>  endif
>  
> +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
>@@ -39,15 +39,15 @@
>  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
>  REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
>  REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
>-@@ -165,6 +168,7 @@
>+@@ -217,6 +220,7 @@
>  REDIS_SERVER_NAME=redis-server
>  REDIS_SENTINEL_NAME=redis-sentinel
>- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
>+ REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o
> +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
>  REDIS_CLI_NAME=redis-cli
>- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
>+ REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o
>  REDIS_BENCHMARK_NAME=redis-benchmark
>-@@ -216,7 +220,7 @@
>+@@ -268,7 +272,7 @@
>  
>  # redis-server
>  $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
>Index: databases/redis/files/patch-deps-hiredis-Makefile
>===================================================================
>--- databases/redis/files/patch-deps-hiredis-Makefile	(revision 544765)
>+++ databases/redis/files/patch-deps-hiredis-Makefile	(working copy)
>@@ -1,6 +1,6 @@
>---- deps/hiredis/Makefile.orig	2019-09-25 10:40:18 UTC
>+--- deps/hiredis/Makefile.orig	2019-11-29 16:35:59 UTC
> +++ deps/hiredis/Makefile
>-@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
>+@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
>  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
>  
>  # Installation related variables and target
>@@ -9,33 +9,32 @@
>  INCLUDE_PATH?=include/hiredis
>  LIBRARY_PATH?=lib
>  PKGCONF_PATH?=pkgconfig
>-@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
>+@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG
>  # Fallback to gcc when $CC is not in $PATH.
>- CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
>- CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
>+ CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
>+ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
> -OPTIMIZATION?=-O3
>-+#OPTIMIZATION?=-O3
>- WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
>+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
> -DEBUG_FLAGS?= -g -ggdb
>--REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH)
>-+#DEBUG_FLAGS?= -g -ggdb
>+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
> +REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
>- REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
>+ REAL_LDFLAGS=$(LDFLAGS)
>  
>  DYLIBSUFFIX=so
>-@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
>+@@ -82,6 +80,16 @@ endif
>+ ifeq ($(uname_S),SunOS)
>    REAL_LDFLAGS+= -ldl -lnsl -lsocket
>    DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
>-   INSTALL= cp -r
> +endif
> +ifeq ($(uname_S),FreeBSD)
> +  CFLAGS?=$(CFLAGS)
>-+  CCLINK?=-pthread
>++  CCLINK?=pthread
> +  LDFLAGS?=-L. -Wl,-rpath,.
> +  DYLIBNAME?=libhiredis.so
> +  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
> +  STLIBNAME?=libhiredis.a
> +  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
>++  SSL_LDFLAGS+=	${OPENSSL_LDFLAGS}
>  endif
>  ifeq ($(uname_S),Darwin)
>    DYLIBSUFFIX=dylib
>Index: databases/redis/files/patch-deps-hiredis-net.c
>===================================================================
>--- databases/redis/files/patch-deps-hiredis-net.c	(revision 544765)
>+++ databases/redis/files/patch-deps-hiredis-net.c	(working copy)
>@@ -1,12 +1,6 @@
>---- deps/hiredis/net.c.orig	2019-09-25 10:40:18 UTC
>-+++ deps/hiredis/net.c
>-@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
>- 
>-     val = interval;
>- 
>--#ifdef _OSX
>-+#if defined(_OSX)
>-     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
>+--- 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
>+@@ -178,14 +178,34 @@
>          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
>          return REDIS_ERR;
>      }
>@@ -13,23 +7,12 @@
> -#else
> -#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
> +#elif defined(__GLIBC__)
>-     val = interval;
>      if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
>          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
>-@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
>-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
>          return REDIS_ERR;
>      }
>-+#else
>-+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \
>-+    defined(TCP_KEEPCNT)
>-+    val = interval;
>-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
>-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
>-+        return REDIS_ERR;
>-+    }
>-+ 
>-+    val = interval/3;
>+ 
>+     val = interval/3;
> +    if (val == 0) val = 1;
> +    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
> +        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
>@@ -41,24 +24,16 @@
> +        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
> +        return REDIS_ERR;
> +    }
>- #endif
>- #endif
>- 
>-@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
>-     struct sockaddr_un sa;
>-     long timeout_msec = -1;
>- 
>--    if (redisCreateSocket(c,AF_LOCAL) < 0)
>-+    if (redisCreateSocket(c,AF_UNIX) < 0)
>-         return REDIS_ERR;
>-     if (redisSetBlocking(c,0) != REDIS_OK)
>-         return REDIS_ERR;
>-@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
>-     if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
>-         return REDIS_ERR;
>- 
>--    sa.sun_family = AF_LOCAL;
>-+    sa.sun_family = AF_UNIX;
>-     strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
>-     if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
>-         if (errno == EINPROGRESS && !blocking) {
>++#else
>++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
>++    defined(TCP_KEEPCNT)
>++    val = interval;
>++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
>++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
>++        return REDIS_ERR;
>++    }
>++
>++    val = internal/3;
>+     if (val == 0) val = 1;
>+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
>+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
>Index: databases/redis/files/patch-redis.conf
>===================================================================
>--- databases/redis/files/patch-redis.conf	(revision 544765)
>+++ databases/redis/files/patch-redis.conf	(working copy)
>@@ -1,6 +1,6 @@
>---- redis.conf.orig	2019-09-25 10:40:18 UTC
>+--- redis.conf.orig	2019-11-22 16:54:22 UTC
> +++ redis.conf
>-@@ -133,7 +133,7 @@ tcp-keepalive 300
>+@@ -203,7 +203,7 @@ tcp-keepalive 300
>  
>  # 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.
>@@ -9,7 +9,7 @@
>  
>  # If you run Redis from upstart or systemd, Redis can interact with your
>  # supervision tree. Options:
>-@@ -155,7 +155,7 @@ supervised no
>+@@ -225,7 +225,7 @@ supervised no
>  #
>  # Creating a pid file is best effort: if Redis is not able to create it
>  # nothing bad happens, the server will start and run normally.
>@@ -18,7 +18,7 @@
>  
>  # Specify the server verbosity level.
>  # This can be one of:
>-@@ -168,7 +168,7 @@ loglevel notice
>+@@ -238,7 +238,7 @@ loglevel notice
>  # Specify the log file name. Also the empty string can be used to force
>  # Redis to log on the standard output. Note that if you use standard
>  # output for logging but daemonize, logs will be sent to /dev/null
>@@ -27,7 +27,7 @@
>  
>  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
>  # and optionally update the other syslog parameters to suit your needs.
>-@@ -260,7 +260,7 @@ dbfilename dump.rdb
>+@@ -330,7 +330,7 @@ dbfilename dump.rdb
>  # The Append Only File will also be created inside this directory.
>  #
>  # Note that you must specify a directory here, not a file name.
>Index: databases/redis/files/patch-src-Makefile
>===================================================================
>--- databases/redis/files/patch-src-Makefile	(revision 544765)
>+++ databases/redis/files/patch-src-Makefile	(working copy)
>@@ -1,4 +1,4 @@
>---- src/Makefile.orig	2019-09-25 10:40:18 UTC
>+--- src/Makefile.orig	2019-11-29 16:35:59 UTC
> +++ src/Makefile
> @@ -29,7 +29,7 @@ endif
>  WARN=-Wall -W -Wno-missing-field-initializers
>@@ -15,11 +15,11 @@
>  FINAL_LIBS=-lm
> -DEBUG=-g -ggdb
>  
>- ifeq ($(uname_S),SunOS)
>- 	# SunOS
>-@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
>- 	# Darwin
>- 	FINAL_LIBS+= -ldl
>+ # Linux ARM needs -latomic at linking time
>+ ifneq (,$(filter aarch64 armv,$(uname_M)))
>+@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin)
>+ 	OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
>+ 	OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
>  else
> +ifeq ($(uname_S),FreeBSD)
> +        # FreeBSD
>@@ -29,7 +29,7 @@
>  ifeq ($(uname_S),AIX)
>          # AIX
>          FINAL_LDFLAGS+= -Wl,-bexpall
>-@@ -120,6 +124,7 @@ else
>+@@ -131,6 +135,7 @@ else
>  	# All the other OSes (notably Linux)
>  	FINAL_LDFLAGS+= -rdynamic
>  	FINAL_LIBS+=-ldl -pthread -lrt
>Index: databases/redis/files/patch-src-mkreleasehdr.sh
>===================================================================
>--- databases/redis/files/patch-src-mkreleasehdr.sh	(revision 544765)
>+++ databases/redis/files/patch-src-mkreleasehdr.sh	(working copy)
>@@ -1,4 +1,4 @@
>---- src/mkreleasehdr.sh.orig	2019-09-25 10:40:18 UTC
>+--- src/mkreleasehdr.sh.orig	2019-11-22 16:54:22 UTC
> +++ src/mkreleasehdr.sh
> @@ -1,6 +1,6 @@
>  #!/bin/sh
>@@ -8,4 +8,4 @@
> +GIT_DIRTY="0"
>  BUILD_ID=`uname -n`"-"`date +%s`
>  if [ -n "$SOURCE_DATE_EPOCH" ]; then
>-   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s)
>+   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s)
>Index: databases/redis-devel/Makefile
>===================================================================
>--- databases/redis-devel/Makefile	(revision 544765)
>+++ databases/redis-devel/Makefile	(working copy)
>@@ -71,7 +71,7 @@
> 
> LDFLAGS+=	-lpthread -lm -lexecinfo
> 
>-CONFLICTS?=	redis4-4.* redis-5.*
>+CONFLICTS?=	redis4 redis5 redis
> 
> USE_RC_SUBR=	redis sentinel
> BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
>Index: databases/redis4/Makefile
>===================================================================
>--- databases/redis4/Makefile	(revision 544765)
>+++ databases/redis4/Makefile	(working copy)
>@@ -58,7 +58,7 @@
> 
> LDFLAGS+=	-lpthread -lm -lexecinfo
> 
>-CONFLICTS?=	redis-5.* redis-devel-5.*
>+CONFLICTS?=	redis5 redis redis-devel
> 
> USES+=		gmake
> MAKE_ENV=	"V=yo"
>Index: databases/redis5/Makefile
>===================================================================
>--- databases/redis5/Makefile	(revision 544765)
>+++ databases/redis5/Makefile	(working copy)
>@@ -1,10 +1,11 @@
> # Created by: Sergey Skvortsov <skv@protey.ru>
> # $FreeBSD$
> 
>-PORTNAME=	redis
>+PORTNAME=	redis5
> PORTVERSION=	5.0.9
> CATEGORIES=	databases
> MASTER_SITES=	http://download.redis.io/releases/
>+DISTNAME=	redis-${PORTVERSION}
> 
> MAINTAINER=	osa@FreeBSD.org
> COMMENT=	Persistent key-value database with built-in net interface
>@@ -71,7 +72,7 @@
> 
> LDFLAGS+=	-lpthread -lm -lexecinfo
> 
>-CONFLICTS?=	redis4-4.* redis-devel-5.*
>+CONFLICTS?=	redis4 redis redis-devel
> 
> USE_RC_SUBR=	redis sentinel
> BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \

Actions: View | Diff

Attachments on bug 246770: 214904 | 215429 | 216598 | 216610 | 217189 | 217698 | 217873 | 219139 | 220240