From e1117f76ed85f10a46d861cdff0b0c82c23cf1f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Dec 2014 19:59:36 +0100 Subject: redis 2.8.18 --- 0001-redis-2.8.18-redis-conf.patch | 44 ++++++++++++++++++++++ ...8.18-deps-library-fPIC-performance-tuning.patch | 24 ++++++++++++ 0003-redis-2.8.11-use-system-jemalloc.patch | 14 +++++++ redis-2.8.15-conf.patch | 44 ---------------------- redis-deps-PIC.patch | 23 ----------- redis-deps-unbundle-jemalloc.patch | 14 ------- redis.spec | 14 ++++--- 7 files changed, 91 insertions(+), 86 deletions(-) create mode 100644 0001-redis-2.8.18-redis-conf.patch create mode 100644 0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch create mode 100644 0003-redis-2.8.11-use-system-jemalloc.patch delete mode 100644 redis-2.8.15-conf.patch delete mode 100644 redis-deps-PIC.patch delete mode 100644 redis-deps-unbundle-jemalloc.patch 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..44ef765 --- /dev/null +++ b/0001-redis-2.8.18-redis-conf.patch @@ -0,0 +1,44 @@ +diff -up redis-2.8.18/redis.conf.rpmconf redis-2.8.18/redis.conf +--- redis-2.8.18/redis.conf.rpmconf 2014-12-04 11:36:52.000000000 +0100 ++++ redis-2.8.18/redis.conf 2014-12-04 19:39:55.101325437 +0100 +@@ -62,6 +62,7 @@ tcp-backlog 511 + # + # 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 +101,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 +185,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 ################################# + +diff -up redis-2.8.18/sentinel.conf.rpmconf redis-2.8.18/sentinel.conf +--- redis-2.8.18/sentinel.conf.rpmconf 2014-12-04 11:36:52.000000000 +0100 ++++ redis-2.8.18/sentinel.conf 2014-12-04 19:39:21.949190312 +0100 +@@ -4,6 +4,11 @@ + # The port that this sentinel instance will run on + port 26379 + ++# 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 ++ + # sentinel announce-ip + # sentinel announce-port + # 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..a9b68d7 --- /dev/null +++ b/0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch @@ -0,0 +1,24 @@ +diff -up redis-2.8.18/deps/linenoise/Makefile.pic redis-2.8.18/deps/linenoise/Makefile +--- redis-2.8.18/deps/linenoise/Makefile.pic 2014-12-04 11:36:52.000000000 +0100 ++++ redis-2.8.18/deps/linenoise/Makefile 2014-12-04 19:41:57.437824019 +0100 +@@ -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 + +diff -up redis-2.8.18/deps/Makefile.pic redis-2.8.18/deps/Makefile +--- redis-2.8.18/deps/Makefile.pic 2014-12-04 19:41:57.437824019 +0100 ++++ redis-2.8.18/deps/Makefile 2014-12-04 19:43:26.346186323 +0100 +@@ -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/0003-redis-2.8.11-use-system-jemalloc.patch b/0003-redis-2.8.11-use-system-jemalloc.patch new file mode 100644 index 0000000..cf1b231 --- /dev/null +++ b/0003-redis-2.8.11-use-system-jemalloc.patch @@ -0,0 +1,14 @@ +--- a/src/Makefile 2013-04-30 15:15:56.000000000 +0200 ++++ b/src/Makefile 2013-06-19 12:58:12.345612310 +0200 +@@ -89,9 +89,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) + 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) diff --git a/redis-2.8.15-conf.patch b/redis-2.8.15-conf.patch deleted file mode 100644 index fc5e343..0000000 --- a/redis-2.8.15-conf.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up redis-2.8.15/redis.conf.rpmconf redis-2.8.15/redis.conf ---- redis-2.8.15/redis.conf.rpmconf 2014-09-12 16:16:58.000000000 +0200 -+++ redis-2.8.15/redis.conf 2014-09-12 17:46:45.918482580 +0200 -@@ -62,6 +62,7 @@ tcp-backlog 511 - # - # 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 +101,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 +185,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 ################################# - -diff -up redis-2.8.15/sentinel.conf.rpmconf redis-2.8.15/sentinel.conf ---- redis-2.8.15/sentinel.conf.rpmconf 2014-09-12 17:46:45.918482580 +0200 -+++ redis-2.8.15/sentinel.conf 2014-09-12 17:47:39.512717702 +0200 -@@ -4,6 +4,11 @@ - # The port that this sentinel instance will run on - port 26379 - -+# 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 -+ - # sentinel announce-ip - # sentinel announce-port - # diff --git a/redis-deps-PIC.patch b/redis-deps-PIC.patch deleted file mode 100644 index d29cdfa..0000000 --- a/redis-deps-PIC.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/deps/Makefile.pic 2014-09-04 20:14:53.780910375 +0200 -+++ a/deps/Makefile 2014-09-04 20:15:49.278133046 +0200 -@@ -58,7 +58,7 @@ - LUA_CFLAGS= -D__C99FEATURES__=1 - endif - --LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI $(CFLAGS) -+LUA_CFLAGS+= -O2 -Wall -fPIC -DLUA_ANSI $(CFLAGS) - 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 ---- a/deps/linenoise/Makefile -+++ a/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 - - diff --git a/redis-deps-unbundle-jemalloc.patch b/redis-deps-unbundle-jemalloc.patch deleted file mode 100644 index cf1b231..0000000 --- a/redis-deps-unbundle-jemalloc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/Makefile 2013-04-30 15:15:56.000000000 +0200 -+++ b/src/Makefile 2013-06-19 12:58:12.345612310 +0200 -@@ -89,9 +89,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) - 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) diff --git a/redis.spec b/redis.spec index 38d1b72..3b6e278 100644 --- a/redis.spec +++ b/redis.spec @@ -10,8 +10,8 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 2.8.17 -Release: 2%{?dist} +Version: 2.8.18 +Release: 1%{?dist} Summary: A persistent key-value database Group: Applications/Databases @@ -26,9 +26,9 @@ Source5: %{name}-sentinel.init Source6: %{name}-sentinel.service Source7: %{name}-shutdown # Update configuration for Fedora -Patch0: %{name}-2.8.15-conf.patch -Patch1: %{name}-deps-PIC.patch -Patch2: %{name}-deps-unbundle-jemalloc.patch +Patch0: 0001-redis-2.8.18-redis-conf.patch +Patch1: 0002-redis-2.8.18-deps-library-fPIC-performance-tuning.patch +Patch2: 0003-redis-2.8.11-use-system-jemalloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if !0%{?el5} @@ -218,6 +218,10 @@ fi %changelog +* Thu Dec 4 2014 Remi Collet - 2.8.18-1 +- Redis 2.8.18 - Release date: 4 Dec 2014 + upgrade urgency: LOW for both Redis and Sentinel. + * Sun Sep 21 2014 Remi Collet - 2.8.17-2 - fix sentinel service unit file for systemd - also use redis-shutdown in init scripts -- cgit