added patches from Jacco de Leeuw, bug #35344

3 files changed, 78 insertions, 2 deletions

diff --git a/net-dialup/l2tpd/Manifest b/net-dialup/l2tpd/Manifest
index 9a7f47f38e75..b25da452914b 100644
--- a/net-dialup/l2tpd/Manifest
+++ b/net-dialup/l2tpd/Manifest
@@ -1,6 +1,6 @@
-MD5 bfd20e8052d1770d0060f77a87e34803 l2tpd-0.69-r1.ebuild 1803
+MD5 7cdd9a2c694870e6fd22a0730163d6ba l2tpd-0.69-r1.ebuild 1810
 MD5 042ed627bba801f51ef5ee905aa2131e l2tpd-0.69.ebuild 1563
-MD5 cdf7286d4655654083ab7bdda3eade9c ChangeLog 639
+MD5 7bd4ed19adca94aac505d08e67103216 ChangeLog 791
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 8fac6f64a3fa92ee4046a60f1c09dc66 files/digest-l2tpd-0.69-r1 67
 MD5 d6a701a4f443b06067841f3f72714b00 files/digest-l2tpd-0.69 131
diff --git a/net-dialup/l2tpd/files/digest-l2tpd-0.69-r1 b/net-dialup/l2tpd/files/digest-l2tpd-0.69-r1
new file mode 100644
index 000000000000..4060c95bf5dd
--- /dev/null
+++ b/net-dialup/l2tpd/files/digest-l2tpd-0.69-r1
@@ -0,0 +1 @@
+MD5 ea3689150ebbaf1266cbd73bd3115bfe freeswan-l2tp-8jdl.tgz 143569
diff --git a/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild b/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild
new file mode 100644
index 000000000000..5fc18ce0281f
--- /dev/null
+++ b/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.69-r1.ebuild,v 1.1 2003/12/09 14:53:20 lanius Exp $
+
+DESCRIPTION="Layer 2 Tunnelling Protocol Daemon"
+HOMEPAGE="http://www.l2tpd.org/"
+MY_P="freeswan-l2tp-8jdl"
+SRC_URI="http://www.jacco2.dds.nl/networking/tarballs/${MY_P}.tgz"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4"
+
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}/${P}"
+
+src_unpack() {
+	unpack ${MY_P}.tgz || die
+	cd ${MY_P} || die
+
+	tar xzf ${P}.tar.gz || die
+	cd ${S} || die
+
+	epatch ../${PN}-pty.patch2.bz2
+	epatch ../${PN}-pty-noecho.patch.bz2
+	epatch ../${PN}-close.patch.bz2
+	epatch ../${PN}-cfgpath.patch.bz2
+	epatch ../${PN}-warnings.patch.bz2
+	epatch ../${PN}-listenaddr.patch.bz2
+	epatch ../${PN}-MSL2TP-hostname.patch.bz2
+
+	sed -i.orig -e "s|-g -O2|${CFLAGS}|" Makefile
+		#-e "s|^#\(OSFLAGS+= -DUSE_KERNEL\)|\1|" \
+		#^wants an #include <linux/l2tp>
+
+	# gentoo file paths
+	sed -i.orig \
+		-e 's|\(#define DEFAULT_AUTH_FILE \).*|\1"/etc/l2tpd/l2tp-secrets"|' \
+		-e 's|\(#define DEFAULT_CONFIG_FILE \).*|\1"/etc/l2tpd/l2tpd.conf"|' \
+		-e 's|\(#define DEFAULT_PID_FILE \).*|\1"/var/run/l2tpd.pid"|' \
+		file.h
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dosbin l2tpd
+	doman doc/*.[85]
+
+	dodoc BUGS CHANGELOG LICENSE CREDITS README TODO \
+		doc/rfc2661.txt doc/*.sample
+
+	cd ..
+
+	insinto /etc/l2tpd
+	newins l2tpd-chapsecrets.sample l2tp-secrets
+	doins l2tpd.conf
+
+	insinto /etc/ppp
+	newins l2tpd-options.l2tpd options-l2tp
+
+	insinto /etc/ipsec
+	doins l2tpd-L2TP-CERT-orgWIN2KXP.conf
+	doins l2tpd-L2TP-CERT.conf
+	doins l2tpd-L2TP-PSK-orgWIN2KXP.conf
+	doins l2tpd-L2TP-PSK.conf
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/l2tpd-init l2tpd
+}