[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/heartbeat/FC-5 heartbeat-fedora-ccmuser.patch, NONE, 1.1 heartbeat-fedora-chkconfig.patch, NONE, 1.1 heartbeat-fedora-pam.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 heartbeat.spec, 1.1, 1.2



Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17216

Modified Files:
	.cvsignore sources heartbeat.spec 
Added Files:
	heartbeat-fedora-ccmuser.patch 
	heartbeat-fedora-chkconfig.patch heartbeat-fedora-pam.patch 
Log Message:
Update to 2.0.4

heartbeat-fedora-ccmuser.patch:

--- NEW FILE heartbeat-fedora-ccmuser.patch ---
diff -Nur heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in
--- heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in	2006-02-27 10:19:42.000000000 +0100
+++ heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in	2006-03-27 19:49:36.000000000 +0200
@@ -155,7 +155,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...'''

heartbeat-fedora-chkconfig.patch:

--- NEW FILE heartbeat-fedora-chkconfig.patch ---
diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
--- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in	2006-03-27 19:55:19.000000000 +0200
@@ -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.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord
--- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord	2006-03-27 19:56:40.000000000 +0200
@@ -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

heartbeat-fedora-pam.patch:

--- NEW FILE heartbeat-fedora-pam.patch ---
diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
--- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam	2006-03-27 19:59:12.000000000 +0200
@@ -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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	2 Mar 2006 06:41:39 -0000	1.2
+++ .cvsignore	30 Mar 2006 17:42:04 -0000	1.3
@@ -1 +1 @@
-heartbeat-2.0.3.tar.gz
+heartbeat-2.0.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	2 Mar 2006 06:41:39 -0000	1.2
+++ sources	30 Mar 2006 17:42:04 -0000	1.3
@@ -1 +1 @@
-ef926928325e7f4c1aaa51b93dffdcf4  heartbeat-2.0.3.tar.gz
+659aae2365daea3a17e5a4a4ae0b0a3e  heartbeat-2.0.4.tar.gz


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat.spec	2 Mar 2006 06:41:39 -0000	1.1
+++ heartbeat.spec	30 Mar 2006 17:42:04 -0000	1.2
@@ -5,22 +5,21 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.3
-Release:          9%{?dist}
+Version:          2.0.4
+Release:          2%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
-Patch0:           heartbeat-2.0.3-fedora-pam.patch
-Patch1:           heartbeat-2.0.3-fedora-chkconfig.patch
-Patch2:           heartbeat-2.0.3-fedora-ccmuser.patch
+Patch0:           heartbeat-fedora-pam.patch
+Patch1:           heartbeat-fedora-chkconfig.patch
+Patch2:           heartbeat-fedora-ccmuser.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
 BuildRequires:    openssl-devel
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
-#BuildRequires:    fedora-usermgmt
 BuildRequires:    net-snmp-devel
 BuildRequires:    bzip2-devel 
 %if %{ENABLE_MGMT}
@@ -291,6 +290,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Mar 29 2006  Joost Soeterbroek <fedora soeterbroek com> - 2.0.4-2
+- Version 2.0.4
+
 * Wed Mar  1 2006  Joost Soeterbroek <fedora soeterbroek com> - 2.0.3-9
 - changed user creation
 - added patch2 heartbeat-2.0.3-fedora-ccmuser.patch  


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]