diff --git a/keepalived-2.0.12.tar.gz b/keepalived-2.0.12.tar.gz deleted file mode 100644 index e65394d008e8720c0853d944f3a1b0f8fba92889..0000000000000000000000000000000000000000 Binary files a/keepalived-2.0.12.tar.gz and /dev/null differ diff --git a/keepalived-2.0.20.tar.gz b/keepalived-2.0.20.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a0e569177c119f6763fe97bdc95845844ef2f1f9 Binary files /dev/null and b/keepalived-2.0.20.tar.gz differ diff --git a/keepalived.service b/keepalived.service index 64c5d3f03da5bf5404768a19b935fd3c82513b4e..a5a9b282adf96bcef94092d4dadc74f390970de8 100644 --- a/keepalived.service +++ b/keepalived.service @@ -5,7 +5,7 @@ Wants=network-online.target [Service] Type=forking -PIDFile=/var/run/keepalived.pid +PIDFile=/run/keepalived.pid KillMode=process EnvironmentFile=-/etc/sysconfig/keepalived ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS diff --git a/keepalived.spec b/keepalived.spec index efe4b73b134c5c41dae8683d99c9b79633c1a3bd..ed127e5471858a9df0c45fa3d7b57dddd02f300d 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -2,12 +2,13 @@ %bcond_without vrrp %bcond_without sha1 %bcond_with profile +%bcond_without nftables %bcond_with debug %global _hardened_build 1 Name: keepalived -Version: 2.0.12 +Version: 2.0.20 Release: 2 Summary: High Availability monitor built upon LVS, VRRP and service pollers License: GPLv2+ @@ -16,7 +17,7 @@ Source0: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service BuildRequires: net-snmp-devel gcc systemd-units openssl-devel libnl3-devel -BuildRequires: ipset-devel iptables-devel libnfnetlink-devel +BuildRequires: ipset-devel iptables-devel libnfnetlink-devel libnftnl-devel %{?systemd requires} %description @@ -44,6 +45,7 @@ or all together to provide resilient infrastructures. %configure %{?with_debug:--enable-debug} %{?with_profile:--enable-profile} \ %{!?with_vrrp:--disable-vrrp} %{?with_sha1:--enable-sha1} \ --with-init=systemd %{!?with_vrrp:--disable-vrrp} \ + %{?with_nftables:--enable-nftables --disable-iptables --disable-ipset} \ %{?with_snmp:--enable-snmp --enable-snmp-rfc} \ %make_build STRIP=/bin/true @@ -87,5 +89,5 @@ install -Dd -m 0755 %{buildroot}%{_libexecdir}/keepalived %{_mandir}/man* %changelog -* Sat Dec 21 2019 openEuler Buildteam - 2.0.12-2 +* Fri 21 2020 openEuler Buildteam - 2.0.20-2 - Package init