[packages/pacemaker] - (re)added link patch, now removing unnecessary libraries from global LIBS - added corosync patch (
qboosh
qboosh at pld-linux.org
Sun Sep 8 18:24:36 CEST 2013
commit 650f9adf590050405a3d19682ff32eda3b4aec8b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 8 18:24:31 2013 +0200
- (re)added link patch, now removing unnecessary libraries from global LIBS
- added corosync patch (fixes build without corosync support)
- added update patch (updates servicelog-related code, allowing to compile)
- added man patch (removes ipmiservicelogd.8 from generated mans, ipmiservicelogd doesn't support --help)
pacemaker-corosync.patch | 12 +++
pacemaker-libs.patch | 221 ++++++++++++++++++++++++++++++++++++-----------
pacemaker-man.patch | 11 +++
pacemaker-update.patch | 74 ++++++++++++++++
pacemaker.spec | 126 ++++++++++++++++++++++-----
5 files changed, 372 insertions(+), 72 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 1697581..fb8abb1 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -2,7 +2,15 @@
# Conditional build:
%bcond_without corosync # Corosync stack support
%bcond_without heartbeat # Heartbeat stack support
+%bcond_without servicelog # ServiceLog support [IBM PPC specific]
+%bcond_without ipmi # IPMI ServiceLog support [IBM PPC specific]
#
+%ifnarch ppc ppc64
+%undefine with_servicelog
+%endif
+%if %{without servicelog}
+%undefine with_ipmi
+%endif
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
@@ -17,22 +25,31 @@ Source2: %{name}.init
Source3: %{name}.service
Patch0: %{name}-automake.patch
Patch1: %{name}-manpage_xslt.patch
+Patch2: %{name}-corosync.patch
+Patch3: %{name}-update.patch
+Patch4: %{name}-man.patch
+Patch5: %{name}-libs.patch
URL: http://clusterlabs.org/wiki/Main_Page
+%{?with_ipmi:BuildRequires: OpenIPMI-devel}
BuildRequires: asciidoc
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: bzip2-devel
BuildRequires: cluster-glue-libs-devel
%{?with_corosync:BuildRequires: corosync-devel >= 2.0}
BuildRequires: docbook-style-xsl
BuildRequires: e2fsprogs-devel
-BuildRequires: glib2-devel
+BuildRequires: glib2-devel >= 2.0
BuildRequires: gnutls-devel
+BuildRequires: help2man
%{?with_heartbeat:BuildRequires: heartbeat-devel >= 3.0.5-6}
BuildRequires: libesmtp-devel
-BuildRequires: libqb
+BuildRequires: libltdl-devel
+BuildRequires: libqb-devel >= 0.13
+%{?with_servicelog:BuildRequires: libservicelog-devel}
BuildRequires: libtool
-BuildRequires: libxml2-devel
+BuildRequires: libuuid-devel
+BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxslt-devel
BuildRequires: libxslt-progs
BuildRequires: ncurses-devel
@@ -52,10 +69,6 @@ Provides: user(hacluster)
Suggests: pacemaker-shell
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# Unresolved symbol in libpe_status.so.3.0.0: get_object_root
-# not handled by -libs patch, as it is a circular dependency
-%define skip_post_check_so libpe_status.so.*
-
%description
Pacemaker makes use of your cluster infrastructure (either
Corosync/OpenAIS or Heartbeat) to stop, start and monitor the health
@@ -167,6 +180,10 @@ lub w kontenerach uruchomionych na klastrze opartym o Pacemaker.
%setup -qn pacemaker-Pacemaker-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
%{__libtoolize}
@@ -175,30 +192,32 @@ lub w kontenerach uruchomionych na klastrze opartym o Pacemaker.
%{__autoheader}
%{__automake}
+CPPFLAGS="%{rpmcppflags} %{?with_heartbeat:-I/usr/include/heartbeat}"
%configure \
- CPPFLAGS="%{rpmcppflags} %{?with_heartbeat:-I/usr/include/heartbeat}" \
--with-acl \
--with-corosync%{!?with_corosync:=no} \
--with-esmtp \
--with-heartbeat%{!?with_heartbeat:=no} \
--with-initdir=/etc/rc.d/init.d \
--with-snmp \
- --disable-fatal-warnings
+ --disable-fatal-warnings \
+ --disable-silent-rules
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,/etc/rc.d/init.d,%{systemdunitdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pacemaker
-install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+%if %{with corosync}
+install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install -D %{SOURCE3} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -262,6 +281,12 @@ fi
%attr(755,root,root) %{_sbindir}/fence_pcmk
%attr(755,root,root) %{_sbindir}/iso8601
%attr(755,root,root) %{_sbindir}/stonith_admin
+%if %{with servicelog}
+%if %{with ipmi}
+%attr(755,root,root) %{_sbindir}/ipmiservicelogd
+%endif
+%attr(755,root,root) %{_sbindir}/notifyServicelogEvent
+%endif
%dir %{_libdir}/%{name}
%attr(755,root,root) %{_libdir}/%{name}/attrd
%attr(755,root,root) %{_libdir}/%{name}/cib
@@ -273,8 +298,12 @@ fi
%attr(755,root,root) %{_libdir}/%{name}/stonith-test
%attr(755,root,root) %{_libdir}/%{name}/stonithd
%{_datadir}/pacemaker
-%{_datadir}/snmp/mibs/*
+%{_datadir}/snmp/mibs/PCMK-MIB.txt
%{py_sitedir}/cts
+%{_mandir}/man7/crmd.7*
+%{_mandir}/man7/ocf_pacemaker_*.7*
+%{_mandir}/man7/pengine.7*
+%{_mandir}/man7/stonithd.7*
%{_mandir}/man8/attrd_updater.8*
%{_mandir}/man8/cibadmin.8*
%{_mandir}/man8/crm_attribute.8*
@@ -296,7 +325,9 @@ fi
%{_mandir}/man8/fence_pcmk.8*
%{_mandir}/man8/iso8601.8*
%{_mandir}/man8/stonith_admin.8*
-%{_mandir}/man7/*.7*
+%if %{with servicelog}
+%{_mandir}/man8/notifyServicelogEvent.8*
+%endif
%dir %{_prefix}/lib/ocf/resource.d/pacemaker
%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ClusterMon
@@ -321,19 +352,70 @@ fi
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%attr(755,root,root) %{_libdir}/lib*.so.[0-9]
+%attr(755,root,root) %{_libdir}/libcib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcib.so.3
+%attr(755,root,root) %{_libdir}/libcrmcluster.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcrmcluster.so.4
+%attr(755,root,root) %{_libdir}/libcrmcommon.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcrmcommon.so.3
+%attr(755,root,root) %{_libdir}/libcrmservice.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcrmservice.so.1
+%attr(755,root,root) %{_libdir}/liblrmd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblrmd.so.1
+%attr(755,root,root) %{_libdir}/libpe_rules.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpe_rules.so.2
+%attr(755,root,root) %{_libdir}/libpe_status.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpe_status.so.4
+%attr(755,root,root) %{_libdir}/libpengine.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpengine.so.4
+%attr(755,root,root) %{_libdir}/libstonithd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libstonithd.so.2
+%attr(755,root,root) %{_libdir}/libtransitioner.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libtransitioner.so.2
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libcib.so
+%attr(755,root,root) %{_libdir}/libcrmcluster.so
+%attr(755,root,root) %{_libdir}/libcrmcommon.so
+%attr(755,root,root) %{_libdir}/libcrmservice.so
+%attr(755,root,root) %{_libdir}/liblrmd.so
+%attr(755,root,root) %{_libdir}/libpe_rules.so
+%attr(755,root,root) %{_libdir}/libpe_status.so
+%attr(755,root,root) %{_libdir}/libpengine.so
+%attr(755,root,root) %{_libdir}/libstonithd.so
+%attr(755,root,root) %{_libdir}/libtransitioner.so
+%{_libdir}/libcib.la
+%{_libdir}/libcrmcluster.la
+%{_libdir}/libcrmcommon.la
+%{_libdir}/libcrmservice.la
+%{_libdir}/liblrmd.la
+%{_libdir}/libpe_rules.la
+%{_libdir}/libpe_status.la
+%{_libdir}/libpengine.la
+%{_libdir}/libstonithd.la
+%{_libdir}/libtransitioner.la
%{_includedir}/pacemaker
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/pacemaker.pc
+%{_pkgconfigdir}/pacemaker-cib.pc
+%{_pkgconfigdir}/pacemaker-cluster.pc
+%{_pkgconfigdir}/pacemaker-fencing.pc
+%{_pkgconfigdir}/pacemaker-lrmd.pc
+%{_pkgconfigdir}/pacemaker-pengine.pc
+%{_pkgconfigdir}/pacemaker-service.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libcib.a
+%{_libdir}/libcrmcluster.a
+%{_libdir}/libcrmcommon.a
+%{_libdir}/libcrmservice.a
+%{_libdir}/liblrmd.a
+%{_libdir}/libpe_rules.a
+%{_libdir}/libpe_status.a
+%{_libdir}/libpengine.a
+%{_libdir}/libstonithd.a
+%{_libdir}/libtransitioner.a
%files remote
%defattr(644,root,root,755)
diff --git a/pacemaker-corosync.patch b/pacemaker-corosync.patch
new file mode 100644
index 0000000..f1011b9
--- /dev/null
+++ b/pacemaker-corosync.patch
@@ -0,0 +1,12 @@
+--- pacemaker-Pacemaker-1.1.10/include/crm/cluster.h.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/include/crm/cluster.h 2013-09-07 17:08:13.369459479 +0200
+@@ -195,7 +195,9 @@
+ const char *get_local_node_name(void);
+ char *get_node_name(uint32_t nodeid);
+
++#if SUPPORT_COROSYNC
+ char *pcmk_message_common_cs(cpg_handle_t handle, uint32_t nodeid, uint32_t pid, void *msg,
+ uint32_t *kind, const char **from);
++#endif
+
+ #endif
diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 2b6e370..7620da9 100644
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -1,55 +1,176 @@
-diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/Makefile.am pacemaker-Pacemaker-1.1.9/lib/Makefile.am
---- pacemaker-Pacemaker-1.1.9.orig/lib/Makefile.am 2013-03-08 11:48:01.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.9/lib/Makefile.am 2013-06-21 13:53:10.000000000 +0200
-@@ -39,7 +39,7 @@
- rm -f *.pc
-
- ## Subdirectories...
--SUBDIRS = gnu common pengine transition cib fencing services lrmd cluster
-+SUBDIRS = gnu common pengine cib transition fencing services lrmd cluster
- DIST_SUBDIRS = $(SUBDIRS) ais
-
- if BUILD_CS_PLUGIN
-diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/pengine/Makefile.am pacemaker-Pacemaker-1.1.9/lib/pengine/Makefile.am
---- pacemaker-Pacemaker-1.1.9.orig/lib/pengine/Makefile.am 2013-03-08 11:48:01.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.9/lib/pengine/Makefile.am 2013-06-21 13:54:07.000000000 +0200
-@@ -28,10 +28,12 @@
-
- libpe_rules_la_LDFLAGS = -version-info 2:2:0
- libpe_rules_la_SOURCES = rules.c common.c
-+libpe_rules_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
-
- libpe_status_la_LDFLAGS = -version-info 5:0:1
+--- pacemaker-Pacemaker-1.1.10/configure.ac.orig 2013-09-08 08:13:21.430513721 +0200
++++ pacemaker-Pacemaker-1.1.10/configure.ac 2013-09-08 13:42:48.939684155 +0200
+@@ -612,17 +612,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_getparam sched_setparam sched_get_priority_min])
+
+-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)
+
+@@ -764,8 +766,10 @@
+ else
+ XML2HEAD="`$XML2CONFIG --cflags`"
+ AC_MSG_RESULT($XML2HEAD)
+- AC_CHECK_LIB(xml2, xmlReadMemory)
+- AC_CHECK_LIB(xslt, xsltApplyStylesheet)
++ AC_CHECK_LIB(xml2, xmlReadMemory, [LIBXML2=-lxml2])
++ AC_CHECK_LIB(xslt, xsltApplyStylesheet, [LIBXSLT=-lxslt])
++ AC_SUBST([LIBXML2])
++ AC_SUBST([LIBXSLT])
+ fi
+
+ CPPFLAGS="$CPPFLAGS $XML2HEAD"
+@@ -830,7 +832,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)
+@@ -992,7 +994,8 @@
+
+ PKG_CHECK_MODULES(libqb, libqb, HAVE_libqb=1, HAVE_libqb=0)
+ AC_CHECK_HEADERS(qb/qbipc_common.h)
+-AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set)
++AC_CHECK_LIB(qb, qb_ipcs_connection_auth_set, [LIBQB=-lqb])
++AC_SUBST([LIBQB])
+
+ LIBQB_LOG=1
+ PCMK_FEATURES="$PCMK_FEATURES libqb-logging libqb-ipc"
+@@ -1003,7 +1005,6 @@
+ AC_MSG_FAILURE(Version of libqb is too old: v0.13 or greater requried)
+ fi
+
+-LIBS="$LIBS $libqb_LIBS"
+
+ AC_CHECK_HEADERS(heartbeat/hb_config.h)
+ AC_CHECK_HEADERS(heartbeat/glue_config.h)
+@@ -1030,8 +1031,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 depenancies (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 ===============================================
+@@ -1526,7 +1527,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
+@@ -1592,8 +1593,11 @@
+ 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)
++LIBS="$oldLIBS"
+
+ AC_SUBST(GNUTLSHEAD)
+ AC_SUBST(GNUTLSLIBS)
+--- pacemaker-Pacemaker-1.1.10/pengine/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/pengine/Makefile.am 2013-09-08 15:19:23.022774335 +0200
+@@ -65,10 +65,10 @@
+ libpengine_la_SOURCES += native.c group.c clone.c master.c graph.c
+
+ libpengine_la_LIBADD = $(top_builddir)/lib/pengine/libpe_status.la \
+- $(top_builddir)/lib/cib/libcib.la
++ $(top_builddir)/lib/cib/libcib.la $(LIBXML2)
+
+ pengine_SOURCES = main.c
+-pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS)
++pengine_LDADD = $(top_builddir)/lib/cib/libcib.la $(COMMONLIBS) $(LIBQB)
+ # libcib for get_object_root()
+ # $(top_builddir)/lib/hbclient/libhbclient.la
+
+--- pacemaker-Pacemaker-1.1.10/lib/common/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/lib/common/Makefile.am 2013-09-08 15:15:32.782783998 +0200
+@@ -38,7 +38,7 @@
+ endif
+
+ libcrmcommon_la_LDFLAGS = -version-info 5:0:2
+-libcrmcommon_la_LIBADD = -ldl $(GNUTLSLIBS)
++libcrmcommon_la_LIBADD = -ldl $(LIBPLUMB) $(GNUTLSLIBS) $(LIBXML2) $(LIBXSLT) $(LIBQB) $(LIBBZ2) $(LIBUUID)
+ libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
+
+ clean-generic:
+--- pacemaker-Pacemaker-1.1.10/lib/cib/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/lib/cib/Makefile.am 2013-09-08 15:20:01.962772701 +0200
+@@ -33,7 +33,7 @@
+ endif
+
+ libcib_la_LDFLAGS = -version-info 3:1:0 -L$(top_builddir)/lib/pengine/.libs
+-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)
+ libcib_la_CFLAGS = -I$(top_srcdir)
+
+ clean-generic:
+--- pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/lib/pengine/Makefile.am 2013-09-08 15:20:26.939438320 +0200
+@@ -32,7 +32,7 @@
+
+ libpe_status_la_LDFLAGS = -version-info 6:0:2
libpe_status_la_SOURCES = status.c unpack.c utils.c complex.c native.c group.c clone.c rules.c common.c
--libpe_status_la_LIBADD = @CURSESLIBS@
-+libpe_status_la_LIBADD = @CURSESLIBS@ \
-+ $(top_builddir)/lib/common/libcrmcommon.la
+-libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la
++libpe_status_la_LIBADD = @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la $(LIBXML2)
clean-generic:
rm -f *.log *.debug *~
-Only in pacemaker-Pacemaker-1.1.9/lib/pengine: Makefile.am.orig
-Only in pacemaker-Pacemaker-1.1.9/lib/pengine: Makefile.am.rej
-diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/services/Makefile.am pacemaker-Pacemaker-1.1.9/lib/services/Makefile.am
---- pacemaker-Pacemaker-1.1.9.orig/lib/services/Makefile.am 2013-03-08 11:48:01.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.9/lib/services/Makefile.am 2013-06-21 13:53:10.000000000 +0200
-@@ -26,7 +26,8 @@
- libcrmservice_la_SOURCES = services.c services_linux.c
- libcrmservice_la_LDFLAGS = -version-info 1:0:0
- libcrmservice_la_CFLAGS = $(GIO_CFLAGS)
--libcrmservice_la_LIBADD = $(GIO_LIBS)
-+libcrmservice_la_LIBADD = $(GIO_LIBS) \
-+ $(top_builddir)/lib/common/libcrmcommon.la
-
- if BUILD_UPSTART
- libcrmservice_la_SOURCES += upstart.c
-diff -dur -x '*~' pacemaker-Pacemaker-1.1.9.orig/lib/transition/Makefile.am pacemaker-Pacemaker-1.1.9/lib/transition/Makefile.am
---- pacemaker-Pacemaker-1.1.9.orig/lib/transition/Makefile.am 2013-03-08 11:48:01.000000000 +0100
-+++ pacemaker-Pacemaker-1.1.9/lib/transition/Makefile.am 2013-06-21 13:53:10.000000000 +0200
-@@ -29,6 +29,7 @@
-
- libtransitioner_la_LDFLAGS = -version-info 2:0:0
- libtransitioner_la_CFLAGS = -I$(top_builddir)
-+libtransitioner_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
+--- pacemaker-Pacemaker-1.1.10/lib/fencing/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/lib/fencing/Makefile.am 2013-09-08 17:10:35.692494309 +0200
+@@ -26,6 +26,6 @@
- clean-generic:
- rm -f *~
+ libstonithd_la_SOURCES = st_client.c
+ libstonithd_la_LDFLAGS = -version-info 3:0:1
+-libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
++libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(LIBPILS)
+
+ AM_CFLAGS = $(INCLUDES)
+--- pacemaker-Pacemaker-1.1.10/cib/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/cib/Makefile.am 2013-09-08 17:11:22.042492364 +0200
+@@ -48,7 +48,7 @@
+ callbacks.c main.c remote.c common.c
+
+ cib_LDADD = $(top_builddir)/lib/cluster/libcrmcluster.la \
+- $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS)
++ $(COMMONLIBS) $(CRYPTOLIB) $(CLUSTERLIBS) $(LIBPAM)
+
+ cibmon_SOURCES = cibmon.c
+ cibmon_LDADD = $(COMMONLIBS)
diff --git a/pacemaker-man.patch b/pacemaker-man.patch
new file mode 100644
index 0000000..e025de7
--- /dev/null
+++ b/pacemaker-man.patch
@@ -0,0 +1,11 @@
+--- pacemaker-Pacemaker-1.1.10/tools/Makefile.am.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/tools/Makefile.am 2013-09-08 08:12:08.253850125 +0200
+@@ -58,7 +58,7 @@
+ endif
+
+ if BUILD_HELP
+-man8_MANS = $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8)
++man8_MANS = $(filter-out ipmiservicelogd.8, $(sbin_PROGRAMS:%=%.8) $(sbin_SCRIPTS:%=%.8))
+ endif
+
+ ## SOURCES
diff --git a/pacemaker-update.patch b/pacemaker-update.patch
new file mode 100644
index 0000000..142401e
--- /dev/null
+++ b/pacemaker-update.patch
@@ -0,0 +1,74 @@
+--- pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/tools/notifyServicelogEvent.c 2013-09-07 22:08:44.162036132 +0200
+@@ -31,13 +31,13 @@
+ #include <crm/common/util.h>
+ #include <crm_internal.h>
+
+-typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS;
++typedef enum { STATUS_GREEN = 1, STATUS_YELLOW, STATUS_RED } STATUS_T;
+
+-const char *status2char(STATUS status);
+-STATUS event2status(struct sl_event *event);
++const char *status2char(STATUS_T status);
++STATUS_T event2status(struct sl_event *event);
+
+ const char *
+-status2char(STATUS status)
++status2char(STATUS_T status)
+ {
+ switch (status) {
+ default:
+@@ -50,10 +50,10 @@
+ }
+ }
+
+-STATUS
++STATUS_T
+ event2status(struct sl_event * event)
+ {
+- STATUS status = STATUS_GREEN;
++ STATUS_T status = STATUS_GREEN;
+
+ crm_debug("Severity = %d, Disposition = %d", event->severity, event->disposition);
+
+@@ -91,7 +91,7 @@
+ struct sl_event *event = NULL;
+ uint64_t event_id = 0;
+
+- crm_log_init_quiet("notifyServicelogEvent", LOG_INFO, FALSE, TRUE, argc, argv);
++ crm_log_init("notifyServicelogEvent", LOG_INFO, FALSE, TRUE, argc, argv, TRUE);
+ crm_set_options(NULL, "event_id ", long_options,
+ "Gets called upon events written to servicelog database");
+
+@@ -153,7 +153,7 @@
+ }
+
+ if (rc == 0) {
+- STATUS status = STATUS_GREEN;
++ STATUS_T status = STATUS_GREEN;
+ const char *health_component = "#health-ipmi";
+ const char *health_status = NULL;
+
+@@ -167,9 +167,9 @@
+ if (health_status) {
+ gboolean rc;
+
+- rc = attrd_update_no_mainloop(NULL,
++ rc = (attrd_update_delegate(NULL,
+ 'v',
+- NULL, health_component, health_status, NULL, NULL, NULL);
++ NULL, health_component, health_status, NULL, NULL, NULL, NULL) > 0);
+
+ crm_debug("attrd_update_no_mainloop ('%s', '%s') = %d",
+ health_component, health_status, rc);
+--- pacemaker-Pacemaker-1.1.10/tools/ipmiservicelogd.c.orig 2013-07-26 02:02:31.000000000 +0200
++++ pacemaker-Pacemaker-1.1.10/tools/ipmiservicelogd.c 2013-09-07 22:09:35.002033998 +0200
+@@ -565,7 +565,7 @@
+
+ crm_make_daemon("ipmiservicelogd", TRUE, "/var/run/ipmiservicelogd.pid0");
+
+- crm_log_init("ipmiservicelogd", LOG_INFO, FALSE, TRUE, argc, argv);
++ crm_log_init("ipmiservicelogd", LOG_INFO, FALSE, TRUE, argc, argv, FALSE);
+
+ #ifdef COMPLEX
+ rv = ipmi_args_setup_con(args, os_hnd, NULL, &con);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pacemaker.git/commitdiff/650f9adf590050405a3d19682ff32eda3b4aec8b
More information about the pld-cvs-commit
mailing list