[arch-commits] Commit in redis/repos/community-x86_64 (14 files)
Andrew Crerar
andrewsc at archlinux.org
Tue Oct 13 14:34:18 UTC 2020
Date: Tuesday, October 13, 2020 @ 14:34:17
Author: andrewsc
Revision: 723824
archrelease: copy trunk to community-x86_64
Added:
redis/repos/community-x86_64/PKGBUILD
(from rev 723823, redis/trunk/PKGBUILD)
redis/repos/community-x86_64/redis-5.0-use-system-jemalloc.patch
(from rev 723823, redis/trunk/redis-5.0-use-system-jemalloc.patch)
redis/repos/community-x86_64/redis.conf-sane-defaults.patch
(from rev 723823, redis/trunk/redis.conf-sane-defaults.patch)
redis/repos/community-x86_64/redis.logrotate
(from rev 723823, redis/trunk/redis.logrotate)
redis/repos/community-x86_64/redis.service
(from rev 723823, redis/trunk/redis.service)
redis/repos/community-x86_64/redis.sysusers
(from rev 723823, redis/trunk/redis.sysusers)
redis/repos/community-x86_64/redis.tmpfiles
(from rev 723823, redis/trunk/redis.tmpfiles)
Deleted:
redis/repos/community-x86_64/PKGBUILD
redis/repos/community-x86_64/redis-5.0-use-system-jemalloc.patch
redis/repos/community-x86_64/redis.conf-sane-defaults.patch
redis/repos/community-x86_64/redis.logrotate
redis/repos/community-x86_64/redis.service
redis/repos/community-x86_64/redis.sysusers
redis/repos/community-x86_64/redis.tmpfiles
-------------------------------------+
PKGBUILD | 122 +++++++++++++++++-----------------
redis-5.0-use-system-jemalloc.patch | 30 ++++----
redis.conf-sane-defaults.patch | 40 +++++------
redis.logrotate | 10 +-
redis.service | 48 ++++++-------
redis.sysusers | 2
redis.tmpfiles | 2
7 files changed, 128 insertions(+), 126 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-13 14:33:38 UTC (rev 723823)
+++ PKGBUILD 2020-10-13 14:34:17 UTC (rev 723824)
@@ -1,60 +0,0 @@
-# Maintainer: Andrew Crerar <crerar at archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Jan-Erik Rediger <badboy at archlinux dot us>
-# Contributor: nofxx <x@<nick>.com>
-
-pkgname=redis
-pkgver=6.0.8
-pkgrel=2
-pkgdesc='An in-memory database that persists on disk'
-arch=('x86_64')
-url='https://redis.io/'
-license=('BSD')
-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"
- redis.service
- redis.sysusers
- redis.tmpfiles
- redis.logrotate
- redis.conf-sane-defaults.patch
- redis-5.0-use-system-jemalloc.patch)
-sha512sums=('792b2a21a123be82aa0b70f74f275ec12cdfe72bd34f0889fb9570efbf1f41ee0d9dc21400464321bdccb5fbe1dc5082ab08854f18e10a97135dd5fe92b5d798'
- '78c996636fc3f4d404a01fbbc63978ee4c3bce9bc7f5728e8ca14b013cabc7df73ff882ec7f4a2e0b5494faf0d1da5a3c5e9570bd579597b0fea03a9d8d066cc'
- '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
- '68f7bc12e3b95cb199b71255c6aa5bfaa431fbabbc7d2308e54347c0d35e6d8091c4a79a5a6b56494ab3a294f9389e3ec63902931920862f60b1ffe77222eeeb'
- 'df11492df0458b224f75fff31475d39b85116cba6deb06d80d0fd8c467d221db51a2a8f5fc5d2e3e8239c0718e1cf5dc12e99cac9019cb99d3f11835ad00aa5d'
- 'e60d1b213c3689f011490b47ef48d80b1240046585cae7ffe50fd9221350a24ee9c18ecbdee8e7d98d65f4af1a16809d1046f1246590aadaae5bcc5fda58d61b'
- '55b4085900c54fa7e7bf1c2bad7fba8cdbaf496a3f83b6d32fccb8aed5048cdde1690fea0485162dbb637e7fafb00a6b995908fa6db55e77854eb9f575b54d40')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -Np1 < ../redis.conf-sane-defaults.patch
- patch -Np1 < ../redis-5.0-use-system-jemalloc.patch
-}
-
-build() {
- make -C $pkgname-$pkgver
-}
-
-package() {
- cd $pkgname-$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
-
- # 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 "$srcdir"/redis.sysusers "$pkgdir"/usr/lib/sysusers.d/redis.conf
- install -Dm644 "$srcdir"/redis.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/redis.conf
-}
Copied: redis/repos/community-x86_64/PKGBUILD (from rev 723823, redis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-10-13 14:34:17 UTC (rev 723824)
@@ -0,0 +1,62 @@
+# Maintainer: Andrew Crerar <crerar at archlinux.org>
+# Maintainer: Frederik Schwan <freswa at archlinux dot org>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Jan-Erik Rediger <badboy at archlinux dot us>
+# Contributor: nofxx <x@<nick>.com>
+
+pkgname=redis
+pkgver=6.0.8
+pkgrel=3
+pkgdesc='An in-memory database that persists on disk'
+arch=('x86_64')
+url='https://redis.io/'
+license=('BSD')
+depends=('jemalloc' 'grep' 'shadow' 'systemd-libs')
+# pkg-config fails to detect systemd libraries if systemd is not installed
+makedepends=('systemd' 'openssl')
+backup=('etc/redis.conf'
+ 'etc/logrotate.d/redis')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/antirez/redis/archive/${pkgver}.tar.gz"
+ redis.service
+ redis.sysusers
+ redis.tmpfiles
+ redis.logrotate
+ redis.conf-sane-defaults.patch
+ redis-5.0-use-system-jemalloc.patch)
+sha512sums=('792b2a21a123be82aa0b70f74f275ec12cdfe72bd34f0889fb9570efbf1f41ee0d9dc21400464321bdccb5fbe1dc5082ab08854f18e10a97135dd5fe92b5d798'
+ '78c996636fc3f4d404a01fbbc63978ee4c3bce9bc7f5728e8ca14b013cabc7df73ff882ec7f4a2e0b5494faf0d1da5a3c5e9570bd579597b0fea03a9d8d066cc'
+ '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
+ '68f7bc12e3b95cb199b71255c6aa5bfaa431fbabbc7d2308e54347c0d35e6d8091c4a79a5a6b56494ab3a294f9389e3ec63902931920862f60b1ffe77222eeeb'
+ 'df11492df0458b224f75fff31475d39b85116cba6deb06d80d0fd8c467d221db51a2a8f5fc5d2e3e8239c0718e1cf5dc12e99cac9019cb99d3f11835ad00aa5d'
+ 'e60d1b213c3689f011490b47ef48d80b1240046585cae7ffe50fd9221350a24ee9c18ecbdee8e7d98d65f4af1a16809d1046f1246590aadaae5bcc5fda58d61b'
+ '55b4085900c54fa7e7bf1c2bad7fba8cdbaf496a3f83b6d32fccb8aed5048cdde1690fea0485162dbb637e7fafb00a6b995908fa6db55e77854eb9f575b54d40')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 < ../redis.conf-sane-defaults.patch
+ patch -Np1 < ../redis-5.0-use-system-jemalloc.patch
+}
+
+build() {
+ make BUILD_TLS=yes \
+ USE_SYSTEMD=yes \
+ -C $pkgname-$pkgver
+}
+
+package() {
+ cd $pkgname-$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
+
+ # 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 "$srcdir"/redis.sysusers "$pkgdir"/usr/lib/sysusers.d/redis.conf
+ install -Dm644 "$srcdir"/redis.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/redis.conf
+}
Deleted: redis-5.0-use-system-jemalloc.patch
===================================================================
--- redis-5.0-use-system-jemalloc.patch 2020-10-13 14:33:38 UTC (rev 723823)
+++ redis-5.0-use-system-jemalloc.patch 2020-10-13 14:34:17 UTC (rev 723824)
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 912cbc19..6840ce08 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -125,8 +125,8 @@ endif
-
- ifeq ($(MALLOC),jemalloc)
- DEPENDENCY_TARGETS+= jemalloc
-- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
-- FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
-+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
-+ FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
- endif
-
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
Copied: redis/repos/community-x86_64/redis-5.0-use-system-jemalloc.patch (from rev 723823, redis/trunk/redis-5.0-use-system-jemalloc.patch)
===================================================================
--- redis-5.0-use-system-jemalloc.patch (rev 0)
+++ redis-5.0-use-system-jemalloc.patch 2020-10-13 14:34:17 UTC (rev 723824)
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile b/src/Makefile
+index 912cbc19..6840ce08 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -125,8 +125,8 @@ endif
+
+ ifeq ($(MALLOC),jemalloc)
+ DEPENDENCY_TARGETS+= jemalloc
+- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
+- FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
++ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include/jemalloc
++ FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
+ endif
+
+ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
Deleted: redis.conf-sane-defaults.patch
===================================================================
--- redis.conf-sane-defaults.patch 2020-10-13 14:33:38 UTC (rev 723823)
+++ redis.conf-sane-defaults.patch 2020-10-13 14:34:17 UTC (rev 723824)
@@ -1,20 +0,0 @@
---- 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.
--dir ./
-+dir /var/lib/redis/
-
- ################################# REPLICATION #################################
-
Copied: redis/repos/community-x86_64/redis.conf-sane-defaults.patch (from rev 723823, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- redis.conf-sane-defaults.patch (rev 0)
+++ redis.conf-sane-defaults.patch 2020-10-13 14:34:17 UTC (rev 723824)
@@ -0,0 +1,20 @@
+--- 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.
+-dir ./
++dir /var/lib/redis/
+
+ ################################# REPLICATION #################################
+
Deleted: redis.logrotate
===================================================================
--- redis.logrotate 2020-10-13 14:33:38 UTC (rev 723823)
+++ redis.logrotate 2020-10-13 14:34:17 UTC (rev 723824)
@@ -1,5 +0,0 @@
-/var/log/redis.log {
- notifempty
- copytruncate
- missingok
-}
Copied: redis/repos/community-x86_64/redis.logrotate (from rev 723823, redis/trunk/redis.logrotate)
===================================================================
--- redis.logrotate (rev 0)
+++ redis.logrotate 2020-10-13 14:34:17 UTC (rev 723824)
@@ -0,0 +1,5 @@
+/var/log/redis.log {
+ notifempty
+ copytruncate
+ missingok
+}
Deleted: redis.service
===================================================================
--- redis.service 2020-10-13 14:33:38 UTC (rev 723823)
+++ redis.service 2020-10-13 14:34:17 UTC (rev 723824)
@@ -1,24 +0,0 @@
-[Unit]
-Description=Advanced key-value store
-After=network.target
-
-[Service]
-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
-ProtectSystem=full
-ProtectHome=true
-NoNewPrivileges=true
-RuntimeDirectory=redis
-RuntimeDirectoryMode=755
-LimitNOFILE=10032
-
-[Install]
-WantedBy=multi-user.target
Copied: redis/repos/community-x86_64/redis.service (from rev 723823, redis/trunk/redis.service)
===================================================================
--- redis.service (rev 0)
+++ redis.service 2020-10-13 14:34:17 UTC (rev 723824)
@@ -0,0 +1,24 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+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
+ProtectSystem=full
+ProtectHome=true
+NoNewPrivileges=true
+RuntimeDirectory=redis
+RuntimeDirectoryMode=755
+LimitNOFILE=10032
+
+[Install]
+WantedBy=multi-user.target
Deleted: redis.sysusers
===================================================================
--- redis.sysusers 2020-10-13 14:33:38 UTC (rev 723823)
+++ redis.sysusers 2020-10-13 14:34:17 UTC (rev 723824)
@@ -1 +0,0 @@
-u redis - "Redis in-memory data structure store" /var/lib/redis
Copied: redis/repos/community-x86_64/redis.sysusers (from rev 723823, redis/trunk/redis.sysusers)
===================================================================
--- redis.sysusers (rev 0)
+++ redis.sysusers 2020-10-13 14:34:17 UTC (rev 723824)
@@ -0,0 +1 @@
+u redis - "Redis in-memory data structure store" /var/lib/redis
Deleted: redis.tmpfiles
===================================================================
--- redis.tmpfiles 2020-10-13 14:33:38 UTC (rev 723823)
+++ redis.tmpfiles 2020-10-13 14:34:17 UTC (rev 723824)
@@ -1 +0,0 @@
-d /var/lib/redis 0700 redis redis
Copied: redis/repos/community-x86_64/redis.tmpfiles (from rev 723823, redis/trunk/redis.tmpfiles)
===================================================================
--- redis.tmpfiles (rev 0)
+++ redis.tmpfiles 2020-10-13 14:34:17 UTC (rev 723824)
@@ -0,0 +1 @@
+d /var/lib/redis 0700 redis redis
More information about the arch-commits
mailing list