From 4d1e4c3aa9fe8a7b18adafe8196251b3084dd2b2 Mon Sep 17 00:00:00 2001 From: Haïkel Guémar Date: Dec 08 2014 09:52:45 +0000 Subject: Upstream 2.8.18 Rebased patches --- diff --git a/.gitignore b/.gitignore index b601561..7bad17c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /redis-2.8.14.tar.gz /redis-2.8.15.tar.gz /redis-2.8.17.tar.gz +/redis-2.8.18.tar.gz diff --git a/0001-redis-2.8.11-redis-conf.patch b/0001-redis-2.8.11-redis-conf.patch deleted file mode 100644 index eab5c08..0000000 --- a/0001-redis-2.8.11-redis-conf.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 81f2f0a7341a5d56202506dd68440710188615cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= -Date: Thu, 11 Sep 2014 13:40:31 +0200 -Subject: [PATCH 1/5] redis 2.8.11: redis conf - ---- - redis.conf | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/redis.conf b/redis.conf -index 24c1b7a..186121a 100644 ---- a/redis.conf -+++ b/redis.conf -@@ -38,7 +38,7 @@ daemonize no - - # When running daemonized, Redis writes a pid file in /var/run/redis.pid by - # default. You can specify a custom pid file location here. --pidfile /var/run/redis.pid -+pidfile /var/run/redis/redis.pid - - # Accept connections on the specified port, default is 6379. - # If port 0 is specified Redis will not listen on a TCP socket. -@@ -61,7 +61,7 @@ tcp-backlog 511 - # Examples: - # - # bind 192.168.1.100 10.0.0.1 --# bind 127.0.0.1 -+bind 127.0.0.1 - - # Specify the path for the Unix socket that will be used to listen for - # incoming connections. There is no default, so Redis will not listen -@@ -100,7 +100,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 --logfile "" -+logfile /var/log/redis/redis.log - - # To enable logging to the system logger, just set 'syslog-enabled' to yes, - # and optionally update the other syslog parameters to suit your needs. -@@ -184,7 +184,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. --dir ./ -+dir /var/lib/redis/ - - ################################# REPLICATION ################################# - --- -1.9.3 - diff --git a/0001-redis-2.8.18-redis-conf.patch b/0001-redis-2.8.18-redis-conf.patch new file mode 100644 index 0000000..0577c60 --- /dev/null +++ b/0001-redis-2.8.18-redis-conf.patch @@ -0,0 +1,52 @@ +From 99c028fdf6723f5a32c3fa5e308f9339f95f66ca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Fri, 5 Dec 2014 14:11:15 +0100 +Subject: [PATCH 1/5] redis 2.8.18: redis conf + +--- + redis.conf | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/redis.conf b/redis.conf +index 6c76569..dd0ef34 100644 +--- a/redis.conf ++++ b/redis.conf +@@ -38,7 +38,7 @@ daemonize no + + # When running daemonized, Redis writes a pid file in /var/run/redis.pid by + # default. You can specify a custom pid file location here. +-pidfile /var/run/redis.pid ++pidfile /var/run/redis/redis.pid + + # Accept connections on the specified port, default is 6379. + # If port 0 is specified Redis will not listen on a TCP socket. +@@ -61,7 +61,7 @@ tcp-backlog 511 + # Examples: + # + # bind 192.168.1.100 10.0.0.1 +-# bind 127.0.0.1 ++bind 127.0.0.1 + + # Specify the path for the Unix socket that will be used to listen for + # incoming connections. There is no default, so Redis will not listen +@@ -100,7 +100,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 +-logfile "" ++logfile /var/log/redis/redis.log + + # To enable logging to the system logger, just set 'syslog-enabled' to yes, + # and optionally update the other syslog parameters to suit your needs. +@@ -184,7 +184,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. +-dir ./ ++dir /var/lib/redis/ + + ################################# REPLICATION ################################# + +-- +2.1.0 + diff --git a/0002-redis-2.8.11-deps-library-fPIC-performance-tuning.patch b/0002-redis-2.8.11-deps-library-fPIC-performance-tuning.patch deleted file mode 100644 index e87bdfa..0000000 --- a/0002-redis-2.8.11-deps-library-fPIC-performance-tuning.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9083bd267135c4d3404c2f1f4a90e900cc13c097 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= -Date: Thu, 11 Sep 2014 13:40:54 +0200 -Subject: [PATCH 2/5] redis 2.8.11: deps library fPIC performance tuning - ---- - deps/Makefile | 2 +- - deps/linenoise/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/deps/Makefile b/deps/Makefile -index e183ede..9dcb6b1 100644 ---- a/deps/Makefile -+++ b/deps/Makefile -@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS) - LUA_CFLAGS= -D__C99FEATURES__=1 - endif - --LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS) -+LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS) -fPIC - LUA_LDFLAGS+= $(LDFLAGS) - # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more - # challenging to cross-compile lua (and redis). These defines make it easier -diff --git a/deps/linenoise/Makefile b/deps/linenoise/Makefile -index 1dd894b..712f2a6 100644 ---- a/deps/linenoise/Makefile -+++ b/deps/linenoise/Makefile -@@ -2,7 +2,7 @@ STD= - WARN= -Wall - OPT= -Os - --R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -+R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC - R_LDFLAGS= $(LDFLAGS) - DEBUG= -g - --- -1.9.3 - diff --git a/0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch b/0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch new file mode 100644 index 0000000..90aef84 --- /dev/null +++ b/0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch @@ -0,0 +1,39 @@ +From 4325ecb8fadeb36c7d09b994360110fa9c7b63a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Mon, 8 Dec 2014 10:02:54 +0100 +Subject: [PATCH 2/5] redis 2.8.18: deps library fPIC performance tuning + +--- + deps/Makefile | 2 +- + deps/linenoise/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/deps/Makefile b/deps/Makefile +index 1f623ea..4c2df41 100644 +--- a/deps/Makefile ++++ b/deps/Makefile +@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS) + LUA_CFLAGS= -D__C99FEATURES__=1 + endif + +-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL $(CFLAGS) ++LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL $(CFLAGS) -fPIC + LUA_LDFLAGS+= $(LDFLAGS) + # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more + # challenging to cross-compile lua (and redis). These defines make it easier +diff --git a/deps/linenoise/Makefile b/deps/linenoise/Makefile +index 1dd894b..712f2a6 100644 +--- a/deps/linenoise/Makefile ++++ b/deps/linenoise/Makefile +@@ -2,7 +2,7 @@ STD= + WARN= -Wall + OPT= -Os + +-R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) ++R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) -fPIC + R_LDFLAGS= $(LDFLAGS) + DEBUG= -g + +-- +2.1.0 + diff --git a/0003-redis-2.8.11-use-system-jemalloc.patch b/0003-redis-2.8.11-use-system-jemalloc.patch deleted file mode 100644 index b4ba815..0000000 --- a/0003-redis-2.8.11-use-system-jemalloc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 50a409c4f9f753c97c49fd10a44fd7c5f737aea6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= -Date: Thu, 11 Sep 2014 13:41:17 +0200 -Subject: [PATCH 3/5] redis 2.8.11: use system jemalloc - ---- - src/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index 8b3e959..af6a4fe 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -90,8 +90,8 @@ endif - - ifeq ($(MALLOC),jemalloc) - DEPENDENCY_TARGETS+= jemalloc -- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) --- -1.9.3 - diff --git a/0003-redis-2.8.18-use-system-jemalloc.patch b/0003-redis-2.8.18-use-system-jemalloc.patch new file mode 100644 index 0000000..657d027 --- /dev/null +++ b/0003-redis-2.8.18-use-system-jemalloc.patch @@ -0,0 +1,27 @@ +From d3cdf6aafbe700cd856440058e3b8a345838d326 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Mon, 8 Dec 2014 10:03:40 +0100 +Subject: [PATCH 3/5] redis 2.8.18: use system jemalloc + +--- + src/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 8b3e959..af6a4fe 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -90,8 +90,8 @@ endif + + ifeq ($(MALLOC),jemalloc) + DEPENDENCY_TARGETS+= jemalloc +- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include +- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl ++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc ++ FINAL_LIBS+= -ljemalloc -ldl + endif + + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) +-- +2.1.0 + diff --git a/0004-redis-2.8.11-disable-test-failed-on-slow-machine.patch b/0004-redis-2.8.11-disable-test-failed-on-slow-machine.patch deleted file mode 100644 index 2b095c6..0000000 --- a/0004-redis-2.8.11-disable-test-failed-on-slow-machine.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8b0e3e46bc63975d6fc10a65292d1c1400ce38c4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= -Date: Thu, 11 Sep 2014 13:42:01 +0200 -Subject: [PATCH 4/5] redis 2.8.11: disable test failed on slow machine - ---- - tests/test_helper.tcl | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl -index 5f958e5..bcd258a 100644 ---- a/tests/test_helper.tcl -+++ b/tests/test_helper.tcl -@@ -33,7 +33,6 @@ set ::all_tests { - integration/replication-2 - integration/replication-3 - integration/replication-4 -- integration/replication-psync - integration/aof - integration/rdb - integration/convert-zipmap-hash-on-load --- -1.9.3 - diff --git a/0004-redis-2.8.18-disable-test-failed-on-slow-machine.patch b/0004-redis-2.8.18-disable-test-failed-on-slow-machine.patch new file mode 100644 index 0000000..abb7956 --- /dev/null +++ b/0004-redis-2.8.18-disable-test-failed-on-slow-machine.patch @@ -0,0 +1,24 @@ +From 2d056b8da3fb3ee4480b7849eefae6637e9ed22c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Mon, 8 Dec 2014 10:04:18 +0100 +Subject: [PATCH 4/5] redis 2.8.18: disable test failed on slow machine + +--- + tests/test_helper.tcl | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl +index d1ebde1..369ebc2 100644 +--- a/tests/test_helper.tcl ++++ b/tests/test_helper.tcl +@@ -33,7 +33,6 @@ set ::all_tests { + integration/replication-2 + integration/replication-3 + integration/replication-4 +- integration/replication-psync + integration/aof + integration/rdb + integration/convert-zipmap-hash-on-load +-- +2.1.0 + diff --git a/0005-redis-2.8.15-sentinel-configuration-file-fix.patch b/0005-redis-2.8.15-sentinel-configuration-file-fix.patch deleted file mode 100644 index 7d8879f..0000000 --- a/0005-redis-2.8.15-sentinel-configuration-file-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 39027199f73e7164fb5f64307f491ebc165a2f5f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= -Date: Sat, 13 Sep 2014 14:03:04 +0200 -Subject: [PATCH 5/5] redis 2.8.15: sentinel configuration file fix - ---- - sentinel.conf | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/sentinel.conf b/sentinel.conf -index 4b3b792..1e6a11b 100644 ---- a/sentinel.conf -+++ b/sentinel.conf -@@ -177,5 +177,10 @@ sentinel failover-timeout mymaster 180000 - # Example: - # - # sentinel client-reconfig-script mymaster /var/redis/reconfig.sh -+# -+# 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 -+logfile /var/log/redis/sentinel.log - - --- -1.9.3 - diff --git a/0005-redis-2.8.18-sentinel-configuration-file-fix.patch b/0005-redis-2.8.18-sentinel-configuration-file-fix.patch new file mode 100644 index 0000000..59a1123 --- /dev/null +++ b/0005-redis-2.8.18-sentinel-configuration-file-fix.patch @@ -0,0 +1,27 @@ +From 35e87543975c05e3f4d07de7c1dba2f7b88add59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= +Date: Sat, 13 Sep 2014 14:03:04 +0200 +Subject: [PATCH 5/5] redis 2.8.18: sentinel configuration file fix + +--- + sentinel.conf | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/sentinel.conf b/sentinel.conf +index 39d1044..543d40d 100644 +--- a/sentinel.conf ++++ b/sentinel.conf +@@ -177,5 +177,10 @@ sentinel failover-timeout mymaster 180000 + # Example: + # + # sentinel client-reconfig-script mymaster /var/redis/reconfig.sh ++# ++# 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 ++logfile /var/log/redis/sentinel.log + + +-- +2.1.0 + diff --git a/redis.spec b/redis.spec index 8841e5d..64710a1 100644 --- a/redis.spec +++ b/redis.spec @@ -18,7 +18,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 2.8.17 +Version: 2.8.18 Release: 1%{?dist} Summary: A persistent key-value database License: BSD @@ -37,13 +37,13 @@ Source7: %{name}-shutdown # Then refresh your patches # git format-patch HEAD~ # Update configuration for Fedora -Patch0001: 0001-redis-2.8.11-redis-conf.patch -Patch0002: 0002-redis-2.8.11-deps-library-fPIC-performance-tuning.patch -Patch0003: 0003-redis-2.8.11-use-system-jemalloc.patch +Patch0001: 0001-redis-2.8.18-redis-conf.patch +Patch0002: 0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch +Patch0003: 0003-redis-2.8.18-use-system-jemalloc.patch # tests/integration/replication-psync.tcl failed on slow machines(GITHUB #1417) -Patch0004: 0004-redis-2.8.11-disable-test-failed-on-slow-machine.patch +Patch0004: 0004-redis-2.8.18-disable-test-failed-on-slow-machine.patch # Fix sentinel configuration to use a different log file than redis -Patch0005: 0005-redis-2.8.15-sentinel-configuration-file-fix.patch +Patch0005: 0005-redis-2.8.18-sentinel-configuration-file-fix.patch %if 0%{?with_perftools} BuildRequires: gperftools-devel %else @@ -264,7 +264,11 @@ fi %changelog -* Sun Sep 20 2014 Remi Collet - 2.8.17-1 +* Fri Dec 05 2014 Haïkel Guémar - 2.8.18-1 +- Upstream 2.8.18 +- Rebased patches + +* Sat Sep 20 2014 Remi Collet - 2.8.17-1 - Upstream 2.8.17 - fix redis-sentinel service unit file for systemd - fix redis-shutdown for sentinel diff --git a/sources b/sources index faae72c..0d24687 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69023c3005664602268a5e2dbe23425c redis-2.8.17.tar.gz +1ba2df52c6761edb010b8976c84aebd6 redis-2.8.18.tar.gz