[arch-commits] Commit in redis/repos (9 files)
Frederik Schwan
freswa at gemini.archlinux.org
Tue Feb 22 11:01:59 UTC 2022
Date: Tuesday, February 22, 2022 @ 11:01:59
Author: freswa
Revision: 1135852
archrelease: copy trunk to community-testing-x86_64
Added:
redis/repos/community-testing-x86_64/
redis/repos/community-testing-x86_64/PKGBUILD
(from rev 1135851, redis/trunk/PKGBUILD)
redis/repos/community-testing-x86_64/redis-5.0-use-system-jemalloc.patch
(from rev 1135851, redis/trunk/redis-5.0-use-system-jemalloc.patch)
redis/repos/community-testing-x86_64/redis-sentinel.service
(from rev 1135851, redis/trunk/redis-sentinel.service)
redis/repos/community-testing-x86_64/redis.conf-sane-defaults.patch
(from rev 1135851, redis/trunk/redis.conf-sane-defaults.patch)
redis/repos/community-testing-x86_64/redis.install
(from rev 1135851, redis/trunk/redis.install)
redis/repos/community-testing-x86_64/redis.service
(from rev 1135851, redis/trunk/redis.service)
redis/repos/community-testing-x86_64/redis.sysusers
(from rev 1135851, redis/trunk/redis.sysusers)
redis/repos/community-testing-x86_64/redis.tmpfiles
(from rev 1135851, redis/trunk/redis.tmpfiles)
-------------------------------------+
PKGBUILD | 57 ++++++++++++++++++++++++++++++++++
redis-5.0-use-system-jemalloc.patch | 15 ++++++++
redis-sentinel.service | 24 ++++++++++++++
redis.conf-sane-defaults.patch | 13 +++++++
redis.install | 7 ++++
redis.service | 23 +++++++++++++
redis.sysusers | 1
redis.tmpfiles | 3 +
8 files changed, 143 insertions(+)
Copied: redis/repos/community-testing-x86_64/PKGBUILD (from rev 1135851, redis/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1,57 @@
+# 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.2.6
+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' 'openssl')
+backup=('etc/redis/redis.conf'
+ 'etc/redis/sentinel.conf')
+install=redis.install
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/redis/redis/archive/${pkgver}.tar.gz"
+ redis.service
+ redis-sentinel.service
+ redis.sysusers
+ redis.tmpfiles
+ redis.conf-sane-defaults.patch
+ redis-5.0-use-system-jemalloc.patch)
+sha512sums=('33dccbc511916ceb6793b0ba74f9639a2b3cf90334dc4a44a78256aa651cd60d12f848ab425f2ca6c64c138159657c3eadc600f49ce2dc6a8b444943491706c1'
+ '8abf27f173a4532295dafd91b8e6e226e4376f1b2543c911e4fa60466d50523ada4dcfe520a738fd756c5725f4319153a0c0b26f6cdba234775114c72e4e7865'
+ '2314c26920f5f0989fb98622f594b621a0b5035525146263da3fdfe640257118e03fc1903c15a62bcd4fbf260e0dcbf9249088292323739a607a11c9630795bf'
+ '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
+ '6a817024df70213205159de8350c684684d7dbda568c35a0a3d654bab0b91ec62d60b1a2aac6e1ffbe24040df4033b37a77361357834c572759f2d3c76d16ac0'
+ 'f45b5d20769159faeeb705e1bb9e4fdc3d74c0779b476cada829bfb49014c6ba6cd78d1d2751bf39acb6db4528281e9cab3aca684cadf687eb5fad10c7453154'
+ '0acb08a6e0eaba239db7461bcfeddfbe0c1aaa517dc33c3918c9e991a1d5067cfe135b7f75085caade8c3ababd51ec9cefcc4120f57818bea1f7029a548a7732')
+
+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 -t "$pkgdir"/etc/redis redis.conf sentinel.conf
+ install -Dm644 -t "$pkgdir"/usr/lib/systemd/system/ ../redis.service ../redis-sentinel.service
+ 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-testing-x86_64/redis-5.0-use-system-jemalloc.patch (from rev 1135851, redis/trunk/redis-5.0-use-system-jemalloc.patch)
===================================================================
--- community-testing-x86_64/redis-5.0-use-system-jemalloc.patch (rev 0)
+++ community-testing-x86_64/redis-5.0-use-system-jemalloc.patch 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile b/src/Makefile
+index 3bc9f11c0..a4b23d986 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -229,8 +229,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
+
+ ifeq ($(BUILD_TLS),yes)
Copied: redis/repos/community-testing-x86_64/redis-sentinel.service (from rev 1135851, redis/trunk/redis-sentinel.service)
===================================================================
--- community-testing-x86_64/redis-sentinel.service (rev 0)
+++ community-testing-x86_64/redis-sentinel.service 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1,24 @@
+[Unit]
+Description=High availability daemon for Redis
+After=network.target
+
+[Service]
+Type=notify
+User=redis
+Group=redis
+ExecStart=/usr/bin/redis-sentinel /etc/redis/sentinel.conf --supervised systemd
+TimeoutStartSec=60
+TimeoutStopSec=60
+CapabilityBoundingSet=
+PrivateTmp=true
+PrivateDevices=true
+ProtectSystem=full
+ProtectHome=true
+ReadWritePaths=/etc/redis/
+NoNewPrivileges=true
+RuntimeDirectory=redis
+RuntimeDirectoryMode=755
+LimitNOFILE=10032
+
+[Install]
+WantedBy=multi-user.target
Copied: redis/repos/community-testing-x86_64/redis.conf-sane-defaults.patch (from rev 1135851, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- community-testing-x86_64/redis.conf-sane-defaults.patch (rev 0)
+++ community-testing-x86_64/redis.conf-sane-defaults.patch 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1,13 @@
+diff --git a/redis.conf b/redis.conf
+index 465d56fc0..9c1bd1ed1 100644
+--- a/redis.conf
++++ b/redis.conf
+@@ -441,7 +441,7 @@ rdb-del-sync-files no
+ # 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-testing-x86_64/redis.install (from rev 1135851, redis/trunk/redis.install)
===================================================================
--- community-testing-x86_64/redis.install (rev 0)
+++ community-testing-x86_64/redis.install 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1,7 @@
+post_upgrade() {
+ if (( $(vercmp $2 6.2.1-2) < 0 )); then
+ echo ""
+ echo "Note: The redis config has been moved from /etc/redis.conf to /etc/redis/redis.conf"
+ echo ""
+ fi
+}
Copied: redis/repos/community-testing-x86_64/redis.service (from rev 1135851, redis/trunk/redis.service)
===================================================================
--- community-testing-x86_64/redis.service (rev 0)
+++ community-testing-x86_64/redis.service 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1,23 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+Type=notify
+User=redis
+Group=redis
+ExecStart=/usr/bin/redis-server /etc/redis/redis.conf --supervised systemd
+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-testing-x86_64/redis.sysusers (from rev 1135851, redis/trunk/redis.sysusers)
===================================================================
--- community-testing-x86_64/redis.sysusers (rev 0)
+++ community-testing-x86_64/redis.sysusers 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1 @@
+u redis - "Redis in-memory data structure store" /var/lib/redis
Copied: redis/repos/community-testing-x86_64/redis.tmpfiles (from rev 1135851, redis/trunk/redis.tmpfiles)
===================================================================
--- community-testing-x86_64/redis.tmpfiles (rev 0)
+++ community-testing-x86_64/redis.tmpfiles 2022-02-22 11:01:59 UTC (rev 1135852)
@@ -0,0 +1,3 @@
+d /var/lib/redis 0700 redis redis
+d /etc/redis 0775 root redis
+f /etc/redis/sentinel.conf 0664 root redis
More information about the arch-commits
mailing list