diff --git a/debian/patches/disable-buildd-failed-test.patch b/debian/patches/disable-buildd-failed-test.patch index 743e3a1dae9f3d9e149da72b3b7ab3dc03e94180..fe35b9ef5e0da327c69ca0e070aa5ca0c4bb1c8c 100644 --- a/debian/patches/disable-buildd-failed-test.patch +++ b/debian/patches/disable-buildd-failed-test.patch @@ -3,7 +3,7 @@ Last-Update: 2020-09-27 --- a/test/cluster_client_options_test.rb +++ b/test/cluster_client_options_test.rb -@@ -66,7 +66,7 @@ +@@ -69,7 +69,7 @@ build_another_client(invalid_option: true) end diff --git a/debian/patches/disable-encoding-check.patch b/debian/patches/disable-encoding-check.patch index 7cb427bcdbab119d8e611fa5c85c3cca7252c22f..45beccde358d43180ee0d6713a10f05d838c8e87 100644 --- a/debian/patches/disable-encoding-check.patch +++ b/debian/patches/disable-encoding-check.patch @@ -6,7 +6,7 @@ Last-Update: 2020-09-27 --- a/test/distributed_commands_requiring_clustering_test.rb +++ b/test/distributed_commands_requiring_clustering_test.rb -@@ -157,7 +157,7 @@ +@@ -170,7 +170,7 @@ r.bitop(:xor, "{qux}foo^bar", "{qux}foo", "{qux}bar") assert_equal "\x03", r.get("{qux}foo^bar") r.bitop(:not, "{qux}~foo", "{qux}foo") diff --git a/debian/patches/disable-ssl-test.patch b/debian/patches/disable-ssl-test.patch index d7409cf932c04dd7772d8b2a8f97fd9307c27fcd..72af358ee8dd30605aa3148bccb3a9d13ead5196 100644 --- a/debian/patches/disable-ssl-test.patch +++ b/debian/patches/disable-ssl-test.patch @@ -8,7 +8,7 @@ Last-Update: 2020-09-27 --- a/Rakefile +++ b/Rakefile -@@ -17,7 +17,7 @@ +@@ -7,7 +7,7 @@ t.libs = %w(lib test) if ARGV.size == 1 diff --git a/debian/patches/use-system-redis.patch b/debian/patches/use-system-redis.patch index 9a4f12d89d2547908a1bed2987072040af46e8df..699d9cfc7dcfa4fbcdb20c11815a36e6c8cb0387 100644 --- a/debian/patches/use-system-redis.patch +++ b/debian/patches/use-system-redis.patch @@ -10,7 +10,7 @@ Last-Update: 2020-09-27 --- a/makefile +++ b/makefile @@ -1,16 +1,14 @@ --REDIS_BRANCH ?= 6.0 +-REDIS_BRANCH ?= 6.2 TMP := tmp -BUILD_DIR := ${TMP}/cache/redis-${REDIS_BRANCH} -TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz