From 33934650adb1b6e17e1508a1856802df36a27fd4 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 18 Nov 2021 23:32:16 +0530
Subject: [PATCH] Refresh patches
---
debian/patches/disable-buildd-failed-test.patch | 2 +-
debian/patches/disable-encoding-check.patch | 2 +-
debian/patches/disable-ssl-test.patch | 2 +-
debian/patches/use-system-redis.patch | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/patches/disable-buildd-failed-test.patch b/debian/patches/disable-buildd-failed-test.patch
index 743e3a1..fe35b9e 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 7cb427b..45beccd 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 d7409cf..72af358 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 9a4f12d..699d9cf 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
--
GitLab