add patch for testing with baselayout-1.11.x netscripts

2 files changed, 114 insertions, 1 deletions

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index ef9bad6757dc..fafe69a39b44 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,9 +1,12 @@
-MD5 443cd9158850793019160ef6fd003ffc rp-pppoe-3.5-r2.ebuild 1641
 MD5 0f639c9d201201602dd1d3cbcefc8896 rp-pppoe-3.5-r1.ebuild 1598
 MD5 c96a783057ea36e7066457073da18c2c ChangeLog 5016
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 dddb52073965c67e9c0f7f70920fdc08 rp-pppoe-3.5-r2.ebuild 1461
+MD5 e76ac2be1e56c4c53cad53c17e75f94a rp-pppoe-3.5-r3.ebuild 1511
 MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r1 64
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r2 64
 MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
 MD5 d90e4422c967ed2ba160c12b22f977b4 files/rp-pppoe-3.5-pidfile.patch 3266
+MD5 8708f33468c5aeada5ec65d597edec17 files/rp-pppoe-3.5-netscripts.patch 4063
+MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r3 64
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-netscripts.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-netscripts.patch
new file mode 100644
index 000000000000..d35d74bd3d5a
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-netscripts.patch
@@ -0,0 +1,110 @@
+diff -urN rp-pppoe-3.5/configs/pppoe.conf rp-pppoe-3.5.agriffis/configs/pppoe.conf
+--- rp-pppoe-3.5/configs/pppoe.conf	2002-07-08 10:38:24.000000000 -0400
++++ rp-pppoe-3.5.agriffis/configs/pppoe.conf	2004-10-21 23:23:48.490710213 -0400
+@@ -21,6 +21,9 @@
+ # When you configure a variable, DO NOT leave spaces around the "=" sign.
+ 
+ # Ethernet card connected to ADSL modem
++#
++# NB: Gentoo overrides ETH when adsl-start is called from the
++# networking scripts.  This setting has no effect in that case.
+ ETH=eth1
+ 
+ # ADSL user name.  You may have to supply "@provider.com"  Sympatico
+@@ -86,6 +89,9 @@
+ #   $PIDFILE       contains PID of adsl-connect script
+ #   $PIDFILE.pppoe contains PID of pppoe process
+ #   $PIDFILE.pppd  contains PID of pppd process
++#
++# NB: Gentoo overrides PIDFILE when adsl-start is run from the
++# networking scripts.  This setting has no effect in that case.
+ CF_BASE=`basename $CONFIG`
+ PIDFILE="/var/run/$CF_BASE-adsl.pid"
+ 
+diff -urN rp-pppoe-3.5/scripts/adsl-connect.in rp-pppoe-3.5.agriffis/scripts/adsl-connect.in
+--- rp-pppoe-3.5/scripts/adsl-connect.in	2002-07-08 10:38:24.000000000 -0400
++++ rp-pppoe-3.5.agriffis/scripts/adsl-connect.in	2004-10-21 23:07:06.421795686 -0400
+@@ -62,7 +62,9 @@
+     ;;
+ 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
+diff -urN rp-pppoe-3.5/scripts/adsl-start.in rp-pppoe-3.5.agriffis/scripts/adsl-start.in
+--- rp-pppoe-3.5/scripts/adsl-start.in	2002-07-08 10:38:24.000000000 -0400
++++ rp-pppoe-3.5.agriffis/scripts/adsl-start.in	2004-10-21 23:11:47.318117476 -0400
+@@ -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
+ 
+-. $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
+@@ -164,7 +169,7 @@
+ # Monitor connection
+ TIME=0
+ while [ true ] ; do
+-    @sbindir@/adsl-status $CONFIG > /dev/null 2>&1
++    @sbindir@/adsl-status <(echo "$CONFREAD") >/dev/null 2>&1
+ 
+     # Looks like the interface came up
+     if [ $? = 0 ] ; then
+diff -urN rp-pppoe-3.5/scripts/adsl-status rp-pppoe-3.5.agriffis/scripts/adsl-status
+--- rp-pppoe-3.5/scripts/adsl-status	2002-07-08 10:38:24.000000000 -0400
++++ rp-pppoe-3.5.agriffis/scripts/adsl-status	2004-10-21 23:13:22.901045096 -0400
+@@ -28,7 +28,9 @@
+ 	;;
+ 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
+@@ -81,4 +83,4 @@
+ 
+ echo "adsl-status: Link is down -- could not find interface corresponding to"
+ echo "pppd pid $PPPD_PID"
+-exit 1
+\ No newline at end of file
++exit 1
+diff -urN rp-pppoe-3.5/scripts/adsl-stop.in rp-pppoe-3.5.agriffis/scripts/adsl-stop.in
+--- rp-pppoe-3.5/scripts/adsl-stop.in	2002-07-08 10:38:24.000000000 -0400
++++ rp-pppoe-3.5.agriffis/scripts/adsl-stop.in	2004-10-21 23:14:00.818098880 -0400
+@@ -31,7 +31,9 @@
+     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