testing/redis: upgrade to 2.8.9

4 files changed, 26 insertions, 27 deletions

diff --git a/testing/redis/APKBUILD b/testing/redis/APKBUILD
index 549200865e..3d8d07484c 100644
--- a/testing/redis/APKBUILD
+++ b/testing/redis/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: V.Krishn <vkrishn4@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=redis
-pkgver=2.6.17
+pkgver=2.8.9
 pkgrel=0
 pkgdesc="Advanced key-value store"
 url="http://redis.io/"
@@ -27,7 +27,7 @@ prepare() {
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
-		*.patch) msg $i; patch -p2 -i "$srcdir"/$i || return 1;;
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
 	sed -i -e 's|^daemonize .*|daemonize yes|' \
@@ -72,21 +72,21 @@ package() {
 }
 
 
-md5sums="918d74591e272e4419cba5beef67e995  redis-2.6.17.tar.gz
-7fb0daf8dcfcda6fd6291dc0291ce579  redis.initd
+md5sums="3c106b0f1128dc930684e2da88b2a03d  redis-2.8.9.tar.gz
+6910862d7f07d5655c3d827a7fdddd6e  redis.initd
 f49b80f4418f456dbf865a32443d4d1d  redis.logrotate
 bf204d560e41b854297c60aff8d862d5  redis.confd
-a8c70ad9cc2633f87ac44eb78a1f6de9  redis-unbundle-jemalloc.patch
-c2c9ac9ad280d15364dfcc6ecbb36f03  redis-no-backtrace.patch"
-sha256sums="5a65b54bb6deef2a8a4fabd7bd6962654a5d35787e68f732f471bbf117f4768e  redis-2.6.17.tar.gz
-527c5200ac9bb7862ce048f728ca6a8091dc8efdabe8f4e81145212738ae3472  redis.initd
+e1099082cc40651e7cc19557f2fd2ee8  redis-unbundle-jemalloc.patch
+b05226a52976efe40a23117d0b1fd9fa  redis-no-backtrace.patch"
+sha256sums="7834c37f2ff186c46aef8e4a066dfbf1d6772a285aa31c19c58162f264f1007f  redis-2.8.9.tar.gz
+573f75738c6e9526550334552a160b5e1fdb13fad0dbd859aaafdb2fa0f49310  redis.initd
 197d9b212eec3b8cd33878ba224f9a79b6f98a43c0663caf7e084c7969beb3f9  redis.logrotate
 97d50b2bee2df995317b505d459c31fe4abe74e670028f0335febdd6e4e31486  redis.confd
-ebc7cd565a9b5476d0211e6bf86840aa2bd2b73f995608743affc3e1c1dad982  redis-unbundle-jemalloc.patch
-02110c8453a8753a6c82b6f80d9724e27db8b847e6bb0605f69761056a9a64d7  redis-no-backtrace.patch"
-sha512sums="bc0d487cdab3ce1bfe68a6efad9f4532552065fa45cd4c4429f3413397ec228d1ecf9afd8d2cc6d4aee115c7fb757fa1ef480f34c264b2290fd30ec831131f82  redis-2.6.17.tar.gz
-cc5645e864aea72c247baf3fe344378e906392bec03b571280229fcc88698298a7574a7980ea8eead8626fa6b83ff3fac61abd8967f3dc35fb833c9a380d0bd1  redis.initd
+a98a5041a491877ed6010d86dff38332422f44d08cf47cb52b40fd57a6ed666b  redis-unbundle-jemalloc.patch
+595306f5ecd12530ef80914aef48020e2683cd6bb774aa167c3c3146c1b66907  redis-no-backtrace.patch"
+sha512sums="f202c44e16d257e33f7fabaa3b46218bf45848158a4b8c7cc2fab119fdf42bb4e19764a2f5f82fc8c76a3e353754b6b25f2cacf20a253d28244acbf87fd6dd7a  redis-2.8.9.tar.gz
+35f10b9cfcc19ebcffb418d031bdc5bcf613d5e12d601c04ad1475b0e805950cb3a2304ba6137432b0a1d9bbc788aa2d8246d036f9f96f3b9c1f7a76ffaad845  redis.initd
 706cfedb7fb320649c7ad02845d7477b85ce1e5d9dced39b938c6f754e6e9eb666e22f6eddc4cbffa3f63a1f6fb6f3221244e5bcd8fa92706c256aa1fe50ff41  redis.logrotate
 d87aad6185300c99cc9b6a478c83bf62c450fb2c225592d74cc43a3adb93e19d8d2a42cc279907b385aa73a7b9c77b66828dbfb001009edc16a604abb2087e99  redis.confd
-743810a1d6224b8ebd5443f3db4bd4df863ac3c969862bc347b42489edce90a2699e5dca85eedc53db471d578e3a22dc806ee14cba1f5d261561a7c77a25388e  redis-unbundle-jemalloc.patch
-a45cd258442889e9abc958dcb664e6099bebfad27cefcfcf89887fa5c67c50ad21b4ef6d714f5fa48c29ab7cea41687999dc2798d95230806870ce45c39a5b2e  redis-no-backtrace.patch"
+4d2cbc018c19ce9939571a6b81f7b7482dc5cb0b788e4a3aa59777259983dd2b4c2a9a3d06bbdb43a13cec897578fcd83eb6635baba7f6c888dd515821a4837a  redis-unbundle-jemalloc.patch
+c2ff78d0c161ef63661e09d860887d35c74049a2ae3bd00ced755fb848dfe2ae60b1f0a2b435f5c028638db5502de1475f8355bb097d8180a4d2c76def36a1cc  redis-no-backtrace.patch"
diff --git a/testing/redis/redis-no-backtrace.patch b/testing/redis/redis-no-backtrace.patch
index 5c0332b373..809e924f20 100644
--- a/testing/redis/redis-no-backtrace.patch
+++ b/testing/redis/redis-no-backtrace.patch
@@ -1,5 +1,5 @@
---- src/redis-2.6.16/src/config.h.orig
-+++ src/redis-2.6.16/src/config.h
+--- a/src/config.h
++++ b/src/config.h
 @@ -54,7 +54,7 @@
  #endif
  
diff --git a/testing/redis/redis-unbundle-jemalloc.patch b/testing/redis/redis-unbundle-jemalloc.patch
index 9213f5d635..c2222cd0fa 100644
--- a/testing/redis/redis-unbundle-jemalloc.patch
+++ b/testing/redis/redis-unbundle-jemalloc.patch
@@ -1,14 +1,14 @@
---- src/redis-2.6.16/src/Makefile
-+++ src/redis-2.6.16/src/Makefile.new
-@@ -71,9 +71,8 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -83,9 +83,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
+-	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
++	FINAL_LIBS+= -ljemalloc -ldl
  endif
  
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
diff --git a/testing/redis/redis.initd b/testing/redis/redis.initd
index 3c4b7901c4..f6c2ce617a 100755
--- a/testing/redis/redis.initd
+++ b/testing/redis/redis.initd
@@ -43,11 +43,10 @@ start() {
 	eend $? 
 }
 
-stop_post() {
+stop() {
 	get_config
 	ebegin "Stopping $name"
-	start-stop-daemon --stop --quiet --pidfile "${pidfile}" \
-		&& rm -f "${pidfile}"
+	start-stop-daemon --stop --retry 30 --pidfile "${pidfile}"
 	eend $?
 }