abslibre/libre/rp-pppoe/libre.patch

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