kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update fsck_ext2fs wrapper to make it safe in sudo - the old

Browse source 
would copy unlimited arguments over
- Replace MACHINE_ARCH by ARCH
- Bump portrevision

PR:		ports/64736
Submitted by:	maintainer
This commit is contained in:
Kirill Ponomarev 2004-03-26 08:43:20 +00:00
parent 8492803387
commit b2bafc7f23
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=105307
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sysutils/e2fsprogs/Makefile
View file

@ -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 @@ post-extract:
${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \
${WRKSRC}/${CONFIGURE_SCRIPT}
.include <bsd.port.pre.mk>
post-patch:
${REINPLACE_CMD} -e 's|-DRESOURCE_TRACK||' ${WRKSRC}/e2fsck/Makefile.in
${GUNZIP_CMD} ${WRKSRC}/tests/m_*/expect*.gz
@ -73,7 +75,7 @@ post-patch:
-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 @@ post-install:
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
.include <bsd.port.post.mk>

15
sysutils/e2fsprogs/files/fsck_ext2fs.c
View file

@ -6,7 +6,7 @@
*
* $FreeBSD$
*
* 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 <sys/wait.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <errno.h>
__attribute__ ((noreturn))
static int die(const char *tag)
@ -94,11 +95,21 @@ int main(int argc, char **argv)
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;