Drop radvd package

This is being replaced by bird

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/network/network.nm b/network/network.nm
index c6a789447c91897e2c473a059498d5e6d6794096..1a1c4546e3e18b49816e5a801627245f72763a3c 100644 (file)
--- a/network/network.nm
+++ b/network/network.nm
@@ -6,7 +6,7 @@
 name       = network
 epoch      = 1
 version    = 010
-release    = 2
+release    = 3
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = Base Networking/Tools
@@ -48,6 +48,7 @@ packages
        package %{name}
                requires
                        bash >= 4.0
+                       bird >= 2
                        crda
                        curl
                        dhclient >= 4.2.4-2
@@ -59,7 +60,6 @@ packages
                        iw
                        man
                        ppp >= 2.4.5-4
-                       radvd
                        rp-pppoe
                        strongswan
                        sqlite

diff --git a/radvd/radvd.nm b/radvd/radvd.nm
deleted file mode 100644 (file)
index 686dadb..0000000
--- a/radvd/radvd.nm
+++ /dev/null
@@ -1,96 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = radvd
-version    = 1.9.1
-release    = 1
-
-groups     = System/Daemons
-url        = http://www.litech.org/radvd/
-license    = BSD with advertising
-summary    = A Router Advertisement daemon.
-
-description
-       radvd is the router advertisement daemon for IPv6. It listens to
-       router solicitations and sends router advertisements as described
-       in Neighbor Discovery for IP Version 6. With these
-       advertisements hosts can automatically configure their addresses and
-       some other parameters. They also can choose a default router based
-       on these advertisements.
-end
-
-source_dl  = http://www.litech.org/radvd/dist/
-
-build
-       requires
-               bison
-               flex
-               flex-devel
-               libdaemon-devel
-               shadow-utils
-       end
-
-       configure_options += \
-               --with-pidfile=/run/radvd/radvd.pid
-
-       prepare_cmds
-               %{create_user}
-
-               sed -e "s/-lfl/-lfl_pic/g" -i Makefile.*
-       end
-
-       install_cmds
-               mkdir -pv -m 750 %{BUILDROOT}/run/radvd
-               chown -v radvd.radvd %{BUILDROOT}/run/radvd
-       end
-end
-
-create_user
-       getent group radvd >/dev/null || groupadd -r radvd
-
-       # The radvd user also needs to be in the wheel group to get access to
-       # /proc.
-       getent passwd radvd >/dev/null || \
-               useradd -r -g radvd -G wheel -d / -s /sbin/nologin \
-                       -c "User for the Router Advertisement daemon." radvd
-end
-
-packages
-       package %{name}
-               requires
-                       network
-               end
-
-               script prein
-                       %{create_user}
-               end
-
-               # Just search for new unit files that were just installed.
-               script postin
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               # Disable the service that is to be removed and stop it if it is still running.
-               script preun
-                       /bin/systemctl --no-reload disable radvd.service >/dev/null 2>&1 || :
-                       /bin/systemctl stop radvd.service >/dev/null 2>&1 || :
-               end
-
-               # Just tell systemd that unitfiles have been removed.
-               script postun
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               # Try to restart the service if it is running.
-               script postup
-                       /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-                       /bin/systemctl try-restart radvd.service >/dev/null 2>&1 || :
-               end
-       end
-
-       package %{name}-debuginfo
-               template DEBUGINFO
-       end
-end

diff --git a/radvd/radvd.tmpfiles b/radvd/radvd.tmpfiles
deleted file mode 100644 (file)
index c2a3047..0000000
--- a/radvd/radvd.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/radvd 0750 radvd radvd -
-

diff --git a/radvd/systemd/radvd.service b/radvd/systemd/radvd.service
deleted file mode 100644 (file)
index effdc6b..0000000
--- a/radvd/systemd/radvd.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Router Advertisement Daemon
-Requires=network.target
-After=network.target
-
-[Service]
-ExecStartPre=/usr/lib/network/network-radvd-config start
-ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -u radvd -n
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStopPost=/usr/lib/network/network-radvd-config stop
-PIDFile=/run/radvd/radvd.pid
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target