patch split, merged security fix, marked stable on x86. -r2 experimental ebuild with lvm fixes.

Package-Manager: portage-2.0.51.19

7 files changed, 186 insertions, 93 deletions

diff --git a/sys-cluster/heartbeat/ChangeLog b/sys-cluster/heartbeat/ChangeLog
index 46da282124ea..cab4a6dc395b 100644
--- a/sys-cluster/heartbeat/ChangeLog
+++ b/sys-cluster/heartbeat/ChangeLog
@@ -1,9 +1,21 @@
 # ChangeLog for sys-cluster/heartbeat
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.34 2005/07/29 00:25:04 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/ChangeLog,v 1.35 2005/08/01 13:34:25 xmerlin Exp $
+
+*heartbeat-1.2.3-r2 (01 Aug 2005)
+
+  01 Aug 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  +heartbeat-1.2.3-r2.ebuild:
+  experimental ebuild with lvm fixes.
 
 *heartbeat-1.2.3-r1 (29 Jul 2005)
 
+  01 Aug 2005; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/heartbeat-1.2.3-debian_security_fixes,
+  +files/heartbeat-1.2.3-lvm.patch,
+  +files/heartbeat-1.2.3-misc_security_fixes.patch, heartbeat-1.2.3-r1.ebuild:
+  patch split, merged security fix, marked stable on x86.
+
   29 Jul 2005; Christian Zoffoli <xmerlin@gentoo.org>
   +files/heartbeat-1.2.3-debian_security_fixes, +heartbeat-1.2.3-r1.ebuild:
   fixed bug #97175.
diff --git a/sys-cluster/heartbeat/Manifest b/sys-cluster/heartbeat/Manifest
index 917451367f1a..fdaaf43d0141 100644
--- a/sys-cluster/heartbeat/Manifest
+++ b/sys-cluster/heartbeat/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7ec992b1c67df6492d7e6377ee693c55 ChangeLog 5312
+MD5 282362c9cf1b10e21648b0073f74fd0a ChangeLog 5746
 MD5 469a4f6cad0c54b4faed31a2852af816 metadata.xml 339
-MD5 36f8ae4d9ff9d6c1a912e0a5f0b26ffe heartbeat-1.2.3-r1.ebuild 1982
+MD5 1e34e710d62a791c69a3d307ac7b43cf heartbeat-1.2.3-r1.ebuild 1985
 MD5 72cd506bc581948c4a68e28017430c64 heartbeat-1.2.3.ebuild 1875
+MD5 d191f1ab52f525e575dbc013933998fe heartbeat-1.2.3-r2.ebuild 2039
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3 68
 MD5 343f80e3711eec80114c5ca01d38b8b0 files/heartbeat-init 821
-MD5 703eafb05d6e931e32e4762f7559df7c files/heartbeat-1.2.3-debian_security_fixes 9340
 MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r1 68
