rp-pppoe/rp-pppoe-3.14-redhat.lux.patch

diff -uarNbB '--exclude=*.orig' '--exclude=*.rej' rp-pppoe-3.14.orig/man/pppoe.conf.5 rp-pppoe-3.14/man/pppoe.conf.5
--- rp-pppoe-3.14.orig/man/pppoe.conf.5	2020-05-27 02:29:37.000000000 +0200
+++ rp-pppoe-3.14/man/pppoe.conf.5	2020-08-23 07:43:22.741789590 +0200
@@ -2,16 +2,16 @@
 .TH PPPOE.CONF 5 "21 February 2000"
 .UC 4
 .SH NAME
-pppoe.conf \- Configuration file used by \fBpppoe-start\fR(8),
+ifcfg-ppp0 \- Configuration file used by \fBpppoe-start\fR(8),
 \fBpppoe-stop\fR(8), \fBpppoe-status(8)\fR and \fBpppoe-connect\fR(8).
 
 .SH DESCRIPTION
-\fB/etc/ppp/pppoe.conf\fR is a shell script which contains configuration
-information for RP-PPPoE scripts.  Note that \fBpppoe.conf\fR
+\fB/etc/sysconfig/network-scripts/ifcfg-ppp0\fR is a shell script which contains configuration
+information for RP-PPPoE scripts.  Note that \fBifcfg-ppp0\fR
 is used only by the various pppoe-* shell scripts, not by \fBpppoe\fR
 itself.
 
-\fBpppoe.conf\fR consists of a sequence of shell variable assignments.
+\fBifcfg-ppp0\fR consists of a sequence of shell variable assignments.
 The variables and their meanings are:
 
 .TP
@@ -54,11 +54,10 @@
 IP addresses of DNS servers if you use DNSTYPE=SPECIFY.
 
 .TP
-.B NONROOT
-If the line \fBNONROOT=OK\fR (exactly like that; no whitespace or comments)
-appears in the configuration file, then \fBpppoe-wrapper\fR will allow
-non-root users to bring the conneciton up or down.  The wrapper is installed
-only if you installed the rp-pppoe-gui package.
+.B USERCTL
+If the line \fBUSERCTL=yes\fR (exactly like that; no whitespace or comments)
+appears in the configuration file, then \fB/sbin/ifup\fR will allow
+non-root users to bring the conneciton up or down.
 
 .TP
 .B USEPEERDNS
diff -uarNbB '--exclude=*.orig' '--exclude=*.rej' rp-pppoe-3.14.orig/man/pppoe-connect.8 rp-pppoe-3.14/man/pppoe-connect.8
--- rp-pppoe-3.14.orig/man/pppoe-connect.8	2020-05-27 02:29:37.000000000 +0200
+++ rp-pppoe-3.14/man/pppoe-connect.8	2020-08-23 07:41:04.337069110 +0200
@@ -13,7 +13,8 @@
 .SH DESCRIPTION
 \fBpppoe-connect\fR is a shell script which manages a PPPoE connection
 using the Roaring Penguin user-space PPPoE client.  If you omit
-\fIconfig_file\fR, the default file \fB/etc/ppp/pppoe.conf\fR is used.
+\fIconfig_file\fR, the default file
+\fB/etc/sysconfig/network-scripts/ifcfg-ppp0\fR is used.
 If you supply \fIinterface\fR and \fIuser\fR, then they override the
 Ethernet interface and user-name settings in the configuration file.
 .P
diff -uarNbB '--exclude=*.orig' '--exclude=*.rej' rp-pppoe-3.14.orig/man/pppoe-setup.8 rp-pppoe-3.14/man/pppoe-setup.8
--- rp-pppoe-3.14.orig/man/pppoe-setup.8	2020-05-27 02:29:37.000000000 +0200
+++ rp-pppoe-3.14/man/pppoe-setup.8	2020-08-23 07:41:04.336069104 +0200
@@ -8,8 +8,9 @@
 
 .SH DESCRIPTION
 \fBpppoe-setup\fR is a shell script which prompts you for various pieces
-of information and sets up an /etc/ppp/pppoe.conf configuration script
-for the \fBpppoe-start\fR, \fBpppoe-stop\fR and \fBpppoe-connect\fR scripts.
+of information and sets up an /etc/sysconfig/network-scripts/ifcfg-ppp0
+configuration script for the \fBpppoe-start\fR, \fBpppoe-stop\fR and
++\fBpppoe-connect\fR scripts.
 
 .SH AUTHOR
 \fBpppoe-setup\fR was written by Dianne Skoll <dianne@skoll.ca>.
diff -uarNbB '--exclude=*.orig' '--exclude=*.rej' rp-pppoe-3.14.orig/man/pppoe-start.8 rp-pppoe-3.14/man/pppoe-start.8
--- rp-pppoe-3.14.orig/man/pppoe-start.8	2020-05-27 02:29:37.000000000 +0200
+++ rp-pppoe-3.14/man/pppoe-start.8	2020-08-23 07:41:04.337069110 +0200
@@ -11,7 +11,7 @@
 .SH DESCRIPTION
 \fBpppoe-start\fR is a shell script which starts the RP-PPPoE
 user-space PPPoE client.  If you omit \fIconfig_file\fR, the default
-file \fB/etc/ppp/pppoe.conf\fR is used.  If you supply
+file \fB/etc/sysconfig/network-scripts/ifcfg-ppp0\fR is used.  If you supply
 \fIinterface\fR and \fIuser\fR, then they override the Ethernet interface
 and user-name settings in the configuration file.
 
diff -uarNbB '--exclude=*.orig' '--exclude=*.rej' rp-pppoe-3.14.orig/man/pppoe-status.8 rp-pppoe-3.14/man/pppoe-status.8
--- rp-pppoe-3.14.orig/man/pppoe-status.8	2020-05-27 02:29:37.000000000 +0200
+++ rp-pppoe-3.14/man/pppoe-status.8	2020-08-23 07:41:04.338069115 +0200
@@ -10,7 +10,7 @@
 \fBpppoe-status\fR is a shell script which checks the status of the
 PPPoE link established by the Roaring Penguin user-space PPPoE client.
 If you omit \fIconfig_file\fR, the default file
-\fB/etc/ppp/pppoe.conf\fR is used.
+\fB/etc/sysconfig/network-scripts/ifcfg-ppp0\fR is used.
 
 .SH AUTHOR
 \fBpppoe-status\fR was written by Dianne Skoll <dianne@skoll.ca>.
diff -uarNbB '--exclude=*.orig' '--exclude=*.rej' rp-pppoe-3.14.orig/man/pppoe-stop.8 rp-pppoe-3.14/man/pppoe-stop.8
--- rp-pppoe-3.14.orig/man/pppoe-stop.8	2020-05-27 02:29:37.000000000 +0200
+++ rp-pppoe-3.14/man/pppoe-stop.8	2020-08-23 07:41:04.338069115 +0200
@@ -9,7 +9,7 @@
 .SH DESCRIPTION
 \fBpppoe-stop\fR is a shell script which stops the RP-PPPoE
 user-space PPPoE client.  If you omit \fIconfig_file\fR, the default
-file \fB/etc/ppp/pppoe.conf\fR is used.
+file \fB/etc/sysconfig/network-scripts/ifcfg-ppp0\fR is used.
 
 .SH AUTHOR
 \fBpppoe-stop\fR was written by Dianne Skoll <dianne@skoll.ca>