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

[Andrew Crerar]

    Date: Monday, February 22, 2021 @ 22:13:17
  Author: andrewsc
Revision: 869115

upgpkg: redis 6.2.0-1

Modified:
  redis/trunk/PKGBUILD
  redis/trunk/redis-5.0-use-system-jemalloc.patch
  redis/trunk/redis.conf-sane-defaults.patch

-------------------------------------+
 PKGBUILD                            |    8 ++++----
 redis-5.0-use-system-jemalloc.patch |    6 +++---
 redis.conf-sane-defaults.patch      |   18 ++++++++++--------
 3 files changed, 17 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-22 22:12:35 UTC (rev 869114)
+++ PKGBUILD	2021-02-22 22:13:17 UTC (rev 869115)
@@ -6,7 +6,7 @@
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=6.0.10
+pkgver=6.2.0
 pkgrel=1
 pkgdesc='An in-memory database that persists on disk'
 arch=('x86_64')
@@ -24,13 +24,13 @@
         redis.logrotate
         redis.conf-sane-defaults.patch
         redis-5.0-use-system-jemalloc.patch)
-sha512sums=('bcbe29855c39d9d882e5824906c2772a74a7ed1f6904c4c18290f262e6261637b40e9614c2dacdd94261af2a1fbb2c798943ec9b5f2e4aa4d8c567f2604bcea2'
+sha512sums=('5fdc8d2e16df1fe3ea0548b0a24d86e27871f6419431920dd9d40e70e9763d9fcaa0128c89d7192d87212913f052fdee19250b493ee1f2db9448898493df5a22'
             '78c996636fc3f4d404a01fbbc63978ee4c3bce9bc7f5728e8ca14b013cabc7df73ff882ec7f4a2e0b5494faf0d1da5a3c5e9570bd579597b0fea03a9d8d066cc'
             '2227dfb41bf5112f91716f011862ba5fade220aea3b6a8134a5a05ee3af6d1cca05b08d793a486be97df98780bf43ac5dc4e5e9989ae0c5cd4e1eedb6cee5d71'
             '68f7bc12e3b95cb199b71255c6aa5bfaa431fbabbc7d2308e54347c0d35e6d8091c4a79a5a6b56494ab3a294f9389e3ec63902931920862f60b1ffe77222eeeb'
             'df11492df0458b224f75fff31475d39b85116cba6deb06d80d0fd8c467d221db51a2a8f5fc5d2e3e8239c0718e1cf5dc12e99cac9019cb99d3f11835ad00aa5d'
-            'c940920942abedd394777d380f7ecc1b3b3dc185908ac592a8db5bed744ef6f4401d2ea5f54890a9e27b12fe18fdff94ce86b46258cb37267f3e9d60c97cac69'
-            '55b4085900c54fa7e7bf1c2bad7fba8cdbaf496a3f83b6d32fccb8aed5048cdde1690fea0485162dbb637e7fafb00a6b995908fa6db55e77854eb9f575b54d40')
+            '9c43c858270d72cf5251d8226b0113f83c1749ad39b8ba286b7f90f05ad666d62ae7e17dc41a2d0a7bec833d65c98c7a3f12a30a93a28f0b1ab1c5a9e9a04a73'
+            '0acb08a6e0eaba239db7461bcfeddfbe0c1aaa517dc33c3918c9e991a1d5067cfe135b7f75085caade8c3ababd51ec9cefcc4120f57818bea1f7029a548a7732')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: redis-5.0-use-system-jemalloc.patch
===================================================================
--- redis-5.0-use-system-jemalloc.patch	2021-02-22 22:12:35 UTC (rev 869114)
+++ redis-5.0-use-system-jemalloc.patch	2021-02-22 22:13:17 UTC (rev 869115)
@@ -1,8 +1,8 @@
 diff --git a/src/Makefile b/src/Makefile
-index 912cbc19..6840ce08 100644
+index 3bc9f11c0..a4b23d986 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -125,8 +125,8 @@ endif
+@@ -229,8 +229,8 @@ endif
  
  ifeq ($(MALLOC),jemalloc)
  	DEPENDENCY_TARGETS+= jemalloc
@@ -12,4 +12,4 @@
 +	FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
  endif
  
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
+ ifeq ($(BUILD_TLS),yes)

Modified: redis.conf-sane-defaults.patch
===================================================================
--- redis.conf-sane-defaults.patch	2021-02-22 22:12:35 UTC (rev 869114)
+++ redis.conf-sane-defaults.patch	2021-02-22 22:13:17 UTC (rev 869115)
@@ -1,15 +1,17 @@
---- a/redis.conf	2020-10-27 14:50:41.137789753 +0100
-+++ b/redis.conf	2020-10-27 14:50:46.161211877 +0100
-@@ -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 pings back to your supervisor.
--supervised no
+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.
-@@ -362,7 +362,7 @@
+@@ -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.