From 0078e5d80caf30c72b7a4034bb1f58f5b3120bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Audrius=20Ka=C5=BEukauskas?= <audrius@neutrino.lt>
Date: Sun, 7 Jun 2015 13:50:48 +0300
Subject: system/redis: Updated for version 3.0.2.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Audrius Kažukauskas <audrius@neutrino.lt>
---
 system/redis/doinst.sh        |  1 +
 system/redis/redis.SlackBuild | 15 +++------------
 system/redis/redis.info       |  6 +++---
 3 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'system/redis')

diff --git a/system/redis/doinst.sh b/system/redis/doinst.sh
index 27ee4d0acc..9e57d26a6f 100644
--- a/system/redis/doinst.sh
+++ b/system/redis/doinst.sh
@@ -23,5 +23,6 @@ preserve_perms() {
 }
 
 config etc/redis/redis.conf.new
+config etc/redis/sentinel.conf.new
 config etc/logrotate.d/redis.new
 preserve_perms etc/rc.d/rc.redis.new
diff --git a/system/redis/redis.SlackBuild b/system/redis/redis.SlackBuild
index e524d3488b..8af4397f7d 100644
--- a/system/redis/redis.SlackBuild
+++ b/system/redis/redis.SlackBuild
@@ -24,7 +24,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=redis
-VERSION=${VERSION:-2.8.19}
+VERSION=${VERSION:-3.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,17 +76,7 @@ sed -i "s|-O3||" deps/Makefile deps/hiredis/Makefile
 # No ./configure necessary.
 # http://lists.slackbuilds.org/pipermail/slackbuilds-users/2013-January/010042.html
 ( unset ARCH ; CFLAGS="$SLKCFLAGS" make )
-
-# Install binaries.
-mkdir -p $PKG/usr/bin
-( cd src
-  install -m 0755 \
-    redis-server redis-cli redis-benchmark redis-check-aof redis-check-dump \
-    $PKG/usr/bin
-)
-
-# Create symlink to start redis in sentinel mode.
-( cd $PKG/usr/bin ; ln -sf redis-server redis-sentinel )
+make install PREFIX=$PKG/usr
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -99,6 +89,7 @@ sed -i \
   -e 's|^logfile ""|logfile /var/log/redis/redis.log|' \
   -e 's|^# bind 127.0.0.1|bind 127.0.0.1|' \
   $PKG/etc/redis/redis.conf.new
+install -D -m 0644 sentinel.conf $PKG/etc/redis/sentinel.conf.new
 
 # Create data directory.
 mkdir -p $PKG/var/lib/redis
diff --git a/system/redis/redis.info b/system/redis/redis.info
index 2742e95472..0eff44555f 100644
--- a/system/redis/redis.info
+++ b/system/redis/redis.info
@@ -1,8 +1,8 @@
 PRGNAM="redis"
-VERSION="2.8.19"
+VERSION="3.0.2"
 HOMEPAGE="http://redis.io/"
-DOWNLOAD="http://download.redis.io/releases/redis-2.8.19.tar.gz"
-MD5SUM="3794107224043465603f48941f5c86a7"
+DOWNLOAD="http://download.redis.io/releases/redis-3.0.2.tar.gz"
+MD5SUM="87be8867447f62524b584813e5a7bd14"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3