Version: 1.1.8

diff --git a/pacemaker-awk.patch b/pacemaker-awk.patch
deleted file mode 100644 (file)
index 2992b4a..0000000
--- a/pacemaker-awk.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ClusterLabs-pacemaker-b5b0a7b/shell/regression/testcases/ra.filter.orig    2012-06-06 11:11:49.000000000 +0200
-+++ ClusterLabs-pacemaker-b5b0a7b/shell/regression/testcases/ra.filter 2012-06-06 11:11:56.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/awk -f
-+#!/bin/awk -f
- # reduce the providers list to heartbeat and pacemaker
- # (prevents other providers creeping in)
- function reduce(a) {

diff --git a/pacemaker-cs_quorum.patch b/pacemaker-cs_quorum.patch
deleted file mode 100644 (file)
index 4016d53..0000000
--- a/pacemaker-cs_quorum.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- ClusterLabs-pacemaker-b5b0a7b.orig/lib/cluster/corosync.c  2012-03-28 08:14:13.000000000 +0200
-+++ ClusterLabs-pacemaker-b5b0a7b/lib/cluster/corosync.c       2012-07-01 14:38:57.297207127 +0200
-@@ -672,7 +672,11 @@
- 
-   bail:
-     if(ais_ipc_handle) {
-+#  if CS_USES_LIBQB
-         crm_err("AIS connection failed: %p", (void*)ais_ipc_handle);
-+#  else
-+        crm_err("AIS connection failed: %li", (long)ais_ipc_handle);
-+#  endif
-     }
-     return FALSE;
- }
-@@ -1075,11 +1079,10 @@
-     int rc = -1;
-     int fd = 0;
-     int quorate = 0;
--    uint32_t quorum_type = 0;
- 
-     crm_debug("Configuring Pacemaker to obtain quorum from Corosync");
- 
--    rc = quorum_initialize(&pcmk_quorum_handle, &quorum_callbacks, &quorum_type);
-+    rc = quorum_initialize(&pcmk_quorum_handle, &quorum_callbacks);
-     if (rc != CS_OK) {
-         crm_err("Could not connect to the Quorum API: %d\n", rc);
-         goto bail;
---- ClusterLabs-pacemaker-b5b0a7b.orig/configure.ac    2012-07-01 14:27:54.000000000 +0200
-+++ ClusterLabs-pacemaker-b5b0a7b/configure.ac 2012-07-01 14:49:25.664207127 +0200
-@@ -1182,7 +1182,7 @@
- fi
- 
- 
--if test $SUPPORT_CS = 1 -a x$HAVE_oldipc = x0 ; then
-+if true ; then
-     dnl Support for plugins was removed about the time the IPC was
-     dnl moved to libqb.
-     dnl The only option now is the built-in quorum API
---- ClusterLabs-pacemaker-b5b0a7b.orig/tools/ccm_epoche.c      2012-03-28 08:14:13.000000000 +0200
-+++ ClusterLabs-pacemaker-b5b0a7b/tools/ccm_epoche.c   2012-07-01 16:02:03.952168127 +0200
-@@ -505,7 +505,6 @@
- {
-     int rc = 0;
-     int quorate = 0;
--    uint32_t quorum_type = 0;
-     unsigned int nodeid = 0;
-     cpg_handle_t c_handle = 0;
-     quorum_handle_t q_handle = 0;
-@@ -521,7 +520,7 @@
- 
-         case 'q':
-             /* Go direct to the Quorum API */
--            rc = quorum_initialize(&q_handle, NULL, &quorum_type);
-+            rc = quorum_initialize(&q_handle, NULL);
-             if (rc != CS_OK) {
-                 crm_err("Could not connect to the Quorum API: %d\n", rc);
-                 return FALSE;
-

diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index ae8c331ee62150f1bf2f482daccb5cccdd2eecd3..813fafa5337b627b8fb21b3c8d72d09f14ba9079 100644 (file)
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -1,38 +1,51 @@
-diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/Makefile.am
---- ClusterLabs-pacemaker-b5b0a7b.orig/lib/Makefile.am 2012-03-28 08:14:13.000000000 +0200
-+++ ClusterLabs-pacemaker-b5b0a7b/lib/Makefile.am      2012-06-06 08:26:09.000000000 +0200
+diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/Makefile.am
+--- ClusterLabs-pacemaker-1f8858c.orig/lib/Makefile.am 2012-09-20 11:43:41.000000000 +0200
++++ ClusterLabs-pacemaker-1f8858c/lib/Makefile.am      2012-10-25 14:00:13.000000000 +0200
 @@ -39,7 +39,7 @@
        rm -f *.pc
  
  ## Subdirectories...
--SUBDIRS       = common pengine transition cib fencing cluster plugins
-+SUBDIRS       = common pengine cib transition fencing cluster plugins
+-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 ClusterLabs-pacemaker-b5b0a7b.orig/lib/pengine/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/pengine/Makefile.am
---- ClusterLabs-pacemaker-b5b0a7b.orig/lib/pengine/Makefile.am 2012-03-28 08:14:13.000000000 +0200
-+++ ClusterLabs-pacemaker-b5b0a7b/lib/pengine/Makefile.am      2012-06-06 08:28:21.000000000 +0200
-@@ -31,10 +31,12 @@
+diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/pengine/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/pengine/Makefile.am
+--- ClusterLabs-pacemaker-1f8858c.orig/lib/pengine/Makefile.am 2012-09-20 11:43:41.000000000 +0200
++++ ClusterLabs-pacemaker-1f8858c/lib/pengine/Makefile.am      2012-10-25 14:00:13.000000000 +0200
+@@ -28,10 +28,12 @@
  
- libpe_rules_la_LDFLAGS        = -version-info 2:0:0
- libpe_rules_la_SOURCES        = $(rule_files) 
+ libpe_rules_la_LDFLAGS        = -version-info 2:1: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 3:0:0
- libpe_status_la_SOURCES       =  $(rule_files) $(status_files)
--libpe_status_la_LIBADD        = -llrm @CURSESLIBS@
-+libpe_status_la_LIBADD        = -llrm @CURSESLIBS@ \
-+                        $(top_builddir)/lib/common/libcrmcommon.la
+ libpe_status_la_LDFLAGS       = -version-info 4:0:0
+ 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
  
  clean-generic:
        rm -f *.log *.debug *~
-diff -dur ClusterLabs-pacemaker-b5b0a7b.orig/lib/transition/Makefile.am ClusterLabs-pacemaker-b5b0a7b/lib/transition/Makefile.am
---- ClusterLabs-pacemaker-b5b0a7b.orig/lib/transition/Makefile.am      2012-03-28 08:14:13.000000000 +0200
-+++ ClusterLabs-pacemaker-b5b0a7b/lib/transition/Makefile.am   2012-06-06 08:22:40.000000000 +0200
+diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/services/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/services/Makefile.am
+--- ClusterLabs-pacemaker-1f8858c.orig/lib/services/Makefile.am        2012-09-20 11:43:41.000000000 +0200
++++ ClusterLabs-pacemaker-1f8858c/lib/services/Makefile.am     2012-10-25 14:01:45.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 ClusterLabs-pacemaker-1f8858c.orig/lib/transition/Makefile.am ClusterLabs-pacemaker-1f8858c/lib/transition/Makefile.am
+--- ClusterLabs-pacemaker-1f8858c.orig/lib/transition/Makefile.am      2012-09-20 11:43:41.000000000 +0200
++++ ClusterLabs-pacemaker-1f8858c/lib/transition/Makefile.am   2012-10-25 14:00:13.000000000 +0200
 @@ -29,6 +29,7 @@
  
- libtransitioner_la_LDFLAGS    = -version-info 1:0:0
+ libtransitioner_la_LDFLAGS    = -version-info 2:0:0
  libtransitioner_la_CFLAGS     = -I$(top_builddir)
 +libtransitioner_la_LIBADD     = $(top_builddir)/lib/common/libcrmcommon.la
  

diff --git a/pacemaker.init b/pacemaker.init
index 746230a5a39a279de5539ca3c2f0c494e41f0ca0..86bb25c2bb572089ce241f228ec79b94b60244a8 100644 (file)
--- a/pacemaker.init
+++ b/pacemaker.init
@@ -34,7 +34,7 @@ start() {
        fi
 
        msg_starting "Pacemaker Cluster Manager"
-       daemon /usr/sbin/pacemakerd --pid-file=/var/run/pacemakerd.pid
+       daemon --fork --close-fds /usr/sbin/pacemakerd
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pacemaker
 }

diff --git a/pacemaker.service b/pacemaker.service
index e23f11c5e6e6e2eee10bd1eaeb139b7373fde724..c7639827e0717d37b6a16d69e1681fc90fac3df6 100644 (file)
--- a/pacemaker.service
+++ b/pacemaker.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Pacemaker High Availability Cluster Manager for Corosync stack
-
 After=corosync.target
 Requires=corosync.target
 
@@ -8,12 +7,13 @@ Requires=corosync.target
 WantedBy=multi-user.target
 
 [Service]
-Type=forking
+Type=simple
 PIDFile=/var/run/pacemakerd.pid
 KillMode=process
+NotifyAccess=main
 SysVStartPriority=23
 EnvironmentFile=-/etc/sysconfig/pacemaker
-ExecStart=/usr/sbin/pacemakerd --pid-file=/var/run/pacemakerd.pid
+ExecStart=/usr/sbin/pacemakerd -f --pid-file=/var/run/pacemakerd.pid
 
 # Pacemaker can only exit after all managed services have shut down
 # A HA database could conceivably take even longer than this 

diff --git a/pacemaker.spec b/pacemaker.spec
index c2f6a2285d3b609789466949badc63c387b4c88a..23f03e50948bbd16110773cc45e124c1322fba99 100644 (file)
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -3,26 +3,23 @@
 %bcond_without heartbeat       # build without heartbeat stack
 Summary:       The scalable High-Availability cluster resource manager
 Name:          pacemaker
-Version:       1.1.7
-Release:       1.1
+Version:       1.1.8
+Release:       0.1
 License:       GPL v2+; LGPL v2.1+
 Group:         Applications/System
-# https://github.com/ClusterLabs/pacemaker/tarball/Pacemaker-%{version}
-Source0:       ClusterLabs-pacemaker-Pacemaker-%{version}-0-gee0730e.tar.gz
-# Source0-md5: 61076a946cf2ba549dce1458e2ef76e2
+Source0:       https://github.com/ClusterLabs/pacemaker/tarball/Pacemaker-1.1.8/Pacemaker-%{version}.tar.gz
+# Source0-md5: 1bbd5b2282827bc1cf4e19620d606dc7
 Source1:       %{name}.tmpfiles
 Source2:       %{name}.init
 Source3:       %{name}.service
 Patch0:                %{name}-ncurses.patch
 Patch1:                %{name}-libs.patch
-Patch2:                %{name}-awk.patch
-Patch3:                %{name}-cs_quorum.patch
 URL:           http://clusterlabs.org/wiki/Main_Page
 BuildRequires: asciidoc
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bzip2-devel
-%{?with_corosync:BuildRequires:        corosync-devel}
+%{?with_corosync:BuildRequires:        corosync-devel >= 2.0}
 BuildRequires: e2fsprogs-devel
 BuildRequires: glib2-devel
 BuildRequires: gnutls-devel
@@ -41,10 +38,12 @@ BuildRequires:      rpm-pythonprov
 BuildRequires: swig
 BuildRequires: pciutils-devel
 BuildRequires: cluster-glue-libs-devel
+Requires:      cluster-glue
 Requires:      resource-agents
 Requires:      %{name}-libs = %{version}-%{release}
 Provides:      group(haclient)
 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
@@ -109,17 +108,13 @@ Requires: %{name}-devel = %{version}-%{release}
 Static Pacemaker libraries.
 
 %prep
-%setup -qn ClusterLabs-pacemaker-b5b0a7b
+%setup -qn ClusterLabs-pacemaker-1f8858c
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%if %{with corosync}
-%patch3 -p1
-%endif
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -143,7 +138,6 @@ install -d $RPM_BUILD_ROOT{/usr/lib/tmpfiles.d,/etc/rc.d/init.d,%{systemdunitdir
        DESTDIR=$RPM_BUILD_ROOT
 
 rm -r $RPM_BUILD_ROOT%{_docdir}/pacemaker
-rm $RPM_BUILD_ROOT%{_libdir}/heartbeat/plugins/RAExec/*.{la,a}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
@@ -184,20 +178,19 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/cib
 %attr(755,root,root) %{_libdir}/%{name}/cibmon
 %attr(755,root,root) %{_libdir}/%{name}/crmd
-%attr(755,root,root) %{_libdir}/%{name}/hb2openais.sh
+%attr(755,root,root) %{_libdir}/%{name}/lrmd
+%attr(755,root,root) %{_libdir}/%{name}/lrmd_test
 %attr(755,root,root) %{_libdir}/%{name}/pengine
 %attr(755,root,root) %{_libdir}/%{name}/stonith-test
 %attr(755,root,root) %{_libdir}/%{name}/stonithd
-%{_libdir}/%{name}/*.py*
 %attr(755,root,root) %{_bindir}/ccs2cib
 %attr(755,root,root) %{_bindir}/ccs_flatten
 %attr(755,root,root) %{_bindir}/disable_rgmanager
 %attr(755,root,root) %{_sbindir}/attrd_updater
 %attr(755,root,root) %{_sbindir}/cibadmin
-%attr(755,root,root) %{_sbindir}/cibpipe
-%attr(755,root,root) %{_sbindir}/crm
 %attr(755,root,root) %{_sbindir}/crm_attribute
 %attr(755,root,root) %{_sbindir}/crm_diff
+%attr(755,root,root) %{_sbindir}/crm_error
 %attr(755,root,root) %{_sbindir}/crm_failcount
 %attr(755,root,root) %{_sbindir}/crm_master
 %attr(755,root,root) %{_sbindir}/crm_mon
@@ -214,14 +207,11 @@ fi
 %attr(755,root,root) %{_sbindir}/fence_legacy
 %attr(755,root,root) %{_sbindir}/fence_pcmk
 %attr(755,root,root) %{_sbindir}/iso8601
-%attr(755,root,root) %{_sbindir}/ptest
 %attr(755,root,root) %{_sbindir}/stonith_admin
-%{py_sitedir}/crm
 %{py_sitedir}/cts
 %{_datadir}/snmp/mibs
 %{_mandir}/man8/*.8*
 %{_mandir}/man7/*.7*
-%dir %attr(750,hacluster,haclient) %{_var}/lib/pengine
 %dir %attr(750,hacluster,haclient) %{_var}/run/crm
 %dir %{_prefix}/lib/ocf/resource.d/pacemaker
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ClusterMon
@@ -236,7 +226,10 @@ fi
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/ping
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/pacemaker/pingd
 /usr/lib/tmpfiles.d/%{name}.conf
-%dir %attr(750,hacluster,haclient) %{_var}/lib/heartbeat/crm
+%dir /var/lib/%{name}
+%dir %attr(750,hacluster,haclient) /var/lib/%{name}/blackbox
+%dir %attr(750,hacluster,haclient) /var/lib/%{name}/cib
+%dir %attr(750,hacluster,haclient) /var/lib/%{name}/pengine
 
 %files libs
 %defattr(644,root,root,755)
@@ -246,8 +239,6 @@ fi
 %if %{with heartbeat}
 %files heartbeat
 %defattr(644,root,root,755)
-%dir %{_libdir}/heartbeat/plugins/RAExec
-%attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/*.so
 %attr(755,root,root) %{_libdir}/heartbeat/attrd
 %attr(755,root,root) %{_libdir}/heartbeat/cib
 %attr(755,root,root) %{_libdir}/heartbeat/crmd
@@ -261,7 +252,6 @@ fi
 %attr(755,root,root) %{_sbindir}/pacemakerd
 %attr(755,root,root) /etc/rc.d/init.d/%{name}
 %{systemdunitdir}/%{name}.service
-%{_libdir}/lcrso/pacemaker.lcrso
 %endif
 
 %files devel