[arch-commits] Commit in redis/repos/community-x86_64 (14 files)

Andrew Crerar andrewsc at archlinux.org
Sat May 16 19:21:30 UTC 2020


    Date: Saturday, May 16, 2020 @ 19:21:29
  Author: andrewsc
Revision: 628202

archrelease: copy trunk to community-x86_64

Added:
  redis/repos/community-x86_64/PKGBUILD
    (from rev 628201, redis/trunk/PKGBUILD)
  redis/repos/community-x86_64/redis-5.0-use-system-jemalloc.patch
    (from rev 628201, redis/trunk/redis-5.0-use-system-jemalloc.patch)
  redis/repos/community-x86_64/redis.conf-sane-defaults.patch
    (from rev 628201, redis/trunk/redis.conf-sane-defaults.patch)
  redis/repos/community-x86_64/redis.logrotate
    (from rev 628201, redis/trunk/redis.logrotate)
  redis/repos/community-x86_64/redis.service
    (from rev 628201, redis/trunk/redis.service)
  redis/repos/community-x86_64/redis.sysusers
    (from rev 628201, redis/trunk/redis.sysusers)
  redis/repos/community-x86_64/redis.tmpfiles
    (from rev 628201, 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                            |  114 +++++++++++++++++-----------------
 redis-5.0-use-system-jemalloc.patch |   30 ++++----
 redis.conf-sane-defaults.patch      |   24 +++----
 redis.logrotate                     |   10 +-
 redis.service                       |   44 ++++++-------
 redis.sysusers                      |    2 
 redis.tmpfiles                      |    2 
 7 files changed, 113 insertions(+), 113 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-16 19:20:58 UTC (rev 628201)
+++ PKGBUILD	2020-05-16 19:21:29 UTC (rev 628202)
@@ -1,57 +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.1
-pkgrel=1
-pkgdesc='Advanced key-value store'
-arch=('x86_64')
-url='https://redis.io/'
-license=('BSD')
-depends=('jemalloc' 'grep' 'shadow')
-backup=('etc/redis.conf'
-        'etc/logrotate.d/redis')
-source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
-        redis.service
-        redis.sysusers
-        redis.tmpfiles
-        redis.logrotate
-        redis.conf-sane-defaults.patch
-        redis-5.0-use-system-jemalloc.patch)
-sha512sums=('bf1312f08433819941a5d64674d989d260930e2f2588e4a7d743950714e565684cfc35866763a66a3aeed2fe6f750c64a759e6227243784acc97975d49b9ecc2'
-            '86018ddd6625f918295e10f9478da361f73a6dbd6c6b8e4b974201669bcccbd4dba443bb0844be68f6ab8d5a1762b32af04c5e12df53b1f0ea812b790d9f4e37'
-            '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
-            '68f7bc12e3b95cb199b71255c6aa5bfaa431fbabbc7d2308e54347c0d35e6d8091c4a79a5a6b56494ab3a294f9389e3ec63902931920862f60b1ffe77222eeeb'
-            'df11492df0458b224f75fff31475d39b85116cba6deb06d80d0fd8c467d221db51a2a8f5fc5d2e3e8239c0718e1cf5dc12e99cac9019cb99d3f11835ad00aa5d'
-            'fe9748e0ab326e429f4183016b5aeb772199cd4688371c320811c25f8de2fcb7bc34955b359612c1a287e83b4afaba3b7fd6a6567fad66c04e8482cc802f3b50'
-            '55b4085900c54fa7e7bf1c2bad7fba8cdbaf496a3f83b6d32fccb8aed5048cdde1690fea0485162dbb637e7fafb00a6b995908fa6db55e77854eb9f575b54d40')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../redis.conf-sane-defaults.patch
-  patch -p1 -i ../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 628201, redis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-16 19:21:29 UTC (rev 628202)
@@ -0,0 +1,57 @@
+# 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.3
+pkgrel=1
+pkgdesc='Advanced key-value store'
+arch=('x86_64')
+url='https://redis.io/'
+license=('BSD')
+depends=('jemalloc' 'grep' 'shadow')
+backup=('etc/redis.conf'
+        'etc/logrotate.d/redis')
+source=(http://download.redis.io/releases/redis-$pkgver.tar.gz
+        redis.service
+        redis.sysusers
+        redis.tmpfiles
+        redis.logrotate
+        redis.conf-sane-defaults.patch
+        redis-5.0-use-system-jemalloc.patch)
+sha512sums=('88978285db62cb8aa6e27fcd2075bbdb13f2606eaa702491047080bd6396d79d59336f0310d049d88a57e8e7b7096d716f9408b41cc658788a3902627770a807'
+            '86018ddd6625f918295e10f9478da361f73a6dbd6c6b8e4b974201669bcccbd4dba443bb0844be68f6ab8d5a1762b32af04c5e12df53b1f0ea812b790d9f4e37'
+            '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
+            '68f7bc12e3b95cb199b71255c6aa5bfaa431fbabbc7d2308e54347c0d35e6d8091c4a79a5a6b56494ab3a294f9389e3ec63902931920862f60b1ffe77222eeeb'
+            'df11492df0458b224f75fff31475d39b85116cba6deb06d80d0fd8c467d221db51a2a8f5fc5d2e3e8239c0718e1cf5dc12e99cac9019cb99d3f11835ad00aa5d'
+            'fe9748e0ab326e429f4183016b5aeb772199cd4688371c320811c25f8de2fcb7bc34955b359612c1a287e83b4afaba3b7fd6a6567fad66c04e8482cc802f3b50'
+            '55b4085900c54fa7e7bf1c2bad7fba8cdbaf496a3f83b6d32fccb8aed5048cdde1690fea0485162dbb637e7fafb00a6b995908fa6db55e77854eb9f575b54d40')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../redis.conf-sane-defaults.patch
+  patch -p1 -i ../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
+}

Deleted: redis-5.0-use-system-jemalloc.patch
===================================================================
--- redis-5.0-use-system-jemalloc.patch	2020-05-16 19:20:58 UTC (rev 628201)
+++ redis-5.0-use-system-jemalloc.patch	2020-05-16 19:21:29 UTC (rev 628202)
@@ -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 628201, 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-05-16 19:21:29 UTC (rev 628202)
@@ -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-05-16 19:20:58 UTC (rev 628201)
+++ redis.conf-sane-defaults.patch	2020-05-16 19:21:29 UTC (rev 628202)
@@ -1,12 +0,0 @@
-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 @@
- # 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 628201, redis/trunk/redis.conf-sane-defaults.patch)
===================================================================
--- redis.conf-sane-defaults.patch	                        (rev 0)
+++ redis.conf-sane-defaults.patch	2020-05-16 19:21:29 UTC (rev 628202)
@@ -0,0 +1,12 @@
+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 @@
+ # 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-05-16 19:20:58 UTC (rev 628201)
+++ redis.logrotate	2020-05-16 19:21:29 UTC (rev 628202)
@@ -1,5 +0,0 @@
-/var/log/redis.log {
-   notifempty
-   copytruncate
-   missingok
-}

Copied: redis/repos/community-x86_64/redis.logrotate (from rev 628201, redis/trunk/redis.logrotate)
===================================================================
--- redis.logrotate	                        (rev 0)
+++ redis.logrotate	2020-05-16 19:21:29 UTC (rev 628202)
@@ -0,0 +1,5 @@
+/var/log/redis.log {
+   notifempty
+   copytruncate
+   missingok
+}

Deleted: redis.service
===================================================================
--- redis.service	2020-05-16 19:20:58 UTC (rev 628201)
+++ redis.service	2020-05-16 19:21:29 UTC (rev 628202)
@@ -1,22 +0,0 @@
-[Unit]
-Description=Advanced key-value store
-After=network.target
-
-[Service]
-Type=simple
-User=redis
-Group=redis
-ExecStart=/usr/bin/redis-server /etc/redis.conf
-ExecStop=/usr/bin/redis-cli shutdown
-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 628201, redis/trunk/redis.service)
===================================================================
--- redis.service	                        (rev 0)
+++ redis.service	2020-05-16 19:21:29 UTC (rev 628202)
@@ -0,0 +1,22 @@
+[Unit]
+Description=Advanced key-value store
+After=network.target
+
+[Service]
+Type=simple
+User=redis
+Group=redis
+ExecStart=/usr/bin/redis-server /etc/redis.conf
+ExecStop=/usr/bin/redis-cli shutdown
+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-05-16 19:20:58 UTC (rev 628201)
+++ redis.sysusers	2020-05-16 19:21:29 UTC (rev 628202)
@@ -1 +0,0 @@
-u redis - "Redis in-memory data structure store" /var/lib/redis

Copied: redis/repos/community-x86_64/redis.sysusers (from rev 628201, redis/trunk/redis.sysusers)
===================================================================
--- redis.sysusers	                        (rev 0)
+++ redis.sysusers	2020-05-16 19:21:29 UTC (rev 628202)
@@ -0,0 +1 @@
+u redis - "Redis in-memory data structure store" /var/lib/redis

Deleted: redis.tmpfiles
===================================================================
--- redis.tmpfiles	2020-05-16 19:20:58 UTC (rev 628201)
+++ redis.tmpfiles	2020-05-16 19:21:29 UTC (rev 628202)
@@ -1 +0,0 @@
-d /var/lib/redis 0700 redis redis

Copied: redis/repos/community-x86_64/redis.tmpfiles (from rev 628201, redis/trunk/redis.tmpfiles)
===================================================================
--- redis.tmpfiles	                        (rev 0)
+++ redis.tmpfiles	2020-05-16 19:21:29 UTC (rev 628202)
@@ -0,0 +1 @@
+d /var/lib/redis 0700 redis redis


More information about the arch-commits mailing list