[packages/pacemaker.git] / pacemaker-libs.patch

--- pacemaker-Pacemaker-1.1.22/configure.ac.orig	2020-05-01 18:26:26.206360554 +0200
+++ pacemaker-Pacemaker-1.1.22/configure.ac	2020-05-01 18:32:45.394306317 +0200
@@ -807,17 +807,21 @@
 dnl ===============================================
 dnl Libraries
 dnl ===============================================
-AC_CHECK_LIB(socket, socket)			dnl -lsocket
-AC_CHECK_LIB(c, dlopen)				dnl if dlopen is in libc...
-AC_CHECK_LIB(dl, dlopen)			dnl -ldl (for Linux)
-AC_CHECK_LIB(rt, sched_getscheduler)            dnl -lrt (for Tru64)
-AC_CHECK_LIB(gnugetopt, getopt_long)		dnl -lgnugetopt ( if available )
-AC_CHECK_LIB(pam, pam_start)			dnl -lpam (if available)
+AC_SEARCH_LIBS(socket, socket)			dnl -lsocket
+AC_SEARCH_LIBS(dlopen, [dl])			dnl if dlopen is in libc... or -ldl (for Linux)
+AC_SEARCH_LIBS(sched_getscheduler, [rt])	dnl -lrt (for Tru64)
+AC_SEARCH_LIBS(getopt_long, [gnugetopt])	dnl -lgnugetopt ( if available )
+AC_CHECK_LIB(pam, pam_start, [LIBPAM=-lpam])	dnl -lpam (if available)
+AC_SUBST([LIBPAM])
 
 AC_CHECK_FUNCS([sched_setscheduler])
 
-AC_CHECK_LIB(uuid, uuid_parse)			dnl load the library if necessary
+AC_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid])	dnl load the library if necessary
+AC_SUBST([LIBUUID])
+oldLIBS="$LIBS"
+LIBS="$LIBS $LIBUUID"
 AC_CHECK_FUNCS(uuid_unparse)			dnl OSX ships uuid_* as standard functions
+LIBS="$oldLIBS"
 
 AC_CHECK_HEADERS(uuid/uuid.h)
 
@@ -941,8 +945,10 @@
 else
    XML2HEAD="`$XML2CONFIG --cflags`"
    AC_MSG_RESULT($XML2HEAD)
-   AC_CHECK_LIB(xml2, xmlReadMemory)
-   AC_CHECK_LIB(xslt, xsltApplyStylesheet)
+   AC_CHECK_LIB(xml2, xmlReadMemory, [AC_DEFINE([HAVE_LIBXML2], [1], [Have libxml2])  LIBXML2=-lxml2])
+   AC_CHECK_LIB(xslt, xsltApplyStylesheet, [AC_DEFINE([HAVE_LIBXSLT], [1], [Have libxslt])  LIBXSLT=-lxslt])
+   AC_SUBST([LIBXML2])
+   AC_SUBST([LIBXSLT])
 fi
 
 CPPFLAGS="$CPPFLAGS $XML2HEAD"
@@ -988,7 +994,8 @@
 dnl   bzip2
 dnl ========================================================================
 AC_CHECK_HEADERS(bzlib.h)
-AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress)
+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [LIBBZ2=-lbz2])
+AC_SUBST([LIBBZ2])
 
 if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
    AC_MSG_ERROR(BZ2 libraries not found)
@@ -1158,7 +1165,6 @@
 
 PKG_CHECK_MODULES(libqb, libqb >= 0.13)
 CPPFLAGS="$libqb_CFLAGS $CPPFLAGS"
-LIBS="$libqb_LIBS $LIBS"
 AC_CHECK_HEADERS(qb/qbipc_common.h)
 AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
 
@@ -1193,8 +1199,10 @@
 if test $HAVE_GLUE = 1; then
    dnl On Debian, AC_CHECK_LIBS fail if a library has any unresolved symbols
    dnl So check for all the dependencies (so they're added to LIBS) before checking for -lplumb
-   AC_CHECK_LIB(pils, PILLoadPlugin)
-   AC_CHECK_LIB(plumb, G_main_add_IPC_Channel)
+   AC_CHECK_LIB(pils, PILLoadPlugin, [LIBPILS=-lpils])
+   AC_CHECK_LIB(plumb, G_main_add_IPC_Channel, [LIBPLUMB=-lplumb])
+   AC_SUBST([LIBPILS])
+   AC_SUBST([LIBPLUMB])
 fi
 
 dnl ===============================================
@@ -1776,7 +1784,7 @@
     AC_MSG_RESULT($SUPPORT_ACL)
 
     SUPPORT_ACL=1
-    AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
+    AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [:])
     if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then
         SUPPORT_ACL=0
     fi
