summaryrefslogtreecommitdiff
path: root/libre/rp-pppoe/libre.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/rp-pppoe/libre.patch')
-rw-r--r--libre/rp-pppoe/libre.patch38
1 files changed, 8 insertions, 30 deletions
diff --git a/libre/rp-pppoe/libre.patch b/libre/rp-pppoe/libre.patch
index 9cf16d7d7..1e305c861 100644
--- a/libre/rp-pppoe/libre.patch
+++ b/libre/rp-pppoe/libre.patch
@@ -10,31 +10,9 @@ diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec
%config(noreplace) /etc/ppp/pppoe.conf
%config(noreplace) /etc/ppp/pppoe-server-options
%config(noreplace) /etc/ppp/firewall-masq
-diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null
---- rp-pppoe-3.11.orig/SERVPOET 2012-08-17 15:31:25.000000000 -0300
-+++ /dev/null 2012-10-05 01:27:08.580078512 -0300
-@@ -1,18 +0,0 @@
--# LIC: GPL
--
--ServPoET
----------
--
--ServPoET is a commercial version of the PPPoE server. While everything
--you received in this package is licensed under the GNU General Public
--License, ServPoET is not free software and is licensed under a traditional
--commercial license.
--
--ServPoET features RADIUS support, support for different realms,
--real-time server status reporting and a friendly curses-based GUI for
--administration. For information on ServPoET:
--
--Contact Fine Point Technologies, Inc. (http://www.finepoint.com/)
--
----
--David F. Skoll <dfs@roaringpenguin.com>
-diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
---- rp-pppoe-3.11.orig/src/Makefile.in 2012-08-17 15:31:25.000000000 -0300
-+++ rp-pppoe-3.11/src/Makefile.in 2012-10-05 01:46:13.121336619 -0300
+diff -Nur rp-pppoe-3.12.orig/src/Makefile.in rp-pppoe-3.12/src/Makefile.in
+--- rp-pppoe-3.12.orig/src/Makefile.in 2015-11-11 12:10:02.000000000 -0300
++++ rp-pppoe-3.12/src/Makefile.in 2016-01-14 15:09:01.441919395 -0300
@@ -44,9 +44,6 @@
PPPOE_PATH=$(sbindir)/pppoe
PPPD_PATH=@PPPD@
@@ -45,7 +23,7 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
# Kernel-mode plugin gets installed here.
PLUGIN_DIR=/etc/ppp/plugins
PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
-@@ -152,7 +149,6 @@
+@@ -171,7 +168,6 @@
$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
$(install) -m 644 ../README $(DESTDIR)$(docdir)
@@ -53,7 +31,7 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
-mkdir -p $(DESTDIR)$(mandir)/man8
for i in $(TARGETS) ; do \
-@@ -210,25 +206,15 @@
+@@ -229,25 +225,15 @@
@echo ""
@echo "Type 'pppoe-setup' to configure the software."
@@ -80,7 +58,7 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \
done
mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui
-@@ -286,10 +272,6 @@
+@@ -305,10 +291,6 @@
/usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \
/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm
@@ -91,14 +69,14 @@ diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
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
-@@ -304,15 +286,13 @@
+@@ -323,15 +305,13 @@
update-version:
sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(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: $(VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
- test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/servpoet-$(VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true
- # Convenience target for David! Don't try to use this one.
+ # 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