| |
@@ -1,25 +1,30 @@
|
| |
%global _hardened_build 1
|
| |
|
| |
Name: bird
|
| |
- Version: 1.6.4
|
| |
- Release: 2%{?dist}
|
| |
+ Version: 1.6.6
|
| |
+ Release: 1%{?dist}
|
| |
Summary: BIRD Internet Routing Daemon
|
| |
|
| |
Group: System Environment/Daemons
|
| |
License: GPLv2+
|
| |
- URL: http://bird.network.cz
|
| |
+ URL: https://bird.network.cz
|
| |
Source0: ftp://bird.network.cz/pub/bird/bird-%{version}.tar.gz
|
| |
Source1: bird.service
|
| |
+ Source2: bird.tmpfilesd
|
| |
+ Patch0: bird-1.6.6-runstatedir.patch
|
| |
|
| |
BuildRequires: flex bison ncurses-devel readline-devel sed systemd gcc
|
| |
- Requires(post): systemd
|
| |
- Requires(preun): systemd
|
| |
- Requires(postun): systemd
|
| |
+ %{?systemd_requires}
|
| |
Obsoletes: bird-sysvinit
|
| |
|
| |
%description
|
| |
- BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing
|
| |
- protocols BGP, RIP and OSPF.
|
| |
+ BIRD is a dynamic IP routing daemon supporting both, IPv4 and IPv6, Border
|
| |
+ Gateway Protocol (BGPv4), Routing Information Protocol (RIPv2, RIPng), Open
|
| |
+ Shortest Path First protocol (OSPFv2, OSPFv3), Babel Routing Protocol (Babel),
|
| |
+ Bidirectional Forwarding Detection (BFD), IPv6 router advertisements, static
|
| |
+ routes, inter-table protocol, command-line interface allowing on-line control
|
| |
+ and inspection of the status of the daemon, soft reconfiguration as well as a
|
| |
+ powerful language for route filtering.
|
| |
|
| |
This package contains IPv4 version.
|
| |
|
| |
@@ -27,34 +32,42 @@
|
| |
%package -n bird6
|
| |
Summary: BIRD Internet Routing Daemon
|
| |
Group: System Environment/Daemons
|
| |
- Requires(post): systemd
|
| |
- Requires(preun): systemd
|
| |
- Requires(postun): systemd
|
| |
+ %{?systemd_requires}
|
| |
Obsoletes: bird6-sysvinit
|
| |
|
| |
%description -n bird6
|
| |
- BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing
|
| |
- protocols BGP, RIP and OSPF.
|
| |
+ BIRD is a dynamic IP routing daemon supporting both, IPv4 and IPv6, Border
|
| |
+ Gateway Protocol (BGPv4), Routing Information Protocol (RIPv2, RIPng), Open
|
| |
+ Shortest Path First protocol (OSPFv2, OSPFv3), Babel Routing Protocol (Babel),
|
| |
+ Bidirectional Forwarding Detection (BFD), IPv6 router advertisements, static
|
| |
+ routes, inter-table protocol, command-line interface allowing on-line control
|
| |
+ and inspection of the status of the daemon, soft reconfiguration as well as a
|
| |
+ powerful language for route filtering.
|
| |
|
| |
This package contains IPv6 version.
|
| |
|
| |
|
| |
%package doc
|
| |
- Summary: BIRD Internet Routing Daemon
|
| |
- Group: System Environment/Daemons
|
| |
+ Summary: Documentation for BIRD Internet Routing Daemon
|
| |
+ Group: Documentation
|
| |
+ BuildRequires: linuxdoc-tools sgml-common
|
| |
+ BuildArch: noarch
|
| |
|
| |
%description doc
|
| |
- BIRD is dynamic routing daemon supporting IPv4 and IPv6 versions of routing
|
| |
- protocols BGP, RIP and OSPF.
|
| |
+ Documentation for users and programmers of the BIRD Internet Routing Daemon.
|
| |
|
| |
- This package contains documentation.
|
| |
+ BIRD is a dynamic IP routing daemon supporting both, IPv4 and IPv6, Border
|
| |
+ Gateway Protocol (BGPv4), Routing Information Protocol (RIPv2, RIPng), Open
|
| |
+ Shortest Path First protocol (OSPFv2, OSPFv3), Babel Routing Protocol (Babel),
|
| |
+ Bidirectional Forwarding Detection (BFD), IPv6 router advertisements, static
|
| |
+ routes, inter-table protocol, command-line interface allowing on-line control
|
| |
+ and inspection of the status of the daemon, soft reconfiguration as well as a
|
| |
+ powerful language for route filtering.
|
| |
|
| |
|
| |
%prep
|
| |
%setup -q
|
| |
-
|
| |
- #Don't strip executables
|
| |
- sed -i 's/\$(INSTALL_PROGRAM) -s/\$(INSTALL_PROGRAM)/' tools/Makefile.in
|
| |
+ %patch0 -p1 -b .runstatedir
|
| |
|
| |
|
| |
%build
|
| |
@@ -62,30 +75,27 @@
|
| |
tar c --exclude ipv6 . | tar x -C ipv6
|
| |
|
| |
cd ipv6
|
| |
- %configure --prefix=%{_prefix} \
|
| |
- --sysconfdir=%{_sysconfdir} \
|
| |
- --localstatedir=%{_localstatedir} \
|
| |
- --enable-ipv6
|
| |
- make %{?_smp_mflags}
|
| |
+ %configure --runstatedir=%{_rundir}/bird6 --enable-ipv6
|
| |
+ %make_build all
|
| |
cd ..
|
| |
|
| |
- %configure --prefix=%{_prefix} \
|
| |
- --sysconfdir=%{_sysconfdir} \
|
| |
- --localstatedir=%{_localstatedir}
|
| |
- make %{?_smp_mflags}
|
| |
+ %configure --runstatedir=%{_rundir}/bird
|
| |
+ %make_build all docs
|
| |
|
| |
|
| |
%install
|
| |
- make install DESTDIR=%{buildroot}
|
| |
+ %make_install
|
| |
|
| |
cd ipv6
|
| |
- make install DESTDIR=%{buildroot}
|
| |
+ %make_install
|
| |
cd ..
|
| |
|
| |
- install -d %{buildroot}%{_unitdir}
|
| |
- install -d %{buildroot}%{_localstatedir}/lib/bird{,6}
|
| |
+ install -d %{buildroot}{%{_unitdir},%{_tmpfilesdir}}
|
| |
+ install -d %{buildroot}{%{_localstatedir}/lib,%{_rundir}}/bird{,6}
|
| |
sed 's/BIRD_PROGNAME/bird/g' %SOURCE1 > %{buildroot}%{_unitdir}/bird.service
|
| |
sed 's/BIRD_PROGNAME/bird6/g' %SOURCE1 > %{buildroot}%{_unitdir}/bird6.service
|
| |
+ sed 's/BIRD_PROGNAME/bird/g' %SOURCE2 > %{buildroot}%{_tmpfilesdir}/bird.conf
|
| |
+ sed 's/BIRD_PROGNAME/bird6/g' %SOURCE2 > %{buildroot}%{_tmpfilesdir}/bird6.conf
|
| |
|
| |
|
| |
%post
|
| |
@@ -94,8 +104,8 @@
|
| |
%pre
|
| |
getent group bird >/dev/null || groupadd -r bird
|
| |
getent passwd bird >/dev/null || \
|
| |
- useradd -r -g bird -d %{_localstatedir}/lib/bird -s /sbin/nologin \
|
| |
- -c "bird daemon user" bird
|
| |
+ useradd -r -g bird -d %{_localstatedir}/lib/bird -s /sbin/nologin \
|
| |
+ -c "BIRD daemon user" bird
|
| |
exit 0
|
| |
|
| |
%preun
|
| |
@@ -107,8 +117,8 @@
|
| |
%pre -n bird6
|
| |
getent group bird6 >/dev/null || groupadd -r bird6
|
| |
getent passwd bird6 >/dev/null || \
|
| |
- useradd -r -g bird6 -d %{_localstatedir}/lib/bird6 -s /sbin/nologin \
|
| |
- -c "bird6 daemon user" bird6
|
| |
+ useradd -r -g bird6 -d %{_localstatedir}/lib/bird6 -s /sbin/nologin \
|
| |
+ -c "BIRD6 daemon user" bird6
|
| |
exit 0
|
| |
|
| |
%post -n bird6
|
| |
@@ -123,28 +133,44 @@
|
| |
|
| |
%files
|
| |
%doc NEWS README
|
| |
- %config(noreplace) %{_sysconfdir}/bird.conf
|
| |
+ %attr(0640,root,bird) %config(noreplace) %{_sysconfdir}/bird.conf
|
| |
%{_unitdir}/bird.service
|
| |
+ %{_tmpfilesdir}/bird.conf
|
| |
%{_sbindir}/bird
|
| |
%{_sbindir}/birdc
|
| |
%{_sbindir}/birdcl
|
| |
%dir %attr(0750,bird,bird) %{_localstatedir}/lib/bird
|
| |
+ %dir %attr(0750,bird,bird) %{_rundir}/bird
|
| |
|
| |
%files -n bird6
|
| |
%doc NEWS README
|
| |
- %config(noreplace) %{_sysconfdir}/bird6.conf
|
| |
+ %attr(0640,root,bird6) %config(noreplace) %{_sysconfdir}/bird6.conf
|
| |
%{_unitdir}/bird6.service
|
| |
+ %{_tmpfilesdir}/bird6.conf
|
| |
%{_sbindir}/bird6
|
| |
%{_sbindir}/birdc6
|
| |
%{_sbindir}/birdcl6
|
| |
%dir %attr(0750,bird6,bird6) %{_localstatedir}/lib/bird6
|
| |
+ %dir %attr(0750,bird6,bird6) %{_rundir}/bird6
|
| |
|
| |
%files doc
|
| |
%doc NEWS README
|
| |
+ %doc doc/bird.conf.*
|
| |
%doc doc/bird*.html
|
| |
+ %doc doc/bird.pdf
|
| |
+ %doc doc/prog*.html
|
| |
+ %doc doc/prog.pdf
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Sat Mar 30 2019 Robert Scheck <robert@fedoraproject.org> - 1.6.6-1
|
| |
+ - Upgrade to 1.6.6
|
| |
+
|
| |
+ * Fri Jan 18 2019 Robert Scheck <robert@fedoraproject.org> - 1.6.5-1
|
| |
+ - Upgrade to 1.6.5
|
| |
+ - Modernization and cleanup of spec file
|
| |
+ - Ensure /etc/bird.conf can be only read by BIRD user
|
| |
+
|
| |
* Mon Nov 12 2018 Stanislav Kozina <skozina@redhat.org> - 1.6.4-2
|
| |
- bird should run under bird user and group rather than root (#1397574)
|
| |
- bird should run in foreground (#1285672)
|
| |
/etc/bird.conf
can be only read by BIRD user