Patch added to fix bug #57238 Removed unused patch files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz. Moved files/ppp-crypto-fix.patch.bz2 to mirrors.

8 files changed, 203 insertions, 16 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index c8262a7866a4..947171cc63ea 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,16 @@
 # 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.65 2004/07/01 22:09:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.66 2004/09/24 00:23:07 dragonheart Exp $
+
+*ppp-2.4.2-r3 (24 Sep 2004)
+
+  24 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz,
+  -files/ppp-crypto-fix.patch.bz2, +files/2.4.2/control_c.patch,
+  ppp-2.4.1-r14.ebuild, +ppp-2.4.2-r3.ebuild:
+  Patch added to fix bug #57238. Thank to Thomas G <ganto2@gmx.de> et al.
+  Removed unused patch files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz. Moved
+  files/ppp-crypto-fix.patch.bz2 to mirrors.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ppp-2.4.1-r14.ebuild,
   ppp-2.4.2-r1.ebuild, ppp-2.4.2-r2.ebuild, ppp-2.4.2.ebuild:
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index b8450725442a..b8094e4df727 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 40143eb6f693e0b5b79d762952da27b1 ChangeLog 10875
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 9a0e85dac54424069aa89dc058e7d06d ppp-2.4.2.ebuild 3902
-MD5 c34376edf994f56c6eecc243a36b24d1 ppp-2.4.1-r14.ebuild 4622
+MD5 ace98f79a0a8de27f24e060ac9911eed ppp-2.4.1-r14.ebuild 4622
+MD5 ad97f35e904013462fc1cd8786b6ab84 ppp-2.4.2-r3.ebuild 4492
+MD5 4dd73d480e16526a252336fbca21d952 ChangeLog 11311
 MD5 4c1b00dc50a972cc3b309cb3ed3f861e ppp-2.4.2-r1.ebuild 4220
+MD5 9a0e85dac54424069aa89dc058e7d06d ppp-2.4.2.ebuild 3902
 MD5 5a42c26147c27627ddb5b432ecaf38fa ppp-2.4.2-r2.ebuild 4403
 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
 MD5 1a60baf88a301c6eed8472a01b3691eb files/confd.ppp0 3312
-MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2 61
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
+MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r3 61
 MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
 MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
@@ -22,33 +23,33 @@ 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 61
 MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r1 61
 MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r2 61
+MD5 f7a8c95af55d9cca703c15cdf9386ad4 files/2.4.2/control_c.patch 402
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
 MD5 bc88eaf56862e5ebf8f45ec5ada4bb90 files/2.4.2/cflags.patch 1857
 MD5 a2eaeceee980ff6e183abfa370fc685c files/2.4.2/chat-default 353
 MD5 ef28c96687409a340c6cd66e21dc58db files/2.4.2/confd.ppp0 2786
 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 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
 MD5 b67931e2cb7c2b250e181bc5b25c4ac5 files/2.4.2/modules.ppp 304
+MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
 MD5 c439849808581196549ef0fb2bc6e289 files/2.4.2/net.ppp0 4334
 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 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2/pppoe.html 7605
 MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108
 MD5 bd6bee3df13537a8550d2f39131eab0d files/2.4.2/pppoatm-2.diff.gz 3489
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBMAK7HTu7gpaalycRAnZqAKCCkqW0p8nOFF4mh3smLGLt+f3iXgCfeW/D
-G0nsp3PY9ul88Dl5uFU2mHk=
-=vcJP
+iD8DBQFBU2lWmdTrptrqvGERAmtNAJ4rvObC2N4ISymwrY2ScOKJ7GATMQCeOtnT
+ayYTTCNIQ2VhfOSYdYKZ7xM=
+=cslT
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/files/2.4.2/control_c.patch b/net-dialup/ppp/files/2.4.2/control_c.patch
new file mode 100644
index 000000000000..bf01f9e6b148
--- /dev/null
+++ b/net-dialup/ppp/files/2.4.2/control_c.patch
@@ -0,0 +1,12 @@
+diff -Nrau ppp-2.4.2.orig/pppd/main.c ppp-2.4.2/pppd/main.c
+--- ppp-2.4.2.orig/pppd/main.c  2004-07-16 00:21:19.000000000 +0200
++++ ppp-2.4.2/pppd/main.c       2004-07-16 00:16:36.000000000 +0200
+@@ -1338,8 +1338,8 @@
+
+     act.sa_handler = SIG_IGN;
+     act.sa_flags = 0;
+-    sigaction(sig, &act, &oldact);
+     kill(0, sig);
++    sigaction(sig, &act, &oldact);
+     sigaction(sig, &oldact, NULL);
+ }
\ No newline at end of file
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r3 b/net-dialup/ppp/files/digest-ppp-2.4.2-r3
new file mode 100644
index 000000000000..105b43c0d08b
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r3
@@ -0,0 +1 @@
+MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
diff --git a/net-dialup/ppp/files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz b/net-dialup/ppp/files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz
deleted file mode 100644
index 15e46bf31f88..000000000000
--- a/net-dialup/ppp/files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz
+++ /dev/null
diff --git a/net-dialup/ppp/files/ppp-crypto-fix.patch.bz2 b/net-dialup/ppp/files/ppp-crypto-fix.patch.bz2
deleted file mode 100644
index 34916e0dbd74..000000000000
--- a/net-dialup/ppp/files/ppp-crypto-fix.patch.bz2
+++ /dev/null
diff --git a/net-dialup/ppp/ppp-2.4.1-r14.ebuild b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
index ff5db0ad7a86..31b1a3c1ad8f 100644
--- a/net-dialup/ppp/ppp-2.4.1-r14.ebuild
+++ b/net-dialup/ppp/ppp-2.4.1-r14.ebuild
@@ -1,6 +1,6 @@
 # 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.1-r14.ebuild,v 1.20 2004/07/01 22:09:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.21 2004/09/24 00:23:07 dragonheart Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ src_unpack() {
 	use crypt && {
 		#I took the liberty of combining the two crypto patches
 		einfo "Applying ppp-crypto-fix.patch..."
-		bzcat ${FILESDIR}/ppp-crypto-fix.patch.bz2 | patch -p1
+		bzcat ${DISTDIR}/ppp-crypto-fix.patch.bz2 | patch -p1
 
 	}
 
