fix pppd params when DEMAND != no (#85535)

(Portage version: 2.0.51.19)

5 files changed, 111 insertions, 16 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index cba738e880bc..804f12116bc4 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.52 2005/03/07 23:16:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.53 2005/03/17 13:05:51 mrness Exp $
+
+*rp-pppoe-3.5-r9 (17 Mar 2005)
+
+  17 Mar 2005; Alin Nastac <mrness@gentoo.org>
+  +files/rp-pppoe-3.5-connect-on-demand.patch, +rp-pppoe-3.5-r9.ebuild:
+  Fix pppd parameters when on-demand is enabled (#85535).
 
 *rp-pppoe-3.5-r8 (08 Mar 2005)
 
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index cb2ea100ffea..5b5e2b1d5896 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ef0ca141f79586d79fd6c8937a794033 rp-pppoe-3.5-r7.ebuild 2416
-MD5 4b0dff322ee40aa8f8ec4f7941c2930f rp-pppoe-3.5-r8.ebuild 2463
 MD5 b44e1c3ec39eb0ba6d7ed9624ede8b2f ChangeLog 7530
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 4b0dff322ee40aa8f8ec4f7941c2930f rp-pppoe-3.5-r8.ebuild 2463
+MD5 ef0ca141f79586d79fd6c8937a794033 rp-pppoe-3.5-r7.ebuild 2416
+MD5 0eb335284201bf5ea1a145d6fba00b24 rp-pppoe-3.5-r9.ebuild 2518
+MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r8 125
+MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r9 125
+MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r7 125
 MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
 MD5 4e9fa8d65d286e5e37e953e7c822c70e files/rp-pppoe-3.5-gentoo-netscripts.patch 5180
-MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r7 125
-MD5 d455684124113e2349a9c674b55b493e files/digest-rp-pppoe-3.5-r8 125
-MD5 fdf0ced4a2cd6da4033a1ea9baf94a84 files/rp-pppoe-3.5-username-charset.patch 1951
 MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCLODsjiC39V7gKu0RAg2iAKCSW494l0qQ4fWtesgm5s9NAAxqXACdH7/A
-AHK/jjVENiiSilaM6zSupkk=
-=wSis
------END PGP SIGNATURE-----
+MD5 fdf0ced4a2cd6da4033a1ea9baf94a84 files/rp-pppoe-3.5-username-charset.patch 1951
+MD5 f66e15d135a92d90d6a2d38cfad34dea files/rp-pppoe-3.5-connect-on-demand.patch 616
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-r9
new file mode 100644
index 000000000000..e67ec4d3fe8f
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r9
@@ -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-connect-on-demand.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-connect-on-demand.patch
new file mode 100644
index 000000000000..6612142bab6c
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-connect-on-demand.patch
@@ -0,0 +1,12 @@
+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-03-17 14:24:24.000000000 +0200
++++ rp-pppoe-3.5/scripts/adsl-connect.in	2005-03-17 14:26:28.444590880 +0200
+@@ -189,7 +189,7 @@
+ if test "$DEMAND" = "no" ; then
+     DEMAND=""
+ else
+-    DEMAND="demand persist idle $DEMAND 10.112.112.112:10.112.112.113 ipcp-accept-remote ipcp-accept-local connect true noipdefault ktune"
++    DEMAND="demand persist idle $DEMAND 10.112.112.112:10.112.112.113 ipcp-accept-remote ipcp-accept-local noipdefault ktune"
+ fi
+ 
+ case "$FIREWALL" in
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r9.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r9.ebuild
new file mode 100644
index 000000000000..45a5a8d03e78
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r9.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-r9.ebuild,v 1.1 2005/03/17 13:05:51 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}-connect-on-demand.patch #85535
+
+	#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:15} #reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER/-*/} #reduce it to ${PV}
+	if [ -n "${PPPD_VER}" ] && [ -f /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"
+}