redis: update to 6.2.2

packages/redis/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://redis.io/
 TERMUX_PKG_DESCRIPTION="In-memory data structure store used as a database, cache and message broker"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=6.0.10
+TERMUX_PKG_VERSION=6.2.2
 TERMUX_PKG_SRCURL=http://download.redis.io/releases/redis-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=79bbb894f9dceb33ca699ee3ca4a4e1228be7fb5547aeb2f99d921e86c1285bd
+TERMUX_PKG_SHA256=7a260bb74860f1b88c3d5942bf8ba60ca59f121c6dce42d3017bed6add0b9535
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_CONFFILES="etc/redis.conf"
 

packages/redis/config.h.patch

@@ -1,11 +0,0 @@
---- ../../build/redis/cache/redis-3.2.8/src/config.h	2017-02-12 16:14:57.000000000 +0100
-+++ ./src/config.h	2017-03-02 22:42:23.207883845 +0100
-@@ -96,7 +96,7 @@
- 
- /* Define rdb_fsync_range to sync_file_range() on Linux, otherwise we use
-  * the plain fsync() call. */
--#ifdef __linux__
-+#ifdef __android__
- #if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
- #if (LINUX_VERSION_CODE >= 0x020611 && __GLIBC_PREREQ(2, 6))
- #define HAVE_SYNC_FILE_RANGE 1

packages/redis/pthread_cancel.patch

@@ -0,0 +1,11 @@
+--- ./src/debug.c.orig	2021-05-01 14:39:04.609215050 +0000
++++ ./src/debug.c	2021-05-01 14:39:20.555895312 +0000
+@@ -1706,7 +1706,7 @@
+ 
+ static void killMainThread(void) {
+     int err;
+-    if (pthread_self() != server.main_thread_id && pthread_cancel(server.main_thread_id) == 0) {
++    if (pthread_self() != server.main_thread_id && pthread_kill(server.main_thread_id, 0) == 0) {
+         if ((err = pthread_join(server.main_thread_id,NULL)) != 0) {
+             serverLog(LL_WARNING, "main thread can not be joined: %s", strerror(err));
+         } else {

packages/redis/redis.conf.patch

@@ -1,7 +1,6 @@
-diff -uNr redis-6.0.1/redis.conf redis-6.0.1.mod/redis.conf
---- redis-6.0.1/redis.conf	2020-05-02 01:10:20.000000000 +0300
-+++ redis-6.0.1.mod/redis.conf	2020-05-13 12:33:02.474191557 +0300
-@@ -98,7 +98,7 @@
+--- ./redis.conf.orig	2021-04-20 05:03:58.000000000 +0000
++++ ./redis.conf	2021-05-01 14:31:20.199960661 +0000
+@@ -104,7 +104,7 @@
  # will silently truncate it to the value of /proc/sys/net/core/somaxconn so
  # make sure to raise both the value of somaxconn and tcp_max_syn_backlog
  # in order to get the desired effect.
@@ -10,16 +9,16 @@ diff -uNr redis-6.0.1/redis.conf redis-6.0.1.mod/redis.conf
  
  # Unix socket.
  #
-@@ -201,7 +201,7 @@
+@@ -252,7 +252,7 @@
  ################################# GENERAL #####################################
  
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
 -# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
 +# Note that Redis will write a pid file in @TERMUX_PREFIX@/var/run/redis.pid when daemonized.
+ # When Redis is supervised by upstart or systemd, this parameter has no impact.
  daemonize no
  
- # If you run Redis from upstart or systemd, Redis can interact with your
-@@ -220,11 +220,11 @@
+@@ -279,14 +279,14 @@
  #
  # When the server runs non daemonized, no pid file is created if none is
  # specified in the configuration. When the server is daemonized, the pid file
@@ -28,12 +27,15 @@ diff -uNr redis-6.0.1/redis.conf redis-6.0.1.mod/redis.conf
  #
  # Creating a pid file is best effort: if Redis is not able to create it
  # nothing bad happens, the server will start and run normally.
+ #
+ # Note that on modern Linux systems "/run/redis.pid" is more conforming
+ # and should be used instead.
 -pidfile /var/run/redis_6379.pid
 +pidfile @TERMUX_PREFIX@/var/run/redis_6379.pid
  
  # Specify the server verbosity level.
  # This can be one of:
-@@ -797,7 +797,7 @@
+@@ -949,7 +949,7 @@
  ################################### CLIENTS ####################################
  
  # Set the max number of connected clients at the same time. By default
@@ -42,9 +44,9 @@ diff -uNr redis-6.0.1/redis.conf redis-6.0.1.mod/redis.conf
  # able to configure the process file limit to allow for the specified limit
  # the max number of allowed clients is set to the current file limit
  # minus 32 (as Redis reserves a few file descriptors for internal uses).
-@@ -805,7 +805,7 @@
- # Once the limit is reached Redis will close all the new connections sending
- # an error 'max number of clients reached'.
+@@ -962,7 +962,7 @@
+ # connections, one incoming and another outgoing. It is important to size the
+ # limit accordingly in case of very large clusters.
  #
 -# maxclients 10000
 +# maxclients 512

packages/redis/setproctitle.patch

@@ -0,0 +1,11 @@
+--- ./src/setproctitle.c.orig	2021-05-01 14:35:04.385944179 +0000
++++ ./src/setproctitle.c	2021-05-01 14:36:32.979189534 +0000
+@@ -232,7 +232,7 @@
+ 	if (!(SPT.arg0 = strdup(argv[0])))
+ 		goto syerr;
+ 
+-#if __linux__
++#if defined(__linux__) && !defined(__ANDROID__)
+ 	if (!(tmp = strdup(program_invocation_name)))
+ 		goto syerr;
+