Bump to EAPI2, respect multilib paths, remove obsolete bits fixing man chmods, apply security patch wrt #352213, general cleanup.

Package-Manager: portage-2.2.0_alpha10_p22/cvs/Linux x86_64

4 files changed, 112 insertions, 4 deletions

diff --git a/sys-cluster/rgmanager/ChangeLog b/sys-cluster/rgmanager/ChangeLog
index a4d9150f298e..05e2ab10ba40 100644
--- a/sys-cluster/rgmanager/ChangeLog
+++ b/sys-cluster/rgmanager/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for sys-cluster/rgmanager
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.12 2010/09/11 14:21:31 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/ChangeLog,v 1.13 2011/01/20 09:13:18 xarthisius Exp $
 
-  11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
+*rgmanager-2.03.09-r1 (20 Jan 2011)
+
+  20 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  +rgmanager-2.03.09-r1.ebuild, +files/rgmanager-2.03.09-CVE-2010-3389.patch:
+  Bump to EAPI2, respect multilib paths, remove obsolete bits fixing man
+  chmods, apply security patch wrt #352213, general cleanup.
+
+  11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Drop useles maintainer line
 
   10 Feb 2009; Christian Zoffoli <xmerlin@gentoo.org>
diff --git a/sys-cluster/rgmanager/Manifest b/sys-cluster/rgmanager/Manifest
index a8335caa188e..18c6a9ce0280 100644
--- a/sys-cluster/rgmanager/Manifest
+++ b/sys-cluster/rgmanager/Manifest
@@ -1,6 +1,8 @@
+AUX rgmanager-2.03.09-CVE-2010-3389.patch 1404 RMD160 c2422311a70fc4fdc17f51607d6856398c675c83 SHA1 666e69d2706035aa16d855f8fac5a69bd4e19f38 SHA256 cd7c3ef38d317531c807768f195bb2eb64c1943aec9b114c47d557067171eb3e
 AUX rgmanager-2.0x.conf 245 RMD160 d13382433c60ebf4a23884a745c84735b7c1ee46 SHA1 33c833f4479b73fc47ff62f742f9aed86d126aee SHA256 1b97548dac4f78fc1689298835373c224730c2f5020c3ce0996402ec950f5ece
 AUX rgmanager-2.0x.rc 1991 RMD160 e770fd8805afee61e13f5fb8851b77c22258b1cc SHA1 79a5c9c6d26df07c2f085b61782cbcc10f965c89 SHA256 2cd70711935077ad1020de0f8072cc4add1470ce8052ee493e2a2da4b465e542
 DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f
+EBUILD rgmanager-2.03.09-r1.ebuild 1592 RMD160 6d2f9df4c275f2a58861dbafaa5b0bacc2dbd3eb SHA1 02ed2aa2e241a472812121d709d375fdd1afe688 SHA256 738c932ee22155327bed8e40347e2b0b9217e69a2e5646ef69b96013a1f548c3
 EBUILD rgmanager-2.03.09.ebuild 1655 RMD160 554b92b660db890dbf79e9b4832b39bfd4cdbfe1 SHA1 2967c81ceb981c5c6850e32488ff9b2a418298a8 SHA256 a9b0dde9ccd7c551c7792a7e9442c922bfb5005905745063a6088dbc2b505e93
-MISC ChangeLog 2546 RMD160 a6783c59fd1e8374a032592bca76c9a77667aafe SHA1 d106e1d1eb4f18b5f073755d045e20db6bb049ad SHA256 bcd08ce177f4319d9d39215a5a17dd6822b583bc9ef08f3ebb9f9b05a7614814
+MISC ChangeLog 2857 RMD160 599c4473db3a21c7a9fcd784e4ab8c26d153b032 SHA1 bccbb51b5394f6fc72ce72d15e6c6d189cf30408 SHA256 c4bc8993766e03f45c949f31ab403b126a5f569ae2a3edd9f703312822b0962f
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
diff --git a/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch b/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch
new file mode 100644
index 000000000000..86e1f138eed1
--- /dev/null
+++ b/sys-cluster/rgmanager/files/rgmanager-2.03.09-CVE-2010-3389.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/show_bug.cgi?id=352213
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598549
+
+Patch by Jari Aalto <jari.aalto@cante.net>
+--- a/rgmanager/src/resources/SAPDatabase
++++ b/rgmanager/src/resources/SAPDatabase
+@@ -670,8 +670,11 @@
+ fi
+ 
+ # as root user we need the library path to the SAP kernel to be able to call executables
+-if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
+-  LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
++if [ "$DIR_EXECUTABLE" ]; then
++  if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
++      LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
++      export LD_LIBRARY_PATH
++  fi
+ fi
+ sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"
+ 
+--- a/rgmanager/src/resources/SAPInstance
++++ b/rgmanager/src/resources/SAPInstance
+@@ -382,8 +382,11 @@
+ fi
+ 
+ # as root user we need the library path to the SAP kernel to be able to call sapcontrol
+-if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
+-  LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
++if [ "$DIR_EXECUTABLE" ]; then
++  if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
++    LD_LIBRARY_PATH="$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
++    export LD_LIBRARY_PATH
++  fi
+ fi
+ sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"
+ 
diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
new file mode 100644
index 000000000000..176d5b9ffc01
--- /dev/null
+++ b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild,v 1.1 2011/01/20 09:13:18 xarthisius Exp $
+
+EAPI=2
+
+inherit eutils multilib versionator
+
+CLUSTER_RELEASE=${PV}
+MY_P=cluster-${CLUSTER_RELEASE}
+
+MAJ_PV="$(get_major_version)"
+MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)"
+
+DESCRIPTION="Clustered resource group manager"
+HOMEPAGE="http://sources.redhat.com/cluster/wiki/"
+SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=sys-cluster/ccs-${CLUSTER_RELEASE}*
+	=sys-cluster/dlm-lib-${CLUSTER_RELEASE}*
+	=sys-cluster/cman-lib-${CLUSTER_RELEASE}*"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxml2
+	=sys-libs/slang-2*"
+
+S=${WORKDIR}/${MY_P}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-CVE-2010-3389.patch
+}
+
+src_configure() {
+	(cd "${WORKDIR}"/${MY_P};
+		./configure \
+			--cc="$(tc-getCC)" \
+			--cflags="-Wall" \
+			--disable_kernel_check \
+			--somajor="$MAJ_PV" \
+			--sominor="$MIN_PV" \
+			--dlmlibdir=/usr/$(get_libdir) \
+			--dlmincdir=/usr/include \
+			--cmanlibdir=/usr/$(get_libdir) \
+			--cmanincdir=/usr/include \
+	) || die "configure problem"
+}
+
+src_compile() {
+	# There's a problem with -O2 right now, a patch was submitted.
+	env -u CFLAGS emake -j1 clean all || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	newinitd "${FILESDIR}"/${PN}-2.0x.rc ${PN} || die
+	newconfd "${FILESDIR}"/${PN}-2.0x.conf ${PN} || die
+}