Update to redis-4.0.1

This commit is contained in:
dcoppa 2017-08-09 09:16:09 +00:00
parent 2423fea334
commit bcb91e5fbc
10 changed files with 99 additions and 301 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.97 2017/06/09 09:27:02 dcoppa Exp $
# $OpenBSD: Makefile,v 1.98 2017/08/09 09:16:09 dcoppa Exp $
COMMENT = persistent key-value database
DISTNAME = redis-3.2.9
DISTNAME = redis-4.0.1
CATEGORIES = databases
HOMEPAGE = http://redis.io/
@ -38,6 +38,7 @@ pre-configure:
cp ${WRKSRC}/deps/lua/src/fpconv.? ${WRKSRC}/src/
cp ${WRKSRC}/deps/lua/src/strbuf.? ${WRKSRC}/src/
cp ${WRKSRC}/deps/lua/src/lua_*.c ${WRKSRC}/src/
rm -rf ${WRKSRC}/deps/jemalloc
rm -rf ${WRKSRC}/deps/lua
${SUBST_CMD} ${WRKSRC}/src/Makefile

View File

@ -1,2 +1,2 @@
SHA256 (redis-3.2.9.tar.gz) = bqrPqYOyh+RA0IOerSDCIxdJ1da3i74OD/o6iQxZ/yY=
SIZE (redis-3.2.9.tar.gz) = 1547695
SHA256 (redis-4.0.1.tar.gz) = IEnNaukWfyWHBQgabvI7uAt+/5/z0NdIHolRDydFdZE=
SIZE (redis-4.0.1.tar.gz) = 1711660

View File

@ -1,15 +1,15 @@
$OpenBSD: patch-deps_Makefile,v 1.9 2016/06/20 10:49:38 dcoppa Exp $
--- deps/Makefile.orig Fri May 6 09:11:36 2016
+++ deps/Makefile Tue May 10 09:51:32 2016
@@ -35,7 +35,6 @@ endif
$OpenBSD: patch-deps_Makefile,v 1.10 2017/08/09 09:16:09 dcoppa Exp $
Index: deps/Makefile
--- deps/Makefile.orig
+++ deps/Makefile
@@ -35,49 +35,16 @@ endif
distclean:
-(cd hiredis && $(MAKE) clean) > /dev/null || true
-(cd linenoise && $(MAKE) clean) > /dev/null || true
- -(cd lua && $(MAKE) clean) > /dev/null || true
-(cd geohash-int && $(MAKE) clean) > /dev/null || true
-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
- -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
-(rm -f .make-*)
@@ -43,48 +42,25 @@ distclean:
.PHONY: distclean
hiredis: .make-prerequisites
@ -23,7 +23,7 @@ $OpenBSD: patch-deps_Makefile,v 1.9 2016/06/20 10:49:38 dcoppa Exp $
cd linenoise && $(MAKE)
.PHONY: linenoise
-
-ifeq ($(uname_S),SunOS)
- # Make isinf() available
- LUA_CFLAGS= -D__C99FEATURES__=1
@ -43,18 +43,12 @@ $OpenBSD: patch-deps_Makefile,v 1.9 2016/06/20 10:49:38 dcoppa Exp $
-
-.PHONY: lua
-
JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
JEMALLOC_LDFLAGS= $(LDFLAGS)
jemalloc: .make-prerequisites
-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
-JEMALLOC_LDFLAGS= $(LDFLAGS)
-
-jemalloc: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd jemalloc && ./configure --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
.PHONY: jemalloc
geohash-int: .make-prerequisites
- @printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
cd geohash-int && $(MAKE)
.PHONY: geohash-int
- cd jemalloc && ./configure --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
- cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-
-.PHONY: jemalloc

View File

