rp-pppoe: Drop package

The plugin is already being shipped with ppp.

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

diff --git a/network/network.nm b/network/network.nm
index cd7825749eadd7ec2c3d40af0f890fa35148cc04..92903b7e441971939a24e45773e7673a30b52cc1 100644 (file)
--- a/network/network.nm
+++ b/network/network.nm
@@ -57,7 +57,6 @@ packages
                        iw
                        man
                        ppp >= 2.4.5-4
-                       rp-pppoe
                        strongswan
                        sqlite
                        systemd-units

diff --git a/rp-pppoe/rp-pppoe.nm b/rp-pppoe/rp-pppoe.nm
deleted file mode 100644 (file)
index 354c9c0..0000000
--- a/rp-pppoe/rp-pppoe.nm
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = rp-pppoe
-version    = 3.12
-release    = 1
-
-groups     = Networking/Dialin
-url        = https://www.roaringpenguin.com/products/pppoe
-license    = GPLv2+
-summary    = Administration tools for PPPoE connections.
-
-description
-       PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
-       many ADSL Internet Service Providers.
-       This package contains a set of tools to build your own PPPoE server.
-end
-
-source_dl  = http://www.roaringpenguin.com/files/download/
-
-build
-       requires
-               autoconf
-               automake
-               iproute2
-               libtool
-               ppp-devel
-               systemd-units
-       end
-
-       DIR_APP = %{DIR_APP}/src
-       CFLAGS += -D_GNU_SOURCE -fno-strict-aliasing
-
-       pppd_version = %(pppd --version 2>&1 | awk '{ print $NF }')
-
-       prepare_cmds
-               # PLUGIN_DIR defaults to /etc/ppp/plugins, which is not what we want.
-               sed -i Makefile.in \
-                       -e "s@^PLUGIN_DIR=.*@PLUGIN_DIR=%{libdir}/pppd/%{pppd_version}@"
-
-               # Always enable kernel mode PPPoE for the server, because we
-               # don't ship the userspace component.
-               sed -i pppoe-server.c \
-                       -e "s/UseLinuxKernelModePPPoE = 0/UseLinuxKernelModePPPoE = 1/"
-
-               autoconf
-       end
-
-       # Force support for kernel-mode PPPoE.
-       #configure_options += \
-       #       ac_cv_header_linux_if_pppox_h=yes
-
-       install_cmds
-               # Remove all the client components because we only support the
-               # rp-pppoe plugin that comes with pppd.
-               rm -rvf %{BUILDROOT}%{sysconfdir}
-               rm -vf %{BUILDROOT}%{sbindir}/pppoe
-               rm -vf %{BUILDROOT}%{sbindir}/pppoe-{connect,start,stop,status,setup}
-               rm -vf %{BUILDROOT}%{mandir}/man*/pppoe-{connect,start,stop,status,setup}*
-               rm -vf %{BUILDROOT}%{mandir}/man*/pppoe.{,conf}*
-               rm -rvf %{BUILDROOT}%{libdir}
-       end
-end
-
-packages
-       package %{name}
-               requires
-                       iproute2
-                       ppp = %{pppd_version}
-               end
-
-               script postin
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               script postup
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-
-               script postun
-                       systemctl daemon-reload >/dev/null 2>&1 || :
-               end
-       end
-
-       package %{name}-debuginfo
-               template DEBUGINFO
-       end
-end

diff --git a/rp-pppoe/systemd/pppoe-server@.service b/rp-pppoe/systemd/pppoe-server@.service
deleted file mode 100644 (file)
index 141bc8a..0000000
--- a/rp-pppoe/systemd/pppoe-server@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=PPPoE server daemon on %I
-BindTo=dev-%I.device
-After=dev-%I.device
-
-[Service]
-ExecStart=/usr/lib/network/pppoe-server %I
-ExecStopPost=/usr/lib/network/pppoe-server %I cleanup
-Restart=failure
-UtmpIdentifier=%I
-KillMode=process