From 327e877ee70c2f8a310e481ee60e2f5ed99eb172 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Jun 2014 17:31:59 +0200 Subject: redis: 2.8.10 --- redis-2.8.10-conf.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++ redis-2.8.4-conf.patch | 44 -------------------------------------------- redis.spec | 8 ++++++-- 3 files changed, 50 insertions(+), 46 deletions(-) create mode 100644 redis-2.8.10-conf.patch delete mode 100644 redis-2.8.4-conf.patch diff --git a/redis-2.8.10-conf.patch b/redis-2.8.10-conf.patch new file mode 100644 index 0000000..77c2696 --- /dev/null +++ b/redis-2.8.10-conf.patch @@ -0,0 +1,44 @@ +diff -up redis-2.8.10/redis.conf.rpmconf redis-2.8.10/redis.conf +--- redis-2.8.10/redis.conf.rpmconf 2014-06-05 11:02:23.000000000 +0200 ++++ redis-2.8.10/redis.conf 2014-06-06 17:10:07.493834288 +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.10/sentinel.conf.rpmconf redis-2.8.10/sentinel.conf +--- redis-2.8.10/sentinel.conf.rpmconf 2014-06-06 17:10:07.493834288 +0200 ++++ redis-2.8.10/sentinel.conf 2014-06-06 17:12:17.168324319 +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 ++ + # dir + # Every long running process should have a well-defined working directory. + # For Redis Sentinel to chdir to /tmp at startup is the simplest thing diff --git a/redis-2.8.4-conf.patch b/redis-2.8.4-conf.patch deleted file mode 100644 index c610969..0000000 --- a/redis-2.8.4-conf.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up redis-2.8.4/redis.conf.rpmconf redis-2.8.4/redis.conf ---- redis-2.8.4/redis.conf.rpmconf 2014-01-13 17:09:58.000000000 +0100 -+++ redis-2.8.4/redis.conf 2014-01-16 07:58:47.979995707 +0100 -@@ -53,6 +53,7 @@ port 6379 - # - # 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 -@@ -91,7 +92,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. -@@ -175,7 +176,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.4/sentinel.conf.rpmconf redis-2.8.4/sentinel.conf ---- redis-2.8.4/sentinel.conf.rpmconf 2014-01-16 07:58:47.979995707 +0100 -+++ redis-2.8.4/sentinel.conf 2014-01-16 07:59:27.792112057 +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 monitor - # - # Tells Sentinel to monitor this master, and to consider it in O_DOWN diff --git a/redis.spec b/redis.spec index 414de7f..8a96b3c 100644 --- a/redis.spec +++ b/redis.spec @@ -24,7 +24,7 @@ %global with_tests %{?_with_tests:1}%{!?_with_tests:0} Name: redis -Version: 2.8.9 +Version: 2.8.10 Release: 1%{?dist} Summary: A persistent key-value database @@ -39,7 +39,7 @@ Source4: %{name}.tmpfiles Source5: sentinel.init Source6: sentinel.service # Update configuration for Fedora -Patch0: %{name}-2.8.4-conf.patch +Patch0: %{name}-2.8.10-conf.patch Patch1: %{name}-deps-PIC.patch Patch2: %{name}-deps-unbundle-jemalloc.patch @@ -236,6 +236,10 @@ fi %changelog +* Fri Jun 6 2014 Remi Collet - 2.8.10-1 +- Redis 2.8.10 - Release date: 5 Jun 2014 + upgrade urgency: HIGH if you use min-slaves-to-write option. + * Tue Apr 22 2014 Remi Collet - 2.8.9-1 - Redis 2.8.9 - Release date: 22 Apr 2014 upgrade urgency: LOW, only new features introduced, no bugs fixed. -- cgit