@@ -1842,9 +1850,12 @@
 	GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
 	AC_MSG_RESULT($GNUTLSLIBS)
 fi
-AC_CHECK_LIB(gnutls, gnutls_init)
+AC_CHECK_LIB(gnutls, gnutls_init, [GNUTLSLIBS=-lgnutls])
+oldLIBS="$LIBS"
+LIBS="$LIBS $GNUTLSLIBS"
 AC_CHECK_FUNCS(gnutls_priority_set_direct)
  AC_CHECK_FUNCS([gnutls_sec_param_to_pk_bits]) dnl since 2.12.0 (2011-03-24)
+LIBS="$oldLIBS"
 
 AC_SUBST(GNUTLSHEAD)
 AC_SUBST(GNUTLSLIBS)
--- pacemaker-Pacemaker-1.1.19/pengine/Makefile.am.orig	2018-09-02 14:24:36.610144333 +0200
+++ pacemaker-Pacemaker-1.1.19/pengine/Makefile.am	2018-09-02 14:45:59.036796358 +0200
@@ -66,14 +66,14 @@
 libpengine_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)
 
 libpengine_la_LIBADD	= $(top_builddir)/lib/pengine/libpe_status.la \
-			$(top_builddir)/lib/cib/libcib.la
+			$(top_builddir)/lib/cib/libcib.la $(LIBXML2)
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
 libpengine_la_SOURCES	= pengine.c allocate.c notif.c utils.c constraints.c
 libpengine_la_SOURCES	+= native.c group.c clone.c master.c graph.c utilization.c container.c
 
 pengine_CFLAGS	= $(CFLAGS_HARDENED_EXE)
 pengine_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
-pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
+pengine_LDADD	= $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(libqb_LIBS)
 # libcib for get_object_root()
 #		$(top_builddir)/lib/hbclient/libhbclient.la
 pengine_SOURCES	= main.c
--- pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am.orig	2018-09-02 14:46:36.066795934 +0200
+++ pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am	2018-09-02 14:48:38.040127875 +0200
@@ -35,7 +35,7 @@
 libcrmcommon_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libcrmcommon_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)
 
-libcrmcommon_la_LIBADD	= @LIBADD_DL@ $(GNUTLSLIBS)
+libcrmcommon_la_LIBADD	= @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm
 
 libcrmcommon_la_SOURCES	= compat.c digest.c ipc.c io.c procfs.c utils.c xml.c	\
 			  iso8601.c remote.c mainloop.c logging.c watchdog.c	\
--- pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am.orig	2017-04-16 07:34:31.132737427 +0200
+++ pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am	2017-04-16 07:39:18.802734141 +0200
@@ -30,7 +30,7 @@
 libcib_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libcib_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)
 
-libcib_la_LIBADD	= $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
+libcib_la_LIBADD	= $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la $(GNUTLSLIBS)
 
 clean-generic:
 	rm -f *.log *.debug *.xml *~
--- pacemaker-Pacemaker-1.1.22/lib/pengine/Makefile.am.orig	2020-05-01 18:33:26.394084202 +0200
+++ pacemaker-Pacemaker-1.1.22/lib/pengine/Makefile.am	2020-05-01 18:38:21.532485300 +0200
@@ -36,7 +36,7 @@
 libpe_status_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libpe_status_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)
 
-libpe_status_la_LIBADD	= @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
+libpe_status_la_LIBADD	= @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
 # Use += rather than backlashed continuation lines for parsing by bumplibs.sh
 libpe_status_la_SOURCES        =
 libpe_status_la_SOURCES        += container.c
--- pacemaker-Pacemaker-1.1.22/lib/fencing/Makefile.am.orig	2020-05-01 18:33:26.394084202 +0200
+++ pacemaker-Pacemaker-1.1.22/lib/fencing/Makefile.am	2020-05-01 18:37:57.309283195 +0200
@@ -16,6 +16,7 @@
 
 libstonithd_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
 libstonithd_la_LIBADD   += $(top_builddir)/lib/services/libcrmservice.la
+libstonithd_la_LIBADD   += $(LIBPILS)
 
 libstonithd_la_SOURCES	= st_client.c st_rhcs.c
 if BUILD_LHA_SUPPORT
