Send Linux-ha-cvs mailing list submissions to linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs or, via email, send a message with subject or body 'help' to [EMAIL PROTECTED] You can reach the person managing the list at [EMAIL PROTECTED] When replying, please edit your Subject line so it is more specific than "Re: Contents of Linux-ha-cvs digest..." Today's Topics: 1. Linux-HA CVS: linux-ha by horms from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: ldirectord by horms from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: debian by horms from (linux-ha-cvs@lists.linux-ha.org) 4. Linux-HA CVS: debian by horms from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Tue, 15 Aug 2006 01:44:31 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by horms from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : horms Host : Module : linux-ha Dir : linux-ha Modified Files: heartbeat.spec.in Log Message: Add missing rpm build dependancies As suggested by Martial Paupe, though glib2-devel in addition to glib-devel looks a bit fishy to me. Cc: Martial Paupe <[EMAIL PROTECTED]> Signed-Off-By: Simon Horman <[EMAIL PROTECTED]> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v retrieving revision 1.198 retrieving revision 1.199 diff -u -3 -r1.198 -r1.199 --- heartbeat.spec.in 15 Aug 2006 07:43:39 -0000 1.198 +++ heartbeat.spec.in 15 Aug 2006 07:44:30 -0000 1.199 @@ -1,4 +1,4 @@ -# $Id: heartbeat.spec.in,v 1.198 2006/08/15 07:43:39 horms Exp $ +# $Id: heartbeat.spec.in,v 1.199 2006/08/15 07:44:30 horms Exp $ %define _unpackaged_files_terminate_build 1 %define _missing_doc_files_terminate_build 1 @@ -15,7 +15,7 @@ Packager: Alan Robertson <[EMAIL PROTECTED]> Source: http://linux-ha.org/download/@[EMAIL PROTECTED]@[EMAIL PROTECTED] BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build -BuildPrereq: glib-devel, @UCDSNMPDEVEL@, perl, iputils, /usr/bin/ssh, openssl-devel, libnet +BuildPrereq: glib-devel, @UCDSNMPDEVEL@, perl, iputils, /usr/bin/ssh, openssl-devel, libnet, glib2-devel, python-devel, gnutls-devel # libnet available from www.ultramonkey.org and others Requires: sysklogd, heartbeat-stonith = %{version}-%{release}, heartbeat-pils = %{version}-%{release}, @RPM_MGMT_RUNTIME_REQUIRES@ BuildRequires: libgcrypt-devel ------------------------------ Message: 2 Date: Tue, 15 Aug 2006 01:47:15 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : horms Host : Project : linux-ha Module : ldirectord Dir : linux-ha/ldirectord Modified Files: ldirectord.in Log Message: ldirectord: tabs not spaces for indentation Cc: Ryan Williams <[EMAIL PROTECTED]> Signed-Off-By: Simon Horman <[EMAIL PROTECTED]> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.in,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- ldirectord.in 15 Aug 2006 07:40:50 -0000 1.38 +++ ldirectord.in 15 Aug 2006 07:47:14 -0000 1.39 @@ -1,5 +1,5 @@ #!/usr/bin/perl -my($VERSION)=(qw$Id: ldirectord.in,v 1.38 2006/08/15 07:40:50 horms Exp $)[2]; +my($VERSION)=(qw$Id: ldirectord.in,v 1.39 2006/08/15 07:47:14 horms Exp $)[2]; ###################################################################### # ldirectord http://www.vergenet.net/linux/ldirectord/ @@ -2727,7 +2727,7 @@ service_set($v,$r,"up"); return 0; } - } + } service_set($v,$r,"down"); return 1; @@ -2884,7 +2884,7 @@ $is_quiescent = "quiescent"; } - $or=$ov->{"real"}->{$rservice}; + $or=$ov->{"real"}->{$rservice}; # If a virtual service is a IP/port service (not fwmark) # and a real-servers uses a forwarding mechanism other than masq @@ -2915,7 +2915,7 @@ } } - if((!defined($or) and !defined($is_quiescent)) or + if((!defined($or) and !defined($is_quiescent)) or (defined($is_quiescent) and defined($or) and $or->{"weight"} eq 0 and get_forward_flag($or->{"forward"}) eq $rforw)){ @@ -3517,7 +3517,7 @@ my $status; - &ld_log("Running exec(@args)") if $DEBUG>2; + &ld_log("Running exec(@args)") if $DEBUG>2; $status = exec(@args); if($status != 0) { &ld_log("exec(@args) failed"); ------------------------------ Message: 3 Date: Tue, 15 Aug 2006 01:48:11 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : horms Host : Project : linux-ha Module : debian Dir : linux-ha/debian Modified Files: control Log Message: debian: Add recommends iptabls to heartbeat iptables is needed for the portblock resource function to functino correctly Signed-Off-By: Simon Horman <[EMAIL PROTECTED]> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- control 15 Aug 2006 07:42:19 -0000 1.49 +++ control 15 Aug 2006 07:48:10 -0000 1.50 @@ -24,7 +24,7 @@ Priority: optional Architecture: any Depends: ${shlibs:Depends}, python, iproute, adduser, netkit-ping | iputils-ping -Recommends: sysklogd | syslog-ng | system-log-daemon, logrotate +Recommends: sysklogd | syslog-ng | system-log-daemon, logrotate, iptables Provides: heartbeat, libpils0, libstonith0, stonith Conflicts: heartbeat, libpils0, libstonith0, stonith Replaces: heartbeat, libpils0, libstonith0, stonith ------------------------------ Message: 4 Date: Tue, 15 Aug 2006 01:48:48 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : horms Host : Project : linux-ha Module : debian Dir : linux-ha/debian Modified Files: heartbeat-2.dirs heartbeat-2.postinst Log Message: debian: Add /var/lib/heartbeat/pengine directory Closes Debian Bug: #379071 Signed-Off-By: Simon Horman <[EMAIL PROTECTED]> =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.dirs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- heartbeat-2.dirs 3 Feb 2006 02:23:32 -0000 1.5 +++ heartbeat-2.dirs 15 Aug 2006 07:48:47 -0000 1.6 @@ -26,6 +26,7 @@ var/lib/heartbeat/cores/hacluster var/lib/heartbeat/crm var/lib/heartbeat/ckpt +var/lib/heartbeat/pengine var/lock/subsys var/run/heartbeat var/run/heartbeat/ccm =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.postinst,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- heartbeat-2.postinst 19 May 2006 01:59:35 -0000 1.6 +++ heartbeat-2.postinst 15 Aug 2006 07:48:47 -0000 1.7 @@ -39,7 +39,8 @@ mknod -m 0600 /var/lib/heartbeat/fifo p for i in /var/lib/heartbeat/ccm /var/lib/heartbeat/crm \ - /var/run/heartbeat/ccm /var/run/heartbeat/crm; do + /var/run/heartbeat/ccm /var/run/heartbeat/crm \ + /var/lib/heartbeat/pengine; do chmod 750 $i chown hacluster $i chgrp haclient $i ------------------------------ _______________________________________________ Linux-ha-cvs mailing list Linux-ha-cvs@lists.linux-ha.org http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs End of Linux-ha-cvs Digest, Vol 33, Issue 45 ********************************************