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

[Frederik Schwan]

    Date: Sunday, October 11, 2020 @ 14:49:30
  Author: freswa
Revision: 723488

build with systemd support

implement FS#67525

Modified:
  redis/trunk/PKGBUILD
  redis/trunk/redis.conf-sane-defaults.patch
  redis/trunk/redis.service

--------------------------------+
 PKGBUILD                       |   15 +++++++++------
 redis.conf-sane-defaults.patch |   16 ++++++++++++----
 redis.service                  |    4 +++-
 3 files changed, 24 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-11 14:49:16 UTC (rev 723487)
+++ PKGBUILD	2020-10-11 14:49:30 UTC (rev 723488)
@@ -6,12 +6,15 @@
 
 pkgname=redis
 pkgver=6.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='An in-memory database that persists on disk'
 arch=('x86_64')
 url='https://redis.io/'
 license=('BSD')
-depends=('jemalloc' 'grep' 'shadow')
+depends=('jemalloc' 'grep' 'shadow' 'systemd-libs')
+# pkg-config fails to detect systemd libraries if systemd is not installed
+makedepends=('systemd')
+checkdepends=('tcl')
 backup=('etc/redis.conf'
         'etc/logrotate.d/redis')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/antirez/redis/archive/${pkgver}.tar.gz"
@@ -22,17 +25,17 @@
         redis.conf-sane-defaults.patch
         redis-5.0-use-system-jemalloc.patch)
 sha512sums=('792b2a21a123be82aa0b70f74f275ec12cdfe72bd34f0889fb9570efbf1f41ee0d9dc21400464321bdccb5fbe1dc5082ab08854f18e10a97135dd5fe92b5d798'
-            '86018ddd6625f918295e10f9478da361f73a6dbd6c6b8e4b974201669bcccbd4dba443bb0844be68f6ab8d5a1762b32af04c5e12df53b1f0ea812b790d9f4e37'
+            '78c996636fc3f4d404a01fbbc63978ee4c3bce9bc7f5728e8ca14b013cabc7df73ff882ec7f4a2e0b5494faf0d1da5a3c5e9570bd579597b0fea03a9d8d066cc'
             '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
             '68f7bc12e3b95cb199b71255c6aa5bfaa431fbabbc7d2308e54347c0d35e6d8091c4a79a5a6b56494ab3a294f9389e3ec63902931920862f60b1ffe77222eeeb'
             'df11492df0458b224f75fff31475d39b85116cba6deb06d80d0fd8c467d221db51a2a8f5fc5d2e3e8239c0718e1cf5dc12e99cac9019cb99d3f11835ad00aa5d'
-            'fe9748e0ab326e429f4183016b5aeb772199cd4688371c320811c25f8de2fcb7bc34955b359612c1a287e83b4afaba3b7fd6a6567fad66c04e8482cc802f3b50'
+            'e60d1b213c3689f011490b47ef48d80b1240046585cae7ffe50fd9221350a24ee9c18ecbdee8e7d98d65f4af1a16809d1046f1246590aadaae5bcc5fda58d61b'
             '55b4085900c54fa7e7bf1c2bad7fba8cdbaf496a3f83b6d32fccb8aed5048cdde1690fea0485162dbb637e7fafb00a6b995908fa6db55e77854eb9f575b54d40')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p1 -i ../redis.conf-sane-defaults.patch
-  patch -p1 -i ../redis-5.0-use-system-jemalloc.patch
+  patch -Np1 < ../redis.conf-sane-defaults.patch
+  patch -Np1 < ../redis-5.0-use-system-jemalloc.patch
 }
 
 build() {

Modified: redis.conf-sane-defaults.patch
===================================================================
--- redis.conf-sane-defaults.patch	2020-10-11 14:49:16 UTC (rev 723487)
+++ redis.conf-sane-defaults.patch	2020-10-11 14:49:30 UTC (rev 723488)
@@ -1,7 +1,15 @@
-diff -wbBur redis-3.2.1/redis.conf redis-3.2.1.my/redis.conf
---- redis-3.2.1/redis.conf	2016-06-17 16:15:21.000000000 +0300
-+++ redis-3.2.1.my/redis.conf	2016-06-22 18:06:23.687046141 +0300
-@@ -244,7 +244,7 @@
+--- a/redis.conf	2020-09-10 13:09:00.000000000 +0200
++++ b/redis.conf	2020-10-11 16:29:34.423610442 +0200
+@@ -233,7 +233,7 @@
+ #                        UPSTART_JOB or NOTIFY_SOCKET environment variables
+ # Note: these supervision methods only signal "process is ready."
+ #       They do not enable continuous liveness pings back to your supervisor.
+-supervised no
++supervised systemd
+ 
+ # If a pid file is specified, Redis writes it where specified at startup
+ # and removes it at exit.
+@@ -362,7 +362,7 @@
  # The Append Only File will also be created inside this directory.
  #
  # Note that you must specify a directory here, not a file name.

Modified: redis.service
===================================================================
--- redis.service	2020-10-11 14:49:16 UTC (rev 723487)
+++ redis.service	2020-10-11 14:49:30 UTC (rev 723488)
@@ -3,11 +3,13 @@
 After=network.target
 
 [Service]
-Type=simple
+Type=notify
 User=redis
 Group=redis
 ExecStart=/usr/bin/redis-server /etc/redis.conf
 ExecStop=/usr/bin/redis-cli shutdown
+TimeoutStartSec=60
+TimeoutStopSec=60
 CapabilityBoundingSet=
 PrivateTmp=true
 PrivateDevices=true