diff --git a/debian/changelog b/debian/changelog index fbab4737075284bed8c857f2f5e5b44e1a24ed5f..816160805678d812b6661ea343a429a39ae9b8a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +icinga-redis (6.0.9-1) icinga; urgency=medium + + * Update upstream to 6.0.9 + + -- Alexander A. Klimov Mon, 07 Dec 2020 13:02:57 +0100 + icinga-redis (5.0.10-1) icinga; urgency=medium * Update upstream to 5.0.10 diff --git a/debian/control b/debian/control index 9b60f22e262e061f5f0f806c06b375406185e36e..128f1b5807c4dd6e5862662d8c5a042c8a0801af 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Build-Depends: dpkg-dev (>= 1.17.14), libjemalloc-dev [linux-any], liblua5.1-dev, + libssl-dev, lua-bitop-dev, lua-cjson-dev, procps , diff --git a/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch b/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch index 93d682ca296f914766e025596f2161d5ea5665c9..4b674e8bf33adef93631269466e07acbca1613c9 100644 --- a/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch +++ b/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch @@ -8,7 +8,7 @@ Subject: Add support for a USE_SYSTEM_HIREDIS flag. 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/deps/Makefile b/deps/Makefile -index 2ed7736..d6b8e3e 100644 +index 3ff0d2c..ae5e1b3 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -33,7 +33,9 @@ ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'), @@ -22,7 +22,7 @@ index 2ed7736..d6b8e3e 100644 ifneq ($(USE_SYSTEM_LUA),yes) -(cd lua && $(MAKE) clean) > /dev/null || true diff --git a/src/Makefile b/src/Makefile -index dfbb74e..70d8abc 100644 +index 79afdaa..4850889 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') @@ -34,16 +34,16 @@ index dfbb74e..70d8abc 100644 NODEPS:=clean distclean # Default settings -@@ -127,7 +127,7 @@ endif +@@ -166,7 +166,7 @@ endif endif endif # Include paths to dependencies -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise +FINAL_CFLAGS+= -I../deps/linenoise - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -159,6 +159,15 @@ else + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -240,6 +240,15 @@ else FINAL_LIBS := ../deps/lua/src/liblua.a $(FINAL_LIBS) endif @@ -59,7 +59,7 @@ index dfbb74e..70d8abc 100644 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) $(CPPFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -230,7 +239,7 @@ endif +@@ -313,7 +322,7 @@ endif # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) @@ -68,7 +68,7 @@ index dfbb74e..70d8abc 100644 # redis-sentinel $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) -@@ -246,11 +255,11 @@ $(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME) +@@ -329,11 +338,11 @@ $(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME) # redis-cli $(REDIS_CLI_NAME): $(REDIS_CLI_OBJ) diff --git a/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch b/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch index 89ff75c777483a8b9b95a3575cda0b8bff02d6e7..eae5f5d6e525703a9fff0c4727b17000d882e199 100644 --- a/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch +++ b/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch @@ -6,13 +6,14 @@ https://github.com/antirez/redis/pull/5279 --- deps/Makefile | 2 ++ src/Makefile | 5 +++++ + src/debug.c | 4 ++++ src/object.c | 5 +++++ src/zmalloc.c | 10 ++++++++++ src/zmalloc.h | 4 ++++ - 5 files changed, 26 insertions(+) + 6 files changed, 30 insertions(+) diff --git a/deps/Makefile b/deps/Makefile -index eb35c1e..1342fac 100644 +index 700867f..abfd688 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -36,7 +36,9 @@ distclean: @@ -26,10 +27,10 @@ index eb35c1e..1342fac 100644 .PHONY: distclean diff --git a/src/Makefile b/src/Makefile -index e12602a..26651d5 100644 +index 886d0ec..bbb5bac 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -140,10 +140,15 @@ ifeq ($(MALLOC),tcmalloc_minimal) +@@ -203,10 +203,15 @@ ifeq ($(MALLOC),tcmalloc_minimal) endif ifeq ($(MALLOC),jemalloc) @@ -43,10 +44,25 @@ index e12602a..26651d5 100644 endif +endif - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) $(CPPFLAGS) - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) + ifeq ($(BUILD_TLS),yes) + FINAL_CFLAGS+=-DUSE_OPENSSL $(OPENSSL_CFLAGS) +diff --git a/src/debug.c b/src/debug.c +index 7112ff5..541cb68 100644 +--- a/src/debug.c ++++ b/src/debug.c +@@ -53,6 +53,10 @@ typedef ucontext_t sigcontext_t; + #endif + #endif + ++#if defined(USE_JEMALLOC) && (USE_SYSTEM_JEMALLOC == yes) ++#define je_mallctl mallctl ++#endif ++ + /* ================================= Debugging ============================== */ + + /* Compute the sha1 of string at 's' with 'len' bytes long. diff --git a/src/object.c b/src/object.c -index d5a22e6..b0cf607 100644 +index 92eebb5..cc09e41 100644 --- a/src/object.c +++ b/src/object.c @@ -36,6 +36,11 @@ @@ -62,7 +78,7 @@ index d5a22e6..b0cf607 100644 robj *createObject(int type, void *ptr) { diff --git a/src/zmalloc.c b/src/zmalloc.c -index 2482f51..80e6571 100644 +index d693aac..dfab25c 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c @@ -63,6 +63,15 @@ void zlibc_free(void *ptr) { @@ -90,7 +106,7 @@ index 2482f51..80e6571 100644 #define update_zmalloc_stat_alloc(__n) do { \ size_t _n = (__n); \ diff --git a/src/zmalloc.h b/src/zmalloc.h -index 6fb19b0..62ccf29 100644 +index b136a91..25beb43 100644 --- a/src/zmalloc.h +++ b/src/zmalloc.h @@ -50,7 +50,11 @@ diff --git a/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch b/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch index 834340cb7531a812b62e202bca65ee37f78d4f49..a6c82a22b997531d954c02e803bbb4be0e62cda0 100644 --- a/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch +++ b/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch @@ -8,10 +8,10 @@ Subject: Use get_current_dir_name over PATHMAX, etc. 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/aof.c b/src/aof.c -index 9723fc3..7a4921a 100644 +index 6e2ef5c..cbdd0c7 100644 --- a/src/aof.c +++ b/src/aof.c -@@ -240,13 +240,12 @@ void stopAppendOnly(void) { +@@ -249,13 +249,12 @@ void stopAppendOnly(void) { /* Called when the user switches from "appendonly no" to "appendonly yes" * at runtime using the CONFIG command. */ int startAppendOnly(void) { @@ -26,27 +26,27 @@ index 9723fc3..7a4921a 100644 serverLog(LL_WARNING, "Redis needs to enable the AOF but can't open the " -@@ -254,6 +253,7 @@ int startAppendOnly(void) { +@@ -263,6 +262,7 @@ int startAppendOnly(void) { server.aof_filename, cwdp ? cwdp : "unknown", strerror(errno)); -+ zfree(cwdp); ++ free(cwdp); return C_ERR; } - if (server.rdb_child_pid != -1) { + if (hasActiveChildProcess() && server.aof_child_pid == -1) { diff --git a/src/rdb.c b/src/rdb.c -index 4755510..dac50b9 100644 +index ee9418c..e8f2ee0 100644 --- a/src/rdb.c +++ b/src/rdb.c -@@ -1218,7 +1218,6 @@ werr: /* Write error. */ +@@ -1313,7 +1313,6 @@ werr: /* Write error. */ /* Save the DB on disk. Return C_ERR on error, C_OK on success. */ int rdbSave(char *filename, rdbSaveInfo *rsi) { char tmpfile[256]; - char cwd[MAXPATHLEN]; /* Current working dir path for error messages. */ - FILE *fp; + FILE *fp = NULL; rio rdb; int error = 0; -@@ -1226,13 +1225,14 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) { +@@ -1321,13 +1320,14 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) { snprintf(tmpfile,256,"temp-%d.rdb", (int) getpid()); fp = fopen(tmpfile,"w"); if (!fp) { @@ -58,11 +58,11 @@ index 4755510..dac50b9 100644 filename, cwdp ? cwdp : "unknown", strerror(errno)); -+ zfree(cwdp); ++ free(cwdp); return C_ERR; } -@@ -1254,7 +1254,7 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) { +@@ -1351,7 +1351,7 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) { /* Use RENAME to make sure the DB file is changed atomically only * if the generate DB file is ok. */ if (rename(tmpfile,filename) == -1) { @@ -71,11 +71,11 @@ index 4755510..dac50b9 100644 serverLog(LL_WARNING, "Error moving temp DB file %s on the final " "destination %s (in server root dir %s): %s", -@@ -1262,6 +1262,7 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) { +@@ -1359,6 +1359,7 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) { filename, cwdp ? cwdp : "unknown", strerror(errno)); -+ zfree(cwdp); ++ free(cwdp); unlink(tmpfile); + stopSaving(0); return C_ERR; - } diff --git a/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch b/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch index aabc43ef1253f59fe83c8ccc242aa864e3c54b17..83b2b1d09d4905a2d37cc64db3e068f6d8663f1d 100644 --- a/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch +++ b/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch @@ -2,6 +2,8 @@ From: Chris Lamb Date: Sun, 26 Aug 2018 12:57:32 +0200 Subject: Add support for a USE_SYSTEM_LUA flag. +Forwarded: yes + https://github.com/antirez/redis/pull/5280 --- deps/Makefile | 2 ++ @@ -9,7 +11,7 @@ https://github.com/antirez/redis/pull/5280 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/deps/Makefile b/deps/Makefile -index 1342fac..2ed7736 100644 +index abfd688..3ff0d2c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -35,7 +35,9 @@ endif @@ -23,7 +25,7 @@ index 1342fac..2ed7736 100644 -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true endif diff --git a/src/Makefile b/src/Makefile -index 26651d5..dfbb74e 100644 +index bbb5bac..79afdaa 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') @@ -35,17 +37,17 @@ index 26651d5..dfbb74e 100644 NODEPS:=clean distclean # Default settings -@@ -127,7 +127,7 @@ endif +@@ -166,7 +166,7 @@ endif endif endif # Include paths to dependencies -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -150,6 +150,15 @@ else - endif + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -231,6 +231,15 @@ endif + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) endif +ifeq ($(USE_SYSTEM_LUA),yes) @@ -60,7 +62,7 @@ index 26651d5..dfbb74e 100644 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) $(CPPFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -221,7 +230,7 @@ endif +@@ -304,7 +313,7 @@ endif # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) diff --git a/debian/patches/debian-packaging/0003-dpkg-buildflags.patch b/debian/patches/debian-packaging/0003-dpkg-buildflags.patch index 34270650c1df0706807827a0dd7a5051254a6177..7dfb44fb49d00668055032b5cf1613fe94229a6a 100644 --- a/debian/patches/debian-packaging/0003-dpkg-buildflags.patch +++ b/debian/patches/debian-packaging/0003-dpkg-buildflags.patch @@ -3,24 +3,10 @@ Date: Fri, 30 Oct 2015 10:53:42 +0000 Subject: Add CPPFLAGS in upstream makefiles --- - deps/hiredis/Makefile | 2 +- deps/linenoise/Makefile | 2 +- src/Makefile | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile -index 9a4de83..4c8a8e4 100644 ---- a/deps/hiredis/Makefile -+++ b/deps/hiredis/Makefile -@@ -41,7 +41,7 @@ CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g+ - OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings - DEBUG_FLAGS?= -g -ggdb --REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH) -+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH) $(CPPFLAGS) - REAL_LDFLAGS=$(LDFLAGS) $(ARCH) - - DYLIBSUFFIX=so diff --git a/deps/linenoise/Makefile b/deps/linenoise/Makefile index 1dd894b..12ada21 100644 --- a/deps/linenoise/Makefile @@ -35,11 +21,11 @@ index 1dd894b..12ada21 100644 linenoise.o: linenoise.h linenoise.c diff --git a/src/Makefile b/src/Makefile -index 2a68649..e12602a 100644 +index 3a09ccd..886d0ec 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -145,7 +145,7 @@ ifeq ($(MALLOC),jemalloc) - FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) +@@ -226,7 +226,7 @@ endif + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS) endif -REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) diff --git a/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch b/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch index 87636385f17c0b8af4e01519dcd095cfc6a904c3..87b92858dd5fd95243f5add285581e4f57c13d1a 100644 --- a/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch +++ b/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch @@ -2,25 +2,26 @@ From: Chris Lamb Date: Tue, 10 Oct 2017 09:56:42 +0100 Subject: Set Debian configuration defaults. +Forwarded: not-needed --- - redis.conf | 12 ++++++------ + redis.conf | 15 +++++++++------ sentinel.conf | 9 +++++---- - 2 files changed, 11 insertions(+), 10 deletions(-) + 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/redis.conf b/redis.conf -index 93ab9a4..24e6c79 100644 +index ab0a30c..0629a00 100644 --- a/redis.conf +++ b/redis.conf -@@ -66,7 +66,7 @@ +@@ -65,7 +65,7 @@ # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES - # JUST COMMENT THE FOLLOWING LINE. + # JUST COMMENT OUT THE FOLLOWING LINE. # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -bind 127.0.0.1 +bind 127.0.0.1 ::1 # Protected mode is a layer of security protection, in order to avoid that # Redis instances left open on the internet are accessed and exploited. -@@ -106,7 +106,7 @@ tcp-backlog 511 +@@ -105,7 +105,7 @@ tcp-backlog 511 # incoming connections. There is no default, so Redis will not listen # on a unix socket when not specified. # @@ -29,7 +30,7 @@ index 93ab9a4..24e6c79 100644 # unixsocketperm 700 # Close the connection after a client is idle for N seconds (0 to disable) -@@ -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. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. @@ -38,7 +39,7 @@ index 93ab9a4..24e6c79 100644 # If you run Redis from upstart or systemd, Redis can interact with your # supervision tree. Options: -@@ -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 # nothing bad happens, the server will start and run normally. @@ -47,7 +48,7 @@ index 93ab9a4..24e6c79 100644 # Specify the server verbosity level. # This can be one of: -@@ -168,7 +168,7 @@ loglevel notice +@@ -257,7 +257,7 @@ loglevel notice # 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 +57,7 @@ index 93ab9a4..24e6c79 100644 # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. -@@ -260,7 +260,7 @@ dbfilename dump.rdb +@@ -362,7 +362,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. @@ -65,8 +66,18 @@ index 93ab9a4..24e6c79 100644 ################################# REPLICATION ################################# +@@ -1813,6 +1813,9 @@ rdb-save-incremental-fsync yes + # a good idea to leave the defaults untouched. + + # Enabled active defragmentation ++# NOTE: This feature is not available in the stock Debian packages as they use ++# the distribution-wide jemalloc allocator that does not have support for active ++# defragmentation. See #967970 for more information. + # activedefrag no + + # Minimum amount of fragmentation waste to start active defrag diff --git a/sentinel.conf b/sentinel.conf -index bc9a705..58a4c84 100644 +index b6ff05f..a6bccff 100644 --- a/sentinel.conf +++ b/sentinel.conf @@ -13,6 +13,7 @@ diff --git a/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch b/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch index 09ae0919771b798d645bd1be81d40abad625fa89..b80317b4b8515ecd5461c77d0c307ea6450798f7 100644 --- a/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch +++ b/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch @@ -2,15 +2,16 @@ From: Chris Lamb Date: Thu, 8 Nov 2018 18:05:58 +0100 Subject: Ensure we use the modules for third-party libraries. +Forwarded: not-needed --- src/scripting.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripting.c b/src/scripting.c -index 260b367..e8078dc 100644 +index 6beb6cd..dd22d71 100644 --- a/src/scripting.c +++ b/src/scripting.c -@@ -850,6 +850,7 @@ void luaLoadLibraries(lua_State *lua) { +@@ -1027,6 +1027,7 @@ void luaLoadLibraries(lua_State *lua) { luaLoadLib(lua, LUA_LOADLIBNAME, luaopen_package); luaLoadLib(lua, LUA_OSLIBNAME, luaopen_os); #endif diff --git a/debian/patches/icinga-redis-conf.patch b/debian/patches/icinga-redis-conf.patch index 4b8bbf53ce701121870910c2a894d13b7cf193ab..b7275ce7810b3f969d3137440321da8d741614c4 100644 --- a/debian/patches/icinga-redis-conf.patch +++ b/debian/patches/icinga-redis-conf.patch @@ -11,21 +11,3 @@ Index: redis/redis.conf # Specify the server verbosity level. # This can be one of: -@@ -168,7 +168,7 @@ loglevel notice - # 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 --logfile /var/log/redis/redis-server.log -+logfile /var/log/icinga-redis/icinga-redis-server.log - - # To enable logging to the system logger, just set 'syslog-enabled' to yes, - # and optionally update the other syslog parameters to suit your needs. -@@ -260,7 +260,7 @@ dbfilename dump.rdb - # The Append Only File will also be created inside this directory. - # - # Note that you must specify a directory here, not a file name. --dir /var/lib/redis -+dir /var/lib/icinga-redis - - ################################# REPLICATION ################################# - diff --git a/debian/patches/icinga-server-port.patch b/debian/patches/icinga-server-port.patch index a38cb158ed87c63391486cf8f0c55f25170fef5b..bbce920960073ec0f701626889579aef9b234d81 100644 --- a/debian/patches/icinga-server-port.patch +++ b/debian/patches/icinga-server-port.patch @@ -7,15 +7,27 @@ Index: redis/redis.conf =================================================================== --- redis.orig/redis.conf +++ redis/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. -port 6379 +port 6380 # 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 Index: redis/sentinel.conf =================================================================== --- redis.orig/sentinel.conf @@ -42,7 +54,7 @@ Index: redis/src/redis-benchmark.c =================================================================== --- redis.orig/src/redis-benchmark.c +++ redis/src/redis-benchmark.c -@@ -567,7 +567,7 @@ usage: +@@ -1421,7 +1421,7 @@ usage: printf( "Usage: redis-benchmark [-h ] [-p ] [-c ] [-n ] [-k ]\n\n" " -h Server hostname (default 127.0.0.1)\n" @@ -50,7 +62,7 @@ Index: redis/src/redis-benchmark.c +" -p Server port (default 6380)\n" " -s Server socket (overrides host and port)\n" " -a Password for Redis Auth\n" - " -c Number of parallel connections (default 50)\n" + " --user Used to send ACL style 'AUTH username pass'. Needs -a.\n" @@ -674,7 +674,7 @@ int main(int argc, const char **argv) { config.latency = NULL; config.clients = listCreate(); @@ -86,9 +98,9 @@ Index: redis/src/sentinel.c =================================================================== --- redis.orig/src/sentinel.c +++ redis/src/sentinel.c -@@ -40,7 +40,7 @@ - - extern char **environ; +@@ -48,7 +48,7 @@ extern char **environ; + extern SSL_CTX *redis_tls_ctx; + #endif -#define REDIS_SENTINEL_PORT 26379 +#define REDIS_SENTINEL_PORT 26380 @@ -117,16 +129,16 @@ Index: redis/src/server.c fprintf(stderr," ./redis-server --port 7777\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"); -Index: redis/src/server.h +Index: redis/src/config.c =================================================================== ---- redis.orig/src/server.h -+++ redis/src/server.h -@@ -83,7 +83,7 @@ typedef long long mstime_t; /* milliseco - #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 +--- redis.orig/src/config.c ++++ redis/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/debian/rules b/debian/rules index 6fc9b41a844a6d189be395842ecf65514818a826..fa5a4daeb746af63b550b308ee54aa0137d6c1be 100755 --- a/debian/rules +++ b/debian/rules @@ -14,6 +14,7 @@ LUA_LIBS_BUNDLED = struct cmsgpack LUA_OBJECTS = $(addprefix lua_,$(addsuffix .o,$(LUA_LIBS_BUNDLED))) LUA_LDFLAGS = $(addprefix -llua5.1-,$(LUA_LIBS_DEBIAN)) $(addprefix ../deps/lua/src/,$(LUA_OBJECTS)) +export BUILD_TLS = yes export CFLAGS CPPFLAGS LDFLAGS export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,-no-as-needed -ldl -latomic $(LUA_LDFLAGS)