From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 25 19:50:26 2004 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 BE84316A4D0 for ; Thu, 25 Mar 2004 19:50:14 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 855BA43D46 for ; Thu, 25 Mar 2004 19:50:14 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i2Q3oEbv025804 for ; Thu, 25 Mar 2004 19:50:14 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i2Q3oE9s025803; Thu, 25 Mar 2004 19:50:14 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 25 Mar 2004 19:50:14 -0800 (PST) Resent-Message-Id: <200403260350.i2Q3oE9s025803@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, Matthias Andree Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DA7E216A4D0 for ; Thu, 25 Mar 2004 19:43:11 -0800 (PST) Received: from nx5.hrz.uni-dortmund.de (nx5.HRZ.Uni-Dortmund.DE [129.217.131.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 306FE43D2F for ; Thu, 25 Mar 2004 19:43:11 -0800 (PST) (envelope-from matthias.andree@web.de) Received: from unimail.uni-dortmund.de (mx1.HRZ.Uni-Dortmund.DE [129.217.128.51]) by nx5.hrz.uni-dortmund.de (Postfix) with ESMTP id E1B3E4AEB8E; Fri, 26 Mar 2004 04:43:09 +0100 (MET) Received: from m2a2.myip.org (echs4hnh0sai1bfa@pD951F93D.dip.t-dialin.net [217.81.249.61]) (authenticated (0 bits))i2Q3gsW6003121; Fri, 26 Mar 2004 04:42:55 +0100 (MET) Received: from libertas.emma.line.org (libertas.emma.line.org [192.168.0.2]) by merlin.emma.line.org (Postfix) with ESMTP id 139B41B208; Fri, 26 Mar 2004 04:42:48 +0100 (CET) Received: from emma by libertas.emma.line.org with local (Exim 4.30; FreeBSD) id 1B6iF5-0008dw-0j; Fri, 26 Mar 2004 04:42:47 +0100 Message-Id: Date: Fri, 26 Mar 2004 04:42:47 +0100 From: Matthias Andree Sender: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/64736: [MAINTAINER] sysutils/e2fsprogs: update wrapper and Makefile X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Mar 2004 03:50:27 -0000 >Number: 64736 >Category: ports >Synopsis: [MAINTAINER] sysutils/e2fsprogs: update wrapper and Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Mar 25 19:50:14 PST 2004 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 4.9-STABLE i386 >Organization: >Environment: System: FreeBSD libertas.emma.line.org 4.9-STABLE FreeBSD 4.9-STABLE #94: Wed Mar 24 12:34:25 CET 2004 >Description: - Update fsck_ext2fs wrapper to make it safe in sudo - the old would copy unlimited arguments over. - Replace MACHINE_ARCH by ARCH (and woe betide the fellow who complains that the port now needs bsd.port.pre.mk!) - Bump portrevision. Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- e2fsprogs-1.35_3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/emma/e2fsprogs/Makefile --- /usr/ports/sysutils/e2fsprogs/Makefile Mon Mar 15 12:23:45 2004 +++ /usr/home/emma/e2fsprogs/Makefile Fri Mar 26 04:38:11 2004 @@ -7,7 +7,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.35 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -65,6 +65,8 @@ ${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \ ${WRKSRC}/${CONFIGURE_SCRIPT} +.include + post-patch: ${REINPLACE_CMD} -e 's|-DRESOURCE_TRACK||' ${WRKSRC}/e2fsck/Makefile.in ${GUNZIP_CMD} ${WRKSRC}/tests/m_*/expect*.gz @@ -73,7 +75,7 @@ -e 's|group root|group wheel|' \ -e '/Exit status is 0/ N;s/Exit status is 0\n/Exit status is 0/' \ ${WRKSRC}/tests/m_*/expect.1 -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" +.if ${ARCH} == "alpha" || ${ARCH} == "sparc64" ${RM} -rf ${WRKSRC}/tests/m_large_file .endif @@ -93,4 +95,4 @@ @${CAT} ${PKGMESSAGE} @${ECHO_MSG} -.include +.include diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/fsck_ext2fs.c /usr/home/emma/e2fsprogs/files/fsck_ext2fs.c --- /usr/ports/sysutils/e2fsprogs/files/fsck_ext2fs.c Mon Mar 15 12:23:45 2004 +++ /usr/home/emma/e2fsprogs/files/fsck_ext2fs.c Fri Mar 26 04:04:53 2004 @@ -6,7 +6,7 @@ * * $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.c,v 1.3 2004/03/11 21:51:30 glewis Exp $ * - * Upstream: $Id: fsck_ext2fs.c,v 1.3 2004/03/09 01:10:22 emma Exp $ + * Upstream: $Id: fsck_ext2fs.c,v 1.4 2004/03/20 15:51:01 emma Exp $ * * format: gindent -kr */ @@ -19,6 +19,7 @@ #include #include #include +#include __attribute__ ((noreturn)) static int die(const char *tag) @@ -94,11 +95,21 @@ cmd[i++] = b; } + /* silently limit verbose to 15 so we don't overflow the cmd array */ + if (verbose > 15) + verbose = 15; + for (t = verbose; t > 1; t--) cmd[i++] = "-v"; - while (optind < argc) + while (optind < argc) { cmd[i++] = argv[optind++]; + /* sanity check so we don't overflow the cmd buffer */ + if (i+1 == sizeof(cmd)/sizeof(cmd[0])) { + errno = E2BIG; + die(argv[0]); + } + } cmd[i++] = 0; --- e2fsprogs-1.35_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: