Fix adsl-stop to kill pppoe instead pppd (see #67209). Avoid QA notices regarding lazy bindings.

5 files changed, 107 insertions, 6 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 6cb4a07761af..ad4cb4b74396 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.37 2004/10/23 19:55:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.38 2004/11/14 22:30:45 mrness Exp $
+
+*rp-pppoe-3.5-r4 (15 Nov 2004)
+
+  15 Nov 2004; Alin Nastac <mrness@gentoo.org> +files/3.5-adsl-stop.patch,
+  +rp-pppoe-3.5-r4.ebuild:
+  Fix adsl-stop to kill pppoe instead pppd (see #67209). Avoid QA notices
+  regarding lazy bindings.
 
 *rp-pppoe-3.5-r3 (23 Oct 2004)
 
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 8d2806408be1..c7f3daacf5d2 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,12 +1,15 @@
-MD5 0f639c9d201201602dd1d3cbcefc8896 rp-pppoe-3.5-r1.ebuild 1598
 MD5 c2c88efb93056a555f92b5d6a90494a0 ChangeLog 5211
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 0f639c9d201201602dd1d3cbcefc8896 rp-pppoe-3.5-r1.ebuild 1598
 MD5 443cd9158850793019160ef6fd003ffc rp-pppoe-3.5-r2.ebuild 1641
 MD5 369091616bd1b0e298296a46427b50d6 rp-pppoe-3.5-r3.ebuild 1662
-MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
+MD5 82ba1ae623c845b7ad40d588ec99d7fb rp-pppoe-3.5-r4.ebuild 1935
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r1 64
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r2 64
-MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
-MD5 d90e4422c967ed2ba160c12b22f977b4 files/rp-pppoe-3.5-pidfile.patch 3266
-MD5 8708f33468c5aeada5ec65d597edec17 files/rp-pppoe-3.5-netscripts.patch 4063
 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r3 64
+MD5 3ec97394e888b357e2c6020b3ab0155c files/rp-pppoe-3.5-dsa-557.patch 5581
+MD5 8708f33468c5aeada5ec65d597edec17 files/rp-pppoe-3.5-netscripts.patch 4063
+MD5 d90e4422c967ed2ba160c12b22f977b4 files/rp-pppoe-3.5-pidfile.patch 3266
+MD5 966f79051cec3049cc3abb79ca6d3ab1 files/rp-pppoe.rc 498
+MD5 12a12bf20f670c990419c8f819c760df files/3.5-adsl-stop.patch 875
+MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r4 64
diff --git a/net-dialup/rp-pppoe/files/3.5-adsl-stop.patch b/net-dialup/rp-pppoe/files/3.5-adsl-stop.patch
new file mode 100644
index 000000000000..9c51ad5ae735
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/3.5-adsl-stop.patch
@@ -0,0 +1,22 @@
+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-r4 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r4
new file mode 100644
index 000000000000..f73d1dfb1b55
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r4
@@ -0,0 +1 @@
+MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r4.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r4.ebuild
new file mode 100644
index 000000000000..90b53d53c799
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r4.ebuild
@@ -0,0 +1,68 @@
+# 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 $
+
+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 "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}/rp-pppoe-3.5-netscripts.patch ${FILESDIR}/3.5-adsl-stop.patch
+
+	epatch ${FILESDIR}/rp-pppoe-3.5-dsa-557.patch
+
+	#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
+}
+
+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"
+}