@ -1,19 +1,20 @@
$OpenBSD: patch-deps_hiredis_Makefile,v 1.6 2014/07/12 09:53:57 dcoppa Exp $
--- deps/hiredis/Makefile.orig Mon Jun 23 16:56:18 2014
+++ deps/hiredis/Makefile Sat Jul 12 11:06:45 2014
@@ -25,9 +25,9 @@ export REDIS_TEST_CONFIG
$OpenBSD: patch-deps_hiredis_Makefile,v 1.7 2017/08/09 09:16:09 dcoppa Exp $
Index: deps/hiredis/Makefile
--- deps/hiredis/Makefile.orig
+++ deps/hiredis/Makefile
@@ -38,9 +38,9 @@ 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++')
-OPTIMIZATION?=-O3
+# OPTIMIZATION?=-O3
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
-DEBUG?= -g -ggdb
+# DEBUG?= -g -ggdb
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
-DEBUG_FLAGS?= -g -ggdb
+# DEBUG_FLAGS?= -g -ggdb
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH)
REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
@@ -134,8 +134,12 @@ endif
@@ -167,6 +167,10 @@ endif
INSTALL?= cp -a
@ -21,9 +22,15 @@ $OpenBSD: patch-deps_hiredis_Makefile,v 1.6 2014/07/12 09:53:57 dcoppa Exp $
+ INSTALL_DIR= mkdir -p
+endif
+
install: $(DYLIBNAME) $(STLIBNAME)
$(PKGCONFNAME): hiredis.h
@echo "Generating $@ for pkgconfig..."
@echo prefix=$(PREFIX) > $@
@@ -181,7 +185,7 @@ $(PKGCONFNAME): hiredis.h
@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
- mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
+ $(INSTALL_DIR) $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
$(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
$(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)

View File

@ -1,12 +1,13 @@
$OpenBSD: patch-deps_hiredis_net_c,v 1.1 2014/07/12 09:53:57 dcoppa Exp $
--- deps/hiredis/net.c.orig Mon Jun 23 16:56:18 2014
+++ deps/hiredis/net.c Sat Jul 12 11:41:26 2014
@@ -138,7 +138,7 @@ int redisKeepAlive(redisContext *c, int interval) {
$OpenBSD: patch-deps_hiredis_net_c,v 1.2 2017/08/09 09:16:09 dcoppa Exp $
Index: deps/hiredis/net.c
--- deps/hiredis/net.c.orig
+++ deps/hiredis/net.c
@@ -141,7 +141,7 @@ int redisKeepAlive(redisContext *c, int interval) {
return REDIS_ERR;
}
#else
-#ifndef __sun
+#if !defined(__sun) && !defined(__OpenBSD__)
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
+#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__OpenBSD__)
val = interval;
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-redis_conf,v 1.19 2016/08/05 11:23:42 dcoppa Exp $
--- redis.conf.orig Tue Aug 2 11:00:29 2016
+++ redis.conf Fri Aug 5 13:04:15 2016
@@ -98,8 +98,8 @@ tcp-backlog 511
$OpenBSD: patch-redis_conf,v 1.20 2017/08/09 09:16:09 dcoppa Exp $
Index: redis.conf
--- redis.conf.orig
+++ redis.conf
@@ -106,8 +106,8 @@ tcp-backlog 511
# incoming connections. There is no default, so Redis will not listen
# on a unix socket when not specified.
#
@ -12,7 +13,7 @@ $OpenBSD: patch-redis_conf,v 1.19 2016/08/05 11:23:42 dcoppa Exp $
# Close the connection after a client is idle for N seconds (0 to disable)
timeout 0
@@ -124,8 +124,9 @@ tcp-keepalive 300
@@ -132,8 +132,9 @@ tcp-keepalive 300
################################# GENERAL #####################################
# By default Redis does not run as a daemon. Use 'yes' if you need it.
@ -24,7 +25,7 @@ $OpenBSD: patch-redis_conf,v 1.19 2016/08/05 11:23:42 dcoppa Exp $
# If you run Redis from upstart or systemd, Redis can interact with your
# supervision tree. Options:
@@ -143,11 +144,11 @@ supervised no
@@ -151,11 +152,11 @@ supervised no
#
# When the server runs non daemonized, no pid file is created if none is
# specified in the configuration. When the server is daemonized, the pid file
@ -38,7 +39,7 @@ $OpenBSD: patch-redis_conf,v 1.19 2016/08/05 11:23:42 dcoppa Exp $
# Specify the server verbosity level.
# This can be one of:
@@ -160,17 +161,18 @@ loglevel notice
@@ -168,17 +169,18 @@ 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
@ -62,7 +63,7 @@ $OpenBSD: patch-redis_conf,v 1.19 2016/08/05 11:23:42 dcoppa Exp $
# Set the number of databases. The default database is DB 0, you can select
# a different one on a per-connection basis using SELECT <dbid> where
@@ -244,7 +246,7 @@ dbfilename dump.rdb
@@ -260,7 +262,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.
@ -71,7 +72,7 @@ $OpenBSD: patch-redis_conf,v 1.19 2016/08/05 11:23:42 dcoppa Exp $
################################# REPLICATION #################################
@@ -477,7 +479,7 @@ slave-priority 100
@@ -497,7 +499,7 @@ slave-priority 100
# 150k passwords per second against a good box. This means that you should
# use a very strong password otherwise it will be very easy to break.
#
@ -80,11 +81,11 @@ $OpenBSD: patch-redis_conf,v 1.19 2016/08/05 11:23:42 dcoppa Exp $
# Command renaming.
#
@@ -510,6 +512,7 @@ slave-priority 100
@@ -530,6 +532,7 @@ slave-priority 100
# an error 'max number of clients reached'.
#
# maxclients 10000
+maxclients 96
# Don't use more memory than the specified amount of bytes.
# When the memory limit is reached Redis will try to remove keys
############################## MEMORY MANAGEMENT ################################

View File

@ -1,27 +1,28 @@
$OpenBSD: patch-src_Makefile,v 1.26 2016/11/01 09:07:19 dcoppa Exp $
--- src/Makefile.orig Wed Oct 26 09:17:45 2016
+++ src/Makefile Tue Nov 1 10:03:38 2016
@@ -14,8 +14,8 @@
$OpenBSD: patch-src_Makefile,v 1.27 2017/08/09 09:16:09 dcoppa Exp $
Index: src/Makefile
--- src/Makefile.orig
+++ src/Makefile
@@ -15,8 +15,8 @@
release_hdr := $(shell sh -c './mkreleasehdr.sh')
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 geohash-int
-DEPENDENCY_TARGETS=hiredis linenoise lua
+# OPTIMIZATION?=-O2
+DEPENDENCY_TARGETS=hiredis linenoise geohash-int
+DEPENDENCY_TARGETS=hiredis linenoise
NODEPS:=clean distclean
# Default settings
STD=-std=c99 -pedantic -DREDIS_STATIC=''
@@ -24,6 +24,7 @@ OPT=$(OPTIMIZATION)
@@ -26,6 +26,7 @@ OPT=$(OPTIMIZATION)
PREFIX?=/usr/local
INSTALL_BIN=$(PREFIX)/bin
+INSTALL_SBIN=$(PREFIX)/sbin
INSTALL=install
# Default allocator
@@ -56,7 +57,7 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -I../deps/geohash-int
# Default allocator defaults to Jemalloc if it's not an ARM
@@ -66,7 +67,7 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm
-DEBUG=-g -ggdb
@ -29,7 +30,7 @@ $OpenBSD: patch-src_Makefile,v 1.26 2016/11/01 09:07:19 dcoppa Exp $
ifeq ($(uname_S),SunOS)
# SunOS
@@ -90,7 +91,7 @@ endif
@@ -107,7 +108,7 @@ endif
endif
endif
# Include paths to dependencies
@ -38,7 +39,7 @@ $OpenBSD: patch-src_Makefile,v 1.26 2016/11/01 09:07:19 dcoppa Exp $
ifeq ($(MALLOC),tcmalloc)
FINAL_CFLAGS+= -DUSE_TCMALLOC
@@ -112,6 +113,10 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
@@ -129,6 +130,10 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
@ -49,34 +50,34 @@ $OpenBSD: patch-src_Makefile,v 1.26 2016/11/01 09:07:19 dcoppa Exp $
CCCOLOR="\033[34m"
LINKCOLOR="\033[34;1m"
SRCCOLOR="\033[33m"
@@ -127,7 +132,7 @@ endif
@@ -144,7 +149,7 @@ endif
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
+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 fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_struct.o lua_cmsgpack.o
REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.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 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
+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 fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.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
@@ -182,7 +187,7 @@ endif
REDIS_BENCHMARK_NAME=redis-benchmark
@@ -196,7 +201,7 @@ endif
# redis-server
$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS)
+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(REDIS_GEOHASH_OBJ) $(FINAL_LIBS) -L${LOCALBASE}/lib ${MODLUA_LIB}
- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) -L${LOCALBASE}/lib ${MODLUA_LIB}
# redis-sentinel
$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
@@ -222,7 +227,7 @@ distclean: clean
@@ -239,7 +244,7 @@ distclean: clean
.PHONY: distclean
test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME)
- @(cd ..; ./runtest)
+ @(cd ..; ulimit -Sn `ulimit -Hn`; ${TCL_BIN} tests/test_helper.tcl)
+ @(cd ..; ulimit -Sd `ulimit -Hd`; ulimit -Sn `ulimit -Hn`; ulimit -Sp `ulimit -Hp`; ulimit -Ss `ulimit -Hs`; ${TCL_BIN} tests/test_helper.tcl)
test-sentinel: $(REDIS_SENTINEL_NAME)
@(cd ..; ./runtest-sentinel)
@@ -263,10 +268,11 @@ src/help.h:
@@ -283,10 +288,11 @@ src/help.h:
@../utils/generate-command-help.rb > help.h
install: all