--- pacemaker-Pacemaker-1.1.16/cib/Makefile.am.orig	2017-04-16 07:34:31.236070760 +0200
+++ pacemaker-Pacemaker-1.1.16/cib/Makefile.am	2017-04-16 07:42:50.786065054 +0200
@@ -36,7 +36,7 @@
 cib_LDFLAGS	= $(LDFLAGS_HARDENED_EXE)
 
 cib_LDADD	= $(top_builddir)/lib/cluster/libcrmcluster.la \
-		$(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
+		$(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) $(LIBPAM)
 
 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
Commit	Line	Data
3745c552 JB	1	--- pacemaker-Pacemaker-1.1.22/configure.ac.orig 2020-05-01 18:26:26.206360554 +0200
	2	+++ pacemaker-Pacemaker-1.1.22/configure.ac 2020-05-01 18:32:45.394306317 +0200
	3	@@ -807,17 +807,21 @@
650f9adf JB	4	dnl ===============================================
	5	dnl Libraries
	6	dnl ===============================================
	7	-AC_CHECK_LIB(socket, socket) dnl -lsocket
	8	-AC_CHECK_LIB(c, dlopen) dnl if dlopen is in libc...
	9	-AC_CHECK_LIB(dl, dlopen) dnl -ldl (for Linux)
	10	-AC_CHECK_LIB(rt, sched_getscheduler) dnl -lrt (for Tru64)
	11	-AC_CHECK_LIB(gnugetopt, getopt_long) dnl -lgnugetopt ( if available )
	12	-AC_CHECK_LIB(pam, pam_start) dnl -lpam (if available)
	13	+AC_SEARCH_LIBS(socket, socket) dnl -lsocket
	14	+AC_SEARCH_LIBS(dlopen, [dl]) dnl if dlopen is in libc... or -ldl (for Linux)
68084dab JB	15	+AC_SEARCH_LIBS(sched_getscheduler, [rt]) dnl -lrt (for Tru64)
68084dab JB	16	+AC_SEARCH_LIBS(getopt_long, [gnugetopt]) dnl -lgnugetopt ( if available )
650f9adf JB	17	+AC_CHECK_LIB(pam, pam_start, [LIBPAM=-lpam]) dnl -lpam (if available)
	18	+AC_SUBST([LIBPAM])
	19
68084dab	20	AC_CHECK_FUNCS([sched_setscheduler])
650f9adf JB	21
650f9adf JB	22	-AC_CHECK_LIB(uuid, uuid_parse) dnl load the library if necessary
68084dab	23	+AC_CHECK_LIB(uuid, uuid_parse, [LIBUUID=-luuid]) dnl load the library if necessary
650f9adf JB	24	+AC_SUBST([LIBUUID])
	25	+oldLIBS="$LIBS"
	26	+LIBS="$LIBS $LIBUUID"
	27	AC_CHECK_FUNCS(uuid_unparse) dnl OSX ships uuid_* as standard functions
	28	+LIBS="$oldLIBS"
	29
	30	AC_CHECK_HEADERS(uuid/uuid.h)
	31
3745c552	32	@@ -941,8 +945,10 @@
650f9adf JB	33	else
	34	XML2HEAD="`$XML2CONFIG --cflags`"
	35	AC_MSG_RESULT($XML2HEAD)
	36	- AC_CHECK_LIB(xml2, xmlReadMemory)
	37	- AC_CHECK_LIB(xslt, xsltApplyStylesheet)
a6bb34f7 JB	38	+ AC_CHECK_LIB(xml2, xmlReadMemory, [AC_DEFINE([HAVE_LIBXML2], [1], [Have libxml2]) LIBXML2=-lxml2])
a6bb34f7 JB	39	+ AC_CHECK_LIB(xslt, xsltApplyStylesheet, [AC_DEFINE([HAVE_LIBXSLT], [1], [Have libxslt]) LIBXSLT=-lxslt])
650f9adf JB	40	+ AC_SUBST([LIBXML2])
	41	+ AC_SUBST([LIBXSLT])
	42	fi
	43
	44	CPPFLAGS="$CPPFLAGS $XML2HEAD"
3745c552	45	@@ -988,7 +994,8 @@
650f9adf JB	46	dnl bzip2
	47	dnl ========================================================================
	48	AC_CHECK_HEADERS(bzlib.h)
	49	-AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress)
	50	+AC_CHECK_LIB(bz2, BZ2_bzBuffToBuffCompress, [LIBBZ2=-lbz2])
	51	+AC_SUBST([LIBBZ2])
	52
	53	if test x$ac_cv_lib_bz2_BZ2_bzBuffToBuffCompress != xyes ; then
	54	AC_MSG_ERROR(BZ2 libraries not found)
3745c552	55	@@ -1158,7 +1165,6 @@
73114340	56
3745c552	57	PKG_CHECK_MODULES(libqb, libqb >= 0.13)
bd08ac9c JB	58	CPPFLAGS="$libqb_CFLAGS $CPPFLAGS"
	59	-LIBS="$libqb_LIBS $LIBS"
	60	AC_CHECK_HEADERS(qb/qbipc_common.h)
	61	AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
650f9adf	62
3745c552	63	@@ -1193,8 +1199,10 @@
650f9adf JB	64	if test $HAVE_GLUE = 1; then
650f9adf JB	65	dnl On Debian, AC_CHECK_LIBS fail if a library has any unresolved symbols
bd08ac9c	66	dnl So check for all the dependencies (so they're added to LIBS) before checking for -lplumb
650f9adf JB	67	- AC_CHECK_LIB(pils, PILLoadPlugin)
	68	- AC_CHECK_LIB(plumb, G_main_add_IPC_Channel)
	69	+ AC_CHECK_LIB(pils, PILLoadPlugin, [LIBPILS=-lpils])
	70	+ AC_CHECK_LIB(plumb, G_main_add_IPC_Channel, [LIBPLUMB=-lplumb])
	71	+ AC_SUBST([LIBPILS])
	72	+ AC_SUBST([LIBPLUMB])
	73	fi
	74
	75	dnl ===============================================
3745c552	76	@@ -1776,7 +1784,7 @@
650f9adf JB	77	AC_MSG_RESULT($SUPPORT_ACL)
	78
	79	SUPPORT_ACL=1
	80	- AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
	81	+ AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [:])
	82	if test $ac_cv_lib_qb_qb_ipcs_connection_auth_set != yes; then
	83	SUPPORT_ACL=0
	84	fi
3745c552	85	@@ -1842,9 +1850,12 @@
650f9adf JB	86	GNUTLSLIBS="`$LIBGNUTLS_CONFIG --libs`";
	87	AC_MSG_RESULT($GNUTLSLIBS)
	88	fi
	89	-AC_CHECK_LIB(gnutls, gnutls_init)
	90	+AC_CHECK_LIB(gnutls, gnutls_init, [GNUTLSLIBS=-lgnutls])
	91	+oldLIBS="$LIBS"
	92	+LIBS="$LIBS $GNUTLSLIBS"
	93	AC_CHECK_FUNCS(gnutls_priority_set_direct)
3745c552	94	AC_CHECK_FUNCS([gnutls_sec_param_to_pk_bits]) dnl since 2.12.0 (2011-03-24)
650f9adf JB	95	+LIBS="$oldLIBS"
	96
	97	AC_SUBST(GNUTLSHEAD)
	98	AC_SUBST(GNUTLSLIBS)
8b506ea9 JB	99	--- pacemaker-Pacemaker-1.1.19/pengine/Makefile.am.orig 2018-09-02 14:24:36.610144333 +0200
8b506ea9 JB	100	+++ pacemaker-Pacemaker-1.1.19/pengine/Makefile.am 2018-09-02 14:45:59.036796358 +0200
a6bb34f7 JB	101	@@ -66,14 +66,14 @@
	102	libpengine_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
	103
	104	libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la \
	105	- $(top_builddir)/lib/cib/libcib.la
	106	+ $(top_builddir)/lib/cib/libcib.la $(LIBXML2)
	107	# -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
	108	libpengine_la_SOURCES = pengine.c allocate.c notif.c utils.c constraints.c
8b506ea9	109	libpengine_la_SOURCES += native.c group.c clone.c master.c graph.c utilization.c container.c
a6bb34f7 JB	110
	111	pengine_CFLAGS = $(CFLAGS_HARDENED_EXE)
	112	pengine_LDFLAGS = $(LDFLAGS_HARDENED_EXE)
650f9adf	113	-pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
73114340	114	+pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(libqb_LIBS)
650f9adf JB	115	# libcib for get_object_root()
650f9adf JB	116	# $(top_builddir)/lib/hbclient/libhbclient.la
a6bb34f7	117	pengine_SOURCES = main.c
8b506ea9 JB	118	--- pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am.orig 2018-09-02 14:46:36.066795934 +0200
	119	+++ pacemaker-Pacemaker-1.1.19/lib/common/Makefile.am 2018-09-02 14:48:38.040127875 +0200
	120	@@ -35,7 +35,7 @@
a6bb34f7 JB	121	libcrmcommon_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
	122	libcrmcommon_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
	123
