version bump (#102820)

(Portage version: 2.0.51.22-r3)

8 files changed, 347 insertions, 15 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 4cf1e1b219ed..22f237bae429 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/rp-pppoe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.60 2005/06/23 13:51:35 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.61 2005/10/12 17:57:10 mrness Exp $
+
+*rp-pppoe-3.6 (12 Oct 2005)
+
+  12 Oct 2005; Alin Nastac <mrness@gentoo.org>
+  +files/rp-pppoe-3.6-gentoo-netscripts.patch,
+  +files/rp-pppoe-3.6-on-demand-with-plugin.patch,
+  +files/rp-pppoe-3.6-plugin-options.patch,
+  +files/rp-pppoe-3.6-username-charset.patch, +rp-pppoe-3.6.ebuild:
+  Version bump (#102820).
 
   23 Jun 2005; Yuta SATOH <nigoro@gentoo.org> rp-pppoe-3.5-r11.ebuild:
   added ~ppc64
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 69744ee5e651..bd8e75cdb4c4 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,18 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 b31325271e4a8ec710621869316991fc ChangeLog 8919
+MD5 87dcdcb2682fe6358055298761b28bba rp-pppoe-3.6.ebuild 2575
 MD5 bce4b6caf1dc2ebea4c6ba75f0194526 rp-pppoe-3.5-r11.ebuild 2478
+MD5 b31325271e4a8ec710621869316991fc ChangeLog 8919
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r11 125
+MD5 d6678e5d124fa519195709326558af27 files/rp-pppoe-3.5-on-demand-with-plugin.patch 1058
 MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
 MD5 4e9fa8d65d286e5e37e953e7c822c70e files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
+MD5 084f86d12b06314440de4fce0eee3c5c files/digest-rp-pppoe-3.6 125
+MD5 b62b08755726e381ca8d6afd92662b8f files/rp-pppoe-3.6-gentoo-netscripts.patch 5214
+MD5 f2caeab7f4873474a04c98ab57b6c92a files/rp-pppoe-3.6-username-charset.patch 1946
+MD5 f1c5a33429cf0b27398d3527b2103bd2 files/rp-pppoe-3.6-plugin-options.patch 563
 MD5 fa756506d5f5af4fbd15dac93d9a1e69 files/rp-pppoe-3.5-username-charset.patch 1991
-MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r11 125
-MD5 d6678e5d124fa519195709326558af27 files/rp-pppoe-3.5-on-demand-with-plugin.patch 1058
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCur6C60LfUIagIAkRAiVAAJ4h5kl8JypEVSuRBH2Aw7Re5Mxw3QCgtHPO
-I7fGKo5YY2nUq2NtSMjtxxE=
-=qWYI
------END PGP SIGNATURE-----
+MD5 adcd7cb58c9366ef245cc00bb9c598f4 files/rp-pppoe-3.6-on-demand-with-plugin.patch 1062
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.6 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.6
new file mode 100644
index 000000000000..6f46af60145a
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.6
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000000..17a2e971dcfa
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-gentoo-netscripts.patch
@@ -0,0 +1,150 @@
+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
new file mode 100644
index 000000000000..1afa25544ae1
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-on-demand-with-plugin.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000000..bf3e595a0084
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-plugin-options.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..57e4b8f40529
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.6-username-charset.patch
@@ -0,0 +1,58 @@
+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 ""
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.6.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.6.ebuild
new file mode 100644
index 000000000000..87dffb2f324b
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 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.6.ebuild,v 1.1 2005/10/12 17:57:10 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+HOMEPAGE="http://www.roaringpenguin.com/"
+SRC_URI="http://www.roaringpenguin.com/penguin/pppoe/${P}.tar.gz
+	ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="X tcltk"
+
+DEPEND="net-dialup/ppp
+	X? ( tcltk? (
+		virtual/x11
+		dev-lang/tcl
+		dev-lang/tk ) )"
+
+src_unpack() {
+	unpack ${A} || die "failed to 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}/${P}-gentoo-netscripts.patch
+
+	epatch ${FILESDIR}/${P}-username-charset.patch #82410
+	epatch ${FILESDIR}/${P}-on-demand-with-plugin.patch #85535 and #89609
+	epatch ${FILESDIR}/${P}-plugin-options.patch #remove invalid plugin option
+
+	#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:' ${S}/gui/Makefile.in
+
+	# sanbdox violation workaround
+	sed -i -e 's/modprobe/echo modprobe/' ${S}/src/configure || die "sed failed"
+}
+
+src_compile() {
+	addpredict /dev/ppp
+
+	cd ${S}/src
+	econf --enable-plugin=../../ppp-2.4.3 || 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"
+
+	#Don't use compiled rp-pppoe plugin; use it from the current version of pppd
+	rm ${D}/etc/ppp/plugins/rp-pppoe.so
+	local PPPD_VER=`best_version net-dialup/ppp`
+	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
+	if [ -n "${PPPD_VER}" ] && [ -f ${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so ] ; then
+		dosym /usr/lib/pppd/${PPPD_VER}/rp-pppoe.so /etc/ppp/plugins/rp-pppoe.so
+	fi
+
+	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
+}
+
+pkg_postinst() {
+	einfo "Use pppoe-setup to configure your dialup connection"
+	echo
+	ewarn "Please note that adsl-* scripts have been renamed to pppoe-*."
+}