Remove obsolete test version. Quote $FILESDIR, $S and $D. Stable on x86.

(Portage version: 2.0.54)

5 files changed, 0 insertions, 246 deletions

diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.6 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.6
deleted file mode 100644
index 6f46af60145a..000000000000
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 944bae296796144e1728188a44d18cbd rp-pppoe-3.6.tar.gz 211879
-MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-gentoo-netscripts.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-gentoo-netscripts.patch
deleted file mode 100644
index 17a2e971dcfa..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-gentoo-netscripts.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -Nru rp-pppoe-3.6.orig/configs/pppoe.conf rp-pppoe-3.6/configs/pppoe.conf
---- rp-pppoe-3.6.orig/configs/pppoe.conf	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/configs/pppoe.conf	2005-10-12 20:06:38.188781312 +0300
-@@ -21,6 +21,9 @@
- # When you configure a variable, DO NOT leave spaces around the "=" sign.
- 
- # Ethernet card connected to DSL modem
-+#
-+# NB: Gentoo overrides ETH when pppoe-start is called from the
-+# networking scripts.  This setting has no effect in that case.
- ETH=eth1
- 
- # PPPoE user name.  You may have to supply "@provider.com"  Sympatico
-@@ -86,8 +89,10 @@
- #   $PIDFILE       contains PID of pppoe-connect script
- #   $PIDFILE.pppoe contains PID of pppoe process
- #   $PIDFILE.pppd  contains PID of pppd process
--CF_BASE=`basename $CONFIG`
--PIDFILE="/var/run/$CF_BASE-pppoe.pid"
-+#
-+# NB: Gentoo overrides PIDFILE when pppoe-start is run from the
-+# networking scripts.  This setting has no effect in that case.
-+PIDFILE="/var/run/rp-pppoe.pid"
- 
- # Do you want to use synchronous PPP?  "yes" or "no".  "yes" is much
- # easier on CPU usage, but may not work for you.  It is safer to use
-diff -Nru rp-pppoe-3.6.orig/scripts/pppoe-connect.in rp-pppoe-3.6/scripts/pppoe-connect.in
---- rp-pppoe-3.6.orig/scripts/pppoe-connect.in	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/scripts/pppoe-connect.in	2005-10-12 20:11:24.418879480 +0300
-@@ -62,12 +62,17 @@
-     ;;
- esac
- 
--if test ! -f "$CONFIG" -o ! -r "$CONFIG" ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if test ! -r "$CONFIG" ; then
-     echo "$0: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
--export CONFIG
--. $CONFIG
-+
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
-diff -Nru rp-pppoe-3.6.orig/scripts/pppoe-start.in rp-pppoe-3.6/scripts/pppoe-start.in
---- rp-pppoe-3.6.orig/scripts/pppoe-start.in	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/scripts/pppoe-start.in	2005-10-12 20:13:24.510622760 +0300
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # @configure_input@
- #***********************************************************************
- #
-@@ -113,12 +113,17 @@
- 	;;
- esac
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     $ECHO "$ME: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
--export CONFIG
--. $CONFIG
-+
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- # Check for command-line overriding of ETH and USER
- case "$#" in
-@@ -145,11 +150,11 @@
- 
- # Start the connection in the background unless we're debugging
- if [ "$DEBUG" != "" ] ; then
--    $CONNECT "$@"
-+    $CONNECT <(echo "$CONFREAD")
-     exit 0
- fi
- 
--$CONNECT "$@" > /dev/null 2>&1 &
-+$CONNECT <(echo "$CONFREAD") >/dev/null 2>&1 &
- CONNECT_PID=$!
- 
- if [ "$CONNECT_TIMEOUT" = "" -o "$CONNECT_TIMEOUT" = 0 ] ; then
-@@ -164,7 +169,7 @@
- # Monitor connection
- TIME=0
- while [ true ] ; do
--    @sbindir@/pppoe-status $CONFIG > /dev/null 2>&1
-+    @sbindir@/pppoe-status <(echo "$CONFREAD") >/dev/null 2>&1
- 
-     # Looks like the interface came up
-     if [ $? = 0 ] ; then
-diff -Nru rp-pppoe-3.6.orig/scripts/pppoe-status rp-pppoe-3.6/scripts/pppoe-status
---- rp-pppoe-3.6.orig/scripts/pppoe-status	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/scripts/pppoe-status	2005-10-12 20:02:14.917804584 +0300
-@@ -28,12 +28,17 @@
- 	;;
- esac
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     echo "$0: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
- 
--. $CONFIG
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
-diff -Nru rp-pppoe-3.6.orig/scripts/pppoe-stop.in rp-pppoe-3.6/scripts/pppoe-stop.in
---- rp-pppoe-3.6.orig/scripts/pppoe-stop.in	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/scripts/pppoe-stop.in	2005-10-12 20:15:07.211009928 +0300
-@@ -31,12 +31,17 @@
-     CONFIG=/etc/ppp/pppoe.conf
- fi
- 
--if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then
-+# In Gentoo, CONFIG is a named pipe when adsl is started by the
-+# network scripts.  Testing -r is allowed; testing -f is not.
-+if [ ! -r "$CONFIG" ] ; then
-     echo "$ME: Cannot read configuration file '$CONFIG'" >& 2
-     exit 1
- fi
--export CONFIG
--. $CONFIG
-+
-+# Read the named pipe (/dev/fd/foo) into a variable so we can use it
-+# again later (since reading once from the pipe will exhaust it)
-+CONFREAD=$(<$CONFIG)
-+eval "$CONFREAD"
- 
- PPPOE_PIDFILE="$PIDFILE.pppoe"
- PPPD_PIDFILE="$PIDFILE.pppd"
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-on-demand-with-plugin.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-on-demand-with-plugin.patch
deleted file mode 100644
index 1afa25544ae1..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-on-demand-with-plugin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru rp-pppoe-3.6.orig/configs/pppoe.conf rp-pppoe-3.6/configs/pppoe.conf
---- rp-pppoe-3.6.orig/configs/pppoe.conf	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/configs/pppoe.conf	2005-09-17 16:53:39.844303080 +0300
-@@ -115,7 +115,7 @@
- FIREWALL=NONE
- 
- # Linux kernel-mode plugin for pppd.  If you want to try the kernel-mode
--# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so
-+# plugin, use LINUX_PLUGIN=rp-pppoe.so
- LINUX_PLUGIN=
- 
- # Any extra arguments to pass to pppoe.  Normally, use a blank string
-diff -Nru rp-pppoe-3.6.orig/scripts/pppoe-connect.in rp-pppoe-3.6/scripts/pppoe-connect.in
---- rp-pppoe-3.6.orig/scripts/pppoe-connect.in	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/scripts/pppoe-connect.in	2005-09-17 16:53:39.845302928 +0300
-@@ -295,7 +295,7 @@
- 	$SETSID $OVERRIDE_PPPD_COMMAND &
- 	echo "$!" > $PPPD_PIDFILE
-     elif test "$LINUX_PLUGIN" != "" ; then
--	$SETSID $PPPD $PPP_STD_OPTIONS $DEMAND &
-+	$SETSID $PPPD $DEMAND $PPP_STD_OPTIONS &
- 	echo "$!" > $PPPD_PIDFILE
-     else
- 	$SETSID $PPPD pty "$PPPOE_CMD" \
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-plugin-options.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-plugin-options.patch
deleted file mode 100644
index bf3e595a0084..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-plugin-options.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru rp-pppoe-3.6.orig/scripts/pppoe-connect.in rp-pppoe-3.6/scripts/pppoe-connect.in
---- rp-pppoe-3.6.orig/scripts/pppoe-connect.in	2005-10-12 20:31:43.000000000 +0300
-+++ rp-pppoe-3.6/scripts/pppoe-connect.in	2005-10-12 20:41:23.799332072 +0300
-@@ -202,7 +202,7 @@
- 
- # If we're using kernel-mode PPPoE on Linux...
- if test "$LINUX_PLUGIN" != "" ; then
--    PLUGIN_OPTS="plugin $LINUX_PLUGIN rp_pppoe_dev $ETH"
-+    PLUGIN_OPTS="plugin $LINUX_PLUGIN"
-     if test -n "$SERVICENAME" ; then
- 	PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME"
-     fi
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-username-charset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-username-charset.patch
deleted file mode 100644
index 57e4b8f40529..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.6-username-charset.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nru rp-pppoe-3.6.orig/scripts/pppoe-setup.in rp-pppoe-3.6/scripts/pppoe-setup.in
---- rp-pppoe-3.6.orig/scripts/pppoe-setup.in	2005-08-10 04:50:46.000000000 +0300
-+++ rp-pppoe-3.6/scripts/pppoe-setup.in	2005-09-17 16:42:21.965356344 +0300
-@@ -86,11 +86,13 @@
-     $ECHO "USER NAME"
-     $ECHO ""
-     printf "%s" ">>> Enter your PPPoE user name (default $USER): "
--    read U
-+    read Uu
- 
--    if [ "$U" = "" ] ; then
--	U="$USER"
-+    if [ "$Uu" = "" ] ; then
-+	Uu="$USER"
-     fi
-+  
-+    U=`echo $Uu | sed -e "s/&/\\\\\&/g"`
- 
-     # Under Linux, "fix" the default interface if eth1 is not available
-     if test `uname -s` = "Linux" ; then
-@@ -221,7 +223,7 @@
-     $ECHO "** Summary of what you entered **"
-     $ECHO ""
-     $ECHO "Ethernet Interface: $E"
--    $ECHO "User name:          $U"
-+    $ECHO "User name:          $Uu"
-     if [ "$D" = "no" ] ; then
- 	$ECHO "Activate-on-demand: No"
-     else
-@@ -288,7 +290,12 @@
- fi
- 
- # Some #$(*& ISP's use a slash in the user name...
--sed -e "s&^USER=.*&USER='$U'&" \
-+for SEP in ':' ';' '/' '!' '|' '_' '-' '@' ; do 
-+	if [ "$U" = `echo $U | sed "sI${SEP}II"` ]; then 
-+		break;
-+	fi
-+done
-+sed -e "s${SEP}^USER=.*${SEP}USER='$U'${SEP}"\
-     -e "s&^ETH=.*&ETH='$E'&" \
-     -e "s&^PIDFILE=.*&PIDFILE=\"$VARRUN/\$CF_BASE-pppoe.pid\"&" \
-     -e "s/^FIREWALL=.*/FIREWALL=$FIREWALL/" \
-@@ -337,10 +344,10 @@
-     cp /dev/null /etc/ppp/chap-secrets-bak
- fi
- 
--egrep -v "^$U|^\"$U\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
--$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/pap-secrets
--egrep -v "^$U|^\"$U\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
--$ECHO "\"$U\"	*	\"$PWD1\"" >> /etc/ppp/chap-secrets
-+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets
-+$ECHO "\"$Uu\"	*	\"$PWD1\"" >> /etc/ppp/pap-secrets
-+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets
-+$ECHO "\"$Uu\"	*	\"$PWD1\"" >> /etc/ppp/chap-secrets
- 
- $ECHO ""
- $ECHO ""