From 93650f449c4f0c3c3134fe86150e4c521bcf2423 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Mon, 26 Sep 2016 16:36:02 +0200 Subject: [PATCH] Refresh patchqueue --- 0001-redis-3.2.3-redis-conf.patch | 10 ++++---- ...deps-library-fPIC-performance-tuning.patch | 4 ++-- 0003-redis-2.8.18-use-system-jemalloc.patch | 4 ++-- ...-disable-test-failed-on-slow-machine.patch | 4 ++-- ...8.18-sentinel-configuration-file-fix.patch | 24 ++++++++++--------- ...or-redis-cli-redis-benchmark-redis-c.patch | 7 ++++-- ...eck-rdb-as-a-symlink-instead-of-dupl.patch | 13 ++++++---- redis.spec | 14 +++++------ 8 files changed, 44 insertions(+), 36 deletions(-) rename redis-pr3491.patch => 0006-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch (99%) rename redis-pr3494.patch => 0007-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch (74%) diff --git a/0001-redis-3.2.3-redis-conf.patch b/0001-redis-3.2.3-redis-conf.patch index db82637..59cd369 100644 --- a/0001-redis-3.2.3-redis-conf.patch +++ b/0001-redis-3.2.3-redis-conf.patch @@ -1,14 +1,14 @@ -From 2875336337c14d15878fcc36de83cea350fc47f1 Mon Sep 17 00:00:00 2001 +From 2c3b48cf7fb494e21aa47c03c1de9ce2ee9ccd37 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 3.2.3: redis conf +Subject: [PATCH 1/7] redis 3.2.3: redis conf --- - redis.conf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + redis.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/redis.conf b/redis.conf -index 22e00bc..46a0154 100644 +index 22e00bc..2bcddb8 100644 --- a/redis.conf +++ b/redis.conf @@ -160,7 +160,7 @@ loglevel notice diff --git a/0002-redis-3.2.3-deps-library-fPIC-performance-tuning.patch b/0002-redis-3.2.3-deps-library-fPIC-performance-tuning.patch index bb8a197..7769617 100644 --- a/0002-redis-3.2.3-deps-library-fPIC-performance-tuning.patch +++ b/0002-redis-3.2.3-deps-library-fPIC-performance-tuning.patch @@ -1,7 +1,7 @@ -From 0a7d1df14b256dc77249f8d5d0d483b1b4a6c97d Mon Sep 17 00:00:00 2001 +From 0305001c78ce0304ade54e3f28396bc43763074a 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 3.2.3: deps library fPIC performance tuning +Subject: [PATCH 2/7] redis 3.2.3: deps library fPIC performance tuning --- deps/Makefile | 2 +- diff --git a/0003-redis-2.8.18-use-system-jemalloc.patch b/0003-redis-2.8.18-use-system-jemalloc.patch index c985479..5ed8949 100644 --- a/0003-redis-2.8.18-use-system-jemalloc.patch +++ b/0003-redis-2.8.18-use-system-jemalloc.patch @@ -1,7 +1,7 @@ -From 16501b1430c43d66736ea5530cd68b571af809f2 Mon Sep 17 00:00:00 2001 +From 5c26d1b71675c91ebbcc43c0a9a6c9359e92fd60 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 +Subject: [PATCH 3/7] redis 2.8.18: use system jemalloc --- src/Makefile | 4 ++-- 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 index 0cece90..b73acdb 100644 --- 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 @@ -1,7 +1,7 @@ -From 851ea8154a2a8e974d1588be3d6d38262ca2ae33 Mon Sep 17 00:00:00 2001 +From 8658b92caa8da108a3cdaae7a5d69da43fb4e22e 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 +Subject: [PATCH 4/7] redis 2.8.18: disable test failed on slow machine --- tests/test_helper.tcl | 1 - diff --git a/0005-redis-2.8.18-sentinel-configuration-file-fix.patch b/0005-redis-2.8.18-sentinel-configuration-file-fix.patch index 15027f7..1bf7c13 100644 --- a/0005-redis-2.8.18-sentinel-configuration-file-fix.patch +++ b/0005-redis-2.8.18-sentinel-configuration-file-fix.patch @@ -1,27 +1,29 @@ -From 9502fee0927389b6feb274f2778dfb0b7b4a1459 Mon Sep 17 00:00:00 2001 +From 833926e852de5bfc46021178c3edb90312c7db41 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 +Subject: [PATCH 5/7] redis 2.8.18: sentinel configuration file fix --- - sentinel.conf | 5 +++++ - 1 file changed, 5 insertions(+) + sentinel.conf | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/sentinel.conf b/sentinel.conf -index 39d1044..543d40d 100644 +index 0e1b266..428e7b6 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 +@@ -130,6 +130,12 @@ sentinel parallel-syncs mymaster 1 + # Default is 3 minutes. + sentinel failover-timeout mymaster 180000 + +# +# 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 - - ++ + # SCRIPTS EXECUTION + # + # sentinel notification-script and sentinel reconfig-script are used in order -- 2.9.0 diff --git a/redis-pr3491.patch b/0006-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch similarity index 99% rename from redis-pr3491.patch rename to 0006-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch index 6c52694..624b570 100644 --- a/redis-pr3491.patch +++ b/0006-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch @@ -1,7 +1,7 @@ -From 8295483fcee6c1232ac801ff91f66e21f9d23d80 Mon Sep 17 00:00:00 2001 +From 81a1b8a6e37a83e0dc99c770d5c734c13a0fcb27 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 8 Sep 2016 14:51:15 +0200 -Subject: [PATCH] 1st man pageis for - redis-cli - redis-benchmark - +Subject: [PATCH 6/7] 1st man pageis for - redis-cli - redis-benchmark - redis-check-aof - redis-check-rdb - redis-server - redis.conf as redis-sentinel is a symlink to redis-server, same page can be used (also symlinked) @@ -647,3 +647,6 @@ index 0000000..1e0c9c9 +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-- +2.9.0 + diff --git a/redis-pr3494.patch b/0007-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch similarity index 74% rename from redis-pr3494.patch rename to 0007-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch index e45ccb9..0480ab7 100644 --- a/redis-pr3494.patch +++ b/0007-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch @@ -1,18 +1,18 @@ -From a34f7b1ac2cfb2879cc0889da0297aee96bcb076 Mon Sep 17 00:00:00 2001 +From 4bdb4b591f61566caf65fbdb8e72da672fe1b737 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Sep 2016 17:23:27 +0200 -Subject: [PATCH] install redis-check-rdb as a symlink instead of duplicating - the binary +Subject: [PATCH 7/7] install redis-check-rdb as a symlink instead of + duplicating the binary --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 6bd8d8d..4cc422e 100644 +index d513859..ffc926b 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -269,6 +269,6 @@ install: all +@@ -257,6 +257,6 @@ install: all $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN) $(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN) $(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN) @@ -20,3 +20,6 @@ index 6bd8d8d..4cc422e 100644 $(REDIS_INSTALL) $(REDIS_CHECK_AOF_NAME) $(INSTALL_BIN) @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) + @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) +-- +2.9.0 + diff --git a/redis.spec b/redis.spec index 42defe5..ad4a1bc 100644 --- a/redis.spec +++ b/redis.spec @@ -31,17 +31,17 @@ Source9: %{name}-limit-init # Then refresh your patches # git format-patch HEAD~ # Update configuration for Fedora -Patch0001: 0001-redis-3.2.3-redis-conf.patch -Patch0002: 0002-redis-3.2.3-deps-library-fPIC-performance-tuning.patch -Patch0003: 0003-redis-2.8.18-use-system-jemalloc.patch +Patch0001: 0001-redis-3.2.3-redis-conf.patch +Patch0002: 0002-redis-3.2.3-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.18-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.18-sentinel-configuration-file-fix.patch +Patch0005: 0005-redis-2.8.18-sentinel-configuration-file-fix.patch # https://github.com/antirez/redis/pull/3491 - man pages -Patch0006: %{name}-pr3491.patch +Patch0006: 0006-1st-man-pageis-for-redis-cli-redis-benchmark-redis-c.patch # https://github.com/antirez/redis/pull/3494 - symlink -Patch0007: %{name}-pr3494.patch +Patch0007: 0007-install-redis-check-rdb-as-a-symlink-instead-of-dupl.patch %if 0%{?with_perftools} BuildRequires: gperftools-devel %else