[packages/pacemaker] Version: 1.1.9
jajcus
jajcus at pld-linux.org
Fri Jun 21 14:43:55 CEST 2013
commit cb585696a80a18cc646b1008801f27f662dbe19c
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Fri Jun 21 14:18:17 2013 +0200
Version: 1.1.9
pacemaker-libs.patch | 32 ++++++++++----------
pacemaker-ncurses.patch | 15 ----------
pacemaker-stonithd_crash.patch | 67 ------------------------------------------
pacemaker.spec | 16 ++++------
4 files changed, 23 insertions(+), 107 deletions(-)
---
diff --git a/pacemaker.spec b/pacemaker.spec
index 01a5523..fe1ec0b 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -3,18 +3,16 @@
%bcond_without heartbeat # build without heartbeat stack
Summary: The scalable High-Availability cluster resource manager
Name: pacemaker
-Version: 1.1.8
-Release: 4
+Version: 1.1.9
+Release: 1
License: GPL v2+; LGPL v2.1+
Group: Applications/System
-Source0: https://github.com/ClusterLabs/pacemaker/tarball/Pacemaker-1.1.8/Pacemaker-%{version}.tar.gz
-# Source0-md5: 1bbd5b2282827bc1cf4e19620d606dc7
+Source0: https://github.com/ClusterLabs/pacemaker/archive/Pacemaker-%{version}.tar.gz
+# Source0-md5: 24f3a2bdbac63e640062c207eb838016
Source1: %{name}.tmpfiles
Source2: %{name}.init
Source3: %{name}.service
-Patch0: %{name}-ncurses.patch
-Patch1: %{name}-libs.patch
-Patch2: %{name}-stonithd_crash.patch
+Patch0: %{name}-libs.patch
URL: http://clusterlabs.org/wiki/Main_Page
BuildRequires: asciidoc
BuildRequires: autoconf
@@ -109,10 +107,8 @@ Requires: %{name}-devel = %{version}-%{release}
Static Pacemaker libraries.
%prep
-%setup -qn ClusterLabs-pacemaker-1f8858c
+%setup -qn pacemaker-Pacemaker-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
diff --git a/pacemaker-libs.patch b/pacemaker-libs.patch
index 813fafa..2b6e370 100644
--- a/pacemaker-libs.patch
+++ b/pacemaker-libs.patch
@@ -1,6 +1,6 @@
-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
+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
@@ -10,16 +10,16 @@ diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/Makefile.am ClusterLabs-pacemak
DIST_SUBDIRS = $(SUBDIRS) ais
if BUILD_CS_PLUGIN
-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
+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:1:0
+ 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_rules_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
- libpe_status_la_LDFLAGS = -version-info 4:0:0
+ libpe_status_la_LDFLAGS = -version-info 5:0:1
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@ \
@@ -27,9 +27,11 @@ diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/pengine/Makefile.am ClusterLabs
clean-generic:
rm -f *.log *.debug *~
-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
+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
@@ -40,9 +42,9 @@ diff -dur ClusterLabs-pacemaker-1f8858c.orig/lib/services/Makefile.am ClusterLab
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
+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
diff --git a/pacemaker-ncurses.patch b/pacemaker-ncurses.patch
deleted file mode 100644
index b5698da..0000000
--- a/pacemaker-ncurses.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Pacemaker-1-0-Pacemaker-1.0.3/configure.ac.orig 2009-05-11 14:26:54.000000000 +0200
-+++ Pacemaker-1-0-Pacemaker-1.0.3/configure.ac 2009-05-11 14:26:54.000000000 +0200
-@@ -746,8 +746,12 @@
- [
- #if defined(HAVE_CURSES_H)
- # include <curses.h>
-+#elif defined(HAVE_CURSES_CURSES_H)
-+# include <curses/curses.h>
- #elif defined(HAVE_NCURSES_H)
- # include <ncurses.h>
-+#elif defined(HAVE_NCURSES_NCURSES_H)
-+# include <ncurses/ncurses.h>
- #endif
- ],
- [printw((const char *)"Test");]
diff --git a/pacemaker-stonithd_crash.patch b/pacemaker-stonithd_crash.patch
deleted file mode 100644
index 2a1a801..0000000
--- a/pacemaker-stonithd_crash.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-http://oss.clusterlabs.org/pipermail/pacemaker/2012-November/015857.html
-
-
-commit 280926ab8969ecd18c5a8d173c315fc5a637ead5
-Author: Andrew Beekhof <andrew at beekhof.net>
-Date: Wed Oct 10 18:52:53 2012 +1100
-
- High: Heartbeat: Remove incorrect assert during cluster connect
-
-diff --git a/lib/cluster/cluster.c b/lib/cluster/cluster.c
-index 4cd1633..ad09700 100644
---- a/lib/cluster/cluster.c
-+++ b/lib/cluster/cluster.c
-@@ -224,7 +224,6 @@ crm_cluster_connect(crm_cluster_t *cluster)
- if (is_heartbeat_cluster()) {
- int rv;
-
-- CRM_ASSERT(cluster->hb_conn != NULL);
- /* coverity[var_deref_op] False positive */
- if (cluster->hb_conn == NULL) {
- /* No object passed in, create a new one. */
-
-
-
-commit 728206621d15ee51a8945962f5c07cbf92746c0d
-Author: Philipp Marek <philipp.marek at linbit.com>
-Date: Tue Oct 16 13:04:49 2012 +0200
-
- Medium: Fix uninitialized data for --with-heartbeat.
-
-diff --git a/fencing/main.c b/fencing/main.c
-index 407d51f..41b3cb5 100644
---- a/fencing/main.c
-+++ b/fencing/main.c
-@@ -1005,6 +1005,7 @@ main(int argc, char ** argv)
-
- if(stand_alone == FALSE) {
- #if SUPPORT_HEARTBEAT
-+ cluster.hb_conn = NULL;
- cluster.hb_dispatch = stonith_peer_hb_callback;
- cluster.destroy = stonith_peer_hb_destroy;
- #endif
-diff --git a/lib/cluster/cluster.c b/lib/cluster/cluster.c
-index ad09700..4790d3d 100644
---- a/lib/cluster/cluster.c
-+++ b/lib/cluster/cluster.c
-@@ -314,7 +314,7 @@ send_cluster_message(crm_node_t *node, enum crm_ais_msg_types service, xmlNode *
- #endif
- #if SUPPORT_HEARTBEAT
- if (is_heartbeat_cluster()) {
-- return send_ha_message(heartbeat_cluster, data, node->uname, ordered);
-+ return send_ha_message(heartbeat_cluster, data, node ? node->uname : NULL, ordered);
- }
- #endif
- return FALSE;
-diff --git a/tools/attrd.c b/tools/attrd.c
-index f6eec8d..7f05d38 100644
---- a/tools/attrd.c
-+++ b/tools/attrd.c
-@@ -575,6 +575,7 @@ main(int argc, char **argv)
-
- #if SUPPORT_HEARTBEAT
- if (is_heartbeat_cluster()) {
-+ cluster.hb_conn = NULL;
- cluster.hb_dispatch = attrd_ha_callback;
- cluster.destroy = attrd_ha_connection_destroy;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pacemaker.git/commitdiff/f4369631f115b1a1534b5f41e1c879948059e8bd
More information about the pld-cvs-commit
mailing list