From: "Alexys Jacob" <ultrabug@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/
Date: Fri, 25 Feb 2011 10:49:07 +0000 (UTC) [thread overview]
Message-ID: <952e1fa2d7ddad9525184eca3cb27a72e0c4fd52.ultrabug@gentoo> (raw)
commit: 952e1fa2d7ddad9525184eca3cb27a72e0c4fd52
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 10:48:48 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 10:48:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=952e1fa2
pacemaker bump
---
sys-cluster/pacemaker/Manifest | 6 +-
...ls-r2.patch => pacemaker-1.1.5-autotools.patch} | 68 ++++++++++----------
...aker-1.1.4-r5.ebuild => pacemaker-1.1.5.ebuild} | 7 +-
3 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 425b03a..58e324b 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -1,5 +1,5 @@
-AUX pacemaker-1.1.4-autotools-r2.patch 9932 RMD160 6240324b9188ab5beb5ec2ec775c66a94cc3c7be SHA1 5cb30350c92cd5019f892c2c37d7cb53190c3b79 SHA256 62d937c6a7894a686a79530f6daa2a5f814fecd6ea29dc700308e89d668e488d
+AUX pacemaker-1.1.5-autotools.patch 10094 RMD160 fc2c40684eee70a2d6899c2bae1518a3f3e7a49f SHA1 07f7939ba553d232f75c16c9bb5f705fbe0d2271 SHA256 680849bdb47b4107bd10a055b6b293ae6642ce44c00c832a8dc30b330d72beaa
AUX pacemaker.initd 922 RMD160 1ee204b244f3e40a6fb272f43d0cf11d7e4404d0 SHA1 7ffa0222674d5003d550b51bad7f0735366ffe01 SHA256 0253da4a3a91d8c3aa7badd30062cbba32a0626b77f1a27db1d731d1bbe133af
AUX pacemaker.service 105 RMD160 e743788acefa97f879ea67b5b3bbbff715c71bce SHA1 42739d9a111a25a643d8f5f8b9fdd2cf1267853a SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c
-DIST Pacemaker-1.1.4.tar.bz2 23444765 RMD160 ca2635622e2a63258d7dc9933541eb2e3b728679 SHA1 382a4cbd80ef8f1c303f1c5c02d60390e808397f SHA256 922e2929cf9f2efa2e2d9b3185a7ac826a96e86cd8d9f4c4eae177f88f1f03b1
-EBUILD pacemaker-1.1.4-r5.ebuild 2180 RMD160 1fb5e97611b43e6ba84026f1cb031a6f0b379323 SHA1 c7722c8f1a520cffc504864b4bcff408962c7ac2 SHA256 082f88c67e4679de37ae62c465d30fc2875807f3a91c987fe7e2fb9a0c95d857
+DIST Pacemaker-1.1.5.tar.bz2 23531621 RMD160 56761cb9bb9aa22d0275fedc851269a5f472d29e SHA1 da8c6f09e549879961231028582fdbe69c9ac8c6 SHA256 aa1dcf2dc6deff3676fa7d0938f80bb4f163011d491d0478798e971ca2d58fb2
+EBUILD pacemaker-1.1.5.ebuild 2210 RMD160 2320bbab2916c77935900868d88df7dd461dd206 SHA1 23d0269330f9514af260e384e78eaa87ab362891 SHA256 f1a0315cc61e50f144c078dade036f9724c60006d4a3be82cda9c96353cc483e
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
similarity index 97%
rename from sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
rename to sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
index a3aad64..5cd4f57 100644
--- a/sys-cluster/pacemaker/files/pacemaker-1.1.4-autotools-r2.patch
+++ b/sys-cluster/pacemaker/files/pacemaker-1.1.5-autotools.patch
@@ -16,39 +16,6 @@
OPENIPMI_SERVICELOG_EXISTS="yes"
fi
AC_MSG_RESULT($OPENIPMI_SERVICELOG_EXISTS)
---- a/fencing/Makefile.am
-+++ b/fencing/Makefile.am
-@@ -36,21 +36,20 @@
-
- stonith_test_SOURCES = test.c
-
--stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
-
- stonith_admin_SOURCES = admin.c
-
--stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
--
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
- stonithd_SOURCES = main.c commands.c remote.c
-
--stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
-- $(top_builddir)/lib/common/libcrmcommon.la \
-+stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
- $(top_builddir)/lib/common/libcrmcluster.la \
-- $(top_builddir)/lib/fencing/libstonithd.la
-+ $(top_builddir)/lib/fencing/libstonithd.la \
-+ $(CRYPTOLIB) $(CLUSTERLIBS)
--- a/mcp/Makefile.am
+++ b/mcp/Makefile.am
@@ -34,7 +34,7 @@
@@ -285,3 +252,38 @@
DIST_SUBDIRS = $(SUBDIRS) ais
if BUILD_CS_SUPPORT
+--- a/fencing/Makefile.am 2011-02-25 09:58:45.621572915 +0100
++++ b/fencing/Makefile.am 2011-02-25 10:00:39.024820006 +0100
+@@ -42,23 +42,23 @@
+
+ stonith_test_SOURCES = test.c
+
+-stonith_test_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la \
++stonith_test_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
+
+ stonith_admin_SOURCES = admin.c
+
+-stonith_admin_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
++stonith_admin_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/cib/libcib.la \
+ $(top_builddir)/lib/pengine/libpe_status.la \
+- $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
+
+ stonithd_SOURCES = main.c commands.c remote.c
+
+-stonithd_LDADD = $(CRYPTOLIB) $(CLUSTERLIBS) \
+- $(top_builddir)/lib/common/libcrmcommon.la \
++stonithd_LDADD = $(top_builddir)/lib/common/libcrmcommon.la \
+ $(top_builddir)/lib/common/libcrmcluster.la \
+- $(top_builddir)/lib/fencing/libstonithd.la
++ $(top_builddir)/lib/fencing/libstonithd.la \
++ $(CRYPTOLIB) $(CLUSTERLIBS)
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
similarity index 94%
rename from sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild
rename to sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
index a4fd9a5..94665ce 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.4-r5.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.5.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://hg.clusterlabs.org/${PN}/1.1/archive/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="heartbeat smtp snmp static-libs cman3"
+IUSE="acl cman3 heartbeat smtp snmp static-libs"
RDEPEND="
dev-libs/libxslt
@@ -30,7 +30,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-autotools-r2.patch"
+# "${FILESDIR}/${PN}-1.1.5-autotools.patch"
)
S=${WORKDIR}/${MY_PN}-1-1-${MY_P}
@@ -54,10 +54,11 @@ src_configure() {
--localstatedir=/var \
--disable-dependency-tracking \
--disable-fatal-warnings \
+ $(use_with acl) \
$(use_with cman3 cs-quorum) \
$(use_with cman3 cman) \
- $(use_with smtp esmtp) \
$(use_with heartbeat) \
+ $(use_with smtp esmtp) \
$(use_with snmp) \
$(use_enable static-libs static) \
${myopts}
next reply other threads:[~2011-02-25 10:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-25 10:49 Alexys Jacob [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-15 14:59 [gentoo-commits] dev/ultrabug:master commit in: sys-cluster/pacemaker/files/, sys-cluster/pacemaker/ Alexys Jacob
2011-02-22 12:53 Alexys Jacob
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=952e1fa2d7ddad9525184eca3cb27a72e0c4fd52.ultrabug@gentoo \
--to=ultrabug@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox