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

Package-Manager: portage-2.1.3.19

5 files changed, 145 insertions, 6 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/Manifest b/net-dialup/rp-pppoe/Manifest
index 320fe9bffc7e..4b8ffa14806a 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX rp-pppoe-3.8-configure.patch 2718 RMD160 fd30c474c49c27c8c6c1bc8d529165eabd7d5de7 SHA1 183d7fe2567f74c7fa8227f7d4a83fdfef966626 SHA256 746d3581e8c8a31d1848b76cc071ad82a4d4f81c31b79b5e285344eaa3065915
 MD5 1cbd938e71180f324baf19908d32b158 files/rp-pppoe-3.8-configure.patch 2718
 RMD160 fd30c474c49c27c8c6c1bc8d529165eabd7d5de7 files/rp-pppoe-3.8-configure.patch 2718
@@ -10,6 +13,10 @@ AUX rp-pppoe-3.8-plugin-options.patch 1364 RMD160 8af5cccf80a2c1b26fa50e4ee0da74
 MD5 1938913a9606e60e4fa510512e8f206e files/rp-pppoe-3.8-plugin-options.patch 1364
 RMD160 8af5cccf80a2c1b26fa50e4ee0da749dacc44222 files/rp-pppoe-3.8-plugin-options.patch 1364
 SHA256 508bedec65a24eb876b2eb2151adce84efd51689e8472383debb01b29b82be13 files/rp-pppoe-3.8-plugin-options.patch 1364
+AUX rp-pppoe-3.8-session-offset.patch 828 RMD160 c09fa3ccaa03bd8e1f0b1bce436eec21cd3eb179 SHA1 6160d3345c9a108ca0933eaba548711a5f76d5be SHA256 2428f350d6a9d654401e87def8faa7fc12fb3c6d9a7a698590716391efef30c0
+MD5 ed9370332f5dc582fcabe8fbfcfde536 files/rp-pppoe-3.8-session-offset.patch 828
+RMD160 c09fa3ccaa03bd8e1f0b1bce436eec21cd3eb179 files/rp-pppoe-3.8-session-offset.patch 828
+SHA256 2428f350d6a9d654401e87def8faa7fc12fb3c6d9a7a698590716391efef30c0 files/rp-pppoe-3.8-session-offset.patch 828
 AUX rp-pppoe-3.8-username-charset.patch 1946 RMD160 9aa18182f5a611f54041162976b4f33740439443 SHA1 423b76327e679b48cfee6dca6d611012680b2830 SHA256 21209268903d2c359e5eb4547ab6417f0c63d41791fe413728d690ed879c93bd
 MD5 1d75436eae3217598ce13b690f101978 files/rp-pppoe-3.8-username-charset.patch 1946
 RMD160 9aa18182f5a611f54041162976b4f33740439443 files/rp-pppoe-3.8-username-charset.patch 1946
@@ -20,10 +27,14 @@ EBUILD rp-pppoe-3.8-r1.ebuild 2397 RMD160 5f140f9f37f425d56b1d7cbd2ae7fcaabffe4d
 MD5 64f3e4290927ea8afde0b3cdf1a23681 rp-pppoe-3.8-r1.ebuild 2397
 RMD160 5f140f9f37f425d56b1d7cbd2ae7fcaabffe4d70 rp-pppoe-3.8-r1.ebuild 2397
 SHA256 1186eca50e80fa3e650dd5d77624b00f9f582a1d2c7d5e8227a29468ff9262cc rp-pppoe-3.8-r1.ebuild 2397
-MISC ChangeLog 13241 RMD160 977fc664dc7b3af8e70a5a15e0fcedc44bba4fcc SHA1 e585406419ee7ad7189b6a2201bc71e6e7f36dc1 SHA256 ed8ec0388fd8146d5bcdccb24c68d875f4e24a135b55e2a2fa2c1dda56efda4e
-MD5 bd2b6114f4e32d1fffd9c147b2a74197 ChangeLog 13241
-RMD160 977fc664dc7b3af8e70a5a15e0fcedc44bba4fcc ChangeLog 13241
-SHA256 ed8ec0388fd8146d5bcdccb24c68d875f4e24a135b55e2a2fa2c1dda56efda4e ChangeLog 13241
+EBUILD rp-pppoe-3.8-r2.ebuild 2475 RMD160 7958d40a60a8eccceaeed6b9be80270396323cba SHA1 25fca3cd9b7e4d58e9d4c2e84cf204539ab05224 SHA256 f891fd00b4ffdcc87c0ef00151937def5762a07e08ef4ee83f3d659b2c1a074f
+MD5 3cb456f081b278472b12553185a2a160 rp-pppoe-3.8-r2.ebuild 2475
+RMD160 7958d40a60a8eccceaeed6b9be80270396323cba rp-pppoe-3.8-r2.ebuild 2475
+SHA256 f891fd00b4ffdcc87c0ef00151937def5762a07e08ef4ee83f3d659b2c1a074f rp-pppoe-3.8-r2.ebuild 2475
+MISC ChangeLog 13523 RMD160 c6dc72369729c6e4239d87245ef82e3fca8b7610 SHA1 bc06c777641800d1285e6168945ff74ce5edb84c SHA256 befc0bcbf46e67f71bb09cb3b39d435dfe78102c7168775cab96bd3c0aebf4cc
+MD5 4dee3a9e0f0f07df83c90259db26c1eb ChangeLog 13523
+RMD160 c6dc72369729c6e4239d87245ef82e3fca8b7610 ChangeLog 13523
+SHA256 befc0bcbf46e67f71bb09cb3b39d435dfe78102c7168775cab96bd3c0aebf4cc ChangeLog 13523
 MISC metadata.xml 163 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e SHA1 d8332605fd22c32f15438bbdf24aa622c3d2738a SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 RMD160 df94c60cc0bb7abe5913b464a33966b142b2fe1e metadata.xml 163
@@ -31,3 +42,13 @@ SHA256 1137a0fd866641cf719b0c2e9e77ca9fa4541a42f2cc851fe4659cf2677acca3 metadata
 MD5 c345665140f7ae9908f3256aee68a72f files/digest-rp-pppoe-3.8-r1 467
 RMD160 7b4162f713393d8f869d7436d009f2ebe2d5c38a files/digest-rp-pppoe-3.8-r1 467
 SHA256 9f689e517bfc64f62e853de28c0b87a95e877d2ecf076ec4d556663820303ebe files/digest-rp-pppoe-3.8-r1 467
+MD5 c345665140f7ae9908f3256aee68a72f files/digest-rp-pppoe-3.8-r2 467
+RMD160 7b4162f713393d8f869d7436d009f2ebe2d5c38a files/digest-rp-pppoe-3.8-r2 467
+SHA256 9f689e517bfc64f62e853de28c0b87a95e877d2ecf076ec4d556663820303ebe files/digest-rp-pppoe-3.8-r2 467
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEUEARECAAYFAkeAzlgACgkQ+fWpoTWIA9EzTgCghGJMpul58XzGi2pXy5emXq6E
+jKoAlRlLB7hWS5C0LTAsluLfAoMqWoo=
+=B1j1
+-----END PGP SIGNATURE-----
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."
+}