main/redis: upgrade to 6.0.1

main/redis/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Eivind Uggedal <eu@eju.no>
 # Maintainer: TBK <alpine@jjtc.eu>
 pkgname=redis
-pkgver=5.0.9
+pkgver=6.0.1
 pkgrel=0
 pkgdesc="Advanced key-value store"
 url="https://redis.io/"
@@ -23,7 +23,6 @@ source="http://download.redis.io/releases/redis-$pkgver.tar.gz
 	$pkgname-sentinel.initd
 	$pkgname.logrotate
 	"
-builddir="$srcdir/$pkgname-$pkgver"
 
 # secfixes:
 #   5.0.8-r0:
@@ -34,8 +33,6 @@ builddir="$srcdir/$pkgname-$pkgver"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
-
 	# Disable broken tests:
 	# integration/logging.tcl is not working because musl does not provide BACKTRACE like glibc
 	# https://github.com/antirez/redis/blob/5.0.4/src/config.h#L64-L67
@@ -44,8 +41,10 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-	case "$CARCH" in mips|mipsel*) _libatomic="-latomic";; esac
+	case "$CARCH" in
+		mips|mipsel*) _libatomic="-latomic";;
+	esac
+
 	make PREFIX=/usr \
 		INSTALL_BIN="$pkgdir"/usr/bin \
 		MALLOC=libc \
@@ -54,13 +53,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make test
 }
 
 package() {
-	cd "$builddir"
-
 	make install PREFIX=/usr INSTALL_BIN="$pkgdir/usr/bin"
 
 	cd "$pkgdir"
@@ -80,9 +76,9 @@ package() {
 		var/log/redis
 }
 
-sha512sums="d2c7bc1f769bc5d179bfe6e71954962813b50597eafc752a9b1edf2fd87e84707b7daf0910db56dd0e89cb3bdb3e551da7f111ae4899f505bac5f77f99744c13  redis-5.0.9.tar.gz
-0bfe894843a0b0b1800c5ff1c570cbc631d0bf94e5911210ae8780f57e661c8a61bb7309181fb8492392747deb340025a5380db168418aaf46b273a8120a4169  makefile-dont-duplicate-binary.patch
-c8a35e3c30be99fef8678acb2502f424bcca478dcc1ef1750f8c8c8e9e9c462f97586159f32ebba84b6a4eb398a9d568e3200241fb0de1f96293c9fdaafb06c9  redis.conf.patch
+sha512sums="bf1312f08433819941a5d64674d989d260930e2f2588e4a7d743950714e565684cfc35866763a66a3aeed2fe6f750c64a759e6227243784acc97975d49b9ecc2  redis-6.0.1.tar.gz
+0a7c165307a01ee89935b160fd38628d9982fc5061fae9a51d80a4932437d9504a53af74be15d0505d0d496d24bbdb6cb45dcf2cf50bddb2d4e34f5cf0fd52c2  makefile-dont-duplicate-binary.patch
+72fcc8d828efe30889c48e9c336e2cdf47c2efd73e7d44eb4bf17972e9f3a1dcea1a01a072eedb0e3c08ad77d3f1ac45249e0f82f4a5f60586a7ede0c840d2f5  redis.conf.patch
 e8cd03ab08b354d7d852cc43719ef537586c024f3911e27f0be052de471d3e6c1af947313ba0b045af3f2212afd41eb0cd4e0464cc6568853cfbfd4718b09fa5  sentinel.conf.patch
 f6dcdad1edd6b5fb6aa28ba774bfc8aba035f316695da261fb2ad291b76f00f177479f9d74434d06c26bd15f131edc9a2f55c9880758cf0987800d2031069738  redis.initd
 6752e99df632b14d62a3266929e80c3d667be5c270e4f34e0dcf2b7f9b1754fe0ce9d4569fa413dbbe207e406ff2848a64e0c47629997536ae1d14ca84ebd56b  redis.confd

main/redis/makefile-dont-duplicate-binary.patch

@@ -4,7 +4,7 @@ See https://github.com/antirez/redis/pull/3494
 
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -307,9 +307,9 @@
+@@ -353,9 +353,9 @@
  	$(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(INSTALL_BIN)
  	$(REDIS_INSTALL) $(REDIS_BENCHMARK_NAME) $(INSTALL_BIN)
  	$(REDIS_INSTALL) $(REDIS_CLI_NAME) $(INSTALL_BIN)

main/redis/redis.conf.patch

@@ -18,7 +18,7 @@ convenient to have it enabled by default.
  
  # Close the connection after a client is idle for N seconds (0 to disable)
  timeout 0
-@@ -131,10 +131,6 @@
+@@ -200,10 +200,6 @@
  
  ################################# GENERAL #####################################
  
@@ -29,7 +29,7 @@ convenient to have it enabled by default.
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
  #   supervised no      - no supervision interaction
-@@ -146,17 +142,6 @@
+@@ -215,17 +211,6 @@
  #       They do not enable continuous liveness pings back to your supervisor.
  supervised no
  
@@ -47,7 +47,7 @@ convenient to have it enabled by default.
  # Specify the server verbosity level.
  # This can be one of:
  # debug (a lot of information, useful for development/testing)
-@@ -168,7 +153,7 @@
+@@ -237,7 +222,7 @@
  # Specify the log file name. Also the empty string can be used to force
  # Redis to log on the standard output. Note that if you use standard
  # output for logging but daemonize, logs will be sent to /dev/null
@@ -56,7 +56,7 @@ convenient to have it enabled by default.
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -191,7 +176,7 @@
+@@ -260,7 +245,7 @@
  #
  # However it is possible to force the pre-4.0 behavior and always show a
  # ASCII art logo in startup logs by setting the following option to yes.
@@ -65,7 +65,7 @@ convenient to have it enabled by default.
  
  ################################ SNAPSHOTTING  ################################
  #
-@@ -260,7 +245,7 @@
+@@ -342,7 +327,7 @@
  # The Append Only File will also be created inside this directory.
  #
  # Note that you must specify a directory here, not a file name.