rpms/keepalived/EL-5 keepalived-1.1.14-installmodes.patch, NONE, 1.1 keepalived-1.1.19-fix-ipvs-loading.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 keepalived.init, 1.1, 1.2 keepalived.spec, 1.1, 1.2 sources, 1.2, 1.3 keepalived-1.1.13-iflabel.patch, 1.1, NONE keepalived-1.1.13-makefile.patch, 1.1, NONE keepalived-1.1.13-types.patch, 1.1, NONE keepalived.sysconfig, 1.1, NONE
Matthias Saou
thias at fedoraproject.org
Tue Dec 8 15:41:46 UTC 2009
Author: thias
Update of /cvs/extras/rpms/keepalived/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13076
Modified Files:
.cvsignore keepalived.init keepalived.spec sources
Added Files:
keepalived-1.1.14-installmodes.patch
keepalived-1.1.19-fix-ipvs-loading.patch
Removed Files:
keepalived-1.1.13-iflabel.patch
keepalived-1.1.13-makefile.patch keepalived-1.1.13-types.patch
keepalived.sysconfig
Log Message:
Backport 1.1.19 update from devel.
keepalived-1.1.14-installmodes.patch:
Makefile.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE keepalived-1.1.14-installmodes.patch ---
diff -Naupr keepalived-1.1.14.orig/keepalived/Makefile.in keepalived-1.1.14/keepalived/Makefile.in
--- keepalived-1.1.14.orig/keepalived/Makefile.in 2007-09-13 15:44:39.000000000 +0200
+++ keepalived-1.1.14/keepalived/Makefile.in 2007-09-14 12:38:43.000000000 +0200
@@ -99,13 +99,13 @@ uninstall:
install:
install -d $(DESTDIR)$(sbindir)
- install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
+ install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
install -d $(DESTDIR)$(init_dir)
install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived
install -d $(DESTDIR)$(sysconf_dir)
- install -m 755 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
+ install -m 644 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
install -d $(DESTDIR)$(sysconfdir)/keepalived/samples
- install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
+ install -m 640 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/
install -d $(DESTDIR)$(mandir)/man5
install -d $(DESTDIR)$(mandir)/man8
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/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 26 Mar 2007 17:47:42 -0000 1.2
+++ .cvsignore 8 Dec 2009 15:41:44 -0000 1.3
@@ -1 +1 @@
-keepalived-1.1.13.tar.gz
+keepalived-1.1.19.tar.gz
Index: keepalived.init
===================================================================
RCS file: /cvs/extras/rpms/keepalived/EL-5/keepalived.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keepalived.init 26 Mar 2007 17:47:42 -0000 1.1
+++ keepalived.init 8 Dec 2009 15:41:45 -0000 1.2
@@ -1,73 +1,110 @@
#!/bin/sh
#
-# Startup script for the Keepalived daemon
+# keepalived High Availability monitor built upon LVS and VRRP
#
-# processname: keepalived
-# pidfile: /var/run/keepalived.pid
-# config: /etc/keepalived/keepalived.conf
-# chkconfig: - 21 79
-# description: Start and stop Keepalived
+# chkconfig: - 86 14
+# description: Robust keepalive facility to the Linux Virtual Server project \
+# with multilayer TCP/IP stack checks.
+
+### BEGIN INIT INFO
+# Provides: keepalived
+# Required-Start: $local_fs $network $named $syslog
+# Required-Stop: $local_fs $network $named $syslog
+# Should-Start: smtpdaemon httpd
+# Should-Stop: smtpdaemon httpd
+# Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
+# Short-Description: High Availability monitor built upon LVS and VRRP
+# Description: Robust keepalive facility to the Linux Virtual Server
+# project with multilayer TCP/IP stack checks.
+### END INIT INFO
-# Source function library
+# Source function library.
. /etc/rc.d/init.d/functions
-# Source configuration file (we set KEEPALIVED_OPTIONS there)
-. /etc/sysconfig/keepalived
+exec="/usr/sbin/keepalived"
+prog="keepalived"
+config="/etc/keepalived/keepalived.conf"
-RETVAL=0
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-prog="keepalived"
+lockfile=/var/lock/subsys/$prog
start() {
+ [ -x $exec ] || exit 5
+ [ -e $config ] || exit 6
echo -n $"Starting $prog: "
- daemon keepalived ${KEEPALIVED_OPTIONS}
- RETVAL=$?
+ daemon $exec $KEEPALIVED_OPTIONS
+ retval=$?
echo
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
}
stop() {
echo -n $"Stopping $prog: "
- killproc keepalived
- RETVAL=$?
+ killproc $prog
+ retval=$?
echo
- [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
}
reload() {
echo -n $"Reloading $prog: "
- killproc keepalived -1
- RETVAL=$?
+ killproc $prog -1
+ retval=$?
echo
+ return $retval
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ status $prog
}
-# See how we were called.
+rh_status_q() {
+ rh_status &>/dev/null
+}
+
+
case "$1" in
start)
- start
+ rh_status_q && exit 0
+ $1
;;
stop)
- stop
- ;;
- reload)
- reload
+ rh_status_q || exit 0
+ $1
;;
restart)
- stop
- start
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
;;
- condrestart)
- if [ -f /var/lock/subsys/$prog ]; then
- stop
- start
- fi
+ force-reload)
+ force_reload
;;
status)
- status keepalived
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
;;
*)
- echo "Usage: $0 {start|stop|reload|restart|condrestart|status}"
- exit 1
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
esac
+exit $?
-exit $RETVAL
Index: keepalived.spec
===================================================================
RCS file: /cvs/extras/rpms/keepalived/EL-5/keepalived.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- keepalived.spec 26 Mar 2007 17:47:42 -0000 1.1
+++ keepalived.spec 8 Dec 2009 15:41:45 -0000 1.2
@@ -1,23 +1,25 @@
-# Ugly, but we need headers from a kernel to rebuild against
-%define kernel %(rpm -q kernel-devel --qf '%{RPMTAG_VERSION}-%{RPMTAG_RELEASE}\\n' 2>/dev/null | head -1)
-
Summary: HA monitor built upon LVS, VRRP and service pollers
Name: keepalived
-Version: 1.1.13
-Release: 6%{?dist}
-License: GPL
+Version: 1.1.19
+Release: 3%{?dist}
+License: GPLv2+
Group: Applications/System
URL: http://www.keepalived.org/
Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
Source1: keepalived.init
-Source2: keepalived.sysconfig
-Patch0: keepalived-1.1.13-makefile.patch
-Patch1: keepalived-1.1.13-iflabel.patch
-Patch2: keepalived-1.1.13-types.patch
+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
+Requires(postun): /sbin/service
BuildRequires: openssl-devel
# We need both of these for proper LVS support
BuildRequires: kernel, kernel-devel
+# We need popt, popt-devel is split out of rpm in Fedora 8+
+%if 0%{?fedora} >= 8
+BuildRequires: popt-devel
+%endif
%description
The main goal of the keepalived project is to add a strong & robust keepalive
@@ -34,15 +36,18 @@ healthchecks and LVS directors failover.
%prep
%setup -q
-%patch0 -p1 -b .makefile
-%patch1 -p0 -b .iflabel
-%patch2 -p1 -b .types
-# Fix file mode (600 as of 1.1.13)
+%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
+%{__chmod} -x goodies/arpreset.pl
%build
-%configure --with-kernel-dir="/lib/modules/%{kernel}/build"
+# Get the most recent available kernel build dir, allows to expand arch too
+KERNELDIR=$(ls -1d --sort t /lib/modules/*/build | head -1)
+%configure --with-kernel-dir="${KERNELDIR}"
%{__make} %{?_smp_mflags} STRIP=/bin/true
@@ -51,12 +56,9 @@ healthchecks and LVS directors failover.
%{__make} install DESTDIR=%{buildroot}
# Remove "samples", as we include them in %%doc
%{__rm} -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
-# Init script (based on the included one, but enhanced)
-%{__install} -D -p -m 0755 %{SOURCE1} \
+# Overwrite the init script with our LSB compliant one
+%{__install} -p -m 0755 %{SOURCE1} \
%{buildroot}%{_sysconfdir}/rc.d/init.d/keepalived
-# Sysconfig file (used by the init script)
-%{__install} -D -p -m 0640 %{SOURCE2} \
- %{buildroot}%{_sysconfdir}/sysconfig/keepalived
%check
@@ -90,10 +92,10 @@ fi
%files
%defattr(-,root,root,-)
%doc AUTHOR ChangeLog CONTRIBUTORS COPYING README TODO
-%doc doc/keepalived.conf.SYNOPSIS doc/samples/
+%doc doc/keepalived.conf.SYNOPSIS doc/samples/ goodies/arpreset.pl
%dir %{_sysconfdir}/keepalived/
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
-%attr(0640, root, root) %config(noreplace) %{_sysconfdir}/sysconfig/keepalived
+%config(noreplace) %{_sysconfdir}/keepalived/keepalived.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/keepalived
%{_sysconfdir}/rc.d/init.d/keepalived
%{_bindir}/genhash
%{_sbindir}/keepalived
@@ -103,6 +105,69 @@ fi
%changelog
+* Tue Dec 8 2009 Matthias Saou <http://freshrpms.net/> 1.1.19-3
+- Update init script to have keepalived start after the local MTA (#526512).
+- Simplify the kernel source detection, to avoid running rpm from rpmbuild.
+
+* 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
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.1.17-1
+- Update to 1.1.17.
+- Update init script all the way.
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> 1.1.15-7
+- rebuild with new openssl
+
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 1.1.15-6
+- Fork the init script to be (mostly for now) LSB compliant (#246966).
+
+* Thu Apr 24 2008 Matthias Saou <http://freshrpms.net/> 1.1.15-5
+- Add glob to the kerneldir location, since it contains the arch for F9+.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
+- Autorebuild for GCC 4.3
+
+* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org>
+- Rebuild for deps
+
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-2
+- Update to latest upstream sources, identical except for the included spec.
+
+* Mon Sep 17 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-1
+- Update to 1.1.15.
+- Remove merged genhashman and include patches.
+
+* Fri Sep 14 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-2
+- Include patch from Shinji Tanaka to fix conf include from inside some
+ directives like vrrp_instance.
+
+* Thu Sep 13 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-1
+- Update to 1.1.14.
+- Remove all upstreamed patches.
+- Remove our init script and sysconfig files, use the same now provided by the
+ upstream package (will need to patch for LSB stuff soonish).
+- Include new goodies/arpreset.pl in %%doc.
+- Add missing scriplet requirements.
+
+* Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-8
+- Rebuild for new BuildID feature.
+
+* Sun Aug 5 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-7
+- Update License field.
+
* Mon Mar 26 2007 Matthias Saou <http://freshrpms.net/> 1.1.13-6
- Fix doc/samples/sample.misccheck.smbcheck.sh mode (600 -> 644).
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/keepalived/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 26 Mar 2007 17:47:42 -0000 1.2
+++ sources 8 Dec 2009 15:41:45 -0000 1.3
@@ -1 +1 @@
-578bdb8e3ff4cca50fc877893bad658c keepalived-1.1.13.tar.gz
+a35b8d9d462810f7650d292bd7457523 keepalived-1.1.19.tar.gz
--- keepalived-1.1.13-iflabel.patch DELETED ---
--- keepalived-1.1.13-makefile.patch DELETED ---
--- keepalived-1.1.13-types.patch DELETED ---
--- keepalived.sysconfig DELETED ---
More information about the fedora-extras-commits
mailing list