Commit 9a668cd3 authored by Alexander A. Klimov's avatar Alexander A. Klimov 😎
Browse files

Update to 6.0.9

parent a6f0d900
Pipeline #15051 passed with stages
in 4 minutes and 26 seconds
Index: redis-6.0.1/src/debug.c
===================================================================
--- redis-6.0.1.orig/src/debug.c
+++ redis-6.0.1/src/debug.c
@@ -919,6 +919,8 @@ static void *getMcontextEip(ucontext_t *
return (void*) uc->uc_mcontext.arm_pc;
#elif defined(__aarch64__) /* Linux AArch64 */
return (void*) uc->uc_mcontext.pc;
+ #else
+ return NULL;
#endif
#elif defined(__FreeBSD__)
/* FreeBSD */
...@@ -4,20 +4,41 @@ Date: Wed Nov 20 13:20:51 2019 +0100 ...@@ -4,20 +4,41 @@ Date: Wed Nov 20 13:20:51 2019 +0100
Change default server port for icinga-redis Change default server port for icinga-redis
diff --git a/redis.conf b/redis.conf diff --git a/redis.conf b/redis.conf
index d74ff98..becbb52 100644 index ab0a30cbd..d8e51f8ba 100644
--- a/redis.conf --- a/redis.conf
+++ b/redis.conf +++ b/redis.conf
@@ -89,7 +89,7 @@ protected-mode yes @@ -86,9 +86,9 @@ bind 127.0.0.1
# are explicitly listed using the "bind" directive.
protected-mode yes
# Accept connections on the specified port, default is 6379 (IANA #815344). -# Accept connections on the specified port, default is 6379 (IANA #815344).
+# Accept connections on the specified port, default is 6380.
# If port 0 is specified Redis will not listen on a TCP socket. # If port 0 is specified Redis will not listen on a TCP socket.
-port 6379 -port 6379
+port 6380 +port 6380
# TCP listen() backlog. # TCP listen() backlog.
# #
@@ -135,7 +135,7 @@ tcp-keepalive 300
# default port, use:
#
# port 0
-# tls-port 6379
+# tls-port 6380
# Configure a X.509 certificate and private key to use for authenticating the
# server to connected clients, masters or cluster peers. These files should be
@@ -155,7 +155,7 @@ supervised no
#
# 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.
-pidfile /var/run/redis/default.pid
+pidfile /var/run/redis_6380.pid
# Specify the server verbosity level.
# This can be one of:
diff --git a/sentinel.conf b/sentinel.conf diff --git a/sentinel.conf b/sentinel.conf
index bc9a705..e738713 100644 index b6ff05f25..2d86376fd 100644
--- a/sentinel.conf --- a/sentinel.conf
+++ b/sentinel.conf +++ b/sentinel.conf
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
...@@ -38,11 +59,24 @@ index bc9a705..e738713 100644 ...@@ -38,11 +59,24 @@ index bc9a705..e738713 100644
# sentinel auth-pass <master-name> <password> # sentinel auth-pass <master-name> <password>
# #
diff --git a/src/config.c b/src/config.c
index 4a956d698..bd3100db6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2316,7 +2316,7 @@ standardConfig configs[] = {
/* Integer configs */
createIntConfig("databases", NULL, IMMUTABLE_CONFIG, 1, INT_MAX, server.dbnum, 16, INTEGER_CONFIG, NULL, NULL),
- createIntConfig("port", NULL, IMMUTABLE_CONFIG, 0, 65535, server.port, 6379, INTEGER_CONFIG, NULL, NULL), /* TCP port. */
+ createIntConfig("port", NULL, IMMUTABLE_CONFIG, 0, 65535, server.port, 6380, INTEGER_CONFIG, NULL, NULL), /* TCP port. */
createIntConfig("io-threads", NULL, IMMUTABLE_CONFIG, 1, 128, server.io_threads_num, 1, INTEGER_CONFIG, NULL, NULL), /* Single threaded by default */
createIntConfig("auto-aof-rewrite-percentage", NULL, MODIFIABLE_CONFIG, 0, INT_MAX, server.aof_rewrite_perc, 100, INTEGER_CONFIG, NULL, NULL),
createIntConfig("cluster-replica-validity-factor", "cluster-slave-validity-factor", MODIFIABLE_CONFIG, 0, INT_MAX, server.cluster_slave_validity_factor, 10, INTEGER_CONFIG, NULL, NULL), /* Slave max data age factor. */
diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
index d30879d..fa8d4fe 100644 index 9d9c15e00..ff72dc92b 100644
--- a/src/redis-benchmark.c --- a/src/redis-benchmark.c
+++ b/src/redis-benchmark.c +++ b/src/redis-benchmark.c
@@ -567,7 +567,7 @@ usage: @@ -1421,7 +1421,7 @@ usage:
printf( printf(
"Usage: redis-benchmark [-h <host>] [-p <port>] [-c <clients>] [-n <requests>] [-k <boolean>]\n\n" "Usage: redis-benchmark [-h <host>] [-p <port>] [-c <clients>] [-n <requests>] [-k <boolean>]\n\n"
" -h <hostname> Server hostname (default 127.0.0.1)\n" " -h <hostname> Server hostname (default 127.0.0.1)\n"
...@@ -50,8 +84,8 @@ index d30879d..fa8d4fe 100644 ...@@ -50,8 +84,8 @@ index d30879d..fa8d4fe 100644
+" -p <port> Server port (default 6380)\n" +" -p <port> Server port (default 6380)\n"
" -s <socket> Server socket (overrides host and port)\n" " -s <socket> Server socket (overrides host and port)\n"
" -a <password> Password for Redis Auth\n" " -a <password> Password for Redis Auth\n"
" -c <clients> Number of parallel connections (default 50)\n" " --user <username> Used to send ACL style 'AUTH username pass'. Needs -a.\n"
@@ -674,7 +674,7 @@ int main(int argc, const char **argv) { @@ -1542,7 +1542,7 @@ int main(int argc, const char **argv) {
config.latency = NULL; config.latency = NULL;
config.clients = listCreate(); config.clients = listCreate();
config.hostip = "127.0.0.1"; config.hostip = "127.0.0.1";
...@@ -61,10 +95,10 @@ index d30879d..fa8d4fe 100644 ...@@ -61,10 +95,10 @@ index d30879d..fa8d4fe 100644
config.tests = NULL; config.tests = NULL;
config.dbnum = 0; config.dbnum = 0;
diff --git a/src/redis-cli.c b/src/redis-cli.c diff --git a/src/redis-cli.c b/src/redis-cli.c
index f9b93e9..f112f1c 100644 index 45a1228e6..3259b0d37 100644
--- a/src/redis-cli.c --- a/src/redis-cli.c
+++ b/src/redis-cli.c +++ b/src/redis-cli.c
@@ -1470,7 +1470,7 @@ static void usage(void) { @@ -1720,7 +1720,7 @@ static void usage(void) {
"\n" "\n"
"Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n" "Usage: redis-cli [OPTIONS] [cmd [arg [arg ...]]]\n"
" -h <hostname> Server hostname (default: 127.0.0.1).\n" " -h <hostname> Server hostname (default: 127.0.0.1).\n"
...@@ -73,7 +107,7 @@ index f9b93e9..f112f1c 100644 ...@@ -73,7 +107,7 @@ index f9b93e9..f112f1c 100644
" -s <socket> Server socket (overrides hostname and port).\n" " -s <socket> Server socket (overrides hostname and port).\n"
" -a <password> Password to use when connecting to the server.\n" " -a <password> Password to use when connecting to the server.\n"
" You can also use the " REDIS_CLI_AUTH_ENV " environment\n" " You can also use the " REDIS_CLI_AUTH_ENV " environment\n"
@@ -6999,7 +6999,7 @@ int main(int argc, char **argv) { @@ -8066,7 +8066,7 @@ int main(int argc, char **argv) {
int firstarg; int firstarg;
config.hostip = sdsnew("127.0.0.1"); config.hostip = sdsnew("127.0.0.1");
...@@ -83,12 +117,12 @@ index f9b93e9..f112f1c 100644 ...@@ -83,12 +117,12 @@ index f9b93e9..f112f1c 100644
config.repeat = 1; config.repeat = 1;
config.interval = 0; config.interval = 0;
diff --git a/src/sentinel.c b/src/sentinel.c diff --git a/src/sentinel.c b/src/sentinel.c
index adff9d4..368014e 100644 index 1bd82453f..d85ee6049 100644
--- a/src/sentinel.c --- a/src/sentinel.c
+++ b/src/sentinel.c +++ b/src/sentinel.c
@@ -40,7 +40,7 @@ @@ -48,7 +48,7 @@ extern char **environ;
extern SSL_CTX *redis_tls_ctx;
extern char **environ; #endif
-#define REDIS_SENTINEL_PORT 26379 -#define REDIS_SENTINEL_PORT 26379
+#define REDIS_SENTINEL_PORT 26380 +#define REDIS_SENTINEL_PORT 26380
...@@ -96,10 +130,10 @@ index adff9d4..368014e 100644 ...@@ -96,10 +130,10 @@ index adff9d4..368014e 100644
/* ======================== Sentinel global state =========================== */ /* ======================== Sentinel global state =========================== */
diff --git a/src/server.c b/src/server.c diff --git a/src/server.c b/src/server.c
index 7f0acaa..0301801 100644 index 831349a76..34b9eea3f 100644
--- a/src/server.c --- a/src/server.c
+++ b/src/server.c +++ b/src/server.c
@@ -1645,7 +1645,7 @@ void initServerConfig(void) { @@ -2396,7 +2396,7 @@ void initServerConfig(void) {
/* Replication related */ /* Replication related */
server.masterauth = NULL; server.masterauth = NULL;
server.masterhost = NULL; server.masterhost = NULL;
...@@ -108,7 +142,7 @@ index 7f0acaa..0301801 100644 ...@@ -108,7 +142,7 @@ index 7f0acaa..0301801 100644
server.master = NULL; server.master = NULL;
server.cached_master = NULL; server.cached_master = NULL;
server.master_initial_offset = -1; server.master_initial_offset = -1;
@@ -3739,7 +3739,7 @@ void usage(void) { @@ -4819,7 +4819,7 @@ void usage(void) {
fprintf(stderr," ./redis-server --test-memory <megabytes>\n\n"); fprintf(stderr," ./redis-server --test-memory <megabytes>\n\n");
fprintf(stderr,"Examples:\n"); fprintf(stderr,"Examples:\n");
fprintf(stderr," ./redis-server (run the server with default conf)\n"); fprintf(stderr," ./redis-server (run the server with default conf)\n");
...@@ -117,16 +151,3 @@ index 7f0acaa..0301801 100644 ...@@ -117,16 +151,3 @@ index 7f0acaa..0301801 100644
fprintf(stderr," ./redis-server --port 7777\n"); fprintf(stderr," ./redis-server --port 7777\n");
fprintf(stderr," ./redis-server --port 7777 --replicaof 127.0.0.1 8888\n"); fprintf(stderr," ./redis-server --port 7777 --replicaof 127.0.0.1 8888\n");
fprintf(stderr," ./redis-server /etc/myredis.conf --loglevel verbose\n\n"); fprintf(stderr," ./redis-server /etc/myredis.conf --loglevel verbose\n\n");
diff --git a/src/server.h b/src/server.h
index aa0ec37..70d476e 100644
--- a/src/server.h
+++ b/src/server.h
@@ -83,7 +83,7 @@ typedef long long mstime_t; /* millisecond time type. */
#define CONFIG_MIN_HZ 1
#define CONFIG_MAX_HZ 500
#define MAX_CLIENTS_PER_CLOCK_TICK 200 /* HZ is adapted based on that. */
-#define CONFIG_DEFAULT_SERVER_PORT 6379 /* TCP port. */
+#define CONFIG_DEFAULT_SERVER_PORT 6380 /* TCP port. */
#define CONFIG_DEFAULT_TCP_BACKLOG 511 /* TCP listen backlog. */
#define CONFIG_DEFAULT_CLIENT_TIMEOUT 0 /* Default client timeout: infinite */
#define CONFIG_DEFAULT_DBNUM 16
Index: redis-5.0.9/src/Makefile
===================================================================
--- redis-5.0.9.orig/src/Makefile
+++ redis-5.0.9/src/Makefile
@@ -83,6 +83,10 @@ ifneq (,$(filter aarch64 armv,$(uname_M)
else
ifneq (,$(findstring armv,$(uname_M)))
FINAL_LIBS+=-latomic
+else
+ifneq (,$(findstring ppc,$(uname_M)))
+ FINAL_LIBS+=-latomic
+endif
endif
endif
...@@ -2,7 +2,7 @@ Index: redis.conf ...@@ -2,7 +2,7 @@ Index: redis.conf
=================================================================== ===================================================================
--- redis.conf.orig --- redis.conf.orig
+++ redis.conf +++ redis.conf
@@ -133,7 +133,7 @@ tcp-keepalive 300 @@ -221,7 +221,7 @@ tcp-keepalive 300
# By default Redis does not run as a daemon. Use 'yes' if you need it. # 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 /var/run/redis.pid when daemonized.
...@@ -11,40 +11,40 @@ Index: redis.conf ...@@ -11,40 +11,40 @@ Index: redis.conf
# If you run Redis from upstart or systemd, Redis can interact with your # If you run Redis from upstart or systemd, Redis can interact with your
# supervision tree. Options: # supervision tree. Options:
@@ -144,7 +144,7 @@ daemonize no @@ -233,7 +233,7 @@ daemonize no
# UPSTART_JOB or NOTIFY_SOCKET environment variables # UPSTART_JOB or NOTIFY_SOCKET environment variables
# Note: these supervision methods only signal "process is ready." # Note: these supervision methods only signal "process is ready."
# They do not enable continuous liveness pings back to your supervisor. # They do not enable continuous pings back to your supervisor.
-supervised no -supervised no
+supervised systemd +supervised systemd
# If a pid file is specified, Redis writes it where specified at startup # If a pid file is specified, Redis writes it where specified at startup
# and removes it at exit. # and removes it at exit.
@@ -155,7 +155,7 @@ supervised no @@ -244,7 +244,7 @@ supervised no
# #
# Creating a pid file is best effort: if Redis is not able to create it # 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. # nothing bad happens, the server will start and run normally.
-pidfile /var/run/redis_6379.pid -pidfile /var/run/redis_6379.pid
+pidfile /var/run/icinga-redis/redis.pid +pidfile /var/run/redis/default.pid
# Specify the server verbosity level. # Specify the server verbosity level.
# This can be one of: # This can be one of:
@@ -168,7 +168,8 @@ loglevel notice @@ -257,7 +257,8 @@ loglevel notice
# Specify the log file name. Also the empty string can be used to force # 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 # 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 # output for logging but daemonize, logs will be sent to /dev/null
-logfile "" -logfile ""
+# logfile "" +# logfile ""
+logfile /var/log/icinga-redis/redis.log +logfile /var/log/redis/default.log
# To enable logging to the system logger, just set 'syslog-enabled' to yes, # To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs. # and optionally update the other syslog parameters to suit your needs.
@@ -260,7 +261,7 @@ dbfilename dump.rdb @@ -362,7 +363,7 @@ rdb-del-sync-files no
# The Append Only File will also be created inside this directory. # The Append Only File will also be created inside this directory.
# #
# Note that you must specify a directory here, not a file name. # Note that you must specify a directory here, not a file name.
-dir ./ -dir ./
+dir /var/lib/icinga-redis/redis/ +dir /var/lib/redis/default/
################################# REPLICATION ################################# ################################# REPLICATION #################################
...@@ -55,9 +55,9 @@ Index: sentinel.conf ...@@ -55,9 +55,9 @@ Index: sentinel.conf
@@ -1,4 +1,8 @@ @@ -1,4 +1,8 @@
# Example sentinel.conf # Example sentinel.conf
+# +#
+pidfile /var/run/icinga_redis/sentinel.pid +pidfile /var/run/redis/sentinel-default.pid
+loglevel notice +loglevel notice
+logfile /var/log/icinga_redis/sentinel.log +logfile /var/log/redis/sentinel-default.log
# *** IMPORTANT *** # *** IMPORTANT ***
# #
--- tests/test_helper.tcl.orig 2018-04-17 18:04:29.778303392 +0200
+++ tests/test_helper.tcl 2018-04-17 18:04:46.688365379 +0200
@@ -40,7 +40,6 @@ set ::all_tests {
integration/aof
integration/rdb
integration/convert-zipmap-hash-on-load
- integration/logging
integration/psync2
integration/psync2-reg
unit/pubsub
Index: src/config.h
===================================================================
--- src/config.h.orig
+++ src/config.h
@@ -65,8 +65,10 @@
#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \
defined(__FreeBSD__) || (defined(__OpenBSD__) && defined(USE_BACKTRACE))\
|| defined(__DragonFly__)
+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || defined (__arm__)
#define HAVE_BACKTRACE 1
#endif
+#endif
/* MSG_NOSIGNAL. */
#ifdef __linux__
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%global src_name redis %global src_name redis
Name: %{?pkg_prefix}%{src_name} Name: %{?pkg_prefix}%{src_name}
Version: 5.0.10 Version: 6.0.9
Release: 3 Release: 3
Summary: Persistent key-value database Summary: Persistent key-value database
License: BSD-3-Clause License: BSD-3-Clause
...@@ -38,10 +38,11 @@ Source5: README.SUSE ...@@ -38,10 +38,11 @@ Source5: README.SUSE
Patch0: %{src_name}-initscript.patch Patch0: %{src_name}-initscript.patch
# PATCH-MISSING-TAG -- See https://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines # PATCH-MISSING-TAG -- See https://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: %{src_name}-conf.patch Patch1: %{src_name}-conf.patch
Patch2: %{src_name}-enable-bactrace-on-x86-ia64-and_arm32_only.patch Patch2: reproducible.patch
Patch3: %{src_name}-disable_integration_logging.patch Patch3: getMcontextEip-return-value.patch
Patch4: reproducible.patch Patch4: ppc-atomic.patch
Patch5: icinga-server-port.patch Patch5: icinga-server-port.patch
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: procps BuildRequires: procps
BuildRequires: tcl BuildRequires: tcl
...@@ -71,7 +72,7 @@ different kind of sorting abilities. ...@@ -71,7 +72,7 @@ different kind of sorting abilities.
%build %build
export HOST=OBS # for reproducible builds export HOST=OBS # for reproducible builds
make %{?_smp_mflags} CFLAGS="%{optflags}" V=1 make %{?_smp_mflags} CFLAGS="%{optflags}" BUILD_TLS=yes V=1
%install %install
install -m 0750 -d \ install -m 0750 -d \
...@@ -133,6 +134,9 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue" ...@@ -133,6 +134,9 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%dir %attr(0750,%{name},%{name}) %{_log_dir} %dir %attr(0750,%{name},%{name}) %{_log_dir}
%changelog %changelog
* Mon Dec 07 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 6.0.9-1
- Update to 6.0.9
* Fri Nov 13 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 5.0.10-1 * Fri Nov 13 2020 Alexander A. Klimov <alexander.klimov@icinga.com> - 5.0.10-1
- Update to 5.0.10 - Update to 5.0.10
......
...@@ -11,10 +11,10 @@ See https://reproducible-builds.org/ for why this is good. ...@@ -11,10 +11,10 @@ See https://reproducible-builds.org/ for why this is good.
src/mkreleasehdr.sh | 2 +- src/mkreleasehdr.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: redis-5.0.5/src/mkreleasehdr.sh Index: src/mkreleasehdr.sh
=================================================================== ===================================================================
--- redis-5.0.5.orig/src/mkreleasehdr.sh --- src/mkreleasehdr.sh
+++ redis-5.0.5/src/mkreleasehdr.sh +++ src/mkreleasehdr.sh
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1` GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
...@@ -22,5 +22,5 @@ Index: redis-5.0.5/src/mkreleasehdr.sh ...@@ -22,5 +22,5 @@ Index: redis-5.0.5/src/mkreleasehdr.sh
-BUILD_ID=`uname -n`"-"`date +%s` -BUILD_ID=`uname -n`"-"`date +%s`
+BUILD_ID=${HOST:-`uname -n`}"-"`date -r ../00-RELEASENOTES +%s` +BUILD_ID=${HOST:-`uname -n`}"-"`date -r ../00-RELEASENOTES +%s`
if [ -n "$SOURCE_DATE_EPOCH" ]; then if [ -n "$SOURCE_DATE_EPOCH" ]; then
BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s) BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s)
fi fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment