diff --git a/.cvsignore b/.cvsignore index 451c4d9..918f1e7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -keepalived-1.1.17.tar.gz +keepalived-1.1.19.tar.gz diff --git a/keepalived-1.1.19-fix-ipvs-loading.patch b/keepalived-1.1.19-fix-ipvs-loading.patch new file mode 100644 index 0000000..912914b --- /dev/null +++ b/keepalived-1.1.19-fix-ipvs-loading.patch @@ -0,0 +1,12 @@ +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; diff --git a/keepalived.spec b/keepalived.spec index b662c30..565388b 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -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 1.1.19-2 +- Include patch to remove obsolete -k option to modprobe (#528465). + +* Wed Oct 21 2009 Matthias Saou 1.1.19-1 +- Update to 1.1.19. + * Fri Aug 21 2009 Tomas Mraz - 1.1.17-3 - rebuilt with new openssl diff --git a/sources b/sources index 45cda45..9879826 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -324ef61a9eed389679f0a05edd1d1323 keepalived-1.1.17.tar.gz +a35b8d9d462810f7650d292bd7457523 keepalived-1.1.19.tar.gz