Remove old test version. Add warnings about MPPE-MPPC patch problems and incompatibilities (#119705). If eap-tls is enabled, apply eap-tls-0.7-mppe patch regardless whether mppe-mppc flag is enabled or not.

Package-Manager: portage-2.0.54

11 files changed, 71 insertions, 318 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 75e65ca4e7e6..eb5284420915 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ppp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.133 2005/12/25 15:08:40 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.134 2006/01/24 18:09:32 mrness Exp $
+
+  23 Jan 2006; Alin Nastac <mrness@gentoo.org> files/modules.ppp,
+  ppp-2.4.2-r10.ebuild, ppp-2.4.2-r15.ebuild, -ppp-2.4.3-r9.ebuild,
+  ppp-2.4.3-r10.ebuild:
+  Remove old test version. Add warnings about MPPE-MPPC patch problems and
+  incompatibilities (#119705). If eap-tls is enabled, apply eap-tls-0.7-mppe 
+  patch regardless whether mppe-mppc flag is enabled or not.
 
   25 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> ppp-2.4.3-r10.ebuild:
   Use bindnow-flags function instead of -Wl,-z,now.
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 29fc28d36822..ec9ef015a519 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 06c5273ec4427cc9ab16ce31b3c793c9 ChangeLog 23671
+MD5 7aafa0983e0d3bca1c19df2716186ed6 ChangeLog 24041
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530
 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
 MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775
-MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271
-MD5 23a7e77ad13ddd12f281fe134508e52f files/digest-ppp-2.4.2-r15 271
-MD5 cc3f6844a351a424392e0d5ad6deec0d files/digest-ppp-2.4.3-r10 195
-MD5 cc3f6844a351a424392e0d5ad6deec0d files/digest-ppp-2.4.3-r9 195
+MD5 5402b1b60b30f4b5d8ade8a225451095 files/digest-ppp-2.4.2-r10 271
+MD5 4d67dca76b0f8bae664bc4573222f349 files/digest-ppp-2.4.2-r15 271
+MD5 cc26261aec73c4d1bdee0592b13a96cc files/digest-ppp-2.4.3-r10 195
 MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931
 MD5 6b7aff8114e83512b42ff1be3b1c2462 files/ip-down.baselayout 990
 MD5 341c2661a11f00fdd1043a4d4e82977e files/ip-up 1083
 MD5 684e28baf379cadb97500a1a2d0db06d files/ip-up.baselayout 1337
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
+MD5 1945441c257a952a3de0d95683047ec6 files/modules.ppp 299
 MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408
 MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53
 MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238
@@ -23,14 +22,13 @@ MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295
-MD5 fc56767c28bef6332decb0a5c48cad83 ppp-2.4.2-r10.ebuild 6209
-MD5 22533d9fd22c43aa281a10b2c9a8f9ec ppp-2.4.2-r15.ebuild 7411
-MD5 1b08f3419f9844d1b79bdb5a8016b707 ppp-2.4.3-r10.ebuild 9711
-MD5 beb9521050c6c8e9e21ec6f9143a3601 ppp-2.4.3-r9.ebuild 8323
+MD5 aa48e6320cfa9b25e6ffbb743aa1c343 ppp-2.4.2-r10.ebuild 6730
+MD5 57b3a8750cb05895360a74944ab57c54 ppp-2.4.2-r15.ebuild 7772
+MD5 095515a95270f30bdd6434674b304b72 ppp-2.4.3-r10.ebuild 10119
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDrrYEAiZjviIA2XgRAhlDAKDk6WyudQfH2sPz0ZEXMy50cHGa0ACeJb53
-QXPUi7XHVLVWDMUdZu2yNHQ=
-=0+BL
+iD8DBQFD1m1sjG8pv1lIUX4RAoVEAJ0SV91d2MZ5p8UHEnnJ7m8IwpZMHQCfV54L
+oUUeUeVHoUXms5JP45D7JJY=
+=zbft
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r10 b/net-dialup/ppp/files/digest-ppp-2.4.2-r10
index 1f2afa2ee484..6c5e35ab880f 100644
--- a/net-dialup/ppp/files/digest-ppp-2.4.2-r10
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r10
@@ -1,4 +1,4 @@
-MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
-MD5 760e970cad38d42766c72341f175604d ppp-2.4.2-patches-20050514.tar.gz 11707
 MD5 0d2679907627f68dd6a2c32d1c7dda90 ppp-2.4.2-mppe-mppc-1.1.patch.gz 12532
+MD5 760e970cad38d42766c72341f175604d ppp-2.4.2-patches-20050514.tar.gz 11707
+MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
 MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r15 b/net-dialup/ppp/files/digest-ppp-2.4.2-r15
index 8c0b2925dd71..11e391709308 100644
--- a/net-dialup/ppp/files/digest-ppp-2.4.2-r15
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r15
@@ -1,4 +1,4 @@
-MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
-MD5 fac00b23c87223d1d6cc8a0a169b5719 ppp-2.4.2-patches-20050729.tar.gz 13162
 MD5 0d2679907627f68dd6a2c32d1c7dda90 ppp-2.4.2-mppe-mppc-1.1.patch.gz 12532
+MD5 fac00b23c87223d1d6cc8a0a169b5719 ppp-2.4.2-patches-20050729.tar.gz 13162
+MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
 MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r10 b/net-dialup/ppp/files/digest-ppp-2.4.3-r10
index 2fdf48d49e0d..44946ce43b76 100644
--- a/net-dialup/ppp/files/digest-ppp-2.4.3-r10
+++ b/net-dialup/ppp/files/digest-ppp-2.4.3-r10
@@ -1,3 +1,3 @@
+MD5 cc4fdb4e833f0d7519bccc9e8e026996 ppp-2.4.3-patches-20060123.tar.gz 55084
 MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
-MD5 409bf412f967694e64363af4f020a07b ppp-2.4.3-patches-20051105.tar.gz 54784
 MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r9 b/net-dialup/ppp/files/digest-ppp-2.4.3-r9
deleted file mode 100644
index 2fdf48d49e0d..000000000000
--- a/net-dialup/ppp/files/digest-ppp-2.4.3-r9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092
-MD5 409bf412f967694e64363af4f020a07b ppp-2.4.3-patches-20051105.tar.gz 54784
-MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/files/modules.ppp b/net-dialup/ppp/files/modules.ppp
index 1f5ad7f9938d..e936041c6bb3 100644
--- a/net-dialup/ppp/files/modules.ppp
+++ b/net-dialup/ppp/files/modules.ppp
@@ -3,6 +3,7 @@ alias /dev/ppp		ppp_generic
 alias tty-ldisc-3	ppp_async
 alias tty-ldisc-13	n_hdlc
 alias tty-ldisc-14	ppp_synctty
+alias ppp-compress-18	ppp_mppe
 alias ppp-compress-21	bsd_comp
 alias ppp-compress-24	ppp_deflate
 alias ppp-compress-26	ppp_deflate
diff --git a/net-dialup/ppp/ppp-2.4.2-r10.ebuild b/net-dialup/ppp/ppp-2.4.2-r10.ebuild
index 645e572d483f..2d315d9269c3 100644
--- a/net-dialup/ppp/ppp-2.4.2-r10.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r10.ebuild,v 1.9 2005/05/14 09:27:56 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r10.ebuild,v 1.10 2006/01/24 18:09:32 mrness Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="Point-to-point protocol (PPP)"
 HOMEPAGE="http://www.samba.org/ppp"
 SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
 	mirror://gentoo/${P}-patches-20050514.tar.gz
-	mppe-mppc? ( http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.gz )
+	mppe-mppc? ( http://mppe-mppc.alphacron.de/ppp-2.4.2-mppe-mppc-1.1.patch.gz )
 	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
 
 LICENSE="BSD GPL-2"
@@ -23,6 +23,20 @@ RDEPEND="virtual/libc
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
+pkg_setup() {
+	if use mppe-mppc; then
+		echo
+		ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC"
+		ewarn "patch developed by Jan Dubiec."
+		ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14."
+		einfo "You could obtain the kernel patch from MPPE-MPPC homepage:"
+		einfo "   http://mppe-mppc.alphacron.de/"
+		ewarn "CAUTION: MPPC is a U.S. patented algorithm!"
+		ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first."
+		ebeep
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -153,7 +167,7 @@ src_install() {
 	insopts -m0644
 	newins ${FILESDIR}/modules.ppp ppp
 	if use mppe-mppc; then
-		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
+		sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' ${D}/etc/modules.d/ppp
 	fi
 
 	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
diff --git a/net-dialup/ppp/ppp-2.4.2-r15.ebuild b/net-dialup/ppp/ppp-2.4.2-r15.ebuild
index 9d5d113dc7c6..9d8eff57bb8f 100644
--- a/net-dialup/ppp/ppp-2.4.2-r15.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r15.ebuild,v 1.11 2005/11/14 14:38:49 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r15.ebuild,v 1.12 2006/01/24 18:09:32 mrness Exp $
 
 inherit eutils gnuconfig flag-o-matic linux-info
 
@@ -8,13 +8,14 @@ DESCRIPTION="Point-to-point protocol (PPP)"
 HOMEPAGE="http://www.samba.org/ppp"
 SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
 	mirror://gentoo/${P}-patches-20050729.tar.gz
-	mppe-mppc? ( http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.gz )
+	mppe-mppc? ( http://mppe-mppc.alphacron.de/ppp-2.4.2-mppe-mppc-1.1.patch.gz )
 	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="activefilter atm dhcp ipv6 mppe-mppc pam radius"
+RESTRICT="nomirror"
 
 RDEPEND="virtual/libc
 	activefilter? ( >=virtual/libpcap-0.9.3 )
@@ -24,10 +25,15 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 pkg_setup() {
-	if ! use radius; then
+	if use mppe-mppc; then
 		echo
-		ewarn "RADIUS plugins installation is now controled by radius useflag!"
-		ewarn "If you need them, hit Ctrl-C now!"
+		ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC"
+		ewarn "patch developed by Jan Dubiec."
+		ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14."
+		einfo "You could obtain the kernel patch from MPPE-MPPC homepage:"
+		einfo "   http://mppe-mppc.alphacron.de/"
+		ewarn "CAUTION: MPPC is a U.S. patented algorithm!"
+		ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first."
 		ebeep
 	fi
 }
@@ -179,7 +185,7 @@ src_install() {
 	insopts -m0644
 	newins ${FILESDIR}/modules.ppp ppp
 	if use mppe-mppc; then
-		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
+		sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' ${D}/etc/modules.d/ppp
 	fi
 
 	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
diff --git a/net-dialup/ppp/ppp-2.4.3-r10.ebuild b/net-dialup/ppp/ppp-2.4.3-r10.ebuild
index 392d708ee809..cbba2dba9741 100644
--- a/net-dialup/ppp/ppp-2.4.3-r10.ebuild
+++ b/net-dialup/ppp/ppp-2.4.3-r10.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r10.ebuild,v 1.2 2005/12/25 15:08:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r10.ebuild,v 1.3 2006/01/24 18:09:32 mrness Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
 DESCRIPTION="Point-to-Point Protocol (PPP)"
 HOMEPAGE="http://www.samba.org/ppp"
 SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20051105.tar.gz
+	mirror://gentoo/${P}-patches-20060123.tar.gz
 	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
 
 LICENSE="BSD GPL-2"
@@ -25,10 +25,15 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 pkg_setup() {
-	if ! use radius; then
+	if use mppe-mppc; then
 		echo
-		ewarn "RADIUS plugins installation is now controled by radius useflag!"
-		ewarn "If you need them, hit Ctrl-C now!"
+		ewarn "The mppe-mppc flag overwrites the pppd native MPPE support with MPPE-MPPC"
+		ewarn "patch developed by Jan Dubiec."
+		ewarn "The resulted pppd will work only with patched kernels with version <= 2.6.14."
+		einfo "You could obtain the kernel patch from MPPE-MPPC homepage:"
+		einfo "   http://mppe-mppc.alphacron.de/"
+		ewarn "CAUTION: MPPC is a U.S. patented algorithm!"
+		ewarn "Ask yourself if you really need it and, if you do, consult your lawyer first."
 		ebeep
 	fi
 
@@ -89,12 +94,13 @@ src_unpack() {
 		# see http://eaptls.spe.net/index.html for more info
 		einfo "Enabling EAP-TLS support"
 		epatch ${WORKDIR}/patch/eaptls-0.7-gentoo.patch
+		use mppe-mppc || epatch ${WORKDIR}/patch/eaptls-mppe-0.7.patch
 	}
 
 	use mppe-mppc && {
 		einfo "Enabling MPPE-MPPC support"
 		epatch ${WORKDIR}/patch/mppe-mppc-1.1.patch
-		use eap-tls && epatch ${WORKDIR}/patch/eaptls-mppe-0.7-gentoo.patch
+		use eap-tls && epatch ${WORKDIR}/patch/eaptls-mppe-0.7-with-mppc.patch
 	}
 
 	use atm && {
@@ -235,7 +241,7 @@ src_install() {
 	insopts -m0644
 	newins ${FILESDIR}/modules.ppp ppp
 	if use mppe-mppc; then
-		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
+		sed -i -e 's/ppp_mppe/ppp_mppe_mppc/' ${D}/etc/modules.d/ppp
 	fi
 
 	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
diff --git a/net-dialup/ppp/ppp-2.4.3-r9.ebuild b/net-dialup/ppp/ppp-2.4.3-r9.ebuild
deleted file mode 100644
index 6b56e67b7f70..000000000000
--- a/net-dialup/ppp/ppp-2.4.3-r9.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r9.ebuild,v 1.1 2005/11/05 12:09:22 mrness Exp $
-
-inherit eutils flag-o-matic toolchain-funcs linux-info
-
-DESCRIPTION="Point-to-Point Protocol (PPP)"
-HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	mirror://gentoo/${P}-patches-20051105.tar.gz
-	dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
-
-RDEPEND="virtual/libc
-	activefilter? ( >=virtual/libpcap-0.9.3 )
-	atm? ( net-dialup/linux-atm )
-	pam? ( sys-libs/pam )
-	gtk? ( =x11-libs/gtk+-1* )
-	eap-tls? ( net-misc/curl >=dev-libs/openssl-0.9.7 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-pkg_setup() {
-	if ! use radius; then
-		echo
-		ewarn "RADIUS plugins installation is now controled by radius useflag!"
-		ewarn "If you need them, hit Ctrl-C now!"
-		ebeep
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${WORKDIR}/patch/ppp_flags.patch
-	epatch ${WORKDIR}/patch/mpls.patch
-	epatch ${WORKDIR}/patch/killaddr-smarter.patch
-	epatch ${WORKDIR}/patch/upstream-fixes.patch
-	epatch ${WORKDIR}/patch/rp-pppoe-any-interface.patch
-
-	use eap-tls && {
-		# see http://eaptls.spe.net/index.html for more info
-		einfo "Enabling EAP-TLS support"
-		epatch ${WORKDIR}/patch/eaptls-0.7-gentoo.patch
-	}
-
-	use mppe-mppc && {
-		einfo "Enabling MPPE-MPPC support"
-		epatch ${WORKDIR}/patch/mppe-mppc-1.1.patch
-		use eap-tls && epatch ${WORKDIR}/patch/eaptls-mppe-0.7-gentoo.patch
-	}
-
-	use atm && {
-		einfo "Enabling PPPoATM support"
-		sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" ${S}/pppd/plugins/pppoatm/Makefile.linux
-	}
-
-	use activefilter || {
-		einfo "Disabling active filter"
-		sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux
-	}
-
-	use pam && {
-		einfo "Enabling PAM"
-		sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
-	}
-
-	use ipv6 && {
-		einfo "Enabling IPv6"
-		sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
-	}
-
-	einfo "Enabling CBCP"
-	sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux
-
-	use dhcp && {
-		# copy the ppp-dhcp plugin files
-		einfo "Copying ppp-dhcp plugin files..."
-		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
-		sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux
-		sed -i -e "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux
-		epatch ${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch
-	}
-
-	# Set correct libdir
-	sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \
-		${S}/pppd/{pathnames.h,pppd.8} || die
-
-	find ${S} -type f -name Makefile.linux \
-		-exec sed -i -e '/^CC[[:space:]]*=/d' {} \;
-
-	use radius && {
-		#set the right paths in radiusclient.conf
-		sed -i -e "s:/usr/local/etc:/etc:" \
-			-e "s:/usr/local/sbin:/usr/sbin:" ${S}/pppd/plugins/radius/etc/radiusclient.conf
-		#set config dir to /etc/ppp/radius
-		sed -i -e "s:/etc/radiusclient:/etc/ppp/radius:g" \
-			${S}/pppd/plugins/radius/{*.8,*.c,*.h} \
-			${S}/pppd/plugins/radius/etc/*
-	}
-}
-
-src_compile() {
-	export CC="$(tc-getCC)"
-	export AR="$(tc-getAR)"
-	append-ldflags -Wl,-z,now
-	econf || die "configuration failed"
-	emake COPTS="${CFLAGS}" || die "compile failed"
-
-	#build pppgetpass
-	cd contrib/pppgetpass
-	if use gtk; then
-		emake -f Makefile.linux || die "failed to build pppgetpass"
-	else
-		emake pppgetpass.vt || die "failed to build pppgetpass"
-	fi
-}
-
-pkg_preinst() {
-	if use radius && [ -d ${ROOT}/etc/radiusclient ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
-		ebegin "Copy /etc/radiusclient to /etc/ppp/radius"
-		cp -pPR ${ROOT}/etc/radiusclient ${ROOT}/etc/ppp/radius
-		eend $?
-	fi
-}
-
-src_install() {
-	local y
-	for y in chat pppd pppdump pppstats
-	do
-		doman ${y}/${y}.8
-		dosbin ${y}/${y}
-	done
-	chmod u+s-w ${D}/usr/sbin/pppd
-
-	dosbin pppd/plugins/rp-pppoe/pppoe-discovery
-
-	dodir /etc/ppp/peers
-	insinto /etc/ppp
-	insopts -m0600
-	newins etc.ppp/pap-secrets pap-secrets.example
-	newins etc.ppp/chap-secrets chap-secrets.example
-
-	insopts -m0644
-	doins etc.ppp/options
-	doins ${FILESDIR}/options-pptp
-	doins ${FILESDIR}/options-pppoe
-	doins ${FILESDIR}/chat-default
-
-	insopts -m0755
-	doins ${FILESDIR}/ip-up
-	doins ${FILESDIR}/ip-down
-
-	exeinto /etc/init.d/
-	doexe ${FILESDIR}/net.ppp0
-
-	if use pam; then
-		insinto /etc/pam.d
-		insopts -m0644
-		newins pppd/ppp.pam ppp || die "not found ppp.pam"
-	fi
-
-	insinto /etc/conf.d
-	insopts -m0600
-	newins ${FILESDIR}/confd.ppp0 net.ppp0
-
-	local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
-	#closing " for syntax coloring
-	dodir ${PLUGINS_DIR}
-	insinto ${PLUGINS_DIR}
-	insopts -m0755
-	doins pppd/plugins/minconn.so || die "minconn.so not build"
-	doins pppd/plugins/passprompt.so || die "passprompt.so not build"
-	doins pppd/plugins/passwordfd.so || die "passwordfd.so not build"
-	doins pppd/plugins/winbind.so || die "winbind.so not build"
-	doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build"
-	if use atm; then
-		doins pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build"
-	fi
-	if use dhcp; then
-		doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build"
-	fi
-	if use radius; then
-		doins pppd/plugins/radius/radius.so || die "radius.so not build"
-		doins pppd/plugins/radius/radattr.so || die "radattr.so not build"
-		doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build"
-
-		#Copy radiusclient configuration files (#92878)
-		insinto /etc/ppp/radius
-		insopts -m0644
-		doins pppd/plugins/radius/etc/{dictionary*,issue,port-id-map,radiusclient.conf,realms,servers}
-
-		doman pppd/plugins/radius/pppd-radius.8
-		doman pppd/plugins/radius/pppd-radattr.8
-	fi
-
-	insinto /etc/modules.d
-	insopts -m0644
-	newins ${FILESDIR}/modules.ppp ppp
-	if use mppe-mppc; then
-		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
-	fi
-
-	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc ${FILESDIR}/README.mpls
-	dohtml ${FILESDIR}/pppoe.html
-
-	dosbin scripts/pon
-	dosbin scripts/poff
-	dosbin scripts/plog
-	doman scripts/pon.1
-
-	# Adding misc. specialized scripts to doc dir
-	dodir /usr/share/doc/${PF}/scripts/chatchat
-	insinto /usr/share/doc/${PF}/scripts/chatchat
-	doins scripts/chatchat/*
-	insinto /usr/share/doc/${PF}/scripts
-	doins scripts/*
-
-	if use gtk; then
-		dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk}
-		newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass
-	else
-		newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass
-	fi
-	doman contrib/pppgetpass/pppgetpass.8
-}
-
-pkg_postinst() {
-	if get_version ; then
-		echo
-		ewarn "If any of the following kernel configuration options is missing,"
-		ewarn "you should reconfigure and rebuild your kernel before running pppd."
-		CONFIG_CHECK="~PPP"
-		use activefilter && CONFIG_CHECK="${CONFIG_CHECK} ~PPP_FILTER"
-		CONFIG_CHECK="${CONFIG_CHECK} ~PPP_BSDCOMP ~PPP_DEFLATE"
-		check_extra_config
-		echo
-	fi
-
-	if [ ! -e ${ROOT}/dev/.devfsd ] && [ ! -e ${ROOT}/dev/.udev ] && [ ! -e ${ROOT}/dev/ppp ]; then
-		mknod ${ROOT}/dev/ppp c 108 0
-	fi
-	if [ "$ROOT" = "/" ]; then
-		/sbin/update-modules
-	fi
-
-	#create *-secrets files if not exists
-	[ -f "${ROOT}/etc/ppp/pap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/pap-secrets.example" "${ROOT}/etc/ppp/pap-secrets"
-	[ -f "${ROOT}/etc/ppp/chap-secrets" ] || \
-		cp -pP "${ROOT}/etc/ppp/chap-secrets.example" "${ROOT}/etc/ppp/chap-secrets"
-
-	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
-	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
-	ewarn "Pon, poff and plog scripts have been supplied for experienced users."
-	ewarn "New users or those requiring something more should have a look at"
-	ewarn "the /etc/init.d/net.ppp0 script."
-	ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
-	ewarn "/usr/share/doc/ppp*/scripts directory."
-
-	# lib name has changed
-	sed -i -e "s:^pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options
-
-	if use radius && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
-		echo
-		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
-		ewarn "   /etc/radiusclient to /etc/ppp/radius."
-		einfo "For your convenience, radiusclient directory was copied to the new location."
-	fi
-}