update pppoatm patch, bug #47574

7 files changed, 96 insertions, 81 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index cb473cc28841..63d9472d49b2 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.54 2004/03/08 19:22:17 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.55 2004/04/26 10:49:09 lanius Exp $
+
+  26 Apr 2004; Heinrich Wendel <lanius@gentoo.org> files/2.4.2/modules.ppp:
+  update pppoatm patch, bug #47574
+  add mppe alias, bug #47091
 
   08 Mar 2004; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2-r1.ebuild:
   install pppoatm.so, not only build it
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index c04faa51b643..8aeba9cdc871 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,56 +1,57 @@
+MD5 7226a185b85b8dd36ce1eefb89ec2505 ppp-2.4.1-r14.ebuild 4617
+MD5 0d9fb833e610743144bd048027130f2d ppp-2.4.2-r2.ebuild 4233
+MD5 95d3256716602c7b97dfaad35c67f78b ppp-2.4.2.ebuild 3892
+MD5 13ce70cb136faad07fee54ae82a5f812 ppp-2.4.2-r1.ebuild 4232
+MD5 59461b2869d493cac1b4cd98b57aaa45 ChangeLog 9380
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
+MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
+MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
 MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344
+MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
+MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
+MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
+MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
+MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
 MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309
-MD5 6f7e70fee6e827ad992da785cba032c6 files/digest-ppp-2.4.2_beta3-r1 63
-MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2b3/README.mpls 530
-MD5 0e16e7bb8ae71505e719fe5471bd2097 files/2.4.2b3/cflags.patch 3403
+MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
+MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
+MD5 b783e9bd9ac5956c582499f0623195fe files/net.ppp0 4705
+MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
+MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2 61
+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 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
+MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
+MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
+MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
+MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2/options-pptp 238
+MD5 3f9363730082b77d6d2cddf4ba2fb188 files/2.4.2/chat-default 349
+MD5 aade0f158628e38b74a080bd40222bc3 files/2.4.2/ip-up 1055
+MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
+MD5 ed4ee5550e1016ff405d410f8e37cdfe files/2.4.2/confd.ppp0 2782
+MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53
+MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108
+MD5 eae3621e2f615e9614b392d6d0f3ef81 files/2.4.2/net.ppp0 4341
+MD5 971013ca1ccc5a25acffdb3ff9edff4e files/2.4.2/pppoatm.diff.gz 3567
+MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
+MD5 b67931e2cb7c2b250e181bc5b25c4ac5 files/2.4.2/modules.ppp 304
+MD5 99aa8428a441ff748dc88892a8e98266 files/2.4.2/pcap.patch 728
+MD5 09fcad33830cb2af02446902cf6883c6 files/2.4.2/ip-down 801
+MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2/pppoe.html 7605
+MD5 bc88eaf56862e5ebf8f45ec5ada4bb90 files/2.4.2/cflags.patch 1857
+MD5 bd6bee3df13537a8550d2f39131eab0d files/2.4.2/pppoatm-2.diff.gz 3489
+MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2b3/options-pptp 238
 MD5 7004513b8b14aad3e2f598535e672af4 files/2.4.2b3/chat-default 351
-MD5 12500a756925e9d8f4b2b655e95a2541 files/2.4.2b3/confd.ppp0 2784
-MD5 cb8bde7fab636f046c94e7aa52234ef2 files/2.4.2b3/ip-down 914
 MD5 7fd76d97cb9a07a6b23b3ab7a0c5cc2c files/2.4.2b3/ip-up 1168
 MD5 1c6a75aa9390438f483e2885ea40ca72 files/2.4.2b3/killaddr-smarter.patch 6225
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2b3/modules.ppp 268
+MD5 12500a756925e9d8f4b2b655e95a2541 files/2.4.2b3/confd.ppp0 2784
+MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2b3/options-pppoe 53
 MD5 bf0ee7e6765e3b18dbe3964be6cd4500 files/2.4.2b3/mpls.patch 10506
 MD5 acb0f867e42e9a380eaf8e1c312ad63b files/2.4.2b3/net.ppp0 4343
-MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2b3/options-pppoe 53
-MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2b3/options-pptp 238
+MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2b3/README.mpls 530
+MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2b3/modules.ppp 268
+MD5 cb8bde7fab636f046c94e7aa52234ef2 files/2.4.2b3/ip-down 914
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2b3/pppoe.html 7605
-MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2 61
-MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
-MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
-MD5 bc88eaf56862e5ebf8f45ec5ada4bb90 files/2.4.2/cflags.patch 1857
-MD5 3f9363730082b77d6d2cddf4ba2fb188 files/2.4.2/chat-default 349
-MD5 ed4ee5550e1016ff405d410f8e37cdfe files/2.4.2/confd.ppp0 2782
-MD5 09fcad33830cb2af02446902cf6883c6 files/2.4.2/ip-down 801
-MD5 aade0f158628e38b74a080bd40222bc3 files/2.4.2/ip-up 1055
-MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2/modules.ppp 268
-MD5 eae3621e2f615e9614b392d6d0f3ef81 files/2.4.2/net.ppp0 4341
-MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53
-MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2/options-pptp 238
-MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2/pppoe.html 7605
-MD5 99aa8428a441ff748dc88892a8e98266 files/2.4.2/pcap.patch 728
-MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
-MD5 971013ca1ccc5a25acffdb3ff9edff4e files/2.4.2/pppoatm.diff.gz 3567
-MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108
-MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
-MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
-MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
-MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
-MD5 b783e9bd9ac5956c582499f0623195fe files/net.ppp0 4705
-MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
-MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
-MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
-MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
-MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
-MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
-MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
-MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
-MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r1 61
-MD5 199c0eb709f3f30a785741f6a8c78935 ChangeLog 9239
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 dec80c09b1889b1f20190545772492b5 ppp-2.4.2_beta3-r1.ebuild 3877
-MD5 95d3256716602c7b97dfaad35c67f78b ppp-2.4.2.ebuild 3892
-MD5 7226a185b85b8dd36ce1eefb89ec2505 ppp-2.4.1-r14.ebuild 4617
-MD5 13ce70cb136faad07fee54ae82a5f812 ppp-2.4.2-r1.ebuild 4232
+MD5 0e16e7bb8ae71505e719fe5471bd2097 files/2.4.2b3/cflags.patch 3403
diff --git a/net-dialup/ppp/files/2.4.2/modules.ppp b/net-dialup/ppp/files/2.4.2/modules.ppp
index 1f5ad7f9938d..8aba8199ab83 100644
--- a/net-dialup/ppp/files/2.4.2/modules.ppp
+++ b/net-dialup/ppp/files/2.4.2/modules.ppp
@@ -7,3 +7,4 @@ alias ppp-compress-21	bsd_comp
 alias ppp-compress-24	ppp_deflate
 alias ppp-compress-26	ppp_deflate
 alias net-pf-24		pppoe
+alias ppp-compress-18 ppp_mppe_mppc
diff --git a/net-dialup/ppp/files/2.4.2/pppoatm-2.diff.gz b/net-dialup/ppp/files/2.4.2/pppoatm-2.diff.gz
new file mode 100644
index 000000000000..98b851f3ed1b
--- /dev/null
+++ b/net-dialup/ppp/files/2.4.2/pppoatm-2.diff.gz
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r2 b/net-dialup/ppp/files/digest-ppp-2.4.2-r2
new file mode 100644
index 000000000000..105b43c0d08b
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r2
@@ -0,0 +1 @@
+MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2_beta3-r1 b/net-dialup/ppp/files/digest-ppp-2.4.2_beta3-r1
deleted file mode 100644
index cc38ea92d0de..000000000000
--- a/net-dialup/ppp/files/digest-ppp-2.4.2_beta3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c35c7ff5a1d80be5a2534cd9c7777b10 ppp-2.4.2b3.tar.gz 780590
diff --git a/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild b/net-dialup/ppp/ppp-2.4.2-r2.ebuild
index d1290d4a0d5f..cfb6d945f426 100644
--- a/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r2.ebuild
@@ -1,57 +1,63 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2_beta3-r1.ebuild,v 1.7 2004/03/08 19:22:17 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r2.ebuild,v 1.1 2004/04/26 10:49:09 lanius Exp $
 
-MY_PV=${PV/_beta/b}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Point-to-point protocol - patched for pppoe"
+DESCRIPTION="Point-to-point protocol - patched for PPPOE"
 HOMEPAGE="http://www.samba.org/ppp"
-SRC_URI="ftp://ftp.samba.org/pub/ppp/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~hppa -amd64 ~ia64"
-IUSE="ipv6 activefilter pam"
+IUSE="ipv6 activefilter pam atm"
 