View File

@ -1,209 +0,0 @@
$OpenBSD: patch-src_Makefile_dep,v 1.8 2016/05/10 09:38:48 dcoppa Exp $
--- src/Makefile.dep.orig Fri May 6 09:11:36 2016
+++ src/Makefile.dep Tue May 10 09:54:12 2016
@@ -6,93 +6,93 @@ ae_kqueue.o: ae_kqueue.c
ae_select.o: ae_select.c
anet.o: anet.c fmacros.h anet.h
aof.o: aof.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
bio.h
bio.o: bio.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
bio.h
bitops.o: bitops.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
blocked.o: blocked.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
cluster.o: cluster.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
cluster.h
config.o: config.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
cluster.h
crc16.o: crc16.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
crc64.o: crc64.c
db.o: db.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
cluster.h
debug.o: debug.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
bio.h
dict.o: dict.c fmacros.h dict.h zmalloc.h redisassert.h
endianconv.o: endianconv.c
geo.o: geo.c geo.h server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
../deps/geohash-int/geohash_helper.h ../deps/geohash-int/geohash.h
hyperloglog.o: hyperloglog.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
intset.o: intset.c intset.h zmalloc.h endianconv.h config.h
latency.o: latency.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
lzf_c.o: lzf_c.c lzfP.h
lzf_d.o: lzf_d.c lzfP.h
memtest.o: memtest.c config.h
multi.o: multi.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
networking.o: networking.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
notify.o: notify.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
object.o: object.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
pqsort.o: pqsort.c
pubsub.o: pubsub.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
quicklist.o: quicklist.c quicklist.h zmalloc.h ziplist.h util.h sds.h \
lzf.h
rand.o: rand.c
rdb.o: rdb.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
lzf.h
@@ -100,7 +100,7 @@ redis-benchmark.o: redis-benchmark.c fmacros.h ../deps
../deps/hiredis/hiredis.h adlist.h zmalloc.h
redis-check-aof.o: redis-check-aof.c fmacros.h config.h
redis-check-rdb.o: redis-check-rdb.c server.h fmacros.h config.h \
- solarisfixes.h ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h \
+ solarisfixes.h ae.h \
sds.h dict.h adlist.h zmalloc.h anet.h ziplist.h intset.h version.h \
util.h latency.h sparkline.h quicklist.h zipmap.h sha1.h endianconv.h \
crc64.h rdb.h rio.h lzf.h
@@ -109,69 +109,68 @@ redis-cli.o: redis-cli.c fmacros.h version.h ../deps/h
anet.h ae.h
release.o: release.c release.h version.h crc64.h
replication.o: replication.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
rio.o: rio.c fmacros.h rio.h sds.h util.h crc64.h config.h server.h \
- solarisfixes.h ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h \
+ solarisfixes.h ae.h \
dict.h adlist.h zmalloc.h anet.h ziplist.h intset.h version.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h rdb.h
scripting.o: scripting.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
- rand.h cluster.h ../deps/lua/src/lauxlib.h ../deps/lua/src/lua.h \
- ../deps/lua/src/lualib.h
+ rand.h cluster.h
sds.o: sds.c sds.h sdsalloc.h zmalloc.h
sentinel.o: sentinel.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
../deps/hiredis/hiredis.h ../deps/hiredis/async.h \
../deps/hiredis/hiredis.h
server.o: server.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
cluster.h slowlog.h bio.h asciilogo.h
setproctitle.o: setproctitle.c
sha1.o: sha1.c solarisfixes.h sha1.h config.h
slowlog.o: slowlog.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
slowlog.h
sort.o: sort.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h \
pqsort.h
sparkline.o: sparkline.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
syncio.o: syncio.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
t_hash.o: t_hash.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
t_list.o: t_list.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
t_set.o: t_set.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
t_string.o: t_string.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
t_zset.o: t_zset.c server.h fmacros.h config.h solarisfixes.h \
- ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
+ ae.h sds.h dict.h \
adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \
sparkline.h quicklist.h zipmap.h sha1.h endianconv.h crc64.h rdb.h rio.h
util.o: util.c fmacros.h util.h sds.h sha1.h

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_config_c,v 1.6 2016/05/10 09:38:48 dcoppa Exp $
$OpenBSD: patch-src_config_c,v 1.7 2017/08/09 09:16:09 dcoppa Exp $
Recognize LOG_DAEMON as a valid facility
--- src/config.c.orig Fri May 6 09:11:36 2016
+++ src/config.c Tue May 10 10:09:59 2016
@@ -54,6 +54,7 @@ configEnum maxmemory_policy_enum[] = {
Index: src/config.c
--- src/config.c.orig
+++ src/config.c
@@ -56,6 +56,7 @@ configEnum maxmemory_policy_enum[] = {
};
configEnum syslog_facility_enum[] = {
@ -12,7 +13,7 @@ Recognize LOG_DAEMON as a valid facility
{"user", LOG_USER},
{"local0", LOG_LOCAL0},
{"local1", LOG_LOCAL1},
@@ -278,7 +279,7 @@ void loadServerConfigFromString(char *config) {
@@ -298,7 +299,7 @@ void loadServerConfigFromString(char *config) {
server.syslog_facility =
configEnumGetValue(syslog_facility_enum,argv[1]);
if (server.syslog_facility == INT_MIN) {

View File

@ -1,8 +1,9 @@
$OpenBSD: patch-src_server_h,v 1.2 2016/05/10 12:45:28 dcoppa Exp $
--- src/server.h.orig Tue May 10 10:20:32 2016
+++ src/server.h Tue May 10 10:21:24 2016
@@ -94,7 +94,7 @@ typedef long long mstime_t; /* millisecond time type.
#define AOF_REWRITE_ITEMS_PER_CMD 64
$OpenBSD: patch-src_server_h,v 1.3 2017/08/09 09:16:09 dcoppa Exp $
Index: src/server.h
--- src/server.h.orig
+++ src/server.h
@@ -98,7 +98,7 @@ typedef long long mstime_t; /* millisecond time type.
#define AOF_READ_DIFF_INTERVAL_BYTES (1024*10)
#define CONFIG_DEFAULT_SLOWLOG_LOG_SLOWER_THAN 10000
#define CONFIG_DEFAULT_SLOWLOG_MAX_LEN 128
-#define CONFIG_DEFAULT_MAX_CLIENTS 10000
@ -10,7 +11,7 @@ $OpenBSD: patch-src_server_h,v 1.2 2016/05/10 12:45:28 dcoppa Exp $
#define CONFIG_AUTHPASS_MAX_LEN 512
#define CONFIG_DEFAULT_SLAVE_PRIORITY 100
#define CONFIG_DEFAULT_REPL_TIMEOUT 60
@@ -105,7 +105,7 @@ typedef long long mstime_t; /* millisecond time type.
@@ -109,7 +109,7 @@ typedef long long mstime_t; /* millisecond time type.
#define CONFIG_DEFAULT_REPL_BACKLOG_TIME_LIMIT (60*60) /* 1 hour */
#define CONFIG_REPL_BACKLOG_MIN_SIZE (1024*16) /* 16k */
#define CONFIG_BGSAVE_RETRY_DELAY 5 /* Wait a few secs before trying again. */
@ -18,4 +19,4 @@ $OpenBSD: patch-src_server_h,v 1.2 2016/05/10 12:45:28 dcoppa Exp $
+#define CONFIG_DEFAULT_PID_FILE "/var/run/redis/redis.pid"
#define CONFIG_DEFAULT_SYSLOG_IDENT "redis"
#define CONFIG_DEFAULT_CLUSTER_CONFIG_FILE "nodes.conf"
#define CONFIG_DEFAULT_DAEMONIZE 0
#define CONFIG_DEFAULT_CLUSTER_ANNOUNCE_IP NULL /* Auto detect. */