8b506ea9	124	-libcrmcommon_la_LIBADD = @LIBADD_DL@ $(GNUTLSLIBS)
a6bb34f7 JB	125	+libcrmcommon_la_LIBADD = @LIBADD_DL@ $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(libqb_LIBS) $(LIBBZ2) $(LIBUUID) -lm
a6bb34f7 JB	126
8b506ea9 JB	127	libcrmcommon_la_SOURCES = compat.c digest.c ipc.c io.c procfs.c utils.c xml.c \
8b506ea9 JB	128	iso8601.c remote.c mainloop.c logging.c watchdog.c \
a6bb34f7 JB	129	--- pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am.orig 2017-04-16 07:34:31.132737427 +0200
	130	+++ pacemaker-Pacemaker-1.1.16/lib/cib/Makefile.am 2017-04-16 07:39:18.802734141 +0200
	131	@@ -30,7 +30,7 @@
	132	libcib_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
	133	libcib_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
	134
	135	-libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
	136	+libcib_la_LIBADD = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la $(GNUTLSLIBS)
07ce3f2c MM	137
07ce3f2c MM	138	clean-generic:
a6bb34f7	139	rm -f .log .debug .xml ~
3745c552 JB	140	--- pacemaker-Pacemaker-1.1.22/lib/pengine/Makefile.am.orig 2020-05-01 18:33:26.394084202 +0200
3745c552 JB	141	+++ pacemaker-Pacemaker-1.1.22/lib/pengine/Makefile.am 2020-05-01 18:38:21.532485300 +0200
a6bb34f7 JB	142	@@ -36,7 +36,7 @@
	143	libpe_status_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
	144	libpe_status_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
	145
	146	-libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
	147	+libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
3745c552 JB	148	# Use += rather than backlashed continuation lines for parsing by bumplibs.sh
	149	libpe_status_la_SOURCES =
	150	libpe_status_la_SOURCES += container.c
	151	--- pacemaker-Pacemaker-1.1.22/lib/fencing/Makefile.am.orig 2020-05-01 18:33:26.394084202 +0200
	152	+++ pacemaker-Pacemaker-1.1.22/lib/fencing/Makefile.am 2020-05-01 18:37:57.309283195 +0200
	153	@@ -16,6 +16,7 @@
	154
	155	libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
	156	libstonithd_la_LIBADD += $(top_builddir)/lib/services/libcrmservice.la
	157	+libstonithd_la_LIBADD += $(LIBPILS)
8b506ea9 JB	158
	159	libstonithd_la_SOURCES = st_client.c st_rhcs.c
	160	if BUILD_LHA_SUPPORT
a6bb34f7 JB	161	--- pacemaker-Pacemaker-1.1.16/cib/Makefile.am.orig 2017-04-16 07:34:31.236070760 +0200
	162	+++ pacemaker-Pacemaker-1.1.16/cib/Makefile.am 2017-04-16 07:42:50.786065054 +0200
	163	@@ -36,7 +36,7 @@
	164	cib_LDFLAGS = $(LDFLAGS_HARDENED_EXE)
	165
	166	cib_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la \
	167	- $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
	168	+ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) $(LIBPAM)
	169
	170	cib_SOURCES = io.c messages.c notify.c \
	171	callbacks.c main.c remote.c common.c
17e4c920 JB	172	--- pacemaker-Pacemaker-1.1.24/lib/transition/Makefile.am.orig 2020-12-03 16:37:50.000000000 +0100
	173	+++ pacemaker-Pacemaker-1.1.24/lib/transition/Makefile.am 2022-02-07 17:40:24.372315923 +0100
	174	@@ -28,7 +28,7 @@ libtransitioner_la_CPPFLAGS = -I$(top_bu
	175	libtransitioner_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
	176	libtransitioner_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)
	177
	178	-libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
	179	+libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/lrmd/liblrmd.la
	180	libtransitioner_la_SOURCES = unpack.c graph.c utils.c
	181
	182	clean-generic:
	183	--- pacemaker-Pacemaker-1.1.24/lib/Makefile.am.orig 2020-12-03 16:37:50.000000000 +0100
	184	+++ pacemaker-Pacemaker-1.1.24/lib/Makefile.am 2022-02-07 17:45:16.017402612 +0100
	185	@@ -29,7 +29,7 @@ clean-local:
	186	rm -f $(PC_FILES)
	187
	188	## Subdirectories...
	189	-SUBDIRS = gnu common pengine transition cib services fencing lrmd cluster
	190	+SUBDIRS = gnu common pengine cib services fencing lrmd transition cluster
	191	DIST_SUBDIRS = $(SUBDIRS)
	192
	193	if BUILD_CS_PLUGIN