Only in redis_5.0.3-4: .pc Only in redis_5.0.3-4/debian: .rules.swp diff -uri redis_5.0.3-4/debian/bin/generate-systemd-service-files redis_6.0.15-1/debian/bin/generate-systemd-service-files --- redis_5.0.3-4/debian/bin/generate-systemd-service-files 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/bin/generate-systemd-service-files 2021-08-02 08:19:08.000000000 +0000 @@ -71,9 +71,8 @@ Documentation=http://redis.io/documentation, man:${BINARY}(1) [Service] -Type=forking -ExecStart=/usr/bin/${BINARY} /etc/redis/${NAMESPACED}.conf -ExecStop=/bin/kill -s TERM \$MAINPID +Type=notify +ExecStart=/usr/bin/${BINARY} /etc/redis/${NAMESPACED}.conf --supervised systemd --daemonize no PIDFile=/run/${NAMESPACED}/${BINARY}.pid TimeoutStopSec=0 Restart=always @@ -88,9 +87,9 @@ PrivateDevices=yes ProtectHome=yes ReadOnlyDirectories=/ -ReadWriteDirectories=-/var/lib/redis -ReadWriteDirectories=-/var/log/redis -ReadWriteDirectories=-/var/run/${NAMESPACED} +ReadWritePaths=-/var/lib/redis +ReadWritePaths=-/var/log/redis +ReadWritePaths=-/var/run/${NAMESPACED} NoNewPrivileges=true CapabilityBoundingSet=CAP_SETGID CAP_SETUID CAP_SYS_RESOURCE diff -uri redis_5.0.3-4/debian/changelog redis_6.0.15-1/debian/changelog --- redis_5.0.3-4/debian/changelog 2021-08-31 06:39:39.000000000 +0000 +++ redis_6.0.15-1/debian/changelog 2021-08-02 08:19:08.000000000 +0000 @@ -1,38 +1,433 @@ -redis (5:5.0.3-4+deb10u4) buster; urgency=medium +redis (5:6.0.15-1~bpo10+1) buster-backports; urgency=medium - * TLS support. - (Closes: #951255) + * Rebuild for buster-backports. - -- Sandino Araico Sanchez Tue, 31 Aug 2021 01:40:45 -0500 + -- Chris Lamb Mon, 02 Aug 2021 09:19:08 +0100 -redis (5:5.0.3-4+deb10u3) buster; urgency=medium +redis (5:6.0.15-1) unstable; urgency=medium - * CVE-2021-21309: Fix a series of integer overflow issues on 32-bit systems. - (Closes: #983446) + * New upstream security release. + - CVE-2021-32761: Integer overflow issues with BITFIELD command + on 32-bit systems. + * Bump Standards-Version to 4.5.1. - -- Chris Lamb Thu, 25 Feb 2021 17:46:45 +0000 + -- Chris Lamb Wed, 21 Jul 2021 22:21:54 +0100 -redis (5:5.0.3-4+deb10u2) buster-security; urgency=high +redis (5:6.0.14-1~bpo10+1) buster-backports; urgency=medium - * Non-maintainer upload by the Security Team. - * Fix integer overflow in embedded lua_struct.c (CVE-2020-14147) + * Rebuild for buster-backports. - -- Salvatore Bonaccorso Sun, 19 Jul 2020 14:29:02 +0200 + -- Chris Lamb Mon, 07 Jun 2021 08:14:36 +0100 -redis (5:5.0.3-4+deb10u1) buster-security; urgency=high +redis (5:6.0.14-1) unstable; urgency=medium - * CVE-2019-10192: Fix two heap buffer overflows in the Hyperloglog - functionality. (Closes: #931625) - * CVE-2019-10193: Fix a stack buffer overflow vulnerability in the - Hyperloglog functionality. (Closes: #931625) + * CVE-2021-32625: Fix a vulnerability in the STRALGO LCS command. + (Closes: #989351) - -- Chris Lamb Wed, 10 Jul 2019 14:50:30 -0300 + -- Chris Lamb Tue, 01 Jun 2021 17:35:19 +0100 + +redis (5:6.0.13-1) unstable; urgency=medium + + * New upstream security release: + - CVE-2021-29477: Vulnerability in the STRALGO LCS command. + - CVE-2021-29478: Vulnerability in the COPY command for large intsets. + (Closes: #988045) + * Refresh patches. + + -- Chris Lamb Tue, 04 May 2021 11:06:14 +0100 + +redis (5:6.0.12-1) unstable; urgency=medium + + * New upstream release. + + -- Chris Lamb Sat, 06 Mar 2021 11:03:47 +0000 + +redis (5:6.0.11-1) unstable; urgency=medium + + * New upstream release, incorporating security issues. (Closes: #983446) + - Refresh patches. + + -- Chris Lamb Wed, 24 Feb 2021 11:05:06 +0000 + +redis (5:6.0.10-4~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Mon, 22 Feb 2021 10:04:26 +0000 + +redis (5:6.0.10-4) unstable; urgency=medium + + * New upstream release + - Fix cluster access to unaligned memory on ARM architectures with hard + alignment requirements such as armhf and arm64. (Closes: #982504) + * wrap-and-sort -sa. + + -- Chris Lamb Thu, 11 Feb 2021 14:49:41 +0000 + +redis (5:6.0.9-4~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Sun, 31 Jan 2021 09:50:50 +0000 + +redis (5:6.0.9-4) unstable; urgency=medium + + * Send systemd readiness notification when we are ready to accept connections + in order to fix systemd integration when Redis is used with replicaof. + Thanks to Guillem Jover for the report and patch. (Closes: #981226) + + -- Chris Lamb Thu, 28 Jan 2021 10:12:06 +0000 + +redis (5:6.0.9-3~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Wed, 27 Jan 2021 10:33:40 +0000 + +redis (5:6.0.9-3) unstable; urgency=medium + + * Also remove the /etc/redis directory in purge. + * Allow /etc/redis to be rewritten. Thanks to Yossi Gottlieb for the patch. + (Closes: #981000) + + -- Chris Lamb Mon, 25 Jan 2021 12:44:05 +0000 + +redis (5:6.0.9-2~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Sat, 16 Jan 2021 10:02:18 +0000 + +redis (5:6.0.9-2) unstable; urgency=medium + + * Enable systemd Type=notify support. Thanks to Michael Prokop for all his + help in integration. (Closes: #977852) + * Bump Standards-Version to 4.5.1. + + -- Chris Lamb Wed, 13 Jan 2021 11:11:40 +0000 + +redis (5:6.0.9-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Fri, 30 Oct 2020 08:42:04 +0000 + +redis (5:6.0.9-1) unstable; urgency=medium + + * New upstream release. + - Update patches. + + -- Chris Lamb Tue, 27 Oct 2020 10:24:49 +0000 + +redis (5:6.0.8-2~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Sun, 25 Oct 2020 10:37:01 +0000 + +redis (5:6.0.8-2) unstable; urgency=medium + + * Apply a patch from Yossi Gottlieb to fix a crash when reporting RDB/AOF + file errors. (Closes: #972683) + * Refresh patches. + + -- Chris Lamb Thu, 22 Oct 2020 15:50:56 +0100 + +redis (5:6.0.8-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Fri, 18 Sep 2020 10:55:02 +0100 + +redis (5:6.0.8-1) unstable; urgency=medium + + * New upstream release. + + -- Chris Lamb Wed, 16 Sep 2020 10:57:22 +0100 + +redis (5:6.0.7-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Mon, 07 Sep 2020 12:32:14 +0100 + +redis (5:6.0.7-1) unstable; urgency=medium + + * New upstream release. + * Refresh patches. + * Set some Forwarded headers. + + -- Chris Lamb Sat, 05 Sep 2020 11:44:29 +0100 + +redis (5:6.0.6-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Tue, 28 Jul 2020 11:01:57 +0100 + +redis (5:6.0.6-1) unstable; urgency=medium + + * New upstream release. + + * Refresh patches. + + -- Chris Lamb Sat, 25 Jul 2020 16:05:56 +0100 + +redis (5:6.0.5-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Mon, 15 Jun 2020 11:22:44 +0100 + +redis (5:6.0.5-1) unstable; urgency=medium + + * New upstream release. + + + -- Chris Lamb Sat, 13 Jun 2020 10:48:30 +0100 + +redis (5:6.0.4-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Fri, 05 Jun 2020 10:43:28 +0100 + +redis (5:6.0.4-1) unstable; urgency=medium + + * New upstream release. + + + -- Chris Lamb Wed, 03 Jun 2020 10:28:58 +0100 + +redis (5:6.0.3-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Fri, 22 May 2020 15:01:53 +0100 + +redis (5:6.0.3-1) unstable; urgency=medium + + * New upstream release. + + + -- Chris Lamb Wed, 20 May 2020 11:53:47 +0100 + +redis (5:6.0.1-2~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Tue, 19 May 2020 11:45:17 +0100 + +redis (5:6.0.1-2) unstable; urgency=medium + + * Upload to unstable. + + -- Chris Lamb Sat, 16 May 2020 16:19:33 +0100 + +redis (5:6.0.1-1) experimental; urgency=medium + + * New upstream "General Availability" release. + + + -- Chris Lamb Wed, 06 May 2020 16:27:19 +0100 + +redis (5:6.0.0-2) unstable; urgency=medium + + * Mark 0004-redis-check-rdb as being flaky for now. + * Wrap long changelog line. + * Correct spelling mistake in autopkgtest comment. + + -- Chris Lamb Sun, 03 May 2020 12:04:50 +0100 + +redis (5:6.0.0-1) unstable; urgency=medium + + * New upstream "GA" release. + + - Drop 0002-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch; merged + upstream. + * Upload to unstable. + - Update debian/gbp.conf. + + -- Chris Lamb Sat, 02 May 2020 23:36:45 +0100 + +redis (5:6.0~rc4-1) experimental; urgency=medium + + * New upstream beta release. + + * Use the newly-package liblzf-dev package over the local version. + (Closes: #958321) + * Refresh patches. + + -- Chris Lamb Tue, 21 Apr 2020 11:51:41 +0100 + +redis (5:6.0~rc3-1) experimental; urgency=medium + + * New upstream beta release. + + + -- Chris Lamb Wed, 15 Apr 2020 11:22:59 +0100 + +redis (5:6.0~rc2-1) experimental; urgency=medium + + * New upstream beta release. + + * Refresh patches. + + -- Chris Lamb Wed, 11 Mar 2020 13:32:21 +0000 + +redis (5:6.0~rc1-3) experimental; urgency=medium + + * Install openssl in the testsuite; required for generating test + certificates. + * Correct a typo in a previous changelog entry. + + -- Chris Lamb Wed, 04 Mar 2020 08:22:14 -0800 + +redis (5:6.0~rc1-2) experimental; urgency=medium + + * Add support for TLS added in Redis 6.x. Thanks to Jason Perrin for the + patch. (Closes: #951255) + * Add a comment regarding why we export a MAKEFLAGS variable in debian/rules. + * Bump Standards-Version to 4.5.0. + + -- Chris Lamb Thu, 13 Feb 2020 14:20:15 +0000 + +redis (5:6.0~rc1-1) experimental; urgency=medium + + * New upstream RC1 release. + + * Refresh patches. + * Disable using the system hiredis for now, awaiting a a new upstream + release. + + -- Chris Lamb Sat, 21 Dec 2019 15:28:01 +0000 + +redis (5:5.0.7-7~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + * Don't use liblzf in buster-backports as it has not been backported (yet?). + + -- Chris Lamb Sat, 25 Apr 2020 13:25:08 +0100 + +redis (5:5.0.7-7) unstable; urgency=medium + + * Add a sleep to ensure that the redis server has started before running the + autopkgtests. + + -- Chris Lamb Thu, 23 Apr 2020 13:32:46 +0100 + +redis (5:5.0.7-6) unstable; urgency=medium + + * No change sourceful upload to permit migration to testing. + + -- Chris Lamb Wed, 22 Apr 2020 16:29:58 +0100 + +redis (5:5.0.7-5) unstable; urgency=medium + + * Ensure that the redis daemon is running prior to running the autopkgtests. + + -- Chris Lamb Tue, 21 Apr 2020 11:47:38 +0100 + +redis (5:5.0.7-4) unstable; urgency=medium + + * Use the newly-package liblzf-dev package over the local version. + (Closes: #958321) + * Don't duplicate long description of the redis-server package in the + metapackage. + + -- Chris Lamb Mon, 20 Apr 2020 22:30:42 +0100 + +redis (5:5.0.7-3~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + * Update debian/gbp.conf. + + -- Chris Lamb Tue, 21 Apr 2020 11:42:56 +0100 + +redis (5:5.0.7-3) unstable; urgency=medium + + * Fix FTBFS with GCC 10. (Closes: #957751) + * Refresh all patches. + + -- Chris Lamb Fri, 17 Apr 2020 23:11:08 +0100 + +redis (5:5.0.7-2) unstable; urgency=medium + + [ Christian Göttsche ] + * Update systemd service to reflect new names, etc. + * Create directories in postinst with correct SELinux context. + + [ Chris Lamb ] + * Bump Standards-Version to 4.5.0. + + [ David Prévot ] + * Update long description to remove duplicate information. + + -- Chris Lamb Fri, 07 Feb 2020 22:47:58 +0000 + +redis (5:5.0.7-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Sun, 01 Dec 2019 09:24:49 +0000 + +redis (5:5.0.7-1) unstable; urgency=medium + + * New upstream bugfix release. + + * Bump Standards-Version to 4.4.1. + * Run wrap-and-sort -sa. + + -- Chris Lamb Fri, 22 Nov 2019 20:46:19 -0500 + +redis (5:5.0.6-1~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + + -- Chris Lamb Mon, 30 Sep 2019 07:47:39 +0100 + +redis (5:5.0.6-1) unstable; urgency=medium + + * New upstream release. + + * Specify "Rules-Requires-Root: no">. + + -- Chris Lamb Fri, 27 Sep 2019 16:48:24 +0100 + +redis (5:5.0.5-2~bpo10+1) buster-backports; urgency=medium + + * Rebuild for buster-backports. + * Update debian/gbp.conf. + + -- Chris Lamb Mon, 05 Aug 2019 10:30:21 +0100 + +redis (5:5.0.5-2) unstable; urgency=medium + + * Sourceful upload to unstable to ensure testing migration. + * Bump Standards-Version to 4.4.0. + * Don't build release tags in gitlab-ci.yml. + + -- Chris Lamb Sat, 20 Jul 2019 17:14:37 -0300 + +redis (5:5.0.5-1) unstable; urgency=medium + + * New upstream release. + + + -- Chris Lamb Wed, 22 May 2019 10:03:21 +0100 + +redis (5:5.0.4-1) unstable; urgency=medium + + * New upstream release. + + + -- Chris Lamb Mon, 18 Mar 2019 14:20:46 -0400 redis (5:5.0.3-4) unstable; urgency=medium [ Helmut Grohne ] * Fix cross build failure by building the non-bundled Lua libraries via - dh_auto_build. (Closes: #919682) + dh_auto_build. (Closes: #919862) -- Chris Lamb Sun, 20 Jan 2019 22:23:41 +0000 diff -uri redis_5.0.3-4/debian/control redis_6.0.15-1/debian/control --- redis_5.0.3-4/debian/control 2021-08-31 06:28:34.000000000 +0000 +++ redis_6.0.15-1/debian/control 2021-08-02 08:19:08.000000000 +0000 @@ -3,21 +3,26 @@ Priority: optional Maintainer: Chris Lamb Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), dpkg-dev (>= 1.17.14), libhiredis-dev (>= 0.14.0), libjemalloc-dev [linux-any], liblua5.1-dev, + liblzf-dev, libssl-dev, + libsystemd-dev, lua-bitop-dev, lua-cjson-dev, + openssl , + pkg-config, procps , tcl , tcl-tls , -Standards-Version: 4.3.0 +Standards-Version: 4.5.1 Homepage: https://redis.io/ -Vcs-Git: https://salsa.debian.org/lamby/pkg-redis.git +Vcs-Git: https://salsa.debian.org/lamby/pkg-redis.git -b debian/sid Vcs-Browser: https://salsa.debian.org/lamby/pkg-redis +Rules-Requires-Root: no Package: redis Architecture: all @@ -32,11 +37,12 @@ . The dataset is stored entirely in memory and periodically flushed to disk. . - This package depends on the redis-server package. + This package installs the main redis-server package. Package: redis-sentinel Architecture: any -Pre-Depends: ${misc:Pre-Depends} +Pre-Depends: + ${misc:Pre-Depends}, Depends: lsb-base (>= 3.2-14), redis-tools (= ${binary:Version}), @@ -50,7 +56,8 @@ Package: redis-server Architecture: any -Pre-Depends: ${misc:Pre-Depends} +Pre-Depends: + ${misc:Pre-Depends}, Depends: lsb-base (>= 3.2-14), redis-tools (= ${binary:Version}), diff -uri redis_5.0.3-4/debian/gbp.conf redis_6.0.15-1/debian/gbp.conf --- redis_5.0.3-4/debian/gbp.conf 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/gbp.conf 2021-08-02 08:19:08.000000000 +0000 @@ -1,3 +1,3 @@ [DEFAULT] -debian-branch=debian/sid +debian-branch=debian/buster-backports upstream-branch=upstream/sid Only in redis_6.0.15-1/debian: gitlab-ci.yml Only in redis_5.0.3-4/debian: lua_libs_debian.c diff -uri redis_5.0.3-4/debian/patches/0001-fix-ftbfs-on-kfreebsd.patch redis_6.0.15-1/debian/patches/0001-fix-ftbfs-on-kfreebsd.patch --- redis_5.0.3-4/debian/patches/0001-fix-ftbfs-on-kfreebsd.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/0001-fix-ftbfs-on-kfreebsd.patch 2021-08-02 08:19:08.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fmacros.h b/src/fmacros.h -index 6e56c75..d490aec 100644 +index a97d21a..4b2d895 100644 --- a/src/fmacros.h +++ b/src/fmacros.h @@ -41,7 +41,7 @@ diff -uri redis_5.0.3-4/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch redis_6.0.15-1/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch --- redis_5.0.3-4/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch 2021-08-02 08:19:08.000000000 +0000 @@ -8,7 +8,7 @@ 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 @@ ifneq ($(USE_SYSTEM_LUA),yes) -(cd lua && $(MAKE) clean) > /dev/null || true diff --git a/src/Makefile b/src/Makefile -index fae2db8..a279a9a 100644 +index 9bd0c3d..ee42c02 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') @@ -34,16 +34,16 @@ 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 @@ 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 @@ # 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) @@ -80,5 +80,5 @@ - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) + $(REDIS_LD) -o $@ $^ $(FINAL_LIBS) - dict-benchmark: dict.c zmalloc.c sds.c siphash.c + dict-benchmark: dict.c zmalloc.c sds.c siphash.c mt19937-64.c $(REDIS_CC) $(FINAL_CFLAGS) $^ -D DICT_BENCHMARK_MAIN -o $@ $(FINAL_LIBS) Only in redis_6.0.15-1/debian/patches: 0009-Send-the-readiness-notification-when-we-are-ready-to.patch diff -uri redis_5.0.3-4/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch redis_6.0.15-1/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch --- redis_5.0.3-4/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/0010-Add-support-for-USE_SYSTEM_JEMALLOC-flag.patch 2021-08-02 08:19:08.000000000 +0000 @@ -6,13 +6,14 @@ --- 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 @@ .PHONY: distclean diff --git a/src/Makefile b/src/Makefile -index 8cfdd32..b40b3f8 100644 +index e1cd2c2..85b1ad8 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 @@ 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 7e9c643..514d9cb 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 48ffa42..ca7f425 100644 +index 45cd92b..cacc564 100644 --- a/src/object.c +++ b/src/object.c @@ -36,6 +36,11 @@ @@ -62,10 +78,10 @@ robj *createObject(int type, void *ptr) { diff --git a/src/zmalloc.c b/src/zmalloc.c -index 2482f51..80e6571 100644 +index beae8d6..9106520 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c -@@ -63,6 +63,15 @@ void zlibc_free(void *ptr) { +@@ -66,6 +66,15 @@ void zlibc_free(void *ptr) { #define realloc(ptr,size) tc_realloc(ptr,size) #define free(ptr) tc_free(ptr) #elif defined(USE_JEMALLOC) @@ -81,7 +97,7 @@ #define malloc(size) je_malloc(size) #define calloc(count,size) je_calloc(count,size) #define realloc(ptr,size) je_realloc(ptr,size) -@@ -70,6 +79,7 @@ void zlibc_free(void *ptr) { +@@ -73,6 +82,7 @@ void zlibc_free(void *ptr) { #define mallocx(size,flags) je_mallocx(size,flags) #define dallocx(ptr,flags) je_dallocx(ptr,flags) #endif @@ -90,7 +106,7 @@ #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 -uri redis_5.0.3-4/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch redis_6.0.15-1/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch --- redis_5.0.3-4/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/0010-Use-get_current_dir_name-over-PATHMAX-etc.patch 2021-08-02 08:19:08.000000000 +0000 @@ -8,10 +8,10 @@ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/aof.c b/src/aof.c -index 9723fc3..7a4921a 100644 +index a2a15e3..cf3ed61 100644 --- a/src/aof.c +++ b/src/aof.c -@@ -240,13 +240,12 @@ void stopAppendOnly(void) { +@@ -251,13 +251,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 @@ serverLog(LL_WARNING, "Redis needs to enable the AOF but can't open the " -@@ -254,6 +253,7 @@ int startAppendOnly(void) { +@@ -265,6 +264,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 82b4cf5..2635adb 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 @@ 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 @@ 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 -uri redis_5.0.3-4/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch redis_6.0.15-1/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch --- redis_5.0.3-4/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch 2021-08-02 08:19:08.000000000 +0000 @@ -2,6 +2,8 @@ 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 @@ 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 @@ -(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true endif diff --git a/src/Makefile b/src/Makefile -index b40b3f8..fae2db8 100644 +index 85b1ad8..9bd0c3d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') @@ -35,17 +37,17 @@ 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 @@ 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) Only in redis_5.0.3-4/debian/patches: 0012-CVE-2019-10192.patch Only in redis_5.0.3-4/debian/patches: 0013-CVE-2019-10193.patch Only in redis_5.0.3-4/debian/patches: 0014-CVE-2020-14147.patch Only in redis_5.0.3-4/debian/patches: 0015-CVE-2021-21309.patch diff -uri redis_5.0.3-4/debian/patches/debian-packaging/0003-dpkg-buildflags.patch redis_6.0.15-1/debian/patches/debian-packaging/0003-dpkg-buildflags.patch --- redis_5.0.3-4/debian/patches/debian-packaging/0003-dpkg-buildflags.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/debian-packaging/0003-dpkg-buildflags.patch 2021-08-02 08:19:08.000000000 +0000 @@ -3,24 +3,10 @@ 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 @@ linenoise.o: linenoise.h linenoise.c diff --git a/src/Makefile b/src/Makefile -index 9edbb45..8cfdd32 100644 +index 691d543..e1cd2c2 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 -uri redis_5.0.3-4/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch redis_6.0.15-1/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch --- redis_5.0.3-4/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/debian-packaging/0007-Set-Debian-configuration-defaults.patch 2021-08-02 08:19:08.000000000 +0000 @@ -2,25 +2,26 @@ 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 97f8180..d341032 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 @@ # 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 @@ # 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 @@ # 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 @@ # 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 @@ ################################# REPLICATION ################################# +@@ -1818,6 +1818,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 -uri redis_5.0.3-4/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch redis_6.0.15-1/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch --- redis_5.0.3-4/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch 2021-08-02 08:19:08.000000000 +0000 @@ -2,15 +2,16 @@ 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 a75871a..f160646 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 -uri redis_5.0.3-4/debian/patches/series redis_6.0.15-1/debian/patches/series --- redis_5.0.3-4/debian/patches/series 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/patches/series 2021-08-02 08:19:08.000000000 +0000 @@ -6,7 +6,4 @@ 0011-Add-support-for-a-USE_SYSTEM_LUA-flag.patch 0007-Add-support-for-a-USE_SYSTEM_HIREDIS-flag.patch debian-packaging/0008-Ensure-we-use-the-modules-for-third-party-libraries.patch -0012-CVE-2019-10192.patch -0013-CVE-2019-10193.patch -0014-CVE-2020-14147.patch -0015-CVE-2021-21309.patch +0009-Send-the-readiness-notification-when-we-are-ready-to.patch diff -uri redis_5.0.3-4/debian/redis-tools.postinst redis_6.0.15-1/debian/redis-tools.postinst --- redis_5.0.3-4/debian/redis-tools.postinst 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/redis-tools.postinst 2021-08-02 08:19:08.000000000 +0000 @@ -9,18 +9,7 @@ MODE="${2}" GROUP="${3}" - mkdir -p ${DIR} - - case "${DIR}" in - /var/log/redis) - MODE="02750" - GROUP="adm" - ;; - *) - MODE="750" - GROUP="${USER}" - ;; - esac + mkdir -pZ ${DIR} if ! dpkg-statoverride --list ${DIR} >/dev/null 2>&1 then @@ -38,8 +27,9 @@ --group \ ${USER} || true - Setup_dir /var/log/redis ${USER}:adm 2750 - Setup_dir /var/lib/redis ${USER}:${USER} 750 + Setup_dir /var/log/redis 2750 adm + Setup_dir /var/lib/redis 750 ${USER} + Setup_dir /etc/redis 2770 ${USER} fi #DEBHELPER# diff -uri redis_5.0.3-4/debian/redis-tools.postrm redis_6.0.15-1/debian/redis-tools.postrm --- redis_5.0.3-4/debian/redis-tools.postrm 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/redis-tools.postrm 2021-08-02 08:19:08.000000000 +0000 @@ -5,7 +5,7 @@ if [ "${1}" = "purge" ] then userdel redis || true - rm -rf /var/lib/redis /var/log/redis + rm -rf /var/lib/redis /var/log/redis /etc/redis fi #DEBHELPER# diff -uri redis_5.0.3-4/debian/rules redis_6.0.15-1/debian/rules --- redis_5.0.3-4/debian/rules 2021-08-31 06:31:35.000000000 +0000 +++ redis_6.0.15-1/debian/rules 2021-08-02 08:19:08.000000000 +0000 @@ -14,11 +14,12 @@ 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) -export BUILD_TLS=yes +# Build jemelloc in parallel ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) @@ -45,10 +46,11 @@ # Build the non-bundled Lua libraries dh_auto_build --sourcedirectory=deps/lua/src -- $(LUA_OBJECTS) - dh_auto_build --parallel -- V=1 USE_SYSTEM_JEMALLOC=yes USE_SYSTEM_LUA=yes USE_SYSTEM_HIREDIS=yes + dh_auto_build --parallel -- V=1 USE_SYSTEM_JEMALLOC=yes USE_SYSTEM_LUA=yes USE_SYSTEM_HIREDIS=no USE_SYSTEMD=yes override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + # Avoid race conditions in upstream testsuite. # Generate a root CA and server certificate for testing ./utils/gen-test-certs.sh # Avoid race conditions in upstream testsuite Only in redis_5.0.3-4/debian/source: options diff -uri redis_5.0.3-4/debian/tests/0001-redis-cli redis_6.0.15-1/debian/tests/0001-redis-cli --- redis_5.0.3-4/debian/tests/0001-redis-cli 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/tests/0001-redis-cli 2021-08-02 08:19:08.000000000 +0000 @@ -4,5 +4,9 @@ set -eu +service redis-server restart + +sleep 5 + redis-cli INFO redis-cli LOLWUT diff -uri redis_5.0.3-4/debian/tests/0002-benchmark redis_6.0.15-1/debian/tests/0002-benchmark --- redis_5.0.3-4/debian/tests/0002-benchmark 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/tests/0002-benchmark 2021-08-02 08:19:08.000000000 +0000 @@ -4,4 +4,8 @@ set -eu +service redis-server restart + +sleep 5 + redis-benchmark -P 10 diff -uri redis_5.0.3-4/debian/tests/0004-redis-check-rdb redis_6.0.15-1/debian/tests/0004-redis-check-rdb --- redis_5.0.3-4/debian/tests/0004-redis-check-rdb 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/tests/0004-redis-check-rdb 2021-08-02 08:19:08.000000000 +0000 @@ -1,10 +1,16 @@ #!/bin/sh # # Test redis-check-rdb +# +# Currently failing with 6.0.0: https://github.com/antirez/redis/issues/7187 set -eu -# Perform a synchronous save to ensure .rdb file eixsts +service redis-server restart + +sleep 5 + +# Perform a synchronous save to ensure .rdb file exists redis-cli SAVE redis-check-rdb /var/lib/redis/dump.rdb diff -uri redis_5.0.3-4/debian/tests/0005-cjson redis_6.0.15-1/debian/tests/0005-cjson --- redis_5.0.3-4/debian/tests/0005-cjson 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/tests/0005-cjson 2021-08-02 08:19:08.000000000 +0000 @@ -4,4 +4,8 @@ set -eu +service redis-server restart + +sleep 5 + redis-cli EVAL 'cjson.decode("{}")' 0 diff -uri redis_5.0.3-4/debian/tests/control redis_6.0.15-1/debian/tests/control --- redis_5.0.3-4/debian/tests/control 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/tests/control 2021-08-02 08:19:08.000000000 +0000 @@ -1,10 +1,14 @@ Tests: 0001-redis-cli +Restrictions: needs-root Tests: 0002-benchmark +Restrictions: needs-root Tests: 0003-redis-check-aof +Restrictions: needs-root Tests: 0004-redis-check-rdb -Restrictions: needs-root +Restrictions: needs-root, flaky Tests: 0005-cjson +Restrictions: needs-root diff -uri redis_5.0.3-4/debian/watch redis_6.0.15-1/debian/watch --- redis_5.0.3-4/debian/watch 2021-02-25 17:46:45.000000000 +0000 +++ redis_6.0.15-1/debian/watch 2021-08-02 08:19:08.000000000 +0000 @@ -1,3 +1,3 @@ version=4 opts=uversionmangle=s/-?(alpha|beta|rc)/~$1/ \ - https://github.com/antirez/redis/releases .*/archive/(.*).tar.gz + https://github.com/redis/redis/releases .*/(6\.0\.[^/]+).tar.gz