diff options
| -rw-r--r-- | net-dialup/rp-pppoe/ChangeLog | 9 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/Manifest | 7 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r1 | 1 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/files/rp-pppoe-3.5-pidfile.patch | 93 | ||||
| -rw-r--r-- | net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild | 59 |
5 files changed, 166 insertions, 3 deletions
diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog index 550904098513..0eb381298134 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 Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.24 2004/06/09 20:57:29 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.25 2004/06/15 03:12:35 agriffis Exp $ + +*rp-pppoe-3.5-r1 (14 Jun 2004) + + 14 Jun 2004; Aron Griffis <agriffis@gentoo.org> + +files/rp-pppoe-3.5-pidfile.patch, +rp-pppoe-3.5-r1.ebuild: + Add pidfile override to enable net.eth0 changes to support adsl for bug 24975 + (net.eth0 with support for bringing up adsl interfaces) 09 Jun 2004; Aron Griffis <agriffis@gentoo.org> rp-pppoe-3.5.ebuild: Fix use invocation diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest index ae6846458e4f..4cc8b093b137 100644 --- a/net-dialup/rp-pppoe/Manifest +++ b/net-dialup/rp-pppoe/Manifest @@ -1,5 +1,8 @@ -MD5 fe0f89f74b33b56f1648023c022c9ac8 ChangeLog 3245 MD5 ae53e88d804be689a138fd3954a92b32 rp-pppoe-3.5.ebuild 1260 +MD5 638100cb08a54004fc6d316c9780cf21 rp-pppoe-3.5-r1.ebuild 1510 +MD5 fe0f89f74b33b56f1648023c022c9ac8 ChangeLog 3245 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 -MD5 c8b597f2a6a20a6f0c01d48e5d2d8c8b files/rp-pppoe.rc 504 +MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5-r1 64 MD5 4d75ec30cff5b02997155a83a3c3ed9f files/digest-rp-pppoe-3.5 64 +MD5 c8b597f2a6a20a6f0c01d48e5d2d8c8b files/rp-pppoe.rc 504 +MD5 29343f608e537b94b950d4d3271822df files/rp-pppoe-3.5-pidfile.patch 1879 diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r1 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r1 new file mode 100644 index 000000000000..f73d1dfb1b55 --- /dev/null +++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.5-r1 @@ -0,0 +1 @@ +MD5 97972f8f8f6a3ab9b7070333a6a29c4b rp-pppoe-3.5.tar.gz 189321 diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.5-pidfile.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-pidfile.patch new file mode 100644 index 000000000000..206b0b1d5caa --- /dev/null +++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.5-pidfile.patch @@ -0,0 +1,93 @@ +This patch allows Gentoo to reliably shut down the interface even if +the configuration changes between "net.eth0 up" and "net.eth0 down" +(14 Jun 2004 agriffis) + +--- rp-pppoe-3.5/configs/pppoe.conf.agriffis 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/configs/pppoe.conf 2004-06-14 22:12:01.412927476 -0400 +@@ -86,6 +86,11 @@ + # $PIDFILE contains PID of adsl-connect script + # $PIDFILE.pppoe contains PID of pppoe process + # $PIDFILE.pppd contains PID of pppd process ++# ++# NB: When adsl-start is called from net.eth0, PIDFILE is overruled by ++# a Gentoo patch to adsl-start to allow proper shutdown of devices ++# even when configuration changes. In that case, the PIDFILE setting ++# here has no effect. + CF_BASE=`basename $CONFIG` + PIDFILE="/var/run/$CF_BASE-adsl.pid" + +--- rp-pppoe-3.5/scripts/adsl-stop.in.agriffis 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-stop.in 2004-06-14 22:12:01.414927139 -0400 +@@ -38,6 +38,14 @@ + + . $CONFIG + ++# For Gentoo, override the PIDFILE with our own definition ++# based on the interface. This makes it possible to reliably ++# shut down ADSL on an interface even if configuration ++# changes. GENTOO_PIDFILE is set in /etc/init.d/net.eth0 ++if [[ -n ${GENTOO_PIDFILE} ]]; then ++ PIDFILE=${GENTOO_PIDFILE} ++fi ++ + PPPOE_PIDFILE="$PIDFILE.pppoe" + PPPD_PIDFILE="$PIDFILE.pppd" + STARTPID="$PIDFILE.start" +--- rp-pppoe-3.5/scripts/adsl-start.in.agriffis 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-start.in 2004-06-14 22:12:01.413927308 -0400 +@@ -120,6 +120,14 @@ + + . $CONFIG + ++# For Gentoo, override the PIDFILE with our own definition ++# based on the interface. This makes it possible to reliably ++# shut down ADSL on an interface even if configuration ++# changes. GENTOO_PIDFILE is set in /etc/init.d/net.eth0 ++if [[ -n ${GENTOO_PIDFILE} ]]; then ++ PIDFILE=${GENTOO_PIDFILE} ++fi ++ + # Check for command-line overriding of ETH and USER + case "$#" in + 2|3) +--- rp-pppoe-3.5/scripts/adsl-connect.in.agriffis 2004-06-14 22:27:04.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-connect.in 2004-06-14 22:27:12.234534823 -0400 +@@ -69,6 +69,14 @@ + + . $CONFIG + ++# For Gentoo, override the PIDFILE with our own definition ++# based on the interface. This makes it possible to reliably ++# shut down ADSL on an interface even if configuration ++# changes. GENTOO_PIDFILE is set in /etc/init.d/net.eth0 ++if [[ -n ${GENTOO_PIDFILE} ]]; then ++ PIDFILE=${GENTOO_PIDFILE} ++fi ++ + PPPOE_PIDFILE="$PIDFILE.pppoe" + PPPD_PIDFILE="$PIDFILE.pppd" + +--- rp-pppoe-3.5/scripts/adsl-status.agriffis 2002-07-08 10:38:24.000000000 -0400 ++++ rp-pppoe-3.5/scripts/adsl-status 2004-06-14 22:29:20.678883904 -0400 +@@ -35,6 +35,14 @@ + + . $CONFIG + ++# For Gentoo, override the PIDFILE with our own definition ++# based on the interface. This makes it possible to reliably ++# shut down ADSL on an interface even if configuration ++# changes. GENTOO_PIDFILE is set in /etc/init.d/net.eth0 ++if [[ -n ${GENTOO_PIDFILE} ]]; then ++ PIDFILE=${GENTOO_PIDFILE} ++fi ++ + PPPOE_PIDFILE="$PIDFILE.pppoe" + PPPD_PIDFILE="$PIDFILE.pppd" + +@@ -81,4 +89,4 @@ + + echo "adsl-status: Link is down -- could not find interface corresponding to" + echo "pppd pid $PPPD_PID" +-exit 1 +\ No newline at end of file ++exit 1 diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild new file mode 100644 index 000000000000..d34385e18fe0 --- /dev/null +++ b/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/rp-pppoe-3.5-r1.ebuild,v 1.1 2004/06/15 03:12:35 agriffis 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 hppa ppc sparc x86 mips" +IUSE="X" + +DEPEND=">=net-dialup/ppp-2.4.1 + X? ( virtual/x11 )" + +src_unpack() { + unpack ${A} || die + cd ${S} || die + + # Patch to enable integration of adsl-start and adsl-stop with + # net.eth0 so that the pidfile can be found reliably per interface + epatch ${FILESDIR}/rp-pppoe-3.5-pidfile.patch +} + +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; 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; 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" +} |