+MD5 4382b0b2d64b5483957114b7123e4a94 files/heartbeat-1.2.3-lvm.patch 1660
+MD5 30657e79d1e3630eed837297364fe17c files/heartbeat-1.2.3-misc_security_fixes.patch 7756
+MD5 6cf2ecfcee6a47d187e99cc1fa3081f0 files/digest-heartbeat-1.2.3-r2 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC6XeIgMUyd/cdjWsRAiiJAJ4gnDlzwsfqliCmRVAg7kZ3AkMDNgCeJJ97
-6iAiWBu8P0kA125yASL73Ac=
-=Eaxt
+iD8DBQFC7iW/gMUyd/cdjWsRAnHNAJ9w7wHo51LggERphpTXFxtEm82gPACfQbWe
+RFUlC3mZ8O8O4z1dJNd+rlo=
+=BNfp
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2 b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2
new file mode 100644
index 000000000000..1db4b5d1aa0a
--- /dev/null
+++ b/sys-cluster/heartbeat/files/digest-heartbeat-1.2.3-r2
@@ -0,0 +1 @@
+MD5 9fd126e5dff51cc8c1eee223c252a4af heartbeat-1.2.3.tar.gz 1772513
diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch b/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch
new file mode 100644
index 000000000000..e81a6c289279
--- /dev/null
+++ b/sys-cluster/heartbeat/files/heartbeat-1.2.3-lvm.patch
@@ -0,0 +1,83 @@
+--- a/heartbeat/resource.d/LVM.in	20 Apr 2004 05:05:29 -0000	1.2.4.1
++++ b/heartbeat/resource.d/LVM.in	10 Jun 2005 07:46:28 -0000
+@@ -102,8 +102,15 @@ LVM_methods() {
+ #
+ LVM_status() {
+ 
+-  vgdisplay $1 | grep -i 'Status.*available' >/dev/null
+-  
++  if 
++    [ "$LVM_VERSION" -gt "200" ]
++  then
++  	vgdisplay -v $1 | grep -i 'Status[ \t]*available' &>/dev/null
++	return $?
++  else
++  	vgdisplay $1 | grep -i 'Status.*available' >/dev/null
++	return $?
++  fi
+ }
+ 
+ #
+@@ -111,15 +118,27 @@ LVM_status() {
+ #
+ LVM_report_status() {
+ 
+-  VGOUT=`vgdisplay $1 2>&1`
++  if 
++    [ "$LVM_VERSION" -gt "200" ]
++  then
++  	VGOUT=`vgdisplay -v $1 2>&1`
++	echo "$VGOUT" | grep -i 'Status[ \t]*available' >/dev/null
++	rc=$?
++  else
++  	VGOUT=`vgdisplay $1 2>&1`
++  	echo "$VGOUT" | grep -i 'Status.*available' >/dev/null
++	rc=$?
++  fi
++
+   if
+-    echo "$VGOUT" | grep -i 'Status.*available' >/dev/null
++    [ $rc -eq 0 ]
+   then
+     : Volume $1 is available
+   else
+     echo "LVM Volume $1 is not available (stopped)"
+     return 1
+   fi
++
+   if
+     echo "$VGOUT" | grep -i 'Access.*read/write' >/dev/null
+   then
+@@ -155,7 +174,15 @@ LVM_monitor() {
+ LVM_start() {
+ 
+   ha_log "Activating volume group $1"
+-  run vgscan $1
++
++  if 
++    [ "$LVM_VERSION" -gt "200" ]
++  then
++  	run vgscan
++  else
++  	run vgscan $1
++  fi
++
+   run vgchange -a y $1 || return 1
+ 
+   if
+@@ -196,6 +223,15 @@ if
+ then
+   LVM_methods
+   exit $?
++fi
++
++LVM_VERSION=`LVM_VERSION=`/sbin/lvm version 2> /dev/null | awk '/LVM/ {print $3}' | awk -F"." '{print $1$2}'`
++rc=$?
++if 
++  [ $rc -ne 0 ]
++then
++  ha_log "ERROR: LVM: $1 could not determine LVM version"
++  return  $rc
+ fi
+ 
+ VOLUME=$1
diff --git a/sys-cluster/heartbeat/files/heartbeat-1.2.3-debian_security_fixes b/sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch
index 1b8992a1bb2a..14a9f7466452 100644
--- a/sys-cluster/heartbeat/files/heartbeat-1.2.3-debian_security_fixes
+++ b/sys-cluster/heartbeat/files/heartbeat-1.2.3-misc_security_fixes.patch
@@ -200,86 +200,3 @@ unchanged:
  
      #
      #	If there is local_giveip script, run it.
---- a/heartbeat/resource.d/LVM.in	20 Apr 2004 05:05:29 -0000	1.2.4.1
-+++ b/heartbeat/resource.d/LVM.in	10 Jun 2005 07:46:28 -0000
-@@ -102,8 +102,15 @@ LVM_methods() {
- #
- LVM_status() {
- 
--  vgdisplay $1 | grep -i 'Status.*available' >/dev/null
--  
-+  if 
-+    [ "$LVM_VERSION" -eq "200" ]
-+  then
-+  	vgdisplay -v $1 | grep -i 'Status[ \t]*available' &>/dev/null
-+	return $?
-+  else
-+  	vgdisplay $1 | grep -i 'Status.*available' >/dev/null
-+	return $?
-+  fi
- }
- 
- #
-@@ -111,15 +118,27 @@ LVM_status() {
- #
- LVM_report_status() {
- 
--  VGOUT=`vgdisplay $1 2>&1`
-+  if 
-+    [ "$LVM_VERSION" -eq "200" ]
-+  then
-+  	VGOUT=`vgdisplay -v $1 2>&1`
-+	echo "$VGOUT" | grep -i 'Status[ \t]*available' >/dev/null
-+	rc=$?
-+  else
-+  	VGOUT=`vgdisplay $1 2>&1`
-+  	echo "$VGOUT" | grep -i 'Status.*available' >/dev/null
-+	rc=$?
-+  fi
-+
-   if
--    echo "$VGOUT" | grep -i 'Status.*available' >/dev/null
-+    [ $rc -eq 0 ]
-   then
-     : Volume $1 is available
-   else
-     echo "LVM Volume $1 is not available (stopped)"
-     return 1
-   fi
-+
-   if
-     echo "$VGOUT" | grep -i 'Access.*read/write' >/dev/null
-   then
-@@ -155,7 +174,15 @@ LVM_monitor() {
- LVM_start() {
- 
-   ha_log "Activating volume group $1"
--  run vgscan $1
-+
-+  if 
-+    [ "$LVM_VERSION" -eq "200" ]
-+  then
-+  	run vgscan
-+  else
-+  	run vgscan $1
-+  fi
-+
-   run vgchange -a y $1 || return 1
- 
-   if
-@@ -196,6 +223,15 @@ if
- then
-   LVM_methods
-   exit $?
-+fi
-+
-+LVM_VERSION=`/sbin/lvmiopversion`
-+rc=$?
-+if 
-+  [ $rc -ne 0 ]
-+then
-+  ha_log "ERROR: LVM: $1 could not determine LVM version"
-+  return  $rc
- fi
- 
- VOLUME=$1
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
index 987bbd46a25e..0bda2075aa58 100644
--- a/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild,v 1.1 2005/07/29 00:25:04 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r1.ebuild,v 1.2 2005/08/01 13:34:25 xmerlin Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -mips ~ppc ~amd64"
+KEYWORDS="x86 -mips ~ppc ~amd64"
 IUSE="ldirectord"
 
 DEPEND="dev-libs/popt
@@ -26,7 +26,7 @@ DEPEND="dev-libs/popt
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/heartbeat-1.2.3-debian_security_fixes || die
+	epatch ${FILESDIR}/heartbeat-1.2.3-misc_security_fixes.patch || die
 }
 
 src_compile() {
diff --git a/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild b/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild
new file mode 100644
index 000000000000..ad8cc938accd
--- /dev/null
+++ b/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/heartbeat/heartbeat-1.2.3-r2.ebuild,v 1.1 2005/08/01 13:34:25 xmerlin Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Heartbeat high availability cluster manager"
+HOMEPAGE="http://www.linux-ha.org"
+SRC_URI="http://www.linux-ha.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -mips ~ppc ~amd64"
+IUSE="ldirectord"
+
+DEPEND="dev-libs/popt
+	=dev-libs/glib-1.2*
+	net-libs/libnet
+	ldirectord? (	sys-cluster/ipvsadm
+			dev-perl/libwww-perl
+			dev-perl/perl-ldap
+			dev-perl/libnet )"
+
+# need to add dev-perl/Mail-IMAPClient inside ldirectord above
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/heartbeat-1.2.3-misc_security_fixes.patch || die
+	epatch ${FILESDIR}/heartbeat-1.2.3-lvm.patch || die
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--with-group-name=cluster \
+		--with-group-id=65 \
+		--with-ccmuser-name=cluster \
+		--with-ccmuser-id=65 || die
+	emake -j 1 || die "compile problem"
+}
+
+pkg_preinst() {
+	# check for cluster group, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/group ; then
+		groupadd -g 65 cluster
+	fi
+	# check for cluster user, if it doesn't exist make it
+	if ! grep -q cluster.*65 /etc/passwd ; then
+		useradd -u 65 -g cluster -s /dev/null -d /var/lib/heartbeat cluster
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# heartbeat modules need these dirs
+	keepdir /var/lib/heartbeat/ckpt /var/lib/heartbeat/ccm /var/lib/heartbeat
+
+	keepdir /etc/ha.d/conf
+
+	# if ! USE="ldirectord" then don't install it
+	if ! use ldirectord ; then
+		rm ${D}/etc/init.d/ldirectord
+		rm ${D}/etc/logrotate.d/ldirectord
+		rm ${D}/usr/man/man8/supervise-ldirectord-config.8
+		rm ${D}/usr/man/man8/ldirectord.8
+		rm ${D}/usr/sbin/ldirectord
+		rm ${D}/usr/sbin/supervise-ldirectord-config
+	fi
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/heartbeat-init heartbeat
+}