diff --git a/keepalived-1.2.23.tar.gz b/keepalived-1.2.23.tar.gz deleted file mode 100644 index 3f2fd39..0000000 --- a/keepalived-1.2.23.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19e432bcf10ff3e801aa87acf84113a0b57d31524c3ca8866f13ffeb0475d910 -size 476278 diff --git a/keepalived-1.3.2.tar.gz b/keepalived-1.3.2.tar.gz new file mode 100644 index 0000000..7baeebe --- /dev/null +++ b/keepalived-1.3.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb6729a7b7402ef5ef89e895b2dd597880702a4e2351d4da2f88bf24284e38f4 +size 648434 diff --git a/keepalived.changes b/keepalived.changes index c78bcf6..4836ad2 100644 --- a/keepalived.changes +++ b/keepalived.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Dec 12 14:05:25 UTC 2016 - mrueckert@suse.de + +- fix building with libnfnetlink. the additional include path needs + to be in CPPFLAGS instead of CFLAGS now. +- enabled a few more features: + - enhanced snmp support (V2/V3 RFC) + - make sure we build with ipset/libiptc and routes support +- prepared dbus support: waiting for boo#1015141 + +------------------------------------------------------------------- +Mon Dec 12 12:59:54 UTC 2016 - mrueckert@suse.de + +- update 1.3.2 + - Security focused on notify heplers. Some minor fix and + extensions. + - changes from 1.3.1 + - Quick script fix for regression brought by last release. + - changes from 1.3.0 + - New MAJOR release with stabilization fixes. Support to DBus. + Conf extensions. Parser error log. Security extensions to run + scripts more secure. + - changes from 1.2.24 + - MAJOR release with stabilization fixes and new features like + support to network namespace. + + Refer to /usr/share/doc/packages/keepalived/ChangeLog + for more infos. + ------------------------------------------------------------------- Wed Jul 20 09:07:35 UTC 2016 - michael@stroeder.com diff --git a/keepalived.spec b/keepalived.spec index 67411a7..7bcd881 100644 --- a/keepalived.spec +++ b/keepalived.spec @@ -21,9 +21,10 @@ %else %bcond_with systemd %endif +%bcond_with dbus Name: keepalived -Version: 1.2.23 +Version: 1.3.2 Release: 0 Summary: A strong & robust keepalive facility for linux License: GPL-2.0+ @@ -33,14 +34,25 @@ Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz Source1: keepalived.service Source2: keepalive-rpmlintrc Patch1: keepalive-init.patch +BuildRequires: libnfnetlink-devel BuildRequires: net-snmp-devel BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: snmp-mibs %if 0%{?suse_version} > 1110 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(libipset) +BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(xtables) %else +BuildRequires: dbus-1-devel +BuildRequires: glib2-devel +BuildRequires: ipset-devel +BuildRequires: libiptc-devel BuildRequires: libnl-devel +BuildRequires: libxtables-devel %endif BuildRequires: libnfnetlink-devel # BuildRequires: netsnmp-devel @@ -77,8 +89,24 @@ resilient infrastructures. %build export STRIP=true -export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN $(pkg-config --cflags libnfnetlink)" -%configure --enable-snmp --enable-sha1 +export CPPFLAGS="$(pkg-config --cflags libnfnetlink libiptc libipset xtables)" +export CFLAGS="%optflags -DOPENSSL_NO_SSL_INTERN" +%configure \ + --disable-silent-rules \ + --enable-snmp \ + --enable-snmp-vrrp \ + %if %{with dbus} + --enable-dbus \ + --enable-dbus-create-instance \ + %endif + --enable-snmp-checker \ + --enable-snmp-rfc \ + --enable-snmp-rfcv2 \ + --enable-snmp-rfcv3 \ + --enable-sha1 \ + --enable-routes \ + --enable-libiptc \ + --enable-libipset make %{?_smp_mflags} %install @@ -95,7 +123,7 @@ ln -s /etc/init.d/keepalived %{buildroot}%{_sbindir}/rckeepalived %endif chmod -R o= %{buildroot}/etc/keepalived -rm -rv %{buildroot}/etc/rc.d/init.d/keepalived %{buildroot}/etc/keepalived/samples/ %{buildroot}/etc/sysconfig/keepalived +rm -rv %{buildroot}/etc/keepalived/samples/ %{buildroot}/etc/sysconfig/keepalived %pre /usr/sbin/groupadd -r %{name} >/dev/null 2>&1 || : @@ -125,7 +153,7 @@ rm -rv %{buildroot}/etc/rc.d/init.d/keepalived %{buildroot}/etc/keepalived/sampl %files %defattr(-,root,root) -%doc README COPYING +%doc README COPYING ChangeLog %config(noreplace) %attr(-,root,keepalived) /etc/keepalived/ %{_bindir}/genhash %{_sbindir}/rckeepalived @@ -133,7 +161,16 @@ rm -rv %{buildroot}/etc/rc.d/init.d/keepalived %{buildroot}/etc/keepalived/sampl %{_mandir}/man1/genhash.1.gz %{_mandir}/man5/keepalived.conf.5.gz %{_mandir}/man8/keepalived.8.gz -%{_datadir}/snmp/mibs/KEEPALIVED-MIB +%{_datadir}/snmp/mibs/KEEPALIVED-MIB.txt +%{_datadir}/snmp/mibs/VRRP-MIB.txt +%{_datadir}/snmp/mibs/VRRPv3-MIB.txt +# +%if %{with dbus} +%config /etc/dbus-1/system.d/org.keepalived.Vrrp1.conf +%{_datadir}/dbus-1/interfaces/org.keepalived.Vrrp1.Instance.xml +%{_datadir}/dbus-1/interfaces/org.keepalived.Vrrp1.Vrrp.xml +%endif +# %if %{with systemd} %{_unitdir}/%name.service %else