changed MPPE options

5 files changed, 92 insertions, 9 deletions

diff --git a/net-dialup/pptpclient/ChangeLog b/net-dialup/pptpclient/ChangeLog
index 9a9a2d1667c9..cf3e4e4a5670 100644
--- a/net-dialup/pptpclient/ChangeLog
+++ b/net-dialup/pptpclient/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-dialup/pptpclient
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.17 2004/10/06 07:27:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/ChangeLog,v 1.18 2004/11/08 06:41:50 mrness Exp $
 
+*pptpclient-1.5.0-r1 (08 Nov 2004)
+
+  08 Nov 2004; Alin Nastac <mrness@gentoo.org>
+  +pptpclient-1.5.0-r1.ebuild, +files/new-mppe/options.pptp:
+  Changed MPPE options, which have different names for ppp-2.4.2. Closes bug #65568.
+  
   06 Oct 2004; Daniel Black <dragonheart@gentoo.org>
   -pptpclient-1.1.0-r1.ebuild, -pptpclient-1.1.0.ebuild,
   -pptpclient-1.2.0.ebuild, pptpclient-1.3.1.ebuild, pptpclient-1.4.0.ebuild,
diff --git a/net-dialup/pptpclient/Manifest b/net-dialup/pptpclient/Manifest
index b42dd8e11e6a..2b164333a302 100644
--- a/net-dialup/pptpclient/Manifest
+++ b/net-dialup/pptpclient/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 93c7f2306a6383caa5b1b012235f8b37 ChangeLog 3139
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 b1310133090c4b4cd93c3726ca9c04e3 ChangeLog 2912
 MD5 6060ba5b45d3238976e4695a033c492c pptpclient-1.3.1.ebuild 1052
 MD5 d8af40118ab86214c232a62ea683796e pptpclient-1.4.0.ebuild 1054
 MD5 75bdf2eefabec058ae05b8115ea7175d pptpclient-1.5.0.ebuild 1091
+MD5 bcaa522a4843f65e919c3bd7983c058f pptpclient-1.5.0-r1.ebuild 1106
 MD5 5e3ae8ec4aa13dfc12f71d856a170c99 files/digest-pptpclient-1.3.1 124
-MD5 dad6352a156cbe6ce71b057f50af2eec files/options.pptp 359
-MD5 34862b5af00d851d068eb3e384093c3b files/pptp_fe.pl 8100
-MD5 bd60480b6ba90362342540fb9cbe7ebe files/xpptp_fe.pl 5620
 MD5 017b89e37327254726e469d4346b61f5 files/digest-pptpclient-1.4.0 124
 MD5 2ae5d625d43dc891c4e445b5049bb947 files/digest-pptpclient-1.5.0 124
+MD5 34862b5af00d851d068eb3e384093c3b files/pptp_fe.pl 8100
+MD5 bd60480b6ba90362342540fb9cbe7ebe files/xpptp_fe.pl 5620
+MD5 dad6352a156cbe6ce71b057f50af2eec files/options.pptp 359
+MD5 2ae5d625d43dc891c4e445b5049bb947 files/digest-pptpclient-1.5.0-r1 124
+MD5 eeee374ec64214d7f9c26a21ce8f4a36 files/new-mppe/options.pptp 340
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBY56GmdTrptrqvGERAsIXAKCGYjsJDMWQO63JFKTZYEFqEJiHzQCfV9UR
-BktbQ95aKOdCfDzyKx+uCo8=
-=Ufy2
+iD8DBQFBjxU5jtv59x0+BrURAkTBAJ451wv24rxBqzuy9b7qmlFtiYNB0gCfdEjx
+timL3vvbk2ge5J+bMRAkY8g=
+=mAbo
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r1 b/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r1
new file mode 100644
index 000000000000..3880e63665bb
--- /dev/null
+++ b/net-dialup/pptpclient/files/digest-pptpclient-1.5.0-r1
@@ -0,0 +1,2 @@
+MD5 4c90a2d879d5fca198c93931003f7d77 pptp-command 23014
+MD5 281ee37788bdf3260426eca56a9af858 pptp-linux-1.5.0.tar.gz 223317
diff --git a/net-dialup/pptpclient/files/new-mppe/options.pptp b/net-dialup/pptpclient/files/new-mppe/options.pptp
new file mode 100644
index 000000000000..24119ad5da61
--- /dev/null
+++ b/net-dialup/pptpclient/files/new-mppe/options.pptp
@@ -0,0 +1,32 @@
+#
+# Lock the port
+#
+lock
+
+#
+# We don't need the tunnel server to authenticate itself
+#
+noauth
+
+#
+# Turn off transmission protocols we know won't be used
+#
+nobsdcomp
+nodeflate
+
+#
+# We want MPPE
+#
+require-mppe
+
+#
+# We want a sane mtu/mru
+#
+mtu 1000
+mru 1000
+
+#
+# Time this thing out of it goes poof
+#
+lcp-echo-failure 10
+lcp-echo-interval 10
diff --git a/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild b/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..5eac38fa1b0d
--- /dev/null
+++ b/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/pptpclient/pptpclient-1.5.0-r1.ebuild,v 1.1 2004/11/08 06:41:50 mrness Exp $
+
+MY_P=pptp-linux-${PV}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Linux client for PPTP"
+HOMEPAGE="http://pptpclient.sourceforge.net/"
+SRC_URI="mirror://gentoo/pptp-command
+	mirror://sourceforge/pptpclient/${MY_P}.tar.gz"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha"
+IUSE="tcltk"
+
+DEPEND=">=net-dialup/ppp-2.4.2
+	dev-lang/perl
+	tcltk? ( dev-perl/perl-tk )"
+
+src_compile() {
+	emake OPTIMISE= DEBUG= CFLAGS="${CFLAGS}" || die "make failed"
+}
+
+src_install() {
+	dosbin pptp
+	dodoc AUTHORS COPYING ChangeLog DEVELOPERS NEWS README TODO USING
+	dodoc Documentation/*
+	dodoc Reference/*
+	dodir /etc/pptp.d
+
+	# The current version of pptp-linux doesn't include the
+	# RH-specific portions, so include them ourselves.
+	cd ${FILESDIR}
+	insinto /etc/ppp
+	doins new-mppe/options.pptp
+	dosbin ${DISTDIR}/pptp-command pptp_fe.pl
+	use tcltk && dosbin xpptp_fe.pl
+}