From 162daaeea5c34f8da471db409c234ed26212e793 Mon Sep 17 00:00:00 2001
From: Joost Soeterbroek <jsoeterb@fedoraproject.org>
Date: Apr 27 2006 18:18:56 +0000
Subject: removal of patch files, should not have used version number in filename..


---

diff --git a/heartbeat-2.0.3-fedora-ccmuser.patch b/heartbeat-2.0.3-fedora-ccmuser.patch
deleted file mode 100644
index 1e31454..0000000
--- a/heartbeat-2.0.3-fedora-ccmuser.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur heartbeat-2.0.3.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.3/cts/CM_LinuxHAv2.py.in
---- heartbeat-2.0.3.orig/cts/CM_LinuxHAv2.py.in	2006-02-08 22:58:57.000000000 +0100
-+++ heartbeat-2.0.3/cts/CM_LinuxHAv2.py.in	2006-03-01 20:09:19.000000000 +0100
-@@ -325,7 +325,7 @@
-                     "root@" + (self["CIBfile"]%node)):
-                     raise ValueError("Can not scp file to %s "%node)
- 	
--	    self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml")
-+	    self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml")
- 
-     def prepare(self):
-         '''Finish the Initialization process. Prepare to test...'''
diff --git a/heartbeat-2.0.3-fedora-chkconfig.patch b/heartbeat-2.0.3-fedora-chkconfig.patch
deleted file mode 100644
index 75cfadd..0000000
--- a/heartbeat-2.0.3-fedora-chkconfig.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Nur heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.3/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
-+++ heartbeat-2.0.3/heartbeat/init.d/heartbeat.in	2006-02-28 22:07:00.000000000 +0100
-@@ -13,7 +13,7 @@
- #		We don't hate anyone, and like for everyone to use
- #		our software, no matter what OS or distribution you're using.
- #
--# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
-+# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
- # description: Startup script high-availability services.
- # processname: heartbeat
- # pidfile: @localstatedir@/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
- 
- if
--  [ -r /etc/SuSE-release ]
--then
--  # rc.status is new since SuSE 7.0
--  [ -r /etc/rc.status ] && . /etc/rc.status
--  [ -r /etc/rc.config ] && . /etc/rc.config
--
--  # Determine the base and follow a runlevel link name.
--  base=${0##*/}
--  link=${base#*[SK][0-9][0-9]}
--
--fi
--if
-   [ -z "$rc_done" ]
- then
-   rc_done="Done."
-@@ -391,12 +379,7 @@
- 	StartHA
- 	RC=$?
- 	Echo
--	if
--	  [ $RC -eq 0 ]
--	then
--	  [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR
--	  touch $LOCKDIR/$SUBSYS
--	fi
-+	[ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat
- 	RunStartStop post-start $RC
- 	;;
- 
-@@ -413,11 +396,7 @@
- 	StopHA
- 	RC=$?
- 	Echo
--        if
--          [ $RC -eq 0 ]
--        then
--          rm -f $LOCKDIR/$SUBSYS
--        fi
-+        [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat
-         RunStartStop post-stop $RC
- 	StopLogd
- 	;;
-diff -Nur heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord heartbeat-2.0.3/ldirectord/init.d/ldirectord
---- heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
-+++ heartbeat-2.0.3/ldirectord/init.d/ldirectord	2006-02-25 22:57:16.000000000 +0100
-@@ -2,7 +2,7 @@
- #
- # ldirectord  Linux Director Daemon
- #
--# chkconfig: 2345 92 40
-+# chkconfig: - 92 40
- # description: Start and stop ldirectord on non-heartbeat systems
- #              Using the config file /etc/ha.d/ldirectord.cf
- #              
-@@ -59,9 +59,11 @@
- case "$1" in
-   start)
-         action "Starting ldirectord" $DAEMON start
-+        touch /var/lock/subsys/ldirectord
- 	;;
-   stop)
-         action "Stopping ldirectord" $DAEMON stop
-+        rm -f /var/lock/subsys/ldirectord
- 	;;
-   restart)
-         action "Restarting ldirectord" $DAEMON restart
diff --git a/heartbeat-2.0.3-fedora-pam.patch b/heartbeat-2.0.3-fedora-pam.patch
deleted file mode 100644
index d6c38f7..0000000
--- a/heartbeat-2.0.3-fedora-pam.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur heartbeat-2.0.3.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.3/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.3.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.3/mgmt/daemon/mgmtd.pam	2006-02-12 17:12:13.000000000 +0100
-@@ -1,3 +1,8 @@
--auth    required        pam_unix.so
--account required        pam_unix.so
--
-+#%PAM-1.0
-+auth       sufficient   pam_rootok.so
-+auth       sufficient   pam_timestamp.so
-+auth       required     pam_stack.so service=system-auth
-+session    required     pam_permit.so
-+session    optional     pam_xauth.so
-+session    optional     pam_timestamp.so
-+account    required     pam_permit.so