drop vulnerable wrt #457572

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

5 files changed, 10 insertions, 165 deletions

diff --git a/sys-cluster/pacemaker/ChangeLog b/sys-cluster/pacemaker/ChangeLog
index 7c10e0bf0919..ede955e819fd 100644
--- a/sys-cluster/pacemaker/ChangeLog
+++ b/sys-cluster/pacemaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/pacemaker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.41 2015/04/02 16:44:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/ChangeLog,v 1.42 2015/04/07 08:10:44 ultrabug Exp $
+
+  07 Apr 2015; Ultrabug <ultrabug@gentoo.org> -pacemaker-1.0.10.ebuild,
+  -pacemaker-1.0.12.ebuild, metadata.xml:
+  drop vulnerable wrt #457572
 
   02 Apr 2015; Jeroen Roovers <jer@gentoo.org> pacemaker-1.1.12-r2.ebuild:
   Stable for HPPA (bug #539608).
diff --git a/sys-cluster/pacemaker/Manifest b/sys-cluster/pacemaker/Manifest
index 8f34e7e80d6f..f86676519a49 100644
--- a/sys-cluster/pacemaker/Manifest
+++ b/sys-cluster/pacemaker/Manifest
@@ -12,18 +12,14 @@ AUX pacemaker-1.1.12-stonith.patch 690 SHA256 85e7ce9239b239236eab0aa7d6ba6d3d50
 AUX pacemaker.initd 981 SHA256 9c081cbbf9e3843d61f8175e430f82414bd21661b6b7fb31f74b9c6c64874204 SHA512 ebf1fa1043dda01e1409960f6a0b13284186644e4ced9e348e61ac137c4d8151aa4bf82740fc553a347d19e547f61f5f08d7bd24ce2247dfeae38e7648945103 WHIRLPOOL edc3634278151e5c88082768b71281cc8cd1dd5b191ac93da219b0024a30e29fad538b904a99805b55d20ebec7212c7d8e4269524a846ece117a8aa442ab7c7e
 AUX pacemaker.service 105 SHA256 43034635a3a92ef55bf638ea3e29c2285240228283a70fbd88fe5e28c0d57c8c SHA512 478e1040811f16c0c26fad8feb55cf803e5c4ec4a25e7c82ec771663f25270500fce2dd53622abd7126006c4629bdc3a82fb7f16361eb19543619824a56e848b WHIRLPOOL ec891f83ec9f561060b08bd39e9e0ecf5b243617958bd68f07a2f087a881af85895a4f25f810657ababb6d4541dfcc63e59e195fb6006717dc0cb69a1f869376
 AUX ping 10389 SHA256 021c85d8019b182be7a3603d3363328219ba0b165ea2fe37495dc77d0308f2b4 SHA512 832cd68dab0844b9cee1d1b1453314d42497bc497e97a5cbb78aafbd43b696aa97786b71d1b4d175c1aa8c5f7f240432f1fd4421d16a40ceecdc008d911c0288 WHIRLPOOL 2919972abd1eb4cc78952d39021fcddae07de3f5c193f4872bef07a7745d5d956ba3fff4610f32ef6a107acce6245ad0b8b919585619fe8a03f5436f15b3ce80
-DIST Pacemaker-1.0.10.tar.bz2 6642704 SHA256 2d5635866dcf061a617a33bc4ae7957d038dd764ad840489e4f2f6b8d046e6f9 SHA512 ceed7414ce14d136205d35f4e3e11aa0c5b57b3e0069486ea2b9827d3f78f69ff216474348d3360f31ace06d1071f9287ae3300a495391509c2fb43407fc2711 WHIRLPOOL 3ac764ddcf00eebd851fdd69398670bb4cb5c083f89c6e770759463da8b1fb0f0ca03c0bb134386c45703e0db7b50139e466ba71ded72647131abde4301c283f
 DIST Pacemaker-1.1.12.tar.gz 10459675 SHA256 f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c SHA512 cf88a313f5e91f445a159a5d800d27fd891f63c082c92d3f09bfd2aff856325e8ef6e0ebab8c0b2b9cd6eb15cc593c58c8e23e888e17d5286ebc651dd096f9c1 WHIRLPOOL e737d70288936d2f76d310848940bde78537c32e703c68d8dd37a78e54a66dc9d34cf2fe0037f1621fbc5ba10bb9688490da96394cde65f0668d4b62eccf3f03
-DIST pacemaker-1.0.12.tar.gz 7481273 SHA256 a3b4ea4106eda19ff5569bf0631168454b481fbfd23342421010832cce0a504e SHA512 a6944318cfbddaacfd87dda82be9c377af85cb9f92f913d785f5e8a060c23480a972efc0b255af9ad7c1bbd0f7c5ee57f5e7d9797fe3b2549f4c31c7751c1d86 WHIRLPOOL 2f707c4f74c235b358fff50b4e60069b4c16c9fac5114a74ba75d6aca85c67c56b43f49d1496f876b55e652585d4908e060306cb2a3579e2b15b15d0c2b217f5
-EBUILD pacemaker-1.0.10.ebuild 1821 SHA256 41dddec72a5191be4e23813b97c86d1e89e0f99f846fd16c60772305453cae44 SHA512 c1027dc88f9ae5f28d6345708f6acbf23d4f743ed1e3e06bbc98ebae9acf0fcdc6181daa9f17a4fe9a8f3fef980d7c00d2897bc7e15f12c6f03a148d06dbc913 WHIRLPOOL b9ddd7393ca68564a06e9c3ce5ba46774e645a623d1607b5939c6eb86e2faa82ae0a7023aca27b73f3136156cb60d0da65a63523fdb28afdf7843d8fe727f7f4
-EBUILD pacemaker-1.0.12.ebuild 1791 SHA256 0b5b4b664f6719abbaca3175015d4fc344424360e7651fe4815029f96e302a9c SHA512 c467e326f50922a3c84139c40a567596ec8d81a1c312972a4069c5d6bdd9c5545c55ad48466c139b7352f456d3633fa77bec886202173d1e147cc400646dcb55 WHIRLPOOL 9672495439b1fd1b2f814e8a12bcf71e53edea992399fc7b6416cee195540647a4f6aca243757dac3744673cade98a150f5b0891c91393141ab3eefdfc40dce0
 EBUILD pacemaker-1.1.12-r2.ebuild 2477 SHA256 a739d5e634780c04fab0c971c1b45de86d6c5c25ebeb5add4158e548f3afef3e SHA512 2d74e1b565428502e7481ef60841b7e113785b1f28a0fce97283ce320f1c1409349178ef368069c09462b94c7d13682f7d0a4d85c002da1ee227af127c5a2f59 WHIRLPOOL 1faa3491e61b861f55cba7fc64c12fefb8a29cc55d99f7174d8e133f2d852a09ad43e5f30895b9cbd2406ecd4680d100ba2fb4a0fc25a932b313a64830eab07e
-MISC ChangeLog 7874 SHA256 772c18e2543e435517a7590183cc6e8c46e36ae2b8710cfac54c8d2bc506c356 SHA512 c02c3bc66ee748c767f43109b1a6db20d584f05a4f9e889da84b8606408a61e660f852bc7521e76c77071e22701b80800bf89d29fa4b59c981ea6c5d4dc3dcc2 WHIRLPOOL 286ff50169a986ab6eb529e943dffbd47eba52d410b36d1bb59816e2d0f284198ccf38dff233eebca8fc38ed666586ad89cfbb89606a5dda0765682487ddf521
-MISC metadata.xml 870 SHA256 ca8b9f3af29de78a1e6196cd392c6c85635f8f7fb2303befc762bd135439fd3b SHA512 57a334af692d25bd670f652d03aec50db6b19676910f8f988fff1f3e84af5d6c379204ee277eafcc8f570ad15445ce6364c9643f2d58540f9ee98b12ce9524c8 WHIRLPOOL 2e278c69b2f24eb38b876f832292bedcf2729252e36584c42a8438a965661bc63d87affe3e5e3e09b53b75a7e2f88e31f92edd857b1ff5ea897f47b286567c2a
+MISC ChangeLog 8024 SHA256 7c53f5f74ec8cf5d30d97a1a5ea752524b0b5cdf2a6a48de3fb5382412f23750 SHA512 fe69e97802784a74be5cd102b18ab6e1fac13927a2529e58d5a4035740cef11b8cee857b9fff708aeda614633c73fc903308561db08bbe9f1bde739d358ea0ca WHIRLPOOL 9ab3163a8c0565d19e7854fa3d6454c0955d9076fcbab745555a49fad215b7d57fb99f5c1ce8bbf0b6f086e10cced069f377b7fd5d3ae257af2a892b5a0b4005
+MISC metadata.xml 795 SHA256 a9a97ffc7f1dd3e5b3865158e5be0136a76c458ddd6a913cb1285e2e884b0f06 SHA512 ddb180c322a07880de3f92253d8acfea3241aceb969f03f7b8808e5628a6379076f482e832a4e3041dce3f719eb4a7150af59c37a31625006cd01992a3732706 WHIRLPOOL ee08612a46c40974f0af2a724bc3aa83df70c603b943caf30684081b77efa089418c29e94b38aca831ab25cffbeb2e0123534c9c38925ff868754925c9bf1ef5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUdcfkACgkQVWmRsqeSphO62wCdFChGXSgHB6MerWwPCtEkSGKs
-GRkAnAnt1/1j5nDhQh5dcDqLkcDVGxjI
-=kd61
+iF4EAREIAAYFAlUjkQkACgkQKiQSS7ZY+hPapAD/XOYUGn/a7vvD0EEck39unp7E
+21EVq+uh1V9SWdUmmQYBAJJ3h+UKGICPdQaznv+gHeH0Ce5m6FR0Dc71be9iEnSL
+=ElD4
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/pacemaker/metadata.xml b/sys-cluster/pacemaker/metadata.xml
index e36a21bf761c..f18bd7f45ec8 100644
--- a/sys-cluster/pacemaker/metadata.xml
+++ b/sys-cluster/pacemaker/metadata.xml
@@ -8,7 +8,6 @@
 	  capabilities provided by your preferred cluster infrastructure (either OpenAIS or Heartbeat).
    </longdescription>
    <use>
-	   <flag name="ais">Enable <pkg>sys-cluster/openais</pkg> support.</flag>
 	   <flag name="cman">Enable <pkg>sys-cluster/cman</pkg> support.</flag>
 	   <flag name="heartbeat">Enable <pkg>sys-cluster/heartbeat</pkg> support.</flag>
 	   <flag name="smtp">Enable SMTP support via <pkg>net-libs/libsmtp</pkg></flag>
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
deleted file mode 100644
index c7615ae76c55..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.10.ebuild,v 1.7 2014/12/02 14:45:32 ultrabug Exp $
-
-EAPI="2"
-
-MY_PN="Pacemaker"
-MY_P="${MY_PN}-${PV}"
-PYTHON_DEPEND="2"
-inherit python autotools multilib eutils base flag-o-matic
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.clusterlabs.org/"
-SRC_URI="http://hg.clusterlabs.org/${PN}/stable-1.0/archive/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE="+ais heartbeat smtp snmp static-libs"
-
-RDEPEND="
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/resource-agents
-	ais? ( sys-cluster/openais )
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-	!heartbeat? ( !ais? ( sys-cluster/openais ) )
-	!sys-cluster/crmsh
-"
-DEPEND="${RDEPEND}
-	!=dev-libs/glib-2.32*
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
-	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
-)
-
-S="${WORKDIR}/${MY_PN}-1-0-${MY_P}"
-
-pkg_setup() {
-	if ! use ais && ! use heartbeat; then
-		ewarn "You disabled both cluster implementations"
-		ewarn "Silently enabling OpenAIS/CoroSync support."
-	fi
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -e "s:<glib/ghash.h>:<glib.h>:" \
-		-i lib/ais/plugin.c || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-
-	use heartbeat || use ais || myopts="--with-ais"
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with ais) \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
diff --git a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild b/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
deleted file mode 100644
index c39da3eb9127..000000000000
--- a/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/pacemaker/pacemaker-1.0.12.ebuild,v 1.4 2014/12/02 14:45:32 ultrabug Exp $
-
-EAPI="2"
-
-MY_PN=Pacemaker
-MY_P=${MY_PN}-${PV}
-PYTHON_DEPEND="2"
-
-inherit autotools base python
-
-MY_TREE="066152e"
-
-DESCRIPTION="Pacemaker CRM"
-HOMEPAGE="http://www.linux-ha.org/wiki/Pacemaker"
-SRC_URI="https://github.com/ClusterLabs/${PN}-1.0/tarball/${MY_P} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="+ais heartbeat smtp snmp static-libs"
-
-DEPEND="
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	sys-cluster/cluster-glue
-	sys-cluster/resource-agents
-	heartbeat? ( >=sys-cluster/heartbeat-3.0.0 )
-	!heartbeat? ( sys-cluster/corosync )
-	smtp? ( net-libs/libesmtp )
-	snmp? ( net-analyzer/net-snmp )
-	!sys-cluster/crmsh
-"
-RDEPEND="${DEPEND}
-	!=dev-libs/glib-2.32*
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.10-asneeded.patch"
-	"${FILESDIR}/${PN}-1.0.10-installpaths.patch"
-	"${FILESDIR}/1.0.12-BUILD_VERSION.patch"
-)
-
-S="${WORKDIR}/ClusterLabs-${PN}-1.0-${MY_TREE}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	base_src_prepare
-	sed -i -e "/ggdb3/d" configure.ac || die
-	sed -e "s:<glib/ghash.h>:<glib.h>:" \
-		-i lib/ais/plugin.c || die
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-	use heartbeat || myopts="--with-ais"
-	# appends lib to localstatedir automatically
-	econf \
-		--localstatedir=/var \
-		--disable-dependency-tracking \
-		--disable-fatal-warnings \
-		$(use_with heartbeat) \
-		$(use_with smtp esmtp) \
-		$(use_with snmp) \
-		$(use_enable static-libs static) \
-		${myopts}
-}
-
-src_install() {
-	base_src_install
-	use static-libs || find "${D}" -type f -name "*.la" -delete
-}