From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 3 16:20:13 2003 Return-Path: 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 1DC9D37B401 for ; Sat, 3 May 2003 16:20:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB3C843FB1 for ; Sat, 3 May 2003 16:20:11 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h43NKBUp031552 for ; Sat, 3 May 2003 16:20:11 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h43NKBCi031551; Sat, 3 May 2003 16:20:11 -0700 (PDT) Resent-Date: Sat, 3 May 2003 16:20:11 -0700 (PDT) Resent-Message-Id: <200305032320.h43NKBCi031551@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, "Matthew D.Fuller" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3E9037B405 for ; Sat, 3 May 2003 16:15:49 -0700 (PDT) Received: from praetor.linc-it.com (hardtime.linuxman.net [66.147.26.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41CF543FA3 for ; Sat, 3 May 2003 16:15:48 -0700 (PDT) (envelope-from fullermd@over-yonder.net) Received: from mortis.over-yonder.net (adsl-32-251-198.jan.bellsouth.net [67.32.251.198]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by praetor.linc-it.com (Postfix) with ESMTP id 6C4951543B for ; Sat, 3 May 2003 18:15:46 -0500 (CDT) Received: by mortis.over-yonder.net (Postfix, from userid 100) id 2790920F21; Sat, 3 May 2003 18:15:44 -0500 (CDT) Message-Id: <20030503231544.2790920F21@mortis.over-yonder.net> Date: Sat, 3 May 2003 18:15:44 -0500 (CDT) From: "Matthew D.Fuller" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/51736: [PATCH] Upgrade net/poptop X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Matthew D.Fuller" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 May 2003 23:20:13 -0000 >Number: 51736 >Category: ports >Synopsis: [PATCH] Upgrade net/poptop >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat May 03 16:20:11 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Matthew D. Fuller >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD mortis.sighup.org 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Wed Jan 8 18:46:11 CST 2003 fullermd@mortis.sighup.org:/usr/obj/usr/src/sys/MORTIS i386 >Description: The version of poptop in ports is a version back, and is a version with a security hole in it. Upgrades are good! This has been compile-tested, but not function-tested. >How-To-Repeat: >Fix: 1) cvs rm files/patch-af 2) cvs add files/patch-ae as: --- pptpctrl.c.orig Sat May 3 18:09:16 2003 +++ pptpctrl.c Sat May 3 18:09:28 2003 @@ -26,9 +26,9 @@ #include #include #include +#include #include #include -#include #include #include #ifdef HAVE_OPENPTY 3) Apply following patch to complete upgrade Index: Makefile =================================================================== RCS file: /usr/cvs/ports/net/poptop/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 20 Feb 2003 18:51:05 -0000 1.14 +++ Makefile 3 May 2003 23:10:51 -0000 @@ -6,12 +6,12 @@ # PORTNAME= poptop -PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTVERSION= 1.1.4-b3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= poptop DISTNAME= pptpd-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-1.1.4 MAINTAINER= ports@freebsd.org COMMENT= Windows 9x compatible PPTP (VPN) server @@ -23,7 +23,6 @@ MAN8= pptpd.8 pptpctrl.8 pre-patch: - ${RM} ${WRKSRC}/config.cache ${CP} ${WRKSRC}/our_getopt.h ${WRKSRC}/getopt.h post-install: Index: distinfo =================================================================== RCS file: /usr/cvs/ports/net/poptop/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo 8 Sep 2002 17:39:44 -0000 1.4 +++ distinfo 3 May 2003 22:51:48 -0000 @@ -1 +1 @@ -MD5 (pptpd-1.1.3.tar.gz) = 1f2d75829883a375b43abcc3e39dcf62 +MD5 (pptpd-1.1.4-b3.tar.gz) = 4dd39d55beef23d4d3948a7df844bbbe Index: files/patch-ab =================================================================== RCS file: /usr/cvs/ports/net/poptop/files/patch-ab,v retrieving revision 1.2 diff -u -r1.2 patch-ab --- files/patch-ab 24 Feb 2001 00:02:48 -0000 1.2 +++ files/patch-ab 3 May 2003 23:03:32 -0000 @@ -1,11 +1,11 @@ ---- Makefile.in.orig Tue Oct 5 19:26:04 1999 -+++ Makefile.in Tue Oct 5 19:26:21 1999 -@@ -74,7 +74,7 @@ +--- Makefile.in.orig Sat May 3 17:54:08 2003 ++++ Makefile.in Sat May 3 17:55:08 2003 +@@ -75,7 +75,7 @@ AUTOMAKE_OPTIONS = no-dependencies foreign INCLUDES = -I. --CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' +-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' +CFLAGS+= -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' + #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' - man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5 Index: files/patch-ac =================================================================== RCS file: /usr/cvs/ports/net/poptop/files/patch-ac,v retrieving revision 1.4 diff -u -r1.4 patch-ac --- files/patch-ac 25 Apr 2003 00:31:29 -0000 1.4 +++ files/patch-ac 3 May 2003 22:56:31 -0000 @@ -1,11 +1,11 @@ ---- Makefile.am.orig Wed Sep 22 17:01:28 1999 -+++ Makefile.am Tue Oct 5 19:25:56 1999 +--- Makefile.am.orig Sat May 3 17:55:55 2003 ++++ Makefile.am Sat May 3 17:56:22 2003 @@ -11,7 +11,7 @@ ## warning with -Wmissing-prototypes). ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers ## aren't up to it). --CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' -+CFLAGS= ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' +-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' ++CFLAGS = ${CFLAGS} -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"' + #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' - man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5 Index: files/patch-ad =================================================================== RCS file: /usr/cvs/ports/net/poptop/files/patch-ad,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-ad --- files/patch-ad 6 Oct 1999 02:43:14 -0000 1.1.1.1 +++ files/patch-ad 3 May 2003 23:02:36 -0000 @@ -1,12 +1,16 @@ ---- pptpd.c.orig Wed Sep 22 17:01:28 1999 -+++ pptpd.c Tue Oct 5 19:32:07 1999 -@@ -77,20 +77,19 @@ +--- pptpd.c.orig Thu Feb 27 04:01:10 2003 ++++ pptpd.c Sat May 3 18:02:26 2003 +@@ -82,24 +82,23 @@ static void showusage(char *prog) { printf("\nPoPToP v%s\n", VERSION); - printf("The PPTP Server for Linux\n"); + printf("The PPTP Server for FreeBSD\n"); printf("Usage: pptpd [options], where options are:\n\n"); + #ifdef BCRELAY + printf(" [-b] [--bcrelay if] Use broadcast relay for broadcasts comming from.\n"); + printf(" the specified interface (default is eth1).\n"); + #endif printf(" [-c] [--conf file] Specifies the config file to read default\n"); - printf(" settings from (default is /etc/pptpd.conf).\n"); + printf(" settings from (default is " PPTPD_CONFIG_FILE_DEFAULT ").\n"); @@ -24,7 +28,7 @@ #if !defined(BSDUSER_PPP) printf(" [-s] [--speed baud] Specifies the baud speed for the PPP daemon\n"); printf(" (default is 115200).\n"); -@@ -100,7 +99,7 @@ +@@ -111,7 +110,7 @@ printf("\n\nLogs and debugging go to syslog as DAEMON."); printf("\n\nCommand line options will override any default settings and any settings\n"); >Release-Note: >Audit-Trail: >Unformatted: