From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 9 09:50:11 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 69A4216A41F for ; Tue, 9 Aug 2005 09:50:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7E1143D46 for ; Tue, 9 Aug 2005 09:50:10 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j799oAJ5078570 for ; Tue, 9 Aug 2005 09:50:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j799oAbh078568; Tue, 9 Aug 2005 09:50:10 GMT (envelope-from gnats) Resent-Date: Tue, 9 Aug 2005 09:50:10 GMT Resent-Message-Id: <200508090950.j799oAbh078568@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrej Zverev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3553116A41F for ; Tue, 9 Aug 2005 09:40:21 +0000 (GMT) (envelope-from az@inec.ru) Received: from waterwall.inec.ru (waterwall.inec.ru [213.148.3.225]) by mx1.FreeBSD.org (Postfix) with ESMTP id 42DE943D45 for ; Tue, 9 Aug 2005 09:40:20 +0000 (GMT) (envelope-from az@inec.ru) Received: from waterwall.inec.ru (root@localhost) by waterwall.inec.ru (8.13.1/8.12.6) with SMTP id j799fiwo059712 for ; Tue, 9 Aug 2005 13:41:44 +0400 (MSD) Received: from az.inec.ru (msproxyoutif.intermediate.org [10.0.0.2]) by waterwall.inec.ru (8.13.1/8.12.6) with ESMTP id j799fhPe059705 for ; Tue, 9 Aug 2005 13:41:43 +0400 (MSD) Received: from az by az.inec.ru with local (Exim 4.51 (FreeBSD)) id 1E2Qay-0000Q6-ST for FreeBSD-gnats-submit@freebsd.org; Tue, 09 Aug 2005 13:40:28 +0400 Message-Id: Date: Tue, 09 Aug 2005 13:40:28 +0400 From: Andrej Zverev To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/84695: [unbreak] net/l2tpd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andrej Zverev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Aug 2005 09:50:11 -0000 >Number: 84695 >Category: ports >Synopsis: [unbreak] net/l2tpd >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Aug 09 09:50:09 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Andrej Zverev >Release: FreeBSD 5.4-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD az.inec.ru 5.4-RELEASE-p1 FreeBSD 5.4-RELEASE-p1 #2: Wed Jul 6 12:10:32 MSD 2005 root@az.inec.ru:/usr/obj/usr/src/sys/GENERIC i386 >Description: 1. Fix build on >= 5.x 2. Patch for http://www.FreeBSD.org/ports/portaudit/807b9ddd-dc11-11d8-9b0a-000347a4fa7d.html (from debian proj) 3. New MASTER_SITE >How-To-Repeat: >Fix: --- l2tpd.diff begins here --- diff -Nru l2tpd.orig/Makefile l2tpd/Makefile --- l2tpd.orig/Makefile Sat Sep 18 22:38:34 2004 +++ l2tpd/Makefile Tue Aug 9 13:21:50 2005 @@ -7,9 +7,10 @@ PORTNAME= l2tpd PORTVERSION= 0.69 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net -MASTER_SITES= http://www.l2tpd.org/downloads/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sobomax@FreeBSD.org COMMENT= An implementation of the layer two tunneling protocol @@ -21,10 +22,6 @@ .include -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif - do-configure: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/l2tpd.8 \ ${WRKSRC}/doc/l2tpd.conf.sample ${WRKSRC}/doc/l2tp-secrets.5 \ @@ -32,8 +29,10 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${PREFIX}/bin +.if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} +.endif ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${PREFIX}/man/man8 ${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${PREFIX}/man/man5 diff -Nru l2tpd.orig/files/patch-avp.c l2tpd/files/patch-avp.c --- l2tpd.orig/files/patch-avp.c Wed Oct 23 17:21:53 2002 +++ l2tpd/files/patch-avp.c Tue Aug 9 12:29:44 2005 @@ -1,9 +1,6 @@ - -$FreeBSD: ports/net/l2tpd/files/patch-avp.c,v 1.1 2002/10/23 13:21:53 sobomax Exp $ - ---- avp.c 2002/10/22 09:41:27 1.1 -+++ avp.c 2002/10/22 09:43:02 -@@ -14,7 +14,6 @@ +--- avp.c.orig Mon Aug 19 19:39:27 2002 ++++ avp.c Tue Aug 9 12:29:34 2005 +@@ -15,7 +15,6 @@ #include #include #include @@ -11,3 +8,12 @@ #include "l2tp.h" #define AVP_MAX 39 +@@ -1608,7 +1607,7 @@ + if (AMBIT (avp->length)) + { + log (LOG_WARN, +- "%s: dont know how to handle mandatory attribute %d. Closing %s.\n" ++ "%s: dont know how to handle mandatory attribute %d. Closing %s.\n", + __FUNCTION__, avp->attr, + (c != t->self) ? "call" : "tunnel"); + set_error (c, VENDOR_ERROR, diff -Nru l2tpd.orig/files/patch-control.c l2tpd/files/patch-control.c --- l2tpd.orig/files/patch-control.c Wed Oct 23 17:21:53 2002 +++ l2tpd/files/patch-control.c Tue Aug 9 13:20:10 2005 @@ -1,9 +1,6 @@ - -$FreeBSD: ports/net/l2tpd/files/patch-control.c,v 1.1 2002/10/23 13:21:53 sobomax Exp $ - ---- control.c 2002/10/22 09:41:27 1.1 -+++ control.c 2002/10/22 09:43:24 -@@ -15,8 +15,6 @@ +--- control.c.orig.o Thu Apr 11 00:09:33 2002 ++++ control.c Tue Aug 9 13:20:07 2005 +@@ -16,8 +16,6 @@ #include #include #include @@ -12,3 +9,16 @@ #include #include #include "l2tp.h" +@@ -1582,6 +1580,12 @@ + 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)) { ++ return -EINVAL; ++ } ++ + e = *((char *) buf->start + x); + if ((e < 0x20) || (e == PPP_ESCAPE) || (e == PPP_FLAG)) + { diff -Nru l2tpd.orig/pkg-plist l2tpd/pkg-plist --- l2tpd.orig/pkg-plist Sat Nov 23 03:40:50 2002 +++ l2tpd/pkg-plist Tue Aug 9 12:36:45 2005 @@ -1,6 +1,6 @@ bin/l2tpd etc/l2tp/l2tp-secrets.sample etc/l2tp/l2tpd.conf.sample -share/doc/l2tpd/README -@dirrm share/doc/l2tpd +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm etc/l2tp --- l2tpd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: