Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
e9851a5f23 | ||
|
33352afd41 | ||
|
124c670c37 | ||
|
ec0d1f76e8 | ||
|
9f75513639 | ||
|
8b99b98621 | ||
|
2fa4fa5707 | ||
|
424a5c64c4 | ||
|
a9e623e5af | ||
|
5705b1be77 | ||
|
bffe5f096a | ||
|
86794cc8fd | ||
|
7f2c4dc729 | ||
|
7ba3ea9c42 | ||
|
ba3a7a25ca | ||
|
029751315e | ||
|
5d78a5f28f | ||
|
bb6bcef925 | ||
|
153581c73b | ||
|
bc5fd2e3dd | ||
|
45a84398f5 | ||
|
731c1ff373 | ||
|
1f87050e31 | ||
|
51fde2f824 |
5
.gitignore
vendored
5
.gitignore
vendored
@ -12,3 +12,8 @@ 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
|
||||
/quagga-1.2.2.tar.gz
|
||||
/quagga-1.2.2.tar.gz.asc
|
||||
/quagga-1.2.4.tar.gz
|
||||
/quagga-1.2.4.tar.gz.asc
|
||||
|
120
0001-service-file-braces.patch
Normal file
120
0001-service-file-braces.patch
Normal file
@ -0,0 +1,120 @@
|
||||
From: Michal Ruprich <mruprich@redhat.com>
|
||||
diff --git a/redhat/bgpd.service b/redhat/bgpd.service
|
||||
index a50bfff..2eda1b8 100644
|
||||
--- a/redhat/bgpd.service
|
||||
+++ b/redhat/bgpd.service
|
||||
@@ -11,7 +11,7 @@ Documentation=man:bgpd
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/bgpd.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/bgpd.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/bgpd.conf
|
||||
ExecStart=/usr/sbin/bgpd -d $BGPD_OPTS -f /etc/quagga/bgpd.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/isisd.service b/redhat/isisd.service
|
||||
index 93663aa..db33281 100644
|
||||
--- a/redhat/isisd.service
|
||||
+++ b/redhat/isisd.service
|
||||
@@ -11,7 +11,7 @@ Documentation=man:isisd
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/isisd.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/isisd.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/isisd.conf
|
||||
ExecStart=/usr/sbin/isisd -d $ISISD_OPTS -f /etc/quagga/isisd.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/nhrpd.service b/redhat/nhrpd.service
|
||||
index 5b4120d..043c220 100644
|
||||
--- a/redhat/nhrpd.service
|
||||
+++ b/redhat/nhrpd.service
|
||||
@@ -11,7 +11,7 @@ Documentation=man:nhrpd
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/nhrpd.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/nhrpd.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/nhrpd.conf
|
||||
ExecStart=/usr/sbin/nhrpd -d $NHRPD_OPTS -f /etc/quagga/nhrpdd.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/ospf6d.service b/redhat/ospf6d.service
|
||||
index 3c1c978..a0d6223 100644
|
||||
--- a/redhat/ospf6d.service
|
||||
+++ b/redhat/ospf6d.service
|
||||
@@ -11,7 +11,7 @@ Documentation=man:ospf6d
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ospf6d.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ospf6d.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ospf6d.conf
|
||||
ExecStart=/usr/sbin/ospf6d -d $OSPF6D_OPTS -f /etc/quagga/ospf6d.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/ospfd.service b/redhat/ospfd.service
|
||||
index 0084b6c..ffc048a 100644
|
||||
--- a/redhat/ospfd.service
|
||||
+++ b/redhat/ospfd.service
|
||||
@@ -11,7 +11,7 @@ Documentation=man:ospfd
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ospfd.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ospfd.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ospfd.conf
|
||||
ExecStart=/usr/sbin/ospfd -d $OSPFD_OPTS -f /etc/quagga/ospfd.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/pimd.service b/redhat/pimd.service
|
||||
index 1916846..ae30f16 100644
|
||||
--- a/redhat/pimd.service
|
||||
+++ b/redhat/pimd.service
|
||||
@@ -9,7 +9,7 @@ Documentation=man:pimd
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/pimd.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/pimd.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/pimd.conf
|
||||
ExecStart=/usr/sbin/pimd -d $PIMD_OPTS -f /etc/quagga/pimd.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/ripd.service b/redhat/ripd.service
|
||||
index 103b5a9..56e885a 100644
|
||||
--- a/redhat/ripd.service
|
||||
+++ b/redhat/ripd.service
|
||||
@@ -11,7 +11,7 @@ Documentation=man:ripd
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ripd.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ripd.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ripd.conf
|
||||
ExecStart=/usr/sbin/ripd -d $RIPD_OPTS -f /etc/quagga/ripd.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/ripngd.service b/redhat/ripngd.service
|
||||
index 6fe6ba8..c0defa0 100644
|
||||
--- a/redhat/ripngd.service
|
||||
+++ b/redhat/ripngd.service
|
||||
@@ -11,7 +11,7 @@ Documentation=man:ripngd
|
||||
Type=forking
|
||||
EnvironmentFile=/etc/sysconfig/quagga
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/ripngd.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /etc/quagga/ripngd.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /etc/quagga/ripngd.conf
|
||||
ExecStart=/usr/sbin/ripngd -d $RIPNGD_OPTS -f /etc/quagga/ripngd.conf
|
||||
Restart=on-abort
|
||||
|
||||
diff --git a/redhat/zebra.service b/redhat/zebra.service
|
||||
index fa5a004..d4ba5ea 100644
|
||||
--- a/redhat/zebra.service
|
||||
+++ b/redhat/zebra.service
|
||||
@@ -11,8 +11,8 @@ Type=forking
|
||||
EnvironmentFile=-/etc/sysconfig/quagga
|
||||
ExecStartPre=/sbin/ip route flush proto zebra
|
||||
ExecStartPre=-/bin/chmod -f 640 /etc/quagga/vtysh.conf /etc/quagga/zebra.conf
|
||||
-ExecStartPre=-/bin/chown -f $QUAGGA_USER:$QUAGGA_GROUP /run/quagga /etc/quagga/zebra.conf
|
||||
-ExecStartPre=-/bin/chown -f ${QUAGGA_USER}${VTY_GROUP:+":$VTY_GROUP"} quaggavty /etc/quagga/vtysh.conf
|
||||
+ExecStartPre=-/bin/chown -f ${QUAGGA_USER}:${QUAGGA_GROUP} /run/quagga /etc/quagga/zebra.conf
|
||||
+ExecStartPre=-/bin/sh -c '/bin/chown -f ${QUAGGA_USER}${VTY_GROUP:+":$VTY_GROUP"} /etc/quagga/vtysh.conf'
|
||||
ExecStart=/usr/sbin/zebra -d $ZEBRA_OPTS -f /etc/quagga/zebra.conf
|
||||
Restart=on-abort
|
||||
|
@ -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
|
||||
|
126
quagga.spec
126
quagga.spec
@ -6,29 +6,31 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: quagga
|
||||
Version: 1.1.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.2.4
|
||||
Release: 11%{?dist}
|
||||
Summary: Routing daemon
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
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: texinfo libcap-devel texi2html
|
||||
BuildRequires: readline readline-devel ncurses ncurses-devel
|
||||
BuildRequires: git
|
||||
Requires: net-snmp ncurses
|
||||
Requires(post): systemd /sbin/install-info
|
||||
Requires(preun): systemd /sbin/install-info
|
||||
BuildRequires: c-ares-devel
|
||||
BuildRequires: gcc
|
||||
Requires: net-snmp ncurses c-ares
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Provides: routingdaemon = %{version}-%{release}
|
||||
Obsoletes: quagga-sysvinit
|
||||
Conflicts: frr
|
||||
|
||||
Patch0: 0001-systemd-various-service-file-improvements.patch
|
||||
Patch0001: 0001-service-file-braces.patch
|
||||
|
||||
%define __perl_requires %{SOURCE1}
|
||||
|
||||
@ -38,7 +40,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.
|
||||
@ -48,14 +50,12 @@ Quagga is a fork of GNU Zebra.
|
||||
|
||||
%package contrib
|
||||
Summary: Contrib tools for quagga
|
||||
Group: System Environment/Daemons
|
||||
|
||||
%description contrib
|
||||
Contributed/3rd party tools which may be of use with quagga.
|
||||
|
||||
%package devel
|
||||
Summary: Header and object files for quagga development
|
||||
Group: System Environment/Daemons
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
@ -85,7 +85,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 +111,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 +130,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
|
||||
@ -137,10 +141,6 @@ getent passwd quagga >/dev/null 2>&1 || useradd -u %quagga_uid -g %quagga_gid -M
|
||||
%systemd_post ospf6d.service
|
||||
%systemd_post ripngd.service
|
||||
|
||||
if [ -f %{_infodir}/%{name}.inf* ]; then
|
||||
install-info %{_infodir}/quagga.info %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
# Create dummy files if they don't exist so basic functions can be used.
|
||||
if [ ! -e %{_sysconfdir}/quagga/zebra.conf ]; then
|
||||
echo "hostname `hostname`" > %{_sysconfdir}/quagga/zebra.conf
|
||||
@ -163,10 +163,6 @@ fi
|
||||
%systemd_postun_with_restart ospf6d.service
|
||||
%systemd_postun_with_restart ripngd.service
|
||||
|
||||
if [ -f %{_infodir}/%{name}.inf* ]; then
|
||||
install-info --delete %{_infodir}/quagga.info %{_infodir}/dir || :
|
||||
fi
|
||||
|
||||
%preun
|
||||
%systemd_preun zebra.service
|
||||
%systemd_preun isisd.service
|
||||
@ -177,7 +173,6 @@ fi
|
||||
%systemd_preun ripngd.service
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING
|
||||
%doc zebra/zebra.conf.sample
|
||||
%doc isisd/isisd.conf.sample
|
||||
@ -206,11 +201,9 @@ fi
|
||||
%{_unitdir}/*.service
|
||||
|
||||
%files contrib
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING %attr(0644,root,root) tools
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING
|
||||
%dir %{_libdir}/quagga/
|
||||
%{_libdir}/quagga/*.so
|
||||
@ -220,6 +213,87 @@ fi
|
||||
%{_includedir}/quagga/ospfd/*.h
|
||||
|
||||
%changelog
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Jul 21 2019 Michal Ruprich <mruprich@redhat.com> - 1.2.4-10
|
||||
- Adding conflict with frr
|
||||
|
||||
* Mon Jun 10 22:13:22 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.4-9
|
||||
- Rebuild for RPM 4.15
|
||||
|
||||
* Mon Jun 10 15:42:05 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.4-8
|
||||
- Rebuild for RPM 4.15
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.4-7
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 1.2.4-5
|
||||
- Rebuilt for libcrypt.so.2 (#1666033)
|
||||
|
||||
* Mon Dec 10 2018 Michal Ruprich <mruprich@redhat.com> - 1.2.4-4
|
||||
- Resolves: #1611589 - Need to use {} around the environment variables in unit files
|
||||
|
||||
* Wed Jul 25 2018 Michal Ruprich <mruprich@redhat.com> - 1.2.4-3
|
||||
- Removing tetex from dependencies
|
||||
- Adding gcc to BuildRequires
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri May 04 2018 Michal Ruprich <mruprich@redhat.com> - 1.2.4-1
|
||||
- New version 1.2.4
|
||||
|
||||
* Thu Feb 22 2018 Ondřej Lysoněk <olysonek@redhat.com> - 1.2.2-4
|
||||
- Fixed CVE-2018-5379 - Double free vulnerability in bgpd when processing
|
||||
certain forms of UPDATE message allowing to crash or potentially execute
|
||||
arbitrary code
|
||||
- Resolves: rhbz#1546008
|
||||
- Fixed CVE-2018-5380 - bgpd can overrun internal BGP code-to-string
|
||||
conversion tables potentially allowing crash
|
||||
- Resolves: rhbz#1546006
|
||||
- Fixed CVE-2018-5381 - Infinite loop issue triggered by invalid OPEN message
|
||||
allows denial-of-service
|
||||
- Resolves: rhbz#1546004
|
||||
- Fixed CVE-2018-5378 - bgpd does not properly bounds check the data sent with
|
||||
a NOTIFY allowing leak of sensitive data or crash
|
||||
- Resolves: rhbz#1546009
|
||||
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.2.2-3
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 1.2.2-2
|
||||
- Rebuilt for switch to libxcrypt
|
||||
|
||||
* Tue Nov 14 2017 Michal Ruprich <mruprich@redhat.com> - 1.2.2-1
|
||||
- rebase to 1.2.2(#1504420)
|
||||
- resolves #1462426 - Installing with dnf produces error /var/tmp/rpm-tmp.jMe0EE: line 44 [: too many arguments
|
||||
- resolves #1509292 - CVE-2017-16227 quagga: Incorrect AS_PATH size calculation for long paths
|
||||
|
||||
* Fri Aug 11 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.2.1-6
|
||||
- Rebuilt after RPM update (№ 3)
|
||||
|
||||
* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.2.1-5
|
||||
- Rebuilt for RPM soname bump
|
||||
|
||||
* Thu Aug 10 2017 Igor Gnatenko <ignatenko@redhat.com> - 1.2.1-4
|
||||
- Rebuilt for RPM soname bump
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* 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 +327,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
|
||||
|
||||
@ -394,7 +468,7 @@ fi
|
||||
- #656681 - using tmpfiles.d
|
||||
|
||||
* Thu Dec 02 2010 Jiri Skala <jskala@redhat.com> - 0.99.17-3
|
||||
- fixes #656681 - using %ghost on files in /var/run and /var/lock
|
||||
- fixes #656681 - using %%ghost on files in /var/run and /var/lock
|
||||
- removed unused script from spec
|
||||
- corrected installing /etc/pam.d
|
||||
|
||||
|
3
sources
3
sources
@ -1 +1,2 @@
|
||||
SHA512 (quagga-1.1.1.tar.gz) = 51eb64ada07b42c663705cedf56be5b8b54143a5543b472e3dc7c703a4ab0542f39cfbeed64d1c33ceee6a15ea8d25ef84616fa40b6bf9cc32023f7241c18c58
|
||||
SHA512 (quagga-1.2.4.tar.gz) = 3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909c5c2128a24735bc034ea8b0811827293b480a2584a3a4c8ae36be9cf1fcd
|
||||
SHA512 (quagga-1.2.4.tar.gz.asc) = 054f6159bf3e2ea396e696d6297b026d1322b17eba31826cf3ac42b5a43e924caef1d87bba481cc3c272b56aa5c64b3d5537a67693f99cafb560d216870fede3
|
||||
|
Loading…
Reference in New Issue
Block a user