rpms/keepalived/devel keepalived-1.1.19-fix-ipvs-loading.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 keepalived.spec, 1.17, 1.18 sources, 1.6, 1.7

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/keepalived/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5401

Modified Files:
	.cvsignore keepalived.spec sources 
Added Files:
	keepalived-1.1.19-fix-ipvs-loading.patch 
Log Message:
Update to 1.1.19 and include fix for obsolete modprobe option (#528465).


keepalived-1.1.19-fix-ipvs-loading.patch:
 ipvswrapper.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE keepalived-1.1.19-fix-ipvs-loading.patch ---
diff -Naupr keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c keepalived-1.1.19/keepalived/check/ipvswrapper.c
--- keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c	2009-09-28 13:03:40.000000000 +0200
+++ keepalived-1.1.19/keepalived/check/ipvswrapper.c	2009-11-24 22:41:56.220195007 +0100
@@ -789,7 +789,7 @@ string_to_number(const char *s, int min,
 static int
 modprobe_ipvs(void)
 {
-	char *argv[] = { "/sbin/modprobe", "-s", "-k", "--", "ip_vs", NULL };
+	char *argv[] = { "/sbin/modprobe", "-s", "--", "ip_vs", NULL };
 	int child;
 	int status;
 	int rc;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	12 Apr 2009 17:07:57 -0000	1.5
+++ .cvsignore	24 Nov 2009 21:53:05 -0000	1.6
@@ -1 +1 @@
-keepalived-1.1.17.tar.gz
+keepalived-1.1.19.tar.gz


Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/keepalived.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- keepalived.spec	21 Aug 2009 14:08:23 -0000	1.17
+++ keepalived.spec	24 Nov 2009 21:53:05 -0000	1.18
@@ -3,14 +3,15 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.17
-Release: 3%{?dist}
+Version: 1.1.19
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
 Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.init
 Patch0: keepalived-1.1.14-installmodes.patch
+Patch1: keepalived-1.1.19-fix-ipvs-loading.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -39,6 +40,7 @@ healthchecks and LVS directors failover.
 %prep
 %setup -q
 %patch0 -p1 -b .installmodes
+%patch1 -p1 -b .fix-ipvs-loading
 # Fix file mode (600 as of 1.1.13, still as of 1.1.17)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -106,6 +108,12 @@ fi
 
 
 %changelog
+* Tue Nov 24 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-2
+- Include patch to remove obsolete -k option to modprobe (#528465).
+
+* Wed Oct 21 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-1
+- Update to 1.1.19.
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.1.17-3
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	12 Apr 2009 17:07:57 -0000	1.6
+++ sources	24 Nov 2009 21:53:05 -0000	1.7
@@ -1 +1 @@
-324ef61a9eed389679f0a05edd1d1323  keepalived-1.1.17.tar.gz
+a35b8d9d462810f7650d292bd7457523  keepalived-1.1.19.tar.gz