redis6 pls

5 files changed, 44 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f837cf8049b6..6d864527ea64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = redis-git
-	pkgdesc = Advanced key-value store (git unstable branch)
-	pkgver = r7362.0d6f11f4d
+pkgbase = redis6
+	pkgdesc = Advanced key-value store (version 6)
+	pkgver = 6.2.7
 	pkgrel = 1
 	url = http://redis.io/
 	install = redis.install
@@ -10,20 +10,19 @@ pkgbase = redis-git
 	depends = jemalloc
 	depends = grep
 	depends = shadow
-	provides = redis
-	conflicts = redis
-	backup = etc/redis.conf
-	backup = etc/logrotate.d/redis
-	source = git+https://github.com/antirez/redis.git#branch=unstable
+	provides = redis6
+	conflicts = redis6
+	backup = etc/redis6.conf
+	backup = etc/logrotate.d/redis6
+	source = https://download.redis.io/releases/redis-6.2.7.tar.gz
 	source = redis.service
 	source = redis.logrotate
 	source = redis.conf-sane-defaults.patch
 	source = redis-use-system-jemalloc.patch
-	sha1sums = SKIP
-	sha1sums = 285476bd6f92aa3dfba40cea1ad6cabef5a94df7
-	sha1sums = b2a3cdc6ea1b89dc867d6db9ce02571e58e8b645
+	sha1sums = b01ef3f117c9815dea41bf2609e489a03c3a5ab1
+	sha1sums = d509e13130a103309a7505d395f947d6a9b28082
+	sha1sums = 5db6e7b62f1cfca12a3e8e053c5e2a337640cdd2
 	sha1sums = 8d60927802707bc7096f1c815e0e64937fc899ad
 	sha1sums = 46fed06e1b37165e1bfb994aaa367c232b83ee43
 
-pkgname = redis-git
-
+pkgname = redis6
diff --git a/PKGBUILD b/PKGBUILD
index 3603f077e598..5a90964ab2fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,52 @@
-# $Id: PKGBUILD 159813 2016-02-01 18:34:51Z spupykin $
-
-pkgname=redis-git
-provides=('redis')
-conflicts=('redis')
-pkgver=r7362.0d6f11f4d
+pkgname=redis6
+provides=('redis6')
+conflicts=('redis6')
+pkgver=6.2.7
 pkgrel=1
-pkgdesc='Advanced key-value store (git unstable branch)'
+pkgdesc='Advanced key-value store (version 6)'
 arch=('i686' 'x86_64')
 url='http://redis.io/'
 license=('BSD')
 depends=('jemalloc' 'grep' 'shadow')
-backup=('etc/redis.conf'
-        'etc/logrotate.d/redis')
+backup=('etc/redis6.conf'
+        'etc/logrotate.d/redis6')
 install=redis.install
-source=(git+https://github.com/antirez/redis.git#branch=unstable
+source=(https://download.redis.io/releases/redis-${pkgver}.tar.gz
         redis.service
         redis.logrotate
         redis.conf-sane-defaults.patch
         redis-use-system-jemalloc.patch)
-sha1sums=('SKIP'
-          '285476bd6f92aa3dfba40cea1ad6cabef5a94df7'
-          'b2a3cdc6ea1b89dc867d6db9ce02571e58e8b645'
+sha1sums=('b01ef3f117c9815dea41bf2609e489a03c3a5ab1'
+          'd509e13130a103309a7505d395f947d6a9b28082'
+          '5db6e7b62f1cfca12a3e8e053c5e2a337640cdd2'
           '8d60927802707bc7096f1c815e0e64937fc899ad'
           '46fed06e1b37165e1bfb994aaa367c232b83ee43')
 
-pkgver() {
-  cd redis
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
 prepare() {
-  cd redis
+  cd redis-${pkgver}
   patch -p1 -i ../redis.conf-sane-defaults.patch
   patch -p0 -i ../redis-use-system-jemalloc.patch
 }
 
 build() {
-  make -C redis
+
+  make -C redis-${pkgver} BUILD_TLS=yes
+  
 }
 
 package() {
-  cd redis
+  cd redis-${pkgver}
   make PREFIX="$pkgdir"/usr install
 
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/redis/LICENSE
-  install -Dm644 redis.conf "$pkgdir"/etc/redis.conf
-  install -Dm644 ../redis.service "$pkgdir"/usr/lib/systemd/system/redis.service
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/redis6/LICENSE
+  install -Dm644 redis.conf "$pkgdir"/etc/redis6.conf
+  install -Dm644 ../redis.service "$pkgdir"/usr/lib/systemd/system/redis6.service
+  for bin in server benchmark cli check-rdb check-aof sentinel; do
+    mv "$pkgdir"/usr/bin/redis-$bin "$pkgdir"/usr/bin/redis6-$bin
+  done
 
+  sed 's:dir /var/lib/redis:dir /var/lib/redis6:g' -i "$pkgdir/etc/redis6.conf"
+  
   # files kept for compatibility with installations made before 2.8.13-2
-  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis
-
-  ln -sf redis-server $pkgdir/usr/bin/redis-sentinel
+  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis6
 }
diff --git a/redis.install b/redis.install
index 027e758a61c6..83992b618859 100644
--- a/redis.install
+++ b/redis.install
@@ -3,6 +3,6 @@ post_install() {
   getent passwd redis >/dev/null || useradd --system -g redis \
     -d /var/lib/redis -s /bin/false redis
 
-  install -dm700 var/lib/redis
-  chown redis:redis var/lib/redis
+  install -dm700 var/lib/redis6
+  chown redis:redis var/lib/redis6
 }
diff --git a/redis.logrotate b/redis.logrotate
index 01d11422a596..0497afb43269 100644
--- a/redis.logrotate
+++ b/redis.logrotate
@@ -1,4 +1,4 @@
-/var/log/redis.log {
+/var/log/redis6.log {
    notifempty
    copytruncate
    missingok
diff --git a/redis.service b/redis.service
index 0a8162b8ab8e..5a54d191accc 100644
--- a/redis.service
+++ b/redis.service
@@ -1,20 +1,20 @@
 [Unit]
-Description=Advanced key-value store
+Description=Advanced key-value store (version 6)
 After=network.target
 
 [Service]
 Type=simple
 User=redis
 Group=redis
-ExecStart=/usr/bin/redis-server /etc/redis.conf
-ExecStop=/usr/bin/redis-cli shutdown
+ExecStart=/usr/bin/redis6-server /etc/redis6.conf
+ExecStop=/usr/bin/redis6-cli shutdown
 CapabilityBoundingSet=
 PrivateTmp=true
 PrivateDevices=true
 ProtectSystem=full
 ProtectHome=true
 NoNewPrivileges=true
-RuntimeDirectory=redis
+RuntimeDirectory=redis6
 RuntimeDirectoryMode=755
 LimitNOFILE=10032