[arch-commits] Commit in redis/trunk (5 files)

[Antonio Rojas]

    Date: Friday, December 1, 2017 @ 18:39:27
  Author: arojas
Revision: 271225

Update to 4.0.4, move user management to sysusers

Added:
  redis/trunk/redis.sysusers
  redis/trunk/redis.tmpfiles
Modified:
  redis/trunk/PKGBUILD
  redis/trunk/redis-2.8.11-use-system-jemalloc.patch
Deleted:
  redis/trunk/redis.install

----------------------------------------+
 PKGBUILD                               |   16 ++++++++++------
 redis-2.8.11-use-system-jemalloc.patch |    4 ++--
 redis.install                          |    8 --------
 redis.sysusers                         |    1 +
 redis.tmpfiles                         |    1 +
 5 files changed, 14 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-01 18:27:18 UTC (rev 271224)
+++ PKGBUILD	2017-12-01 18:39:27 UTC (rev 271225)
@@ -5,7 +5,7 @@
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=4.0.2
+pkgver=4.0.4
 pkgrel=1
 pkgdesc='Advanced key-value store'
 arch=('x86_64')
@@ -14,22 +14,23 @@
 depends=('jemalloc' 'grep' 'shadow')
 backup=('etc/redis.conf'
         'etc/logrotate.d/redis')
-install=redis.install
 source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
-        redis.service
+        redis.service redis.sysusers redis.tmpfiles
         redis.logrotate
         redis.conf-sane-defaults.patch
         redis-2.8.11-use-system-jemalloc.patch)
-sha256sums=('b1a0915dbc91b979d06df1977fe594c3fa9b189f1f3d38743a2948c9f7634813'
+sha256sums=('35768145335e874b1b810e23494ad3daa6f442c3dc1d7e3784992ba50799c0cd'
             'cceff2a097d9041a0c73caeb5c33e849af783c6a12db866f24b8417ac3ac9d11'
+            '78f6ab83408956a9afaf28689128f382545c901f172cd5b670724c73f6896d5d'
+            '09dcc8522899dc3d1e9362989aa4acb5a3996d700b9a44f22ebb5b9667b88183'
             '8b4c2caabb4f54157ad91ca472423112b1803685ad18ed11b60463d78494df13'
             '22cd3b9f7e9b17647a615d009b50603e7978b0af26c3e2c53560e57573b996ed'
-            'b1d2802d7e459799565fb4660e97e57a23de0aa47689656ece4a00d1053dd919')
+            '9720468ede366893c32f34616c6d8670e790309757ae0abc0f49402089a7a672')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../redis.conf-sane-defaults.patch
-#  patch -p1 -i ../redis-2.8.11-use-system-jemalloc.patch
+  patch -p1 -i ../redis-2.8.11-use-system-jemalloc.patch
 }
 
 build() {
@@ -48,4 +49,7 @@
   install -Dm644 ../redis.logrotate "$pkgdir"/etc/logrotate.d/redis
 
   ln -sf redis-server "$pkgdir"/usr/bin/redis-sentinel
+
+  install -Dm644 "$srcdir"/redis.sysusers "$pkgdir"/usr/lib/sysusers.d/redis.conf
+  install -Dm644 "$srcdir"/redis.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/redis.conf
 }

Modified: redis-2.8.11-use-system-jemalloc.patch
===================================================================
--- redis-2.8.11-use-system-jemalloc.patch	2017-12-01 18:27:18 UTC (rev 271224)
+++ redis-2.8.11-use-system-jemalloc.patch	2017-12-01 18:39:27 UTC (rev 271225)
@@ -7,9 +7,9 @@
  ifeq ($(MALLOC),jemalloc)
  	DEPENDENCY_TARGETS+= jemalloc
 -	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
--	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl
+-	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
 +	FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
-+	FINAL_LIBS+= -ljemalloc -ldl
++	FINAL_LIBS+= -ljemalloc
  endif
  
  REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

Deleted: redis.install
===================================================================
--- redis.install	2017-12-01 18:27:18 UTC (rev 271224)
+++ redis.install	2017-12-01 18:39:27 UTC (rev 271225)
@@ -1,8 +0,0 @@
-post_install() {
-  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/redis
-  chown redis:redis var/lib/redis
-}

Added: redis.sysusers
===================================================================
--- redis.sysusers	                        (rev 0)
+++ redis.sysusers	2017-12-01 18:39:27 UTC (rev 271225)
@@ -0,0 +1 @@
+u redis - "Redis in-memory data structure store" /var/lib/redis

Added: redis.tmpfiles
===================================================================
--- redis.tmpfiles	                        (rev 0)
+++ redis.tmpfiles	2017-12-01 18:39:27 UTC (rev 271225)
@@ -0,0 +1 @@
+d /var/lib/redis 0700 redis redis