libre: use [rp-pppoe] from Arch Linux

Older versions of rp-pppoe were including "nonfree software
recommendation (ServPoET)" and so they were patched with libre.patch.

But now Arch Linux uses rp-pppoe 4.0, and there the only mention of
ServPoET is in src/plugin.c:
    $ grep -i ServPoET -r *
    src/plugin.c:    /* Set remote_number for ServPoET */
and we don't have files named in this way anymore:
    $ find -iname "*ServPoET*"
so this makes the libre.patch used not necessary anymore, so we can
now safely use Arch Linux package.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

4 files changed, 0 insertions, 167 deletions

diff --git a/libre/rp-pppoe/PKGBUILD b/libre/rp-pppoe/PKGBUILD
deleted file mode 100644
index 5957a0c9e..000000000
--- a/libre/rp-pppoe/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# Maintainer (arch): Felix Yan <felixonmars@archlinux.org>
-# Contributor: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: orelien <aurelien.foret@wanadoo.fr>
-# Contributor: André Silva <emulatorman@hyperbola.info>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-
-# parabola changes and rationale:
-#   - remove nonfree software recommendation (ServPoET)
-
-pkgname=rp-pppoe
-pkgver=3.15
-pkgrel=2
-pkgrel+=.parabola1
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client"
-pkgdesc+=", without nonfree ServPoET recommendation"
-arch=('x86_64')
-arch+=('i686' 'armv7h')
-url="https://dianne.skoll.ca/projects/rp-pppoe"
-license=('GPL')
-depends=('ppp=2.4.9' 'sh' 'iproute2')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq 
-        etc/ppp/pppoe-server-options)
-options=('!makeflags')
-install=rp-pppoe.install
-source=(https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-$pkgver.tar.gz{,.sig} 
-       adsl.service)
-source+=(libre.patch)
-validpgpkeys=('FC2E9B645468698FD7B21655C1842E2A126F42E0'  # Dianne Skoll <dfs@roaringpenguin.com>
-              '738E4D954052902C147D07B2685A5A5E511D30E2') # Dianne Skoll <dianne@skoll.ca>
-sha512sums=('a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9'
-            'SKIP'
-            '75fdb55b872e6388053aa0c1ba0b98ab9eda6b6f59a7452843cff8de5a68276be3f48dbd9a6324917254d4fe0d1b2d7442f7a9bbfa1355b6f500db13c9409089'
-            '42865e02b8ae2168a79db9b53eb51f0fb86c53dec254d581e288f56ffc5df7035b19eacc468dd94b551d08653c880b04b2ff0ebbf291685f1593e12ed6439c65')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  ## remove nonfree software recommendation (ServPoET)
-  rm -v SERVPOET
-  patch -Np1 -i ../libre.patch
-}
-
-build() {
-  cd $pkgname-$pkgver/src
-  ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
-}
-
-package() {
-  cd $pkgname-$pkgver/src
-  make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
-
-  #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
-  install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
-}
diff --git a/libre/rp-pppoe/adsl.service b/libre/rp-pppoe/adsl.service
deleted file mode 100644
index 85ff49287..000000000
--- a/libre/rp-pppoe/adsl.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=ADSL Daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/pppoe-start
-ExecStop=/usr/bin/pppoe-stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/rp-pppoe/libre.patch b/libre/rp-pppoe/libre.patch
deleted file mode 100644
index 6f541cb23..000000000
--- a/libre/rp-pppoe/libre.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/rp-pppoe.spec b/rp-pppoe.spec
-index e7b69a9..d375e25 100644
---- a/rp-pppoe.spec
-+++ b/rp-pppoe.spec
-@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
- 
- %files
- %defattr(-,root,root)
--%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README SERVPOET
-+%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README
- %config(noreplace) /etc/ppp/pppoe.conf
- %config(noreplace) /etc/ppp/pppoe-server-options
- %config(noreplace) /etc/ppp/firewall-masq
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 543454a..438d62e 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -45,9 +45,6 @@ PPPOE_RELAY=@PPPOE_RELAY@
- PPPOE_PATH=$(sbindir)/pppoe
- PPPD_PATH=@PPPD@
- 
--# Include ServPoET version if we're building for ServPoET
--@LIC_MAKEFILE_INCLUDE@
--
- # Kernel-mode plugin gets installed here.
- PLUGIN_DIR=/etc/ppp/plugins
- PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
-@@ -172,7 +169,6 @@ install: all
- 	$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
- 	$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
- 	$(install) -m 644 ../README $(DESTDIR)$(docdir)
--	$(install) -m 644 ../SERVPOET $(DESTDIR)$(docdir)
- 	$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
- 	-mkdir -p $(DESTDIR)$(mandir)/man8
- 	for i in $(TARGETS) ; do \
-@@ -225,25 +221,15 @@ install: all
- 	@echo ""
- 	@echo "Type 'pppoe-setup' to configure the software."
- 
--servpoet-tgz: distro-servpoet
--	cd .. && tar cvf servpoet-$(RP_VERSION)$(BETA).tar servpoet-$(RP_VERSION)$(BETA)
--	gzip -f -v -9 ../servpoet-$(RP_VERSION)$(BETA).tar
--	rm -rf ../servpoet-$(RP_VERSION)$(BETA)
--
- tgz: distro
- 	cd .. && tar cvf rp-pppoe-$(RP_VERSION)$(BETA).tar rp-pppoe-$(RP_VERSION)$(BETA)
- 	gzip -f -v -9 ../rp-pppoe-$(RP_VERSION)$(BETA).tar
- 	rm -rf ../rp-pppoe-$(RP_VERSION)$(BETA)
- 
--distro-servpoet: distro
--	cp ../servpoet.spec ../rp-pppoe-$(RP_VERSION)$(BETA)
--	$(MAKE) -C licensed-only distro RP_VERSION=$(RP_VERSION) BETA=$(BETA)
--	mv ../rp-pppoe-$(RP_VERSION)$(BETA) ../servpoet-$(RP_VERSION)$(BETA)
--
- distro:
- 	rm -rf ../rp-pppoe-$(RP_VERSION)$(BETA)
- 	mkdir ../rp-pppoe-$(RP_VERSION)$(BETA)
--	for i in README SERVPOET go go-gui rp-pppoe.spec ; do \
-+	for i in README go go-gui rp-pppoe.spec ; do \
- 		cp ../$$i ../rp-pppoe-$(RP_VERSION)$(BETA) || exit 1; \
- 	done
- 	mkdir ../rp-pppoe-$(RP_VERSION)$(BETA)/gui
-@@ -301,10 +287,6 @@ rpms: tgz
- 		/usr/src/redhat/RPMS/i386/rp-pppoe-$(RP_VERSION)-1.i386.rpm \
- 		/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(RP_VERSION)-1.i386.rpm
- 
--servpoet-rpms: servpoet-tgz
--	cp ../servpoet-$(RP_VERSION).tar.gz /usr/src/redhat/SOURCES
--	cd .. && rpm -ba servpoet.spec
--
- clean:
- 	rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
- 	test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true
-@@ -319,15 +301,13 @@ distclean: clean
- update-version:
- 	sed -e 's/^Version: .*$$/Version: $(RP_VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
- 	sed -e 's+^Source: .*$$+Source: https://dianne.skoll.ca/projects/rp-pppoe/download/rp-pppoe-$(RP_VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
--	test -f ../servpoet.spec && sed -e 's/^Version: .*$$/Version: $(RP_VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
--	test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: https://dianne.skoll.ca/projects/rp-pppoe/download/servpoet-$(RP_VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
- 
- # Convenience target for Dianne!  Don't try to use this one.
- km:
- 	./configure --enable-plugin=/home/dfs/Archive/PPP/ppp-2.4.0.pppoe4-patched-dfs
- 
- licensed-only:
--	$(MAKE) -C licensed-only all RP_VERSION=$(RP_VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION)
-+	$(MAKE) -C licensed-only all RP_VERSION=$(RP_VERSION)
- 
- l2tp: libevent/libevent.a
- 	$(MAKE) -C l2tp all
diff --git a/libre/rp-pppoe/rp-pppoe.install b/libre/rp-pppoe/rp-pppoe.install
deleted file mode 100644
index 1d4bccce2..000000000
--- a/libre/rp-pppoe/rp-pppoe.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#arg 1:  the new package version
-post_install() {
-echo ">>> The kernel-mode plugin has a new place."
-echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so"
-echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}