Merging debian version 1:4.14.0-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 20 insertions, 103 deletions

diff --git a/debian/changelog b/debian/changelog
index 31e754e..32ad49f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+resource-agents (1:4.14.0-1) unstable; urgency=medium
+
+  * New upstream version 4.14.0
+  * debian/patches: refresh for new version
+  * debian/control: update Standards-Version to 4.7.0
+  * debian/control: update Build-Depends for systemd-dev (Closes: #1060518,
+    #1071980)
+  * debian/control: drop legacy depends on syslog for ldirectord (Closes:
+    #1072026)
+  * debian/tests: install exim4 for MailTo test (Closes: #1060759)
+  * debian/control: update Build-Depends for pkgconf
+
+ -- Valentin Vidic <vvidic@debian.org>  Wed, 05 Jun 2024 21:18:06 +0200
+
 resource-agents (1:4.13.0-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index fdb66cc..03e7f51 100644
--- a/debian/control
+++ b/debian/control
@@ -27,17 +27,17 @@ Build-Depends: autoconf,
                libtool,
                libxml2-utils,
                net-tools,
-               pkg-config,
+               pkgconf,
                python3,
                python3-googleapi,
                python3-pyroute2,
                shellcheck,
 #              for systemd.pc:
-               systemd [linux-any],
+               systemd-dev,
                xsltproc,
                xml-twig-tools,
 Rules-Requires-Root: no
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: https://github.com/ClusterLabs/resource-agents
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/resource-agents
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/resource-agents
@@ -78,7 +78,6 @@ Depends: ipvsadm,
          ${misc:Depends},
          ${perl:Depends}
 Pre-Depends: ${misc:Pre-Depends}
-Recommends: logrotate, rsyslog | system-log-daemon
 Description: Monitors virtual services provided by LVS
  ldirectord is a stand-alone daemon to monitor real servers behind
  virtual services provided by The Linux Virtual Server (LVS).
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
diff --git a/debian/tests/control b/debian/tests/control
index e80996d..8e229e7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -7,7 +7,7 @@ Depends: ldirectord
 Restrictions: needs-root, isolation-container
 
 Test-Command: debian/tests/run-ocft MailTo
-Depends: resource-agents, bsd-mailx
+Depends: resource-agents, bsd-mailx, exim4
 Restrictions: needs-root, isolation-container
 
 Test-Command: debian/tests/run-ocft apache