Propagate pppoe-server session offset to PPP interface name, thanks to Aleksey Shipilev <aleksey.shipilev@gmail.com> (#204476).

(Portage version: 2.1.3.19)

4 files changed, 120 insertions, 2 deletions

diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog
index 3f4fa838e8e9..cc2b6e4e7012 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.88 2007/05/06 08:11:04 genone Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/rp-pppoe/ChangeLog,v 1.89 2008/01/06 12:49:18 mrness Exp $
+
+*rp-pppoe-3.8-r2 (06 Jan 2008)
+
+  06 Jan 2008; Alin Năstac <mrness@gentoo.org>
+  +files/rp-pppoe-3.8-session-offset.patch, +rp-pppoe-3.8-r2.ebuild:
+  Propagate pppoe-server session offset to PPP interface name, thanks to
+  Aleksey Shipilev <aleksey.shipilev@gmail.com> (#204476).
 
   06 May 2007; Marius Mauch <genone@gentoo.org> rp-pppoe-3.8-r1.ebuild:
   Replacing einfo with elog
diff --git a/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.8-r2 b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.8-r2
new file mode 100644
index 000000000000..c5f6d3ae6e3e
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/digest-rp-pppoe-3.8-r2
@@ -0,0 +1,6 @@
+MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
+RMD160 845821496bacb07d93bb7572a171854853ef722b ppp-2.4.3.tar.gz 688092
+SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 ppp-2.4.3.tar.gz 688092
+MD5 0e32760f498f9cde44081ee6aafc823b rp-pppoe-3.8.tar.gz 212931
+RMD160 039798154acae9e7a066172f23904d766ba68a9a rp-pppoe-3.8.tar.gz 212931
+SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479 rp-pppoe-3.8.tar.gz 212931
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-session-offset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-session-offset.patch
new file mode 100644
index 000000000000..8f53a1af4239
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-session-offset.patch
@@ -0,0 +1,21 @@
+diff -Nru rp-pppoe-3.8.orig/src/pppoe-server.c rp-pppoe-3.8/src/pppoe-server.c
+--- rp-pppoe-3.8.orig/src/pppoe-server.c	2006-04-02 17:29:42.000000000 +0300
++++ rp-pppoe-3.8/src/pppoe-server.c	2008-01-06 14:43:39.000000000 +0200
+@@ -1693,7 +1693,7 @@
+     }
+     if (PassUnitOptionToPPPD) {
+ 	argv[c++] = "unit";
+-	sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset));
++	sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1));
+ 	argv[c++] = buffer;
+     }
+     argv[c++] = NULL;
+@@ -1776,7 +1776,7 @@
+     argv[c++] = "default-asyncmap";
+     if (PassUnitOptionToPPPD) {
+ 	argv[c++] = "unit";
+-	sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset));
++	sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1));
+ 	argv[c++] = buffer;
+     }
+     argv[c++] = NULL;
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild
new file mode 100644
index 000000000000..58f77d9eeb7a
--- /dev/null
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 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.8-r2.ebuild,v 1.1 2008/01/06 12:49:18 mrness Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
+HOMEPAGE="http://www.roaringpenguin.com/pppoe/"
+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 ~ppc64 ~sh ~sparc ~x86"
+IUSE="X"
+
+DEPEND="net-dialup/ppp
+	X? ( dev-lang/tk )"
+
+src_unpack() {
+	unpack ${A} || die "failed to unpack"
+
+	# Patch to enable integration of pppoe-start and pppoe-stop with
+	# baselayout-1.11.x so that the pidfile can be found reliably per interface
+	epatch "${FILESDIR}/${P}-gentoo-netscripts.patch"
+
+	epatch "${FILESDIR}/${P}-username-charset.patch" # bug 82410
+	epatch "${FILESDIR}/${P}-plugin-options.patch"
+	epatch "${FILESDIR}/${P}-configure.patch"
+	epatch "${FILESDIR}/${P}-session-offset.patch" # bug 204476
+
+	cd "${S}"
+	#Avoid "setXid, dynamically linked and using lazy bindings" QA notice
+	sed -i -e 's:\(@CC@\) \(-o pppoe-wrapper wrapper.o\):\1 '$(bindnow-flags)' \2:' gui/Makefile.in
+
+	cd src
+	eautoconf
+}
+
+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; 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 - see pkg_preinst below
+	rm "${D}/etc/ppp/plugins/rp-pppoe.so"
+
+	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
+}
+
+pkg_preinst() {
+	# Use the rp-pppoe plugin that comes with net-dialup/pppd
+	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
+}
+
+pkg_postinst() {
+	elog "Use pppoe-setup to configure your dialup connection."
+}