[arch-commits] Commit in redis/repos/community-x86_64 (16 files)
Frederik Schwan
freswa at archlinux.org
Mon May 3 20:40:29 UTC 2021
Date: Monday, May 3, 2021 @ 20:40:29
Author: freswa
Revision: 927287
archrelease: copy trunk to community-x86_64
Added:
redis/repos/community-x86_64/PKGBUILD
(from rev 927286, redis/trunk/PKGBUILD)
redis/repos/community-x86_64/redis-5.0-use-system-jemalloc.patch
(from rev 927286, redis/trunk/redis-5.0-use-system-jemalloc.patch)
redis/repos/community-x86_64/redis-sentinel.service
(from rev 927286, redis/trunk/redis-sentinel.service)
redis/repos/community-x86_64/redis.conf-sane-defaults.patch
(from rev 927286, redis/trunk/redis.conf-sane-defaults.patch)
redis/repos/community-x86_64/redis.install
(from rev 927286, redis/trunk/redis.install)
redis/repos/community-x86_64/redis.service
(from rev 927286, redis/trunk/redis.service)
redis/repos/community-x86_64/redis.sysusers
(from rev 927286, redis/trunk/redis.sysusers)
redis/repos/community-x86_64/redis.tmpfiles
(from rev 927286, 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-sentinel.service
redis/repos/community-x86_64/redis.conf-sane-defaults.patch
redis/repos/community-x86_64/redis.install
redis/repos/community-x86_64/redis.service
redis/repos/community-x86_64/redis.sysusers
redis/repos/community-x86_64/redis.tmpfiles
-------------------------------------+
PKGBUILD | 114 +++++++++++++++++-----------------
redis-5.0-use-system-jemalloc.patch | 30 ++++----
redis-sentinel.service | 48 +++++++-------
redis.conf-sane-defaults.patch | 44 ++++++-------
redis.install | 10 +-
redis.service | 46 ++++++-------
redis.sysusers | 2
redis.tmpfiles | 6 -
8 files changed, 150 insertions(+), 150 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-03 20:40:25 UTC (rev 927286)
+++ PKGBUILD 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1,57 +0,0 @@
-# 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.2
-pkgrel=1
-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=('0aa38612173ccf601f6ef6c41f6d4cf997c67b369af07b8a2600f611e992955443bd7ce0b3f42ed80dccfbe16f0c019822b01949a60b4fee63c0747bd693996b'
- '749c5eecfd6cd2ed949302672c20a7972dbef3a4b971ed569eb064362d7f20434b5c39077f665e178394158b5200375bc2e56614682fa08dbf99e868a9b75783'
- '2314c26920f5f0989fb98622f594b621a0b5035525146263da3fdfe640257118e03fc1903c15a62bcd4fbf260e0dcbf9249088292323739a607a11c9630795bf'
- '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
- '6a817024df70213205159de8350c684684d7dbda568c35a0a3d654bab0b91ec62d60b1a2aac6e1ffbe24040df4033b37a77361357834c572759f2d3c76d16ac0'
- '9c43c858270d72cf5251d8226b0113f83c1749ad39b8ba286b7f90f05ad666d62ae7e17dc41a2d0a7bec833d65c98c7a3f12a30a93a28f0b1ab1c5a9e9a04a73'
- '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-x86_64/PKGBUILD (from rev 927286, redis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-03 20:40:29 UTC (rev 927287)
@@ -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.3
+pkgrel=1
+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=('3f39938a93fa3b226b4b4c1286e64299f39a9ff1bdde85ba490edb73e3c7ab32c50f8709f6bc8db9019abad3c6c0ae65ca0a951ca341a868541a088fdeb84454'
+ '749c5eecfd6cd2ed949302672c20a7972dbef3a4b971ed569eb064362d7f20434b5c39077f665e178394158b5200375bc2e56614682fa08dbf99e868a9b75783'
+ '2314c26920f5f0989fb98622f594b621a0b5035525146263da3fdfe640257118e03fc1903c15a62bcd4fbf260e0dcbf9249088292323739a607a11c9630795bf'
+ '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
+ '6a817024df70213205159de8350c684684d7dbda568c35a0a3d654bab0b91ec62d60b1a2aac6e1ffbe24040df4033b37a77361357834c572759f2d3c76d16ac0'
+ '9c43c858270d72cf5251d8226b0113f83c1749ad39b8ba286b7f90f05ad666d62ae7e17dc41a2d0a7bec833d65c98c7a3f12a30a93a28f0b1ab1c5a9e9a04a73'
+ '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
+}
Deleted: redis-5.0-use-system-jemalloc.patch
===================================================================
--- redis-5.0-use-system-jemalloc.patch 2021-05-03 20:40:25 UTC (rev 927286)
+++ redis-5.0-use-system-jemalloc.patch 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1,15 +0,0 @@
-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-x86_64/redis-5.0-use-system-jemalloc.patch (from rev 927286, 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 2021-05-03 20:40:29 UTC (rev 927287)
@@ -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)
Deleted: redis-sentinel.service
===================================================================
--- redis-sentinel.service 2021-05-03 20:40:25 UTC (rev 927286)
+++ redis-sentinel.service 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1,24 +0,0 @@
-[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-x86_64/redis-sentinel.service (from rev 927286, redis/trunk/redis-sentinel.service)
===================================================================
--- redis-sentinel.service (rev 0)
+++ redis-sentinel.service 2021-05-03 20:40:29 UTC (rev 927287)
@@ -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
Deleted: redis.conf-sane-defaults.patch
===================================================================
--- redis.conf-sane-defaults.patch 2021-05-03 20:40:25 UTC (rev 927286)
+++ redis.conf-sane-defaults.patch 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1,22 +0,0 @@
-diff --git a/redis.conf b/redis.conf
-index 465d56fc0..9c1bd1ed1 100644
---- a/redis.conf
-+++ b/redis.conf
-@@ -262,7 +262,7 @@ daemonize no
- # The default is "no". To run under upstart/systemd, you can simply uncomment
- # the line below:
- #
--# supervised auto
-+supervised systemd
-
- # If a pid file is specified, Redis writes it where specified at startup
- # and removes it at exit.
-@@ -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-x86_64/redis.conf-sane-defaults.patch (from rev 927286, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- redis.conf-sane-defaults.patch (rev 0)
+++ redis.conf-sane-defaults.patch 2021-05-03 20:40:29 UTC (rev 927287)
@@ -0,0 +1,22 @@
+diff --git a/redis.conf b/redis.conf
+index 465d56fc0..9c1bd1ed1 100644
+--- a/redis.conf
++++ b/redis.conf
+@@ -262,7 +262,7 @@ daemonize no
+ # The default is "no". To run under upstart/systemd, you can simply uncomment
+ # the line below:
+ #
+-# supervised auto
++supervised systemd
+
+ # If a pid file is specified, Redis writes it where specified at startup
+ # and removes it at exit.
+@@ -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 #################################
+
Deleted: redis.install
===================================================================
--- redis.install 2021-05-03 20:40:25 UTC (rev 927286)
+++ redis.install 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1,5 +0,0 @@
-post_upgrade() {
- echo ""
- echo "Note: The redis config has been moved from /etc/redis.conf to /etc/redis/redis.conf"
- echo ""
-}
Copied: redis/repos/community-x86_64/redis.install (from rev 927286, redis/trunk/redis.install)
===================================================================
--- redis.install (rev 0)
+++ redis.install 2021-05-03 20:40:29 UTC (rev 927287)
@@ -0,0 +1,5 @@
+post_upgrade() {
+ echo ""
+ echo "Note: The redis config has been moved from /etc/redis.conf to /etc/redis/redis.conf"
+ echo ""
+}
Deleted: redis.service
===================================================================
--- redis.service 2021-05-03 20:40:25 UTC (rev 927286)
+++ redis.service 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1,23 +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/redis.conf
-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 927286, redis/trunk/redis.service)
===================================================================
--- redis.service (rev 0)
+++ redis.service 2021-05-03 20:40:29 UTC (rev 927287)
@@ -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
+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 2021-05-03 20:40:25 UTC (rev 927286)
+++ redis.sysusers 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1 +0,0 @@
-u redis - "Redis in-memory data structure store" /var/lib/redis
Copied: redis/repos/community-x86_64/redis.sysusers (from rev 927286, redis/trunk/redis.sysusers)
===================================================================
--- redis.sysusers (rev 0)
+++ redis.sysusers 2021-05-03 20:40:29 UTC (rev 927287)
@@ -0,0 +1 @@
+u redis - "Redis in-memory data structure store" /var/lib/redis
Deleted: redis.tmpfiles
===================================================================
--- redis.tmpfiles 2021-05-03 20:40:25 UTC (rev 927286)
+++ redis.tmpfiles 2021-05-03 20:40:29 UTC (rev 927287)
@@ -1,3 +0,0 @@
-d /var/lib/redis 0700 redis redis
-d /etc/redis 0775 root redis
-f /etc/redis/sentinel.conf 0664 root redis
Copied: redis/repos/community-x86_64/redis.tmpfiles (from rev 927286, redis/trunk/redis.tmpfiles)
===================================================================
--- redis.tmpfiles (rev 0)
+++ redis.tmpfiles 2021-05-03 20:40:29 UTC (rev 927287)
@@ -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