move 'connect true' before $LINUX_PLUGIN (#89609)

Package-Manager: portage-2.0.51.19

5 files changed, 125 insertions, 8 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index b6e047ea0fbb..d0d621fe6637 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.55 2005/04/25 14:16:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.56 2005/05/05 21:38:59 mrness Exp $
+
+*rp-pppoe-3.5-r11 (05 May 2005)
+
+  05 May 2005; Alin Nastac <mrness@gentoo.org>
+  +files/rp-pppoe-3.5-on-demand-with-plugin.patch, +rp-pppoe-3.5-r11.ebuild:
+  Fix order of pppd parameters when DEMAND & LINUX_PLUGIN are used (#89609).
 
 *rp-pppoe-3.5-r10 (25 Apr 2005)
 
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index bed5a9a4d677..4451f05eeff6 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ddb2ee97a26694b7a83154ae5d69b2ca ChangeLog 8133
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 38be3da99b1c2ac6b23cd6eeb3caa07b rp-pppoe-3.5-r10.ebuild 2520
+MD5 2f95ca7bcbbcfb07ec5f9f4ac3b38538 rp-pppoe-3.5-r11.ebuild 2543
+MD5 9b5ba991f25cfd8148094c6d84925345 ChangeLog 8368
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r10 125
+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 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
-MD5 fa756506d5f5af4fbd15dac93d9a1e69 files/rp-pppoe-3.5-username-charset.patch 1991
 MD5 f66e15d135a92d90d6a2d38cfad34dea files/rp-pppoe-3.5-connect-on-demand.patch 616
+MD5 fa756506d5f5af4fbd15dac93d9a1e69 files/rp-pppoe-3.5-username-charset.patch 1991
+MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbPxcjiC39V7gKu0RAoQ7AKDRm/wq4okxWIithsO26aiecmsctgCgyGtk
-p8VuNCoV0Yf9XihqotPqPJo=
-=rHCt
+iD8DBQFCepJ9jiC39V7gKu0RAiAkAKCiBnsWgK1fL4HH6n+7bAwc5zRpXgCgtfRT
+skOqg2hgD3M3jTsaXdk81xc=
+=8LrS
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r11 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r11
new file mode 100644
index 000000000000..e67ec4d3fe8f
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r11
@@ -0,0 +1,2 @@
+MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321
+MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-on-demand-with-plugin.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-on-demand-with-plugin.patch
new file mode 100644
index 000000000000..886257b901cf
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-on-demand-with-plugin.patch
@@ -0,0 +1,24 @@
+diff -Nru rp-pppoe-3.5.orig/configs/pppoe.conf rp-pppoe-3.5/configs/pppoe.conf
+--- rp-pppoe-3.5.orig/configs/pppoe.conf	2005-05-06 00:30:17.000000000 +0300
++++ rp-pppoe-3.5/configs/pppoe.conf	2005-05-06 00:32:32.181250632 +0300
+@@ -120,7 +120,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.5.orig/scripts/adsl-connect.in rp-pppoe-3.5/scripts/adsl-connect.in
+--- rp-pppoe-3.5.orig/scripts/adsl-connect.in	2005-05-06 00:22:37.000000000 +0300
++++ rp-pppoe-3.5/scripts/adsl-connect.in	2005-05-06 00:23:27.110114040 +0300
+@@ -301,7 +301,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/rp-pppoe-3.5-r11.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild
new file mode 100644
index 000000000000..e15998aa4eba
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r11.ebuild
@@ -0,0 +1,82 @@
+# 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-r11.ebuild,v 1.1 2005/05/05 21:38:59 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 ~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"
+	cd ${S} || die "${S} not found"
+
+	# 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}-dsa-557.patch #66296
+	epatch ${FILESDIR}/${P}-username-charset.patch #82410
+	epatch ${FILESDIR}/${P}-on-demand-with-plugin.patch #85535 and #89609
+
+	#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
+
+	# sanbdox violation workaround
+	sed -i -e 's/modprobe/#modprobe/' 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
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/rp-pppoe.rc rp-pppoe
+}
+
+pkg_postinst() {
+	einfo "Use adsl-setup to configure your dialup connection"
+}