rebase to 1.2.1(#1431309)
added quagga to quaggavt group - resolves #1434028 enabled pimd and nhrpd fix bogus date in changelog
This commit is contained in:
Michal Ruprich
parent
541f305fae
commit
8778710bbb
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@ quagga-0.99.17.tar.gz
|
||||
/quagga-0.99.24.1.tar.xz
|
||||
/quagga-1.1.0.tar.gz
|
||||
/quagga-1.1.1.tar.gz
|
||||
/quagga-1.2.1.tar.gz
|
||||
|
||||
@ -1,183 +0,0 @@
|
||||
From 91eddf68ca54ba11a22f58de9a4e8f5deb53cccc Mon Sep 17 00:00:00 2001
|
||||
From: Michal Sekletar <msekleta@redhat.com>
|
||||
Date: Thu, 20 Oct 2016 12:56:34 +0200
|
||||
Subject: [PATCH] systemd: various service file improvements
|
||||
|
||||
(1) network.target is generally used as a synchronization point during
|
||||
boot up and not as a "boot target" (target where services are actually
|
||||
enabled). Also as per 'man 7 systemd.special', service implementing
|
||||
networking should pull network.target into transaction and order itself
|
||||
before it. Hence, it doesn't make sense for zebra and friends to be
|
||||
enabled in network.target, because they should actively pull in
|
||||
network.target into boot transaction. Let's enable them as normal
|
||||
services in multi-user.target and order against network{,-pre}.target
|
||||
appropriately.
|
||||
|
||||
(2) All quagga daemons needs zebra to be running at all times and want
|
||||
to restarted/stopped whenever zebra is. This is expressed by BindsTo=
|
||||
dependency in a unit file (note "s" in Binds).
|
||||
---
|
||||
redhat/bgpd.service | 8 +++++---
|
||||
redhat/isisd.service | 8 +++++---
|
||||
redhat/ospf6d.service | 8 +++++---
|
||||
redhat/ospfd.service | 8 +++++---
|
||||
redhat/ripd.service | 8 +++++---
|
||||
redhat/ripngd.service | 8 +++++---
|
||||
redhat/zebra.service | 6 ++++--
|
||||
7 files changed, 34 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/redhat/bgpd.service b/redhat/bgpd.service
|
||||
index 5040284..ef24841 100644
|
||||
--- a/redhat/bgpd.service
|
||||
+++ b/redhat/bgpd.service
|
||||
@@ -1,7 +1,9 @@
|
||||
[Unit]
|
||||
Description=BGP routing daemon
|
||||
-BindTo=zebra.service
|
||||
-After=syslog.target network.target zebra.service
|
||||
+BindsTo=zebra.service
|
||||
+Wants=network.target
|
||||
+After=zebra.service network-pre.target
|
||||
+Before=network.target
|
||||
ConditionPathExists=/etc/quagga/bgpd.conf
|
||||
|
||||
[Service]
|
||||
@@ -11,4 +13,4 @@ ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS -f /etc/quagga/bgpd.conf
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
-WantedBy=network.target
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/redhat/isisd.service b/redhat/isisd.service
|
||||
index 4cdf67d..edb6eea 100644
|
||||
--- a/redhat/isisd.service
|
||||
+++ b/redhat/isisd.service
|
||||
@@ -1,7 +1,9 @@
|
||||
[Unit]
|
||||
Description=IS-IS routing daemon
|
||||
-BindTo=zebra.service
|
||||
-After=syslog.target network.target zebra.service
|
||||
+BindsTo=zebra.service
|
||||
+Wants=network.target
|
||||
+After=zebra.service network-pre.target
|
||||
+Before=network.target
|
||||
ConditionPathExists=/etc/quagga/isisd.conf
|
||||
|
||||
[Service]
|
||||
@@ -11,4 +13,4 @@ ExecStart=/usr/sbin/isisd -d $ISISD_OPTS -f /etc/quagga/isisd.conf
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
-WantedBy=network.target
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/redhat/ospf6d.service b/redhat/ospf6d.service
|
||||
index 3c9c466..b53b970 100644
|
||||
--- a/redhat/ospf6d.service
|
||||
+++ b/redhat/ospf6d.service
|
||||
@@ -1,7 +1,9 @@
|
||||
[Unit]
|
||||
Description=OSPF routing daemon for IPv6
|
||||
-BindTo=zebra.service
|
||||
-After=syslog.target network.target zebra.service
|
||||
+BindsTo=zebra.service
|
||||
+Wants=network.target
|
||||
+After=zebra.service network-pre.target
|
||||
+Before=network.target
|
||||
ConditionPathExists=/etc/quagga/ospf6d.conf
|
||||
|
||||
[Service]
|
||||
@@ -11,4 +13,4 @@ ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS -f /etc/quagga/ospf6d.conf
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
-WantedBy=network.target
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/redhat/ospfd.service b/redhat/ospfd.service
|
||||
index 5e3de23..5d6c5bb 100644
|
||||
--- a/redhat/ospfd.service
|
||||
+++ b/redhat/ospfd.service
|
||||
@@ -1,7 +1,9 @@
|
||||
[Unit]
|
||||
Description=OSPF routing daemon
|
||||
-BindTo=zebra.service
|
||||
-After=syslog.target network.target zebra.service
|
||||
+BindsTo=zebra.service
|
||||
+Wants=network.target
|
||||
+After=zebra.service network-pre.target
|
||||
+Before=network.target
|
||||
ConditionPathExists=/etc/quagga/ospfd.conf
|
||||
|
||||
[Service]
|
||||
@@ -11,4 +13,4 @@ ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS -f /etc/quagga/ospfd.conf
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
-WantedBy=network.target
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/redhat/ripd.service b/redhat/ripd.service
|
||||
index d35dc47..ed7f922 100644
|
||||
--- a/redhat/ripd.service
|
||||
+++ b/redhat/ripd.service
|
||||
@@ -1,7 +1,9 @@
|
||||
[Unit]
|
||||
Description=RIP routing daemon
|
||||
-BindTo=zebra.service
|
||||
-After=syslog.target network.target zebra.service
|
||||
+BindsTo=zebra.service
|
||||
+Wants=network.target
|
||||
+After=zebra.service network-pre.target
|
||||
+Before=network.target
|
||||
ConditionPathExists=/etc/quagga/ripd.conf
|
||||
|
||||
[Service]
|
||||
@@ -11,4 +13,4 @@ ExecStart=/usr/sbin/ripd -d $RIPD_OPTS -f /etc/quagga/ripd.conf
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
-WantedBy=network.target
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/redhat/ripngd.service b/redhat/ripngd.service
|
||||
index 567e888..2519b31 100644
|
||||
--- a/redhat/ripngd.service
|
||||
+++ b/redhat/ripngd.service
|
||||
@@ -1,7 +1,9 @@
|
||||
[Unit]
|
||||
Description=RIP routing daemon for IPv6
|
||||
-BindTo=zebra.service
|
||||
-After=syslog.target network.target zebra.service
|
||||
+BindsTo=zebra.service
|
||||
+Wants=network.target
|
||||
+After=zebra.service network-pre.target
|
||||
+Before=network.target
|
||||
ConditionPathExists=/etc/quagga/ripngd.conf
|
||||
|
||||
[Service]
|
||||
@@ -11,4 +13,4 @@ ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS -f /etc/quagga/ripngd.conf
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
-WantedBy=network.target
|
||||
+WantedBy=multi-user.target
|
||||
diff --git a/redhat/zebra.service b/redhat/zebra.service
|
||||
index 27c3a52..f9107f1 100644
|
||||
--- a/redhat/zebra.service
|
||||
+++ b/redhat/zebra.service
|
||||
@@ -1,6 +1,8 @@
|
||||
[Unit]
|
||||
Description=GNU Zebra routing manager
|
||||
-After=syslog.target network.target
|
||||
+Wants=network.target
|
||||
+Before=network.target
|
||||
+After=network-pre.target
|
||||
ConditionPathExists=/etc/quagga/zebra.conf
|
||||
|
||||
[Service]
|
||||
@@ -11,4 +13,4 @@ ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS -f /etc/quagga/zebra.conf
|
||||
Restart=on-abort
|
||||
|
||||
[Install]
|
||||
-WantedBy=network.target
|
||||
+WantedBy=multi-user.target
|
||||
--
|
||||
2.7.4
|
||||
|
||||
27
quagga.spec
27
quagga.spec
@ -6,8 +6,8 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: quagga
|
||||
Version: 1.1.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.2.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Routing daemon
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
@ -15,21 +15,20 @@ URL: http://www.quagga.net
|
||||
Source0: http://download.savannah.gnu.org/releases/quagga/%{name}-%{version}.tar.gz
|
||||
Source1: quagga-filter-perl-requires.sh
|
||||
Source2: quagga-tmpfs.conf
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl-generators pkgconfig
|
||||
BuildRequires: systemd
|
||||
BuildRequires: net-snmp-devel
|
||||
BuildRequires: texinfo tetex libcap-devel texi2html
|
||||
BuildRequires: readline readline-devel ncurses ncurses-devel
|
||||
BuildRequires: git
|
||||
Requires: net-snmp ncurses
|
||||
BuildRequires: c-ares-devel
|
||||
Requires: net-snmp ncurses c-ares
|
||||
Requires(post): systemd /sbin/install-info
|
||||
Requires(preun): systemd /sbin/install-info
|
||||
Requires(postun): systemd
|
||||
Provides: routingdaemon = %{version}-%{release}
|
||||
Obsoletes: quagga-sysvinit
|
||||
|
||||
Patch0: 0001-systemd-various-service-file-improvements.patch
|
||||
|
||||
%define __perl_requires %{SOURCE1}
|
||||
|
||||
%description
|
||||
@ -38,7 +37,7 @@ a multi-server and multi-threaded approach to resolving the current complexity
|
||||
of the Internet.
|
||||
|
||||
Quagga supports Babel, BGP4, BGP4+, BGP4-, IS-IS (experimental), OSPFv2,
|
||||
OSPFv3, RIPv1, RIPv2, and RIPng.
|
||||
OSPFv3, RIPv1, RIPv2, RIPng, PIM-SSM and NHRP.
|
||||
|
||||
Quagga is intended to be used as a Route Server and a Route Reflector. It is
|
||||
not a toolkit; it provides full routing power under a new architecture.
|
||||
@ -85,7 +84,8 @@ developing OSPF-API and quagga applications.
|
||||
--enable-vty-group=%vty_group \
|
||||
--enable-rtadv \
|
||||
--disable-exampledir \
|
||||
--enable-netlink
|
||||
--enable-netlink \
|
||||
--enable-nhrpd
|
||||
|
||||
make %{?_smp_mflags} MAKEINFO="makeinfo --no-split" CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
|
||||
@ -110,6 +110,8 @@ install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/ospfd.service %{buildro
|
||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/bgpd.service %{buildroot}%{_unitdir}/bgpd.service
|
||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/ospf6d.service %{buildroot}%{_unitdir}/ospf6d.service
|
||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/ripngd.service %{buildroot}%{_unitdir}/ripngd.service
|
||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/pimd.service %{buildroot}%{_unitdir}/pimd.service
|
||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/nhrpd.service %{buildroot}%{_unitdir}/nhrpd.service
|
||||
|
||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/quagga.sysconfig %{buildroot}/etc/sysconfig/quagga
|
||||
install -p -m 644 %{_builddir}/%{name}-%{version}/redhat/quagga.logrotate %{buildroot}/etc/logrotate.d/quagga
|
||||
@ -127,6 +129,7 @@ getent group %vty_group >/dev/null 2>&1 || groupadd -r -g %vty_gid %vty_group >/
|
||||
getent group quagga >/dev/null 2>&1 || groupadd -g %quagga_gid quagga >/dev/null 2>&1 || :
|
||||
getent passwd quagga >/dev/null 2>&1 || useradd -u %quagga_uid -g %quagga_gid -M -r -s /sbin/nologin \
|
||||
-c "Quagga routing suite" -d %{_localstatedir}/run/quagga quagga >/dev/null 2>&1 || :
|
||||
usermod -a -G %vty_group quagga
|
||||
|
||||
%post
|
||||
%systemd_post zebra.service
|
||||
@ -220,6 +223,12 @@ fi
|
||||
%{_includedir}/quagga/ospfd/*.h
|
||||
|
||||
%changelog
|
||||
* Mon May 29 2017 Michal Ruprich <mruprich@redhat.com> - 1.2.1-1
|
||||
- rebase to 1.2.1(#1431309)
|
||||
- added quagga to quaggavt group - resolves #1434028
|
||||
- enabled pimd and nhrpd
|
||||
- fix bogus date in changelog
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
@ -253,7 +262,7 @@ fi
|
||||
* Mon May 26 2014 Michal Sekletar <msekleta@redhat.com> - 0.99.22.4-4
|
||||
- raise privileges before creating netlink socket (#1097684)
|
||||
|
||||
* Thu Jan 29 2014 Michal Sekletar <msekleta@redhat.com> - 0.99.22.4-3
|
||||
* Wed Jan 29 2014 Michal Sekletar <msekleta@redhat.com> - 0.99.22.4-3
|
||||
- fix source url
|
||||
- fix date in the changelog
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (quagga-1.1.1.tar.gz) = 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58
|
||||
SHA512 (quagga-1.2.1.tar.gz) = ab7693ccb0cfa0f9ed90cc2b626dcd27aa6cc52e626646a2a37914a01f4b38dd80bf8d0e35d8a6a113718e82024203dbc3704c017f7c5c07bcdc2fe0109e89eb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user