[packages/pacemaker] - updated to 1.1.24 - updated libs patch - added libesmtp patch (support libesmtp 1.1.0 via pkg-conf

[qboosh]

commit 17e4c9201acf8dd5467c68f9ff91bfb3e6cec0f4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Feb 7 19:16:30 2022 +0100

    - updated to 1.1.24
    - updated libs patch
    - added libesmtp patch (support libesmtp 1.1.0 via pkg-config instead of libesmtp-config script)

 pacemaker-libesmtp.patch | 15 +++++++++++++++
 pacemaker-libs.patch     | 22 ++++++++++++++++++++++
 pacemaker.spec           |  8 +++++---
 3 files changed, 42 insertions(+), 3 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 3daa974..cd78e2a 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -15,19 +15,20 @@
 Summary:	The scalable High-Availability cluster resource manager
 Summary(pl.UTF-8):	Skalowalny zarządca zasobów klastrów o wysokiej dostępności
 Name:		pacemaker
-Version:	1.1.22
-Release:	2
+Version:	1.1.24
+Release:	1
 License:	GPL v2+, LGPL v2.1+
 Group:		Applications/System
 #Source0Download: https://github.com/ClusterLabs/pacemaker/releases
 Source0:	https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-%{version}.tar.gz
-# Source0-md5:	ae655914911680a34faf6b0b5033fc6f
+# Source0-md5:	4e0b76f7ba00535514a97dcf9cd47813
 Source1:	%{name}.tmpfiles
 Source2:	%{name}.init
 Source3:	%{name}.service
 Patch0:		%{name}-automake.patch
 Patch1:		%{name}-manpage_xslt.patch
 Patch2:		%{name}-update.patch
+Patch3:		%{name}-libesmtp.patch
 Patch4:		%{name}-libs.patch
 Patch5:		%{name}-heartbeat-libexecdir.patch
 Patch6:		%{name}-no-common.patch
@@ -204,6 +205,7 @@ Dokumentacja do Pacemakera.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
diff --git a/pacemaker-libesmtp.patch b/pacemaker-libesmtp.patch
new file mode 100644
index 0000000..d0d621c
--- /dev/null
+++ b/pacemaker-libesmtp.patch
@@ -0,0 +1,15 @@
+--- pacemaker-Pacemaker-1.1.24/configure.ac.orig	2022-02-07 17:25:42.088523345 +0100
++++ pacemaker-Pacemaker-1.1.24/configure.ac	2022-02-07 17:31:38.959923340 +0100
+@@ -1736,7 +1736,11 @@ else
+    fi
+ 
+    if test $SUPPORT_ESMTP != no; then
+-	AC_PATH_PROGS(ESMTPCONFIG, libesmtp-config)
++	if $PKG_CONFIG --exists libesmtp-1.0 ; then
++		ESMTPCONFIG="$PKG_CONFIG libesmtp-1.0"
++	else
++		AC_PATH_PROGS(ESMTPCONFIG, libesmtp-config)
++	fi
+ 	if test "X${ESMTPCONFIG}" = "X"; then
+ 		AC_MSG_RESULT(You need the libesmtp development package to continue.)
+ 		SUPPORT_ESMTP=no
diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 78f08e3..6c13756 100644
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -169,3 +169,25 @@
  
  cib_SOURCES	= io.c messages.c notify.c \
  		callbacks.c main.c remote.c common.c
+--- pacemaker-Pacemaker-1.1.24/lib/transition/Makefile.am.orig	2020-12-03 16:37:50.000000000 +0100
++++ pacemaker-Pacemaker-1.1.24/lib/transition/Makefile.am	2022-02-07 17:40:24.372315923 +0100
+@@ -28,7 +28,7 @@ libtransitioner_la_CPPFLAGS	= -I$(top_bu
+ libtransitioner_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
+ libtransitioner_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)
+ 
+-libtransitioner_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
++libtransitioner_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/lrmd/liblrmd.la
+ libtransitioner_la_SOURCES	= unpack.c graph.c utils.c
+ 
+ clean-generic:
+--- pacemaker-Pacemaker-1.1.24/lib/Makefile.am.orig	2020-12-03 16:37:50.000000000 +0100
++++ pacemaker-Pacemaker-1.1.24/lib/Makefile.am	2022-02-07 17:45:16.017402612 +0100
+@@ -29,7 +29,7 @@ clean-local:
+ 	rm -f $(PC_FILES)
+ 
+ ## Subdirectories...
+-SUBDIRS	= gnu common pengine transition cib services fencing lrmd cluster
++SUBDIRS	= gnu common pengine cib services fencing lrmd transition cluster
+ DIST_SUBDIRS = $(SUBDIRS)
+ 
+ if BUILD_CS_PLUGIN
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pacemaker.git/commitdiff/17e4c9201acf8dd5467c68f9ff91bfb3e6cec0f4