Upgrade from 4.0-rc2 to 4.0-rc3.
This commit is contained in:
Sergey A. Osokin
parent
8be1e89779
commit
7411659448
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=440283
6 changed files with 101 additions and 49 deletions
|
|
@ -2,7 +2,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= redis
|
||||
DISTVERSION= 4.0-rc2
|
||||
DISTVERSION= 4.0-rc3
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= https://github.com/antirez/redis/archive/
|
||||
PKGNAMESUFFIX= -devel
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1481067740
|
||||
SHA256 (redis/4.0-rc2.tar.gz) = 70941c192e6afe441cf2c8d659c39ab955e476030c492179a91dcf3f02f5db67
|
||||
SIZE (redis/4.0-rc2.tar.gz) = 1684491
|
||||
TIMESTAMP = 1493682125
|
||||
SHA256 (redis/4.0-rc3.tar.gz) = bc948bcb32dc4ba43412dd791b4bb48c64de9debb797346b9c9f1b2cb98f96f4
|
||||
SIZE (redis/4.0-rc3.tar.gz) = 1743279
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
--- src/Makefile.orig 2016-12-04 19:56:10.186400000 -0500
|
||||
+++ src/Makefile 2016-12-04 20:01:02.427294000 -0500
|
||||
@@ -15,7 +15,7 @@
|
||||
release_hdr := $(shell sh -c './mkreleasehdr.sh')
|
||||
--- src/Makefile.orig 2017-05-06 13:55:29.224222000 -0400
|
||||
+++ src/Makefile 2017-05-06 13:57:41.129934000 -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')
|
||||
OPTIMIZATION?=-O2
|
||||
-DEPENDENCY_TARGETS=hiredis linenoise lua
|
||||
+DEPENDENCY_TARGETS=hiredis linenoise
|
||||
NODEPS:=clean distclean
|
||||
|
||||
# Default settings
|
||||
@@ -54,8 +54,8 @@
|
||||
@@ -58,8 +58,8 @@
|
||||
# Override default settings if possible
|
||||
-include .make-settings
|
||||
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
FINAL_LIBS=-lm
|
||||
|
||||
ifeq ($(uname_S),SunOS)
|
||||
@@ -96,7 +96,7 @@
|
||||
@@ -107,7 +107,7 @@
|
||||
endif
|
||||
endif
|
||||
# Include paths to dependencies
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
ifeq ($(MALLOC),tcmalloc)
|
||||
FINAL_CFLAGS+= -DUSE_TCMALLOC
|
||||
@@ -114,6 +114,9 @@
|
||||
@@ -125,6 +125,9 @@
|
||||
FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
|
||||
endif
|
||||
|
||||
|
|
@ -39,15 +39,15 @@
|
|||
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
|
||||
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
|
||||
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
|
||||
@@ -134,6 +137,7 @@
|
||||
@@ -145,6 +148,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 geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.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 crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.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 redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
|
||||
REDIS_BENCHMARK_NAME=redis-benchmark
|
||||
@@ -186,7 +190,7 @@
|
||||
@@ -197,7 +201,7 @@
|
||||
|
||||
# redis-server
|
||||
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
--- src/Makefile.orig 2016-12-04 19:56:10.186400000 -0500
|
||||
+++ src/Makefile 2016-12-04 20:01:02.427294000 -0500
|
||||
@@ -15,7 +15,7 @@
|
||||
release_hdr := $(shell sh -c './mkreleasehdr.sh')
|
||||
--- src/Makefile.orig 2017-05-06 13:55:29.224222000 -0400
|
||||
+++ src/Makefile 2017-05-06 13:57:41.129934000 -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')
|
||||
OPTIMIZATION?=-O2
|
||||
-DEPENDENCY_TARGETS=hiredis linenoise lua
|
||||
+DEPENDENCY_TARGETS=hiredis linenoise
|
||||
NODEPS:=clean distclean
|
||||
|
||||
# Default settings
|
||||
@@ -54,8 +54,8 @@
|
||||
@@ -58,8 +58,8 @@
|
||||
# Override default settings if possible
|
||||
-include .make-settings
|
||||
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
FINAL_LIBS=-lm
|
||||
|
||||
ifeq ($(uname_S),SunOS)
|
||||
@@ -96,7 +96,7 @@
|
||||
@@ -107,7 +107,7 @@
|
||||
endif
|
||||
endif
|
||||
# Include paths to dependencies
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
ifeq ($(MALLOC),tcmalloc)
|
||||
FINAL_CFLAGS+= -DUSE_TCMALLOC
|
||||
@@ -114,6 +114,9 @@
|
||||
@@ -125,6 +125,9 @@
|
||||
FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
|
||||
endif
|
||||
|
||||
|
|
@ -39,15 +39,15 @@
|
|||
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
|
||||
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
|
||||
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
|
||||
@@ -134,6 +137,7 @@
|
||||
@@ -145,6 +148,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 geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.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 crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.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 redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
|
||||
REDIS_BENCHMARK_NAME=redis-benchmark
|
||||
@@ -186,7 +190,7 @@
|
||||
@@ -197,7 +201,7 @@
|
||||
|
||||
# redis-server
|
||||
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
|
||||
|
|
|
|||
|
|
@ -1,20 +1,29 @@
|
|||
--- deps/hiredis/Makefile.orig 2014-07-29 12:17:48.000000000 +0400
|
||||
+++ deps/hiredis/Makefile 2014-09-10 02:32:25.000000000 +0400
|
||||
@@ -25,10 +25,10 @@
|
||||
--- deps/hiredis/Makefile.orig 2017-05-01 19:46:31.733229000 -0400
|
||||
+++ deps/hiredis/Makefile 2017-05-01 19:48:37.150358000 -0400
|
||||
@@ -15,7 +15,7 @@
|
||||
HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
|
||||
|
||||
# Installation related variables and target
|
||||
-PREFIX?=/usr/local
|
||||
+PREFIX?=${PREFIX}
|
||||
INCLUDE_PATH?=include/hiredis
|
||||
LIBRARY_PATH?=lib
|
||||
PKGCONF_PATH?=pkgconfig
|
||||
@@ -38,10 +38,10 @@
|
||||
# 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++')
|
||||
-OPTIMIZATION?=-O3
|
||||
+#OPTIMIZATION?=-O3
|
||||
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
|
||||
-DEBUG?= -g -ggdb
|
||||
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
|
||||
+#DEBUG?= -g -ggdb
|
||||
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG)
|
||||
-DEBUG_FLAGS?= -g -ggdb
|
||||
-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH)
|
||||
+#DEBUG_FLAGS?= -g -ggdb
|
||||
+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
|
||||
REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
|
||||
|
||||
DYLIBSUFFIX=so
|
||||
@@ -47,6 +47,15 @@
|
||||
@@ -60,6 +60,15 @@
|
||||
DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
|
||||
INSTALL= cp -r
|
||||
endif
|
||||
|
|
@ -29,13 +38,4 @@
|
|||
+endif
|
||||
ifeq ($(uname_S),Darwin)
|
||||
DYLIBSUFFIX=dylib
|
||||
DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(DYLIBSUFFIX)
|
||||
@@ -124,7 +133,7 @@
|
||||
$(CC) -MM *.c
|
||||
|
||||
# Installation related variables and target
|
||||
-PREFIX?=/usr/local
|
||||
+PREFIX?=${PREFIX}
|
||||
INSTALL_INCLUDE_PATH= $(PREFIX)/include/hiredis
|
||||
INSTALL_LIBRARY_PATH= $(PREFIX)/lib
|
||||
|
||||
DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,64 @@
|
|||
--- deps/hiredis/net.c.orig 2014-09-12 09:16:58.000000000 -0500
|
||||
+++ deps/hiredis/net.c 2014-09-16 19:45:20.339820576 -0500
|
||||
@@ -138,7 +138,8 @@ int redisKeepAlive(redisContext *c, int
|
||||
--- deps/hiredis/net.c.orig 2017-04-22 07:23:27.000000000 -0400
|
||||
+++ deps/hiredis/net.c 2017-05-05 20:02:09.292479000 -0400
|
||||
@@ -135,13 +135,12 @@
|
||||
|
||||
val = interval;
|
||||
|
||||
-#ifdef _OSX
|
||||
+#if defined(_OSX)
|
||||
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
|
||||
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
||||
return REDIS_ERR;
|
||||
}
|
||||
#else
|
||||
-#ifndef __sun
|
||||
+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \
|
||||
+ defined(TCP_KEEPCNT)
|
||||
-#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 @@
|
||||
__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;
|
||||
+ if (val == 0) val = 1;
|
||||
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
|
||||
+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
||||
+ return REDIS_ERR;
|
||||
+ }
|
||||
+
|
||||
+ val = 3;
|
||||
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
|
||||
+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
||||
+ return REDIS_ERR;
|
||||
+ }
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -431,7 +451,7 @@
|
||||
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 @@
|
||||
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) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue