From: Michael Tremer Date: Thu, 13 Dec 2018 13:34:53 +0000 (+0000) Subject: Drop frr & quagga X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d951df37e52807304a027c55762e1ef500adbe2;p=ipfire-3.x.git Drop frr & quagga These are replaced by bird. There is such chaos now with all these routing daemons... Signed-off-by: Michael Tremer --- diff --git a/frr/frr.nm b/frr/frr.nm deleted file mode 100644 index cafa62677..000000000 --- a/frr/frr.nm +++ /dev/null @@ -1,107 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team # -############################################################################### - -name = frr -version = 2.0 -release = 1 - -groups = Networking/Routing -url = https://frrouting.org -license = GPLv2+ -summary = FRRouting is an IP routing protocol suite - -description - FRRouting (FRR) is an IP routing protocol suite for Linux and Unix - platforms which includes protocol daemons for BGP, IS-IS, LDP, OSPF, - PIM, and RIP. -end - -source_dl = https://github.com/FRRouting/frr/releases/download/frr-%{version}/ - -build - requires - json-c-devel - ncurses-devel - readline-devel - systemd-units - texinfo - end - - prepare_cmds - %{create_user} - end - - configure_options += \ - --sysconfdir=/etc/frr \ - --localstatedir=%{localstatedir}/run/frr \ - --disable-static \ - --disable-watchfrr \ - --enable-multipath=64 \ - --disable-isisd \ - --disable-pimd \ - --disable-ripd \ - --disable-ripngd - - install_cmds - mkdir -pv %{localstatedir}/run/frr - chown -v frr.frr %{localstatedir}/run/frr - end -end - -create_user - getent group frr >/dev/null || /usr/sbin/groupadd -r frr - getent passwd frr >/dev/null || /usr/sbin/useradd -r -g frr \ - -d %{sysconfdir}/%{name} -s /sbin/nologin frr -end - -packages - package %{name} - services = bgpd ospf6d ospfd zebra - - # This is a fork of quagga and installs binaries - # with the same name. Hence we cannot install both - # at the same time. - conflicts = quagga - - script prein - %{create_user} - end - - script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script preun - for i in %{services}; do - systemctl --no-reload disable ${i}.service >/dev/null 2>&1 || : - systemctl stop ${i}.service >/dev/null 2>&1 || : - done - end - - script postun - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - systemctl daemon-reload >/dev/null 2>&1 || : - - for i in %{services}; do - systemctl try-restart ${i}.service >/dev/null 2>&1 || : - done - end - end - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/frr/frr.tmpfiles b/frr/frr.tmpfiles deleted file mode 100644 index ec703564f..000000000 --- a/frr/frr.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/frr 0755 frr frr diff --git a/frr/systemd/bgpd.service b/frr/systemd/bgpd.service deleted file mode 100644 index a52ebea2d..000000000 --- a/frr/systemd/bgpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=BGP routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/bgpd -d -f /etc/frr/bgpd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/frr/systemd/ospf6d.service b/frr/systemd/ospf6d.service deleted file mode 100644 index 14f2f0337..000000000 --- a/frr/systemd/ospf6d.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon for IPv6 -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospf6d -d -f /etc/frr/ospf6d.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/frr/systemd/ospfd.service b/frr/systemd/ospfd.service deleted file mode 100644 index 90b7dbbec..000000000 --- a/frr/systemd/ospfd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospfd -d -f /etc/frr/ospfd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/frr/systemd/zebra.service b/frr/systemd/zebra.service deleted file mode 100644 index 81ac73224..000000000 --- a/frr/systemd/zebra.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=GNU Zebra routing manager -After=syslog.target network.target - -[Service] -Type=forking -ExecStartPre=/sbin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra -d -f /etc/frr/zebra.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/quagga.nm b/quagga/quagga.nm deleted file mode 100644 index ad28175b5..000000000 --- a/quagga/quagga.nm +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team # -############################################################################### - -name = quagga -version = 1.2.0 -release = 1 - -groups = Networking/Routing -url = http://www.quagga.net/ -license = GPLv2+ -summary = Quagga is a rounting daemon. - -description - Quagga is a free software that manages TCP/IP based routing - protocol. It takes multi-server and multi-thread approach to resolve - the current complexity of the Internet. - - Quagga supports BGP4, BGP4+, OSPFv2 and OSPFv3. -end - -source_dl = http://download.savannah.gnu.org/releases/quagga/ - -build - requires - c-ares-devel - ncurses-devel - net-snmp-devel - readline-devel - systemd-units - texinfo - end - - prepare_cmds - %{create_user} - end - - configure_options += \ - --sysconfdir=/etc/quagga \ - --localstatedir=%{localstatedir}/run/quagga \ - --disable-static \ - --disable-watchquagga \ - --enable-multipath=64 \ - --disable-isisd \ - --disable-pimd \ - --disable-ripd \ - --disable-ripngd - - install_cmds - mkdir -pv %{localstatedir}/run/quagga - chown -v quagga.quagga %{localstatedir}/run/quagga - end -end - -create_user - getent group quagga >/dev/null || /usr/sbin/groupadd -r quagga - getent passwd quagga >/dev/null || /usr/sbin/useradd -r -g quagga \ - -d %{sysconfdir}/%{name} -s /sbin/nologin quagga -end - -packages - package %{name} - services = bgpd ospf6d ospfd zebra - - script prein - %{create_user} - end - - script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - end - - script preun - for i in %{services}; do - systemctl --no-reload disable ${i}.service >/dev/null 2>&1 || : - systemctl stop ${i}.service >/dev/null 2>&1 || : - done - end - - script postun - systemctl daemon-reload >/dev/null 2>&1 || : - end - - script postup - systemctl daemon-reload >/dev/null 2>&1 || : - - for i in %{services}; do - systemctl try-restart ${i}.service >/dev/null 2>&1 || : - done - end - end - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/quagga/quagga.tmpfiles b/quagga/quagga.tmpfiles deleted file mode 100644 index 8974b64f8..000000000 --- a/quagga/quagga.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /var/run/quagga 0755 quagga quagga diff --git a/quagga/systemd/bgpd.service b/quagga/systemd/bgpd.service deleted file mode 100644 index 2874432df..000000000 --- a/quagga/systemd/bgpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=BGP routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/bgpd -d -f /etc/quagga/bgpd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/ospf6d.service b/quagga/systemd/ospf6d.service deleted file mode 100644 index 93b9dfa61..000000000 --- a/quagga/systemd/ospf6d.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon for IPv6 -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospf6d -d -f /etc/quagga/ospf6d.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/ospfd.service b/quagga/systemd/ospfd.service deleted file mode 100644 index e276649bc..000000000 --- a/quagga/systemd/ospfd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OSPF routing daemon -BindTo=zebra.service -After=syslog.target network.target zebra.service - -[Service] -Type=forking -ExecStart=/usr/sbin/ospfd -d -f /etc/quagga/ospfd.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/quagga/systemd/zebra.service b/quagga/systemd/zebra.service deleted file mode 100644 index 977c2dc27..000000000 --- a/quagga/systemd/zebra.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=GNU Zebra routing manager -After=syslog.target network.target - -[Service] -Type=forking -ExecStartPre=/sbin/ip route flush proto zebra -ExecStart=/usr/sbin/zebra -d -f /etc/quagga/zebra.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target