bump

5 files changed, 37 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 13ceaca2b25a..0afc9f15ee7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = redis5
-	pkgdesc = Advanced key-value store (version 5)
-	pkgver = 5.0.14
-	pkgrel = 1
+pkgbase = redis6
+	pkgdesc = Advanced key-value store (version 6)
+	pkgver = 6.2.7
+	pkgrel = 2
 	url = http://redis.io/
 	install = redis.install
 	arch = i686
@@ -12,15 +12,15 @@ pkgbase = redis5
 	depends = shadow
 	backup = etc/redis6.conf
 	backup = etc/logrotate.d/redis6
-	source = https://download.redis.io/releases/redis-5.0.14.tar.gz
+	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 = 58f2b4bfd4aded983195c21275516dac2f7e283e
-	sha1sums = d509e13130a103309a7505d395f947d6a9b28082
-	sha1sums = 5db6e7b62f1cfca12a3e8e053c5e2a337640cdd2
+	sha1sums = b01ef3f117c9815dea41bf2609e489a03c3a5ab1
+	sha1sums = 758d0a2cdd99b75c556e6fc13d9ab4cd7475a943
+	sha1sums = f1edcd6e469dc6f076e223e3611ac683a6c37766
 	sha1sums = 8d60927802707bc7096f1c815e0e64937fc899ad
 	sha1sums = 46fed06e1b37165e1bfb994aaa367c232b83ee43
 
-pkgname = redis5
+pkgname = redis6
diff --git a/PKGBUILD b/PKGBUILD
index a7128f7e0b04..fa6edc1cf4fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,23 @@
-pkgname=redis5
-pkgver=5.0.14
-pkgrel=1
-pkgdesc='Advanced key-value store (version 5)'
+pkgver=6.2.7
+_ver=$(echo "$pkgver" | sed -e "s:\([0-9]*\).*:\1:g")
+pkgname=redis${_ver}
+pkgrel=2
+pkgdesc="Advanced key-value store (version $_ver)"
 arch=('i686' 'x86_64')
 url='http://redis.io/'
 license=('BSD')
 depends=('jemalloc' 'grep' 'shadow')
-backup=('etc/redis6.conf'
-        'etc/logrotate.d/redis6')
+backup=("etc/redis${_ver}.conf"
+        "etc/logrotate.d/redis${_ver}")
 install=redis.install
 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=('58f2b4bfd4aded983195c21275516dac2f7e283e'
-          'd509e13130a103309a7505d395f947d6a9b28082'
-          '5db6e7b62f1cfca12a3e8e053c5e2a337640cdd2'
+sha1sums=('b01ef3f117c9815dea41bf2609e489a03c3a5ab1'
+          '758d0a2cdd99b75c556e6fc13d9ab4cd7475a943'
+          'f1edcd6e469dc6f076e223e3611ac683a6c37766'
           '8d60927802707bc7096f1c815e0e64937fc899ad'
           '46fed06e1b37165e1bfb994aaa367c232b83ee43')
 
@@ -36,15 +37,17 @@ package() {
   cd redis-${pkgver}
   make PREFIX="$pkgdir"/usr install
 
-  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
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/redis${_ver}/LICENSE
+  install -Dm644 redis.conf "$pkgdir"/etc/redis${_ver}.conf
+  install -Dm644 ../redis.service "$pkgdir"/usr/lib/systemd/system/redis${_ver}.service
   for bin in server benchmark cli check-rdb check-aof sentinel; do
-    mv "$pkgdir"/usr/bin/redis-$bin "$pkgdir"/usr/bin/redis6-$bin
+    mv "$pkgdir"/usr/bin/redis-$bin "$pkgdir"/usr/bin/redis{$_ver}-$bin
   done
 
-  sed 's:dir /var/lib/redis:dir /var/lib/redis6:g' -i "$pkgdir/etc/redis6.conf"
+  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis${_ver} 
+  
+  sed "s/<version>/${_ver}/g" -i "$pkgdir"/usr/lib/systemd/system/redis${_ver}.service
+  sed "s/<version>/${_ver}/g" -i "$pkgdir"/etc/logrotate.d/redis${_ver}
+  sed "s:dir /var/lib/redis:dir /var/lib/redis${_ver}:g" -i "$pkgdir/etc/redis${_ver}.conf"
   
-  # files kept for compatibility with installations made before 2.8.13-2
-  install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis6
 }
diff --git a/redis.install b/redis.install
index 83992b618859..6fa5a71ec33a 100644
--- a/redis.install
+++ b/redis.install
@@ -1,8 +1,10 @@
 post_install() {
+  _ver=$(echo "$1" | sed -e "s:\([0-9]*\).*:\1:g")
+
   getent group redis >/dev/null || groupadd --system redis
   getent passwd redis >/dev/null || useradd --system -g redis \
     -d /var/lib/redis -s /bin/false redis
 
-  install -dm700 var/lib/redis6
-  chown redis:redis var/lib/redis6
+  install -dm700 var/lib/redis${_ver}
+  chown redis:redis var/lib/redis${_ver}
 }
diff --git a/redis.logrotate b/redis.logrotate
index 0497afb43269..0793e8249c7b 100644
--- a/redis.logrotate
+++ b/redis.logrotate
@@ -1,4 +1,4 @@
-/var/log/redis6.log {
+/var/log/redis<version>.log {
    notifempty
    copytruncate
    missingok
diff --git a/redis.service b/redis.service
index 5a54d191accc..4c4533e7a03e 100644
--- a/redis.service
+++ b/redis.service
@@ -1,20 +1,20 @@
 [Unit]
-Description=Advanced key-value store (version 6)
+Description=Advanced key-value store (version <version>)
 After=network.target
 
 [Service]
 Type=simple
 User=redis
 Group=redis
-ExecStart=/usr/bin/redis6-server /etc/redis6.conf
-ExecStop=/usr/bin/redis6-cli shutdown
+ExecStart=/usr/bin/redis<version>-server /etc/redis<version>.conf
+ExecStop=/usr/bin/redis<version>-cli shutdown
 CapabilityBoundingSet=
 PrivateTmp=true
 PrivateDevices=true
 ProtectSystem=full
 ProtectHome=true
 NoNewPrivileges=true
-RuntimeDirectory=redis6
+RuntimeDirectory=redis<version>
 RuntimeDirectoryMode=755
 LimitNOFILE=10032