From cb109d4de776b5be6d8168fda3897992e8f9d489 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alin=20N=C4=83stac?= Date: Sun, 12 Mar 2006 16:07:36 +0000 Subject: [PATCH] Remove old version. Beutify the code of the remaining version. Package-Manager: portage-2.0.54 --- net-dialup/l2tpd/ChangeLog | 9 ++- net-dialup/l2tpd/Manifest | 19 ++--- net-dialup/l2tpd/files/digest-l2tpd-0.69-r2 | 1 - .../l2tpd/files/digest-l2tpd-0.70_pre20031121 | 2 +- .../files/l2tpd-0.69-can-2004-0649.patch | 18 ----- net-dialup/l2tpd/l2tpd-0.69-r2.ebuild | 79 ------------------- .../l2tpd/l2tpd-0.70_pre20031121.ebuild | 27 +++---- 7 files changed, 26 insertions(+), 129 deletions(-) delete mode 100644 net-dialup/l2tpd/files/digest-l2tpd-0.69-r2 delete mode 100644 net-dialup/l2tpd/files/l2tpd-0.69-can-2004-0649.patch delete mode 100644 net-dialup/l2tpd/l2tpd-0.69-r2.ebuild diff --git a/net-dialup/l2tpd/ChangeLog b/net-dialup/l2tpd/ChangeLog index dff28a98ce63..f711fac0cb73 100644 --- a/net-dialup/l2tpd/ChangeLog +++ b/net-dialup/l2tpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/l2tpd -# Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.14 2004/12/05 09:43:26 mrness Exp $ +# Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.15 2006/03/12 16:07:36 mrness Exp $ + + 12 Mar 2006; Alin Nastac + -files/l2tpd-0.69-can-2004-0649.patch, -l2tpd-0.69-r2.ebuild, + l2tpd-0.70_pre20031121.ebuild: + Remove old version. Beutify the code of the remaining version. 05 Dec 2004; Alin Nastac l2tpd-0.70_pre20031121.ebuild: Stable on x86. diff --git a/net-dialup/l2tpd/Manifest b/net-dialup/l2tpd/Manifest index f707dc50c366..5c6172edb2b1 100644 --- a/net-dialup/l2tpd/Manifest +++ b/net-dialup/l2tpd/Manifest @@ -1,18 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 2541121cba42bd4dcf36a6ebb443f61e l2tpd-0.70_pre20031121.ebuild 1211 -MD5 29dfcbb649bcd5c173d0a97130006a13 l2tpd-0.69-r2.ebuild 1871 -MD5 7b8f8d80ba1cb31a24a450e015cab848 ChangeLog 1858 -MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 -MD5 8fac6f64a3fa92ee4046a60f1c09dc66 files/digest-l2tpd-0.69-r2 67 -MD5 a89d2270d8abbae0aa7faf07488736f0 files/l2tpd-0.69-can-2004-0649.patch 700 +MD5 ec8b98d0c98fdd450246cf83fb5060d5 ChangeLog 2068 +MD5 032a62f61bd560e76f0130861b79be73 files/digest-l2tpd-0.70_pre20031121 155 MD5 acfec4f77489a740550c83d5d275477d files/l2tpd-init 473 -MD5 b77ebcaec769239a75f6715bac6d1bf3 files/digest-l2tpd-0.70_pre20031121 155 +MD5 52d5f05008e95db13eb5825c471451e8 l2tpd-0.70_pre20031121.ebuild 1110 +MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) +Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFDQs7zNSP4Vda7IdsRAlQQAJ40yz4kxPMq9Ds7+2fiNAj0UBwjhQCfULCB -0JwJPjPCiDh72x9SV3VDMuA= -=7lR6 +iD8DBQFEFEdZjG8pv1lIUX4RAugZAKCB2xfFx3J40AFRL/wHIYCivxwGOACgocXn +NVqA7+TP8Ee+mzyTGZscNng= +=uLQL -----END PGP SIGNATURE----- diff --git a/net-dialup/l2tpd/files/digest-l2tpd-0.69-r2 b/net-dialup/l2tpd/files/digest-l2tpd-0.69-r2 deleted file mode 100644 index 4060c95bf5dd..000000000000 --- a/net-dialup/l2tpd/files/digest-l2tpd-0.69-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 ea3689150ebbaf1266cbd73bd3115bfe freeswan-l2tp-8jdl.tgz 143569 diff --git a/net-dialup/l2tpd/files/digest-l2tpd-0.70_pre20031121 b/net-dialup/l2tpd/files/digest-l2tpd-0.70_pre20031121 index c1f062e65e90..c868b5c6aedd 100644 --- a/net-dialup/l2tpd/files/digest-l2tpd-0.70_pre20031121 +++ b/net-dialup/l2tpd/files/digest-l2tpd-0.70_pre20031121 @@ -1,2 +1,2 @@ -MD5 3f2707b6e16a8cb72e7bf64f574202fa l2tpd_0.70-pre20031121.orig.tar.gz 127250 MD5 e0a811d4d0dbe13166443df057e1929b l2tpd_0.70-pre20031121-2.diff.gz 22207 +MD5 3f2707b6e16a8cb72e7bf64f574202fa l2tpd_0.70-pre20031121.orig.tar.gz 127250 diff --git a/net-dialup/l2tpd/files/l2tpd-0.69-can-2004-0649.patch b/net-dialup/l2tpd/files/l2tpd-0.69-can-2004-0649.patch deleted file mode 100644 index 90d3150dc4f5..000000000000 --- a/net-dialup/l2tpd/files/l2tpd-0.69-can-2004-0649.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- l2tpd-0.69.orig/control.c -+++ l2tpd-0.69/control.c -@@ -1575,6 +1575,15 @@ - wbuf[pos++] = e; - for (x = 0; x < buf->len; x++) - { -+ // we must at least still have 3 bytes left in the worst case scenario: -+ // 1 for a possible escape, 1 for the value and 1 to end the PPP stream. -+ if(pos >= (sizeof(wbuf) - 4)) { -+ if(DEBUG) -+ log(LOG_CRIT, "%s: rx packet is too big after PPP encoding (size %u, max is %u)\n", -+ __FUNCTION__, buf->len, MAX_RECV_SIZE); -+ return -EINVAL; -+ } -+ - e = *((char *) buf->start + x); - if ((e < 0x20) || (e == PPP_ESCAPE) || (e == PPP_FLAG)) - { diff --git a/net-dialup/l2tpd/l2tpd-0.69-r2.ebuild b/net-dialup/l2tpd/l2tpd-0.69-r2.ebuild deleted file mode 100644 index c9c916d2491a..000000000000 --- a/net-dialup/l2tpd/l2tpd-0.69-r2.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.69-r2.ebuild,v 1.3 2005/05/13 04:25:09 mrness Exp $ - -inherit eutils - -DESCRIPTION="Layer 2 Tunnelling Protocol Daemon" -HOMEPAGE="http://l2tpd.snapgear.org/" -MY_P="freeswan-l2tp-8jdl" -SRC_URI="http://www.jacco2.dds.nl/networking/tarballs/${MY_P}.tgz" - -DEPEND="virtual/libc - >=sys-apps/sed-4" - -LICENSE="GPL-2" -KEYWORDS="x86 ~ppc" -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 - - epatch ${FILESDIR}/${P}-can-2004-0649.patch - - sed -i.orig -e "s|-g -O2|${CFLAGS}|" Makefile - #-e "s|^#\(OSFLAGS+= -DUSE_KERNEL\)|\1|" \ - #^wants an #include - - # 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 -} diff --git a/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild b/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild index 62bede22aeab..3a4172b515cd 100644 --- a/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild +++ b/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild @@ -1,36 +1,30 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild,v 1.4 2005/10/04 18:50:00 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild,v 1.5 2006/03/12 16:07:36 mrness Exp $ inherit eutils +MY_P="l2tpd_0.70-pre20031121" + DESCRIPTION="Layer 2 Tunnelling Protocol Daemon" HOMEPAGE="http://l2tpd.snapgear.org/" -MY_P="l2tpd_0.70-pre20031121" -S="${WORKDIR}/${P/_/-}.orig" SRC_URI="mirror://debian/pool/main/l/l2tpd/${MY_P}.orig.tar.gz mirror://debian/pool/main/l/l2tpd/${MY_P}-2.diff.gz" -DEPEND="virtual/libc - >=sys-apps/sed-4" - LICENSE="GPL-2" KEYWORDS="x86 ~ppc" SLOT="0" IUSE="" +S="${WORKDIR}/${P/_/-}.orig" + src_unpack() { - unpack ${MY_P}.orig.tar.gz || die - epatch ${DISTDIR}/${MY_P}-2.diff.gz || die + unpack ${A} - cd ${S} || die + epatch "${MY_P}-2.diff" #Put CFLAGS from make.conf and disable builtin definition of log function - sed -i.orig -e "s|-ggdb|${CFLAGS} -fno-builtin-log|" Makefile || die -} - -src_compile() { - emake || die + sed -i.orig -e "s|-ggdb|${CFLAGS} -fno-builtin-log|" "${S}/Makefile" || die "failed to change CFLAGS in Makefile" } src_install() { @@ -45,6 +39,5 @@ src_install() { newins doc/l2tp-secrets.sample l2tp-secrets newins doc/l2tpd.conf.sample l2tpd.conf - exeinto /etc/init.d - newexe ${FILESDIR}/l2tpd-init l2tpd + newinitd "${FILESDIR}/l2tpd-init" l2tpd } -- 2.26.2