add dhcp plugin, bug #62969

4 files changed, 31 insertions, 8 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 5c326072743a..1f8278fa1282 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.77 2004/09/27 11:37:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.78 2004/09/27 11:49:22 lanius Exp $
+
+*ppp-2.4.2-r5 (27 Sep 2004)
+
+  27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> -ppp-2.4.2-r4.ebuild,
+  +ppp-2.4.2-r5.ebuild:
+  add dhcp plugin, bug #62969
 
   27 Sep 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2/net.ppp0:
   fix setup for two modems, bug #43923
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 5e6b238db44a..ec258d3a60ad 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,9 +1,11 @@
+MD5 ac2bd2fc620b90a65d8ae411d20c3ef9 ppp-2.4.2-r5.ebuild 5305
 MD5 3190fd8db6e5622f1106f3b332d068e5 ppp-2.4.1-r14.ebuild 4714
+MD5 1e7897f96b9d395edd55b5fdf44fc31a attachment.cgi?id=39025 5050
 MD5 210b3f9616a92005171f3f25c33c1638 ppp-2.4.2-r2.ebuild 4462
 MD5 24f264eef320520caee8597fb071405b ppp-2.4.2.ebuild 3957
-MD5 af9790a311f56d44ac2f1ec972b82f4c ppp-2.4.2-r4.ebuild 4857
+MD5 16a2aedb92697efcc398ddcf88126fc6 ppp-2.4.2-r4.ebuild 4882
 MD5 20502c85d128ae0dd4545dc3ae3eec6b ppp-2.4.2-r1.ebuild 4276
-MD5 67f506a532f6afe28bee2e3fe78a36ad ChangeLog 12794
+MD5 2a411223635fe3113539a8adae280667 ChangeLog 12907
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
 MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
@@ -22,6 +24,7 @@ MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
 MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r1 61
 MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r2 61
 MD5 16558d0a6962d75f859c53ae8dabe67b files/digest-ppp-2.4.2-r4 137
+MD5 c07c26f0d600a1fde9752fa06fc4b0c3 files/digest-ppp-2.4.2-r5 194
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
@@ -34,7 +37,7 @@ MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
 MD5 ef28c96687409a340c6cd66e21dc58db files/2.4.2/confd.ppp0 2786
 MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53
 MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108
-MD5 ada8101e1aa0e9ff0a9cd0fdeaf7e1d2 files/2.4.2/net.ppp0 4420
+MD5 ae851489b48d5c639c8c6da1fe02a5af files/2.4.2/net.ppp0 4414
 MD5 971013ca1ccc5a25acffdb3ff9edff4e files/2.4.2/pppoatm.diff.gz 3567
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2/modules.ppp 268
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r4 b/net-dialup/ppp/files/digest-ppp-2.4.2-r5
index bd02839b7aef..47080cb9dbd6 100644
--- a/net-dialup/ppp/files/digest-ppp-2.4.2-r4
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r5
@@ -1,2 +1,3 @@
 MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
 MD5 0d2679907627f68dd6a2c32d1c7dda90 ppp-2.4.2-mppe-mppc-1.1.patch.gz 12532
+MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/ppp-2.4.2-r4.ebuild b/net-dialup/ppp/ppp-2.4.2-r5.ebuild
index 97b2a6677f36..4bab57b08979 100644
--- a/net-dialup/ppp/ppp-2.4.2-r4.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r5.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2004 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-r4.ebuild,v 1.3 2004/09/27 11:33:52 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r5.ebuild,v 1.1 2004/09/27 11:49:22 lanius Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="Point-to-point protocol - patched for PPPOE"
 HOMEPAGE="http://www.samba.org/ppp"
 SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
-	http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.gz"
+	http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.gz
+	http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="ipv6 activefilter pam atm mppe-mppc"
+IUSE="ipv6 activefilter pam atm mppe-mppc dhcp"
 
 RDEPEND="virtual/libc
 	activefilter? ( <=net-libs/libpcap-0.7.2-r1 )
-	atm? ( x86? ( net-dialup/linux-atm ) )"
+	atm? ( net-dialup/linux-atm )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
@@ -62,6 +63,14 @@ src_unpack() {
 	einfo "Enabling radius"
 	sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe radius/' pppd/plugins/Makefile.linux || die
 	sed -i -e '/^CFLAGS/s:$: -fPIC:' pppd/plugins/radius/radiusclient/lib/Makefile.in || die
+
+	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/' pppd/plugins/Makefile.linux || die
+		sed -i -e "s/-O2/${CFLAGS}/" pppd/plugins/dhcp/Makefile.linux
+	}
 }
 
 src_compile() {
@@ -115,6 +124,10 @@ src_install() {
 	if use atm; then
 		dolib.so pppd/plugins/pppoatm.so
 	fi
+	if use dhcp; then
+		dolib.so pppd/plugins/dhcp/dhcpc.so
+	fi
+
 	dodir /usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
 	mv ${D}/usr/lib/*.so ${D}/usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)