5 files changed, 2 insertions, 98 deletions
diff --git a/debian/patches/exportfs-fsid-optional.patch b/debian/patches/exportfs-fsid-optional.patch
deleted file mode 100644
index 9889981..0000000
--- a/debian/patches/exportfs-fsid-optional.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1d1481aa6d848efab4d398ad6e74d80b5b32549f Mon Sep 17 00:00:00 2001
-From: Valentin Vidic <vvidic@debian.org>
-Date: Wed, 1 Nov 2023 18:25:45 +0100
-Subject: [PATCH] exportfs: remove test for "fsid=" parameter
-
-fsid parameter is now considered optional.
----
- tools/ocft/exportfs          | 5 -----
- tools/ocft/exportfs-multidir | 5 -----
- 2 files changed, 10 deletions(-)
-
-diff --git a/tools/ocft/exportfs b/tools/ocft/exportfs
-index 285a4b8e..1ec3d4c3 100644
---- a/tools/ocft/exportfs
-+++ b/tools/ocft/exportfs
-@@ -28,11 +28,6 @@ CASE "check base env"
- 	Include prepare
- 	AgentRun start OCF_SUCCESS
- 
--CASE "check base env: no 'OCF_RESKEY_fsid'"
--	Include prepare
--	Env OCF_RESKEY_fsid=
--	AgentRun start OCF_ERR_CONFIGURED
--
- CASE "check base env: invalid 'OCF_RESKEY_directory'"
- 	Include prepare
- 	Env OCF_RESKEY_directory=/no_such
-diff --git a/tools/ocft/exportfs-multidir b/tools/ocft/exportfs-multidir
-index 00e41f08..ac6d5c7f 100644
---- a/tools/ocft/exportfs-multidir
-+++ b/tools/ocft/exportfs-multidir
-@@ -28,11 +28,6 @@ CASE "check base env"
- 	Include prepare
- 	AgentRun start OCF_SUCCESS
- 
--CASE "check base env: no 'OCF_RESKEY_fsid'"
--	Include prepare
--	Env OCF_RESKEY_fsid=
--	AgentRun start OCF_ERR_CONFIGURED
--
- CASE "check base env: invalid 'OCF_RESKEY_directory'"
- 	Include prepare
- 	Env OCF_RESKEY_directory=/no_such
--- 
-2.39.2
-
diff --git a/debian/patches/findif-loopback.patch b/debian/patches/findif-loopback.patch
deleted file mode 100644
index 4fe1280..0000000
--- a/debian/patches/findif-loopback.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e4f84ae185b6943d1ff461d53c7f1b5295783086 Mon Sep 17 00:00:00 2001
-From: Valentin Vidic <vvidic@valentin-vidic.from.hr>
-Date: Wed, 1 Nov 2023 19:35:21 +0100
-Subject: [PATCH] findif.sh: fix loopback handling
-
-tools/ocft/IPaddr2 fails the loopback test because of the missing
-table local parameter:
-
-$ ip -o -f inet route list match 127.0.0.3 scope host
-
-$ ip -o -f inet route list match 127.0.0.3 table local scope host
-local 127.0.0.0/8 dev lo proto kernel src 127.0.0.1
-
-Also rename the function because it is called only in for the special
-loopback address case.
----
- heartbeat/findif.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh
-index 5f1c19ec..7c766e6e 100644
---- a/heartbeat/findif.sh
-+++ b/heartbeat/findif.sh
-@@ -29,10 +29,10 @@ prefixcheck() {
-   fi
-   return 0
- }
--getnetworkinfo()
-+getloopbackinfo()
- {
-   local line netinfo
--  ip -o -f inet route list match $OCF_RESKEY_ip scope host | (while read line;
-+  ip -o -f inet route list match $OCF_RESKEY_ip table local scope host | (while read line;
-   do
-     netinfo=`echo $line | awk '{print $2}'`
-     case $netinfo in
-@@ -222,7 +222,7 @@ findif()
-   if [ $# = 0 ] ; then
-     case $OCF_RESKEY_ip in
-     127.*)
--      set -- `getnetworkinfo`
-+      set -- `getloopbackinfo`
-       shift;;
-     esac
-   fi
--- 
-2.39.2
-
diff --git a/debian/patches/ipv6-linux-only b/debian/patches/ipv6-linux-only
index 69f1e9e..5299a96 100644
--- a/debian/patches/ipv6-linux-only
+++ b/debian/patches/ipv6-linux-only
@@ -6,7 +6,7 @@ Last-Update: 2016-04-08
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/configure.ac
 +++ b/configure.ac
-@@ -808,8 +808,8 @@
+@@ -809,8 +809,8 @@
  dnl ************************************************************************
  dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent
  AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include <sys/types.h>])
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index dd1b482..e346912 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -8,7 +8,7 @@ Last-Update: 2017-08-22
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/configure.ac
 +++ b/configure.ac
-@@ -835,7 +835,7 @@
+@@ -836,7 +836,7 @@
          CFLAGS="$CFLAGS -g"
  	enable_fatal_warnings=no
  else
diff --git a/debian/patches/series b/debian/patches/series
index 7b5c47c..d4e9090 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,3 @@ ocft-configs.patch
 gitignore.patch
 reproducible.patch
 var-run.patch
-exportfs-fsid-optional.patch
-findif-loopback.patch