-DEPEND="virtual/glibc
-	activefilter? ( net-libs/libpcap )"
+RDEPEND="virtual/glibc
+	>=net-libs/libpcap-0.8
+	atm? ( x86? ( net-dialup/linux-atm ) )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${MY_PV}/mpls.patch
-	epatch ${FILESDIR}/${MY_PV}/killaddr-smarter.patch
-	epatch ${FILESDIR}/${MY_PV}/cflags.patch
+	epatch ${FILESDIR}/${PV}/mpls.patch.gz
+	epatch ${FILESDIR}/${PV}/killaddr-smarter.patch.gz
+	epatch ${FILESDIR}/${PV}/cflags.patch
+	epatch ${FILESDIR}/${PV}/pcap.patch
+	epatch ${FILESDIR}/${PV}/stdopt-mppe-mppc-0.82.patch.gz
+
+	if [ "`use atm`" -a "`use x86`" ]; then
+		einfo "Enabling PPPoATM support"
+		epatch ${FILESDIR}/${PV}/pppoatm-2.diff.gz
+	fi
 
 	use activefilter && {
 		einfo "Enabling active-filter"
-		sed -i -e "s/^#FILTER=y/FILTER=y/" pppd/Makefile.linux
+		sed -i -e "s/^#FILTER=y/FILTER=y/" pppd/Makefile.linux || die
 	}
 
 	use pam && {
 		einfo "Enabling PAM"
-		sed -i -e "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux
+		sed -i -e "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux || die
 	}
 
 	use ipv6 && {
 		einfo "Enabling IPv6"
-		sed -i -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
+		sed -i -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux || die
 	}
 
 	einfo "Enabling CBCP"
-	sed -i 's/^#CBCP=y/CBCP=y/' pppd/Makefile.linux
+	sed -i 's/^#CBCP=y/CBCP=y/' pppd/Makefile.linux || die
 
 	einfo "Enabling radius"
-	sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe radius/' pppd/plugins/Makefile.linux
+	sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe radius/' pppd/plugins/Makefile.linux || die
 }
 
 src_compile() {
+	export WANT_AUTOCONF=2.1
 	# compile radius better than their makefile does
-	(cd pppd/plugins/radius/radiusclient; econf; emake) || die
-
+	(cd pppd/plugins/radius/radiusclient && econf && emake) || die
 	./configure --prefix=/usr || die
 	emake COPTS="${CFLAGS}" || die
 }
@@ -71,34 +77,37 @@ src_install() {
 
 	insopts -m0644
 	doins etc.ppp/options
-	doins ${FILESDIR}/${MY_PV}/options-pptp
-	doins ${FILESDIR}/${MY_PV}/options-pppoe
-	doins ${FILESDIR}/${MY_PV}/chat-default
+	doins ${FILESDIR}/${PV}/options-pptp
+	doins ${FILESDIR}/${PV}/options-pppoe
+	doins ${FILESDIR}/${PV}/chat-default
 
 	insopts -m0755
-	doins ${FILESDIR}/${MY_PV}/ip-up
-	doins ${FILESDIR}/${MY_PV}/ip-down
+	doins ${FILESDIR}/${PV}/ip-up
+	doins ${FILESDIR}/${PV}/ip-down
 
 	exeinto /etc/init.d/
-	doexe ${FILESDIR}/${MY_PV}/net.ppp0
+	doexe ${FILESDIR}/${PV}/net.ppp0
 
 	insinto /etc/conf.d
 	insopts -m0600
-	newins ${FILESDIR}/${MY_PV}/confd.ppp0 net.ppp0
+	newins ${FILESDIR}/${PV}/confd.ppp0 net.ppp0
 
 	dolib.so pppd/plugins/minconn.so
 	dolib.so pppd/plugins/passprompt.so
 	dolib.so pppd/plugins/rp-pppoe/rp-pppoe.so
+	if [ "`use atm`" -a "`use x86`" ]; then
+		dolib.so pppd/plugins/pppoatm.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)
 
 	insinto /etc/modules.d
 	insopts -m0644
-	newins ${FILESDIR}/${MY_PV}/modules.ppp ppp
+	newins ${FILESDIR}/${PV}/modules.ppp ppp
 
 	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
-	dodoc ${FILESDIR}/${MY_PV}/README.mpls
-	dohtml ${FILESDIR}/${MY_PV}/pppoe.html
+	dodoc ${FILESDIR}/${PV}/README.mpls
+	dohtml ${FILESDIR}/${PV}/pppoe.html
 
 	dosbin scripts/pon
 	dosbin scripts/poff
@@ -124,7 +133,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [ ! -e ${ROOT}dev/.devfsd ]
+	if [ ! -e ${ROOT}dev/.devfsd || ! -e ${ROOT}dev/.udev ]
 	then
 		if [ ! -e ${ROOT}dev/ppp ]; then
 			mknod ${ROOT}dev/ppp c 108 0