9 files changed, 159 insertions, 154 deletions
diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index ad4cb4b74396..04d38f2f32e6 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/rp-pppoe
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.38 2004/11/14 22:30:45 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.39 2004/12/03 06:39:42 vapier Exp $
+
+*rp-pppoe-3.5-r5 (03 Dec 2004)
+
+  03 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/rp-pppoe-3.5-gentoo-netscripts.patch, +rp-pppoe-3.5-r5.ebuild:
+  Fix net-script integration.  Patch by Andreas Kauer #68934.
 
 *rp-pppoe-3.5-r4 (15 Nov 2004)
 
diff --git a/net-dialup/rp-pppoe/files/3.5-adsl-stop.patch b/net-dialup/rp-pppoe/files/3.5-adsl-stop.patch
deleted file mode 100644
index 9c51ad5ae735..000000000000
--- a/net-dialup/rp-pppoe/files/3.5-adsl-stop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN rp-pppoe-3.5.orig/scripts/adsl-stop.in rp-pppoe-3.5/scripts/adsl-stop.in
---- rp-pppoe-3.5.orig/scripts/adsl-stop.in	2004-11-14 23:20:30.000000000 +0200
-+++ rp-pppoe-3.5/scripts/adsl-stop.in	2004-11-14 23:55:59.293032800 +0200
-@@ -62,12 +62,12 @@
- 	echo "$ME: The adsl-connect script (PID $PID) appears to have died" >& 2
-     fi
- 
--    # Kill pppd, which should in turn kill pppoe
--    if [ -r "$PPPD_PIDFILE" ] ; then
--	PPPD_PID=`cat "$PPPD_PIDFILE"`
--	$LOGGER -p daemon.notice "Killing pppd"
--	echo "Killing pppd ($PPPD_PID)"
--	kill $PPPD_PID > /dev/null 2>&1 || exit 1
-+    # Kill pppoe, which should in turn kill pppd
-+    if [ -r "$PPPOE_PIDFILE" ] ; then
-+	PPPOE_PID=`cat "$PPPOE_PIDFILE"` 
-+	$LOGGER -p daemon.notice "Killing pppoe" 
-+	echo "Killing pppoe ($PPPOE_PID)" 
-+	kill -SIGHUP $PPPOE_PID > /dev/null 2>&1 || exit 1 
-     fi
- 
-     # Kill adsl-start
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r3 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r3
deleted file mode 100644
index f73d1dfb1b55..000000000000
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r4 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r4
deleted file mode 100644
index f73d1dfb1b55..000000000000
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r1 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r5
index f73d1dfb1b55..f73d1dfb1b55 100644
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r1
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r5
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-gentoo-netscripts.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-gentoo-netscripts.patch
new file mode 100644
index 000000000000..f2d537d053e4
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-gentoo-netscripts.patch
@@ -0,0 +1,148 @@
+diff -Naur rp-pppoe-3.5/configs/pppoe.conf rp-pppoe-3.5.patched/configs/pppoe.conf
+--- rp-pppoe-3.5/configs/pppoe.conf	2002-07-08 16:38:24.000000000 +0200
++++ rp-pppoe-3.5.patched/configs/pppoe.conf	2004-10-31 20:59:11.716686192 +0100
+@@ -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,8 +89,10 @@
+ #   $PIDFILE       contains PID of adsl-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-adsl.pid"
++#
++# NB: Gentoo overrides PIDFILE when adsl-start is run from the
++# networking scripts.  This setting has no effect in that case.
++PIDFILE="/var/run/adsl.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 -Naur rp-pppoe-3.5/scripts/adsl-connect.in rp-pppoe-3.5.patched/scripts/adsl-connect.in
+--- rp-pppoe-3.5/scripts/adsl-connect.in	2002-07-08 16:38:24.000000000 +0200
++++ rp-pppoe-3.5.patched/scripts/adsl-connect.in	2004-10-31 17:57:26.934465072 +0100
+@@ -62,12 +62,18 @@
+     ;;
+ 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
+ 
+-. $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 -Naur rp-pppoe-3.5/scripts/adsl-start.in rp-pppoe-3.5.patched/scripts/adsl-start.in
+--- rp-pppoe-3.5/scripts/adsl-start.in	2002-07-08 16:38:24.000000000 +0200
++++ rp-pppoe-3.5.patched/scripts/adsl-start.in	2004-10-31 17:56:18.546861568 +0100
+@@ -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
+@@ -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@/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 -Naur rp-pppoe-3.5/scripts/adsl-status rp-pppoe-3.5.patched/scripts/adsl-status
+--- rp-pppoe-3.5/scripts/adsl-status	2002-07-08 16:38:24.000000000 +0200
++++ rp-pppoe-3.5.patched/scripts/adsl-status	2004-10-31 17:59:41.785964528 +0100
+@@ -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 -Naur rp-pppoe-3.5/scripts/adsl-stop.in rp-pppoe-3.5.patched/scripts/adsl-stop.in
+--- rp-pppoe-3.5/scripts/adsl-stop.in	2002-07-08 16:38:24.000000000 +0200
++++ rp-pppoe-3.5.patched/scripts/adsl-stop.in	2004-10-31 18:00:07.958985624 +0100
+@@ -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
+ 
+-. $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/rp-pppoe-3.5-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild
deleted file mode 100644
index c73247329632..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild,v 1.5 2004/09/27 12:49:23 dragonheart Exp $
-
-inherit eutils
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-SRC_URI="http://www.roaringpenguin.com/pppoe/${P}.tar.gz"
-HOMEPAGE="http://www.roaringpenguin.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa mips ppc sparc x86"
-IUSE="X"
-
-DEPEND=">=net-dialup/ppp-2.4.1
-	X? ( tcltk? ( 	virtual/x11
-			dev-lang/tcl
-			dev-lang/tk ) )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Patch to enable integration of adsl-start and adsl-stop with
-	# net.eth0 so that the pidfile can be found reliably per interface
-	epatch ${FILESDIR}/rp-pppoe-3.5-pidfile.patch
-}
-
-src_compile() {
-	addpredict /dev/ppp
-
-	# sanbdox violation workaround
-	cd ${S}/src
-	sed -i -e 's/modprobe/#modprobe/' configure || die "sed failed"
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use X && use tcltk; then
-		make -C ${S}/gui || die "gui make failed"
-	fi
-}
-
-src_install () {
-	cd ${S}/src
-	make RPM_INSTALL_ROOT=${D} docdir=/usr/share/doc/${PF} install \
-		|| die "install failed"
-	prepalldocs
-
-	if use X && use tcltk; then
-		make -C ${S}/gui install RPM_INSTALL_ROOT=${D} \
-		datadir=/usr/share/doc/${PF}/ || die "gui install failed"
-		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
-	fi
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/rp-pppoe.rc rp-pppoe
-}
-
-pkg_postinst() {
-	einfo "Use adsl-setup to configure your dialup connection"
-}
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r3.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r3.ebuild
deleted file mode 100644
index 6b63e729c636..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r3.ebuild,v 1.1 2004/10/23 19:55:45 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-SRC_URI="http://www.roaringpenguin.com/pppoe/${P}.tar.gz"
-HOMEPAGE="http://www.roaringpenguin.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="X"
-
-DEPEND=">=net-dialup/ppp-2.4.1
-	X? ( tcltk? (
-		virtual/x11
-		dev-lang/tcl
-		dev-lang/tk ) )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	# Patch to enable integration of adsl-start and adsl-stop with
-	# baselayout-1.11.x so that the pidfile can be found reliably per interface
-	epatch ${FILESDIR}/rp-pppoe-3.5-netscripts.patch
-
-	epatch ${FILESDIR}/rp-pppoe-3.5-dsa-557.patch
-}
-
-src_compile() {
-	addpredict /dev/ppp
-
-	# sanbdox violation workaround
-	cd ${S}/src
-	sed -i -e 's/modprobe/#modprobe/' configure || die "sed failed"
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use X && use tcltk; then
-		make -C ${S}/gui || die "gui make failed"
-	fi
-}
-
-src_install () {
-	cd ${S}/src
-	make RPM_INSTALL_ROOT=${D} docdir=/usr/share/doc/${PF} install \
-		|| die "install failed"
-	prepalldocs
-
-	if use X && use tcltk; then
-		make -C ${S}/gui install RPM_INSTALL_ROOT=${D} \
-		datadir=/usr/share/doc/${PF}/ || die "gui install failed"
-		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
-	fi
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/rp-pppoe.rc rp-pppoe
-}
-
-pkg_postinst() {
-	einfo "Use adsl-setup to configure your dialup connection"
-}
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r4.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r5.ebuild
index 90b53d53c799..1e2f1d53f94d 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5-r4.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r4.ebuild,v 1.1 2004/11/14 22:30:45 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r5.ebuild,v 1.1 2004/12/03 06:39:42 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-SRC_URI="http://www.roaringpenguin.com/pppoe/${P}.tar.gz"
 HOMEPAGE="http://www.roaringpenguin.com/"
+SRC_URI="http://www.roaringpenguin.com/pppoe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,9 +26,9 @@ src_unpack() {
 	# Patch to enable integration of adsl-start and adsl-stop with
 	# baselayout-1.11.x so that the pidfile can be found reliably per interface
 	#These 2 patches should be merged some day
-	epatch ${FILESDIR}/rp-pppoe-3.5-netscripts.patch ${FILESDIR}/3.5-adsl-stop.patch
+	epatch ${FILESDIR}/rp-pppoe-3.5-gentoo-netscripts.patch
 
-	epatch ${FILESDIR}/rp-pppoe-3.5-dsa-557.patch
+	epatch ${FILESDIR}/rp-pppoe-3.5-dsa-557.patch #66296
 
 	#Avoid "setXid, dynamically linked and using lazy bindings" QA notice
 	sed -i -e 's:\(@CC@\) \(-o pppoe-wrapper wrapper.o\):\1 -Wl,-z,now \2:' gui/Makefile.in