diff --git a/net-dialup/ppp/ppp-2.4.2-r3.ebuild b/net-dialup/ppp/ppp-2.4.2-r3.ebuild
new file mode 100644
index 000000000000..7e328867f79d
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.2-r3.ebuild
@@ -0,0 +1,163 @@
+# 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-r3.ebuild,v 1.1 2004/09/24 00:23:07 dragonheart 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"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~arm ~hppa ~amd64 ~ia64"
+IUSE="ipv6 activefilter pam atm"
+
+RDEPEND="virtual/libc
+	>=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}/${PV}/mpls.patch.gz
+	epatch ${FILESDIR}/${PV}/killaddr-smarter.patch.gz
+	epatch ${FILESDIR}/${PV}/cflags.patch
+	epatch ${FILESDIR}/${PV}/pcap.patch
+	epatch ${FILESDIR}/${PV}/control_c.patch
+	epatch ${FILESDIR}/${PV}/stdopt-mppe-mppc-0.82.patch.gz
+
+	if use atm && use x86; then
+		einfo "Enabling PPPoATM support"
+		epatch ${FILESDIR}/${PV}/pppoatm-2.diff.gz
+		sed -i -e "s/^LIBS =/LIBS = -latm/" pppd/Makefile.linux || die
+	fi
+
+	use activefilter && {
+		einfo "Enabling active-filter"
+		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 || die
+	}
+
+	use ipv6 && {
+		einfo "Enabling IPv6"
+		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 || die
+
+	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
+}
+
+src_compile() {
+	export WANT_AUTOCONF=2.1
+	gnuconfig_update
+	# compile radius better than their makefile does
+	append-ldflags -Wl,-z,now
+	(cd pppd/plugins/radius/radiusclient && econf && emake) || die
+	./configure --prefix=/usr || die
+	emake COPTS="${CFLAGS}" || die
+}
+
+src_install() {
+	for y in chat pppd pppdump pppstats
+	do
+		doman ${y}/${y}.8
+		dosbin ${y}/${y}
+	done
+	chmod u+s-w ${D}/usr/sbin/pppd
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+
+	insopts -m0644
+	doins etc.ppp/options
+	doins ${FILESDIR}/${PV}/options-pptp
+	doins ${FILESDIR}/${PV}/options-pppoe
+	doins ${FILESDIR}/${PV}/chat-default
+
+	insopts -m0755
+	doins ${FILESDIR}/${PV}/ip-up
+	doins ${FILESDIR}/${PV}/ip-down
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/${PV}/net.ppp0
+
+	insinto /etc/conf.d
+	insopts -m0600
+	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 && 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}/${PV}/modules.ppp ppp
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc ${FILESDIR}/${PV}/README.mpls
+	dohtml ${FILESDIR}/${PV}/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/*
+
+	# install radius
+	cd pppd/plugins/radius
+	dolib.so radius.so
+	dolib.so radattr.so
+	dolib.so radrealms.so
+	doman pppd-radius.8
+	doman pppd-radattr.8
+	cd radiusclient
+	make DESTDIR=${D} install || die
+}
+
+pkg_postinst() {
+	if ! [ -e ${ROOT}dev/.devfsd ] || [ -e ${ROOT}dev/.udev ]
+	then
+		if [ ! -e ${ROOT}dev/ppp ]; then
+			mknod ${ROOT}dev/ppp c 108 0
+		fi
+	fi
+	if [ "$ROOT" = "/" ]
+	then
+		/sbin/update-modules
+	fi
+	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
+}