diff --git a/keepalived-1.2.12.tar.gz b/keepalived-1.2.12.tar.gz new file mode 100644 index 0000000..cf49957 --- /dev/null +++ b/keepalived-1.2.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7cd5b1c44b9ec805bb70d208db5962f2c2ff42798c2efd10c6f92e263cf549ab +size 337974 diff --git a/keepalived-1.2.9.tar.gz b/keepalived-1.2.9.tar.gz deleted file mode 100644 index f1b9e2f..0000000 --- a/keepalived-1.2.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb711dacce95b60eee18f2b89938a9fbebc5096022f17850fd2284f207e41d9d -size 330779 diff --git a/keepalived.changes b/keepalived.changes index 04609f5..9856253 100644 --- a/keepalived.changes +++ b/keepalived.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Feb 11 08:12:55 UTC 2014 - boris@steki.net + +- updated to latest upstream version 1.2.12 + + Fix reallocation issue introduced in last merge. + + Fix some minor memory leaks. + + Better libnl support and selection. + + VRRP unicast TTL fix. + + Support to newer libnl. + + More IPv6 support. + + Fix/extend VRRP gratuitous ARP handling. + + Support xmit VRRP packets from base VMAC interface. + + VRRP multicast group tweaking. + + Fixed VRRP socket sync while leaving FAULT state. + + Code cleanup and cosmetics. + ------------------------------------------------------------------- Tue Jan 7 10:55:42 UTC 2014 - speilicke@suse.com diff --git a/keepalived.service b/keepalived.service new file mode 100644 index 0000000..2b049c0 --- /dev/null +++ b/keepalived.service @@ -0,0 +1,13 @@ +[Unit] +Description=LVS and VRRP High Availability Monitor +After=syslog.target network.target + +[Service] +Type=forking +KillMode=process +EnvironmentFile=-/etc/sysconfig/keepalived +ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/keepalived.spec b/keepalived.spec index 0cfab68..a1599f4 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -16,14 +16,19 @@ # +%if 0%{?suse_version} > 1210 +%define has_systemd 1 +%endif + Name: keepalived -Version: 1.2.9 +Version: 1.2.12 Release: 0 Summary: A strong & robust keepalive facility for linux License: GPL-2.0+ Group: Productivity/Networking/Routing Url: http://www.keepalived.org/ Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz +Source1: keepalived.service Patch1: keepalive-init.patch BuildRequires: openssl-devel # BuildRequires: netsnmp-devel @@ -34,6 +39,11 @@ BuildRequires: cyrus-sasl-devel Requires(pre): pwdutils Requires(pre): %insserv_prereq Requires(pre): %fillup_prereq +%if 0%{?has_systemd} +BuildRequires: systemd +Requires: systemd +%endif + BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -62,6 +72,10 @@ make install DESTDIR="%{buildroot}" install -dD -m 0750 %{buildroot}%{_var}/lib/%{name} install -D -m 0750 keepalived/etc/init.d/keepalived.suse.init %{buildroot}/etc/init.d/keepalived install -D -m 0644 %{buildroot}/etc/sysconfig/keepalived %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} +%if 0%{?has_systemd} +install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service +%endif + rm %{buildroot}/etc/rc.d/init.d/keepalived %{buildroot}/etc/sysconfig/keepalived ln -s /etc/init.d/keepalived %{buildroot}%{_sbindir}/rckeepalived chmod -R o= %{buildroot}/etc/keepalived @@ -104,6 +118,9 @@ rm -rv %{buildroot}/etc/keepalived/samples/ %{_mandir}/man1/genhash.1.gz %{_mandir}/man5/keepalived.conf.5.gz %{_mandir}/man8/keepalived.8.gz +%if 0%{?has_systemd} +%{_unitdir}/%name.service +%endif %dir %attr(-,keepalived,keepalived) %{_var}/lib/%{name} /var/adm/fillup-templates/sysconfig.%{name} %doc AUTHOR ChangeLog CONTRIBUTORS COPYING README