fix username-charset patch

(Portage version: 2.0.51.19)

5 files changed, 23 insertions, 17 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 5ac3cdebcbc3..b6e047ea0fbb 100644
--- a/net-dialup/rp-pppoe/ChangeLog
+++ b/net-dialup/rp-pppoe/ChangeLog
@@ -1,6 +1,13 @@
 # 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.54 2005/04/16 23:27:43 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.55 2005/04/25 14:16:04 mrness Exp $
+
+*rp-pppoe-3.5-r10 (25 Apr 2005)
+
+  25 Apr 2005; Alin Nastac <mrness@gentoo.org>
+  files/rp-pppoe-3.5-username-charset.patch, -rp-pppoe-3.5-r9.ebuild,
+  +rp-pppoe-3.5-r10.ebuild:
+  Fix username-charset patch (#90219)
 
   16 Apr 2005; Alin Nastac <mrness@gentoo.org> -rp-pppoe-3.5-r7.ebuild,
   -rp-pppoe-3.5-r8.ebuild, rp-pppoe-3.5-r9.ebuild:
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 30d54d00fdd3..0256c6eb42c9 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,9 +1,7 @@
-MD5 dddb3c9e661899c77f8bef536dd5c405 ChangeLog 7916
+MD5 ddb2ee97a26694b7a83154ae5d69b2ca ChangeLog 8133
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 4bbd3cb6d611f70455f18ef76f38403e rp-pppoe-3.5-r10.ebuild 2519
-MD5 4bbd3cb6d611f70455f18ef76f38403e rp-pppoe-3.5-r9.ebuild 2519
+MD5 38be3da99b1c2ac6b23cd6eeb3caa07b rp-pppoe-3.5-r10.ebuild 2520
 MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r10 125
-MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r9 125
 MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
 MD5 4e9fa8d65d286e5e37e953e7c822c70e files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
 MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r9 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r10
index e67ec4d3fe8f..e67ec4d3fe8f 100644
--- a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r9
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r10
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-username-charset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-username-charset.patch
index 931bc38eb1ba..6cf7c5e12a6d 100644
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-username-charset.patch
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-username-charset.patch
@@ -1,25 +1,26 @@
-diff -Naur rp-pppoe-3.5.orig/scripts/adsl-setup.in rp-pppoe-3.5/scripts/adsl-setup.in
+diff -Nru rp-pppoe-3.5.orig/scripts/adsl-setup.in rp-pppoe-3.5/scripts/adsl-setup.in
 --- rp-pppoe-3.5.orig/scripts/adsl-setup.in	2002-07-08 17:38:24.000000000 +0300
-+++ rp-pppoe-3.5/scripts/adsl-setup.in	2005-03-08 01:06:46.248252496 +0200
-@@ -86,12 +86,16 @@
++++ rp-pppoe-3.5/scripts/adsl-setup.in	2005-04-25 17:06:59.000000000 +0300
+@@ -86,12 +86,14 @@
      $ECHO "USER NAME"
      $ECHO ""
      $ECHO -n ">>> Enter your PPPoE user name (default $USER): "
 -    read U
+-
+-    if [ "$U" = "" ] ; then
+-	U="$USER"
 +    read Uu
 + 
-+    U=`echo $Uu | sed -e "s/&/\\\\\&/g"` ;
-+
- 
-     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
  	$IFCONFIG $ETH > /dev/null 2>&1 || ETH=eth0
-@@ -221,7 +225,7 @@
+@@ -221,7 +223,7 @@
      $ECHO "** Summary of what you entered **"
      $ECHO ""
      $ECHO "Ethernet Interface: $E"
@@ -28,7 +29,7 @@ diff -Naur rp-pppoe-3.5.orig/scripts/adsl-setup.in rp-pppoe-3.5/scripts/adsl-set
      if [ "$D" = "no" ] ; then
  	$ECHO "Activate-on-demand: No"
      else
-@@ -288,7 +292,12 @@
+@@ -288,7 +290,12 @@
  fi
  
  # Some #$(*& ISP's use a slash in the user name...
@@ -42,7 +43,7 @@ diff -Naur rp-pppoe-3.5.orig/scripts/adsl-setup.in rp-pppoe-3.5/scripts/adsl-set
      -e "s&^ETH=.*&ETH='$E'&" \
      -e "s&^PIDFILE=.*&PIDFILE=\"$VARRUN/\$CF_BASE-adsl.pid\"&" \
      -e "s/^FIREWALL=.*/FIREWALL=$FIREWALL/" \
-@@ -337,10 +346,10 @@
+@@ -337,10 +344,10 @@
      cp /dev/null /etc/ppp/chap-secrets-bak
  fi
  
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r9.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r10.ebuild
index bedf909d0f38..2921c0996ed5 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.5-r9.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r10.ebuild
@@ -1,6 +1,6 @@
 # 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.5-r9.ebuild,v 1.3 2005/04/21 19:08:12 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r10.ebuild,v 1.1 2005/04/25 14:16:04 mrness Exp $
 
 inherit eutils