Compare commits
11 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed1468074d | ||
|
|
bfcd412e89 | ||
|
|
d3dd1cde0b | ||
|
|
55f7b2900d | ||
|
|
9a96084b50 | ||
|
|
68f15cb7f3 | ||
|
|
2b5c163081 | ||
|
|
7a74e981fe | ||
|
|
fc9ae23584 | ||
|
|
86bf8a191d | ||
|
|
d2c32546c5 |
5 changed files with 33 additions and 49 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
|
@ -13,3 +13,8 @@
|
|||
/keepalived-1.2.21.tar.gz
|
||||
/keepalived-1.2.22.tar.gz
|
||||
/keepalived-1.2.23.tar.gz
|
||||
/keepalived-1.2.24.tar.gz
|
||||
/keepalived-1.3.2.tar.gz
|
||||
/keepalived-1.3.5.tar.gz
|
||||
/keepalived-1.3.6.tar.gz
|
||||
/keepalived-1.3.9.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From 15105f7a4d8c6661326e3e70b6bdc27b36e88cd7 Mon Sep 17 00:00:00 2001
|
||||
From: Ryan O'Hara <rohara@redhat.com>
|
||||
Date: Tue, 5 Apr 2016 08:50:33 -0500
|
||||
Subject: [PATCH] Install VRRP-MIB when applicable
|
||||
|
||||
It appears that the condition in Makefile.in for installing VRRP-MIB
|
||||
was using a non-existent macro, SNMP_RFC2_SUPPORT. This patch removes
|
||||
two conditions from Makefile.in that use undefined macros and adds a
|
||||
condition to install VRRP-MIB when SNMP_RFCV2_SUPPORT is set
|
||||
appropriately.
|
||||
---
|
||||
Makefile.in | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index e77f046..fa88656 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -85,12 +85,9 @@ install:
|
||||
$(MAKE) -C genhash install
|
||||
ifeq (@SNMP_SUPPORT@, _WITH_SNMP_)
|
||||
mkdir -p $(DESTDIR)/usr/share/snmp/mibs/
|
||||
-ifeq (@SNMP_RFC2_SUPPORT@, _WITH_SNMP_RFC2_)
|
||||
+ifeq (@SNMP_RFCV2_SUPPORT@, _WITH_SNMP_RFCV2_)
|
||||
cp -f doc/VRRP-MIB $(DESTDIR)/usr/share/snmp/mibs/
|
||||
endif
|
||||
-ifeq (@SNMP_RFC3_SUPPORT@, _WITH_SNMP_RFC3_)
|
||||
- cp -f doc/VRRPv3-MIB $(DESTDIR)/usr/share/snmp/mibs/
|
||||
-endif
|
||||
ifeq (@SNMP_RFCV3_SUPPORT@, _WITH_SNMP_RFCV3_)
|
||||
cp -f doc/VRRPv3-MIB $(DESTDIR)/usr/share/snmp/mibs/
|
||||
endif
|
||||
--
|
||||
2.4.3
|
||||
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
[Unit]
|
||||
Description=LVS and VRRP High Availability Monitor
|
||||
After=syslog.target network-online.target
|
||||
After=network-online.target syslog.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
Name: keepalived
|
||||
Summary: High Availability monitor built upon LVS, VRRP and service pollers
|
||||
Version: 1.2.23
|
||||
Version: 1.3.9
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
URL: http://www.keepalived.org/
|
||||
|
|
@ -29,6 +29,7 @@ BuildRequires: systemd-units
|
|||
BuildRequires: openssl-devel
|
||||
BuildRequires: libnl3-devel
|
||||
BuildRequires: ipset-devel
|
||||
BuildRequires: iptables-devel
|
||||
BuildRequires: libnfnetlink-devel
|
||||
|
||||
%description
|
||||
|
|
@ -54,7 +55,8 @@ infrastructures.
|
|||
%{?with_profile:--enable-profile} \
|
||||
%{!?with_vrrp:--disable-vrrp} \
|
||||
%{?with_snmp:--enable-snmp --enable-snmp-rfc} \
|
||||
%{?with_sha1:--enable-sha1}
|
||||
%{?with_sha1:--enable-sha1} \
|
||||
--with-init=systemd
|
||||
%{__make} %{?_smp_mflags} STRIP=/bin/true
|
||||
|
||||
%install
|
||||
|
|
@ -65,16 +67,6 @@ rm -rf %{buildroot}%{_sysconfdir}/keepalived/samples/
|
|||
%{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/keepalived.service
|
||||
mkdir -p %{buildroot}%{_libexecdir}/keepalived
|
||||
|
||||
%if %{with snmp}
|
||||
mkdir -p %{buildroot}%{_datadir}/snmp/mibs/
|
||||
%{__mv} %{buildroot}%{_datadir}/snmp/mibs/KEEPALIVED-MIB \
|
||||
%{buildroot}%{_datadir}/snmp/mibs/KEEPALIVED-MIB.txt
|
||||
%{__mv} %{buildroot}%{_datadir}/snmp/mibs/VRRP-MIB \
|
||||
%{buildroot}%{_datadir}/snmp/mibs/VRRP-MIB.txt
|
||||
%{__mv} %{buildroot}%{_datadir}/snmp/mibs/VRRPv3-MIB \
|
||||
%{buildroot}%{_datadir}/snmp/mibs/VRRPv3-MIB.txt
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
|
@ -108,6 +100,27 @@ rm -rf %{buildroot}
|
|||
%{_mandir}/man8/keepalived.8*
|
||||
|
||||
%changelog
|
||||
* Wed Oct 25 2017 Ryan O'Hara <rohara@redhat.com> - 1.3.9-1
|
||||
- Update to 1.3.9 (#1497576)
|
||||
|
||||
* Mon Sep 11 2017 Ryan O'Hara <rohara@redhat.com> - 1.3.6-1
|
||||
- Update to 1.3.6 (#1481471)
|
||||
|
||||
* Sun Mar 26 2017 Ryan O'Hara <rohara@redhat.com> - 1.3.5-1
|
||||
- Update to 1.3.5 (#1422063)
|
||||
|
||||
* Mon Nov 28 2016 Ryan O'Hara <rohara@redhat.com> - 1.3.2-1
|
||||
- Update to 1.3.2 (#1396857)
|
||||
|
||||
* Fri Sep 16 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-3
|
||||
- Add BuildRequires for iptables-devel (#1361686)
|
||||
|
||||
* Fri Sep 16 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-2
|
||||
- Fix configure script
|
||||
|
||||
* Thu Sep 15 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.24-1
|
||||
- Update to 1.2.24 (#1376254)
|
||||
|
||||
* Wed Jul 13 2016 Ryan O'Hara <rohara@redhat.com> - 1.2.23-1
|
||||
- Update to 1.2.23 (#1354696)
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
451919d34d0af969a2c574529dca96e9 keepalived-1.2.23.tar.gz
|
||||
SHA512 (keepalived-1.3.9.tar.gz) = 283bfb35052c8f742050c03ce1b24c3db19fb43fbee9307b50ae719b5d06e461dfa4fda3a167afddd2aae216a97f6e84f79c5f0bdbe5c439f339b0f41fa83cd7
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue