From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jul 13 12:20:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E9B571065673 for ; Sun, 13 Jul 2008 12:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C18A68FC22 for ; Sun, 13 Jul 2008 12:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m6DCK1v9055134 for ; Sun, 13 Jul 2008 12:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m6DCK1PY055133; Sun, 13 Jul 2008 12:20:01 GMT (envelope-from gnats) Resent-Date: Sun, 13 Jul 2008 12:20:01 GMT Resent-Message-Id: <200807131220.m6DCK1PY055133@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 021F51065672 for ; Sun, 13 Jul 2008 12:10:18 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by mx1.freebsd.org (Postfix) with SMTP id 42A968FC13 for ; Sun, 13 Jul 2008 12:10:17 +0000 (UTC) (envelope-from matthias.andree@gmx.de) Received: (qmail invoked by alias); 13 Jul 2008 12:10:15 -0000 Received: from f054216206.adsl.alicedsl.de (EHLO m2a2.dyndns.org) [78.54.216.206] by mail.gmx.net (mp031) with SMTP; 13 Jul 2008 14:10:15 +0200 Received: by merlin.localdomain (Postfix, from userid 500) id 1FF85C679; Sun, 13 Jul 2008 14:10:12 +0200 (CEST) Message-Id: <20080713121012.1FF85C679@merlin.localdomain> Date: Sun, 13 Jul 2008 14:10:12 +0200 (CEST) From: Matthias Andree To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/125561: [MAINTAINER] sysutils/e2fsprogs: update to 1.41.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2008 12:20:02 -0000 >Number: 125561 >Category: ports >Synopsis: [MAINTAINER] sysutils/e2fsprogs: update to 1.41.0 >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: Sun Jul 13 12:20:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 6.3-STABLE i386 >Organization: >Environment: System: FreeBSD merlin 6.3-STABLE FreeBSD 6.3-STABLE #33: Sun Jun 1 11:12:24 CEST >Description: - Update to 1.41.0 Added file(s): - files/patch-tests-md5sum Removed file(s): - files/patch-lib_ext2fs_bitmaps.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- e2fsprogs-1.41.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/Makefile /usr/home/emma/ports/sysutils/e2fsprogs/Makefile --- /usr/ports/sysutils/e2fsprogs/Makefile 2008-06-19 01:47:28.000000000 +0200 +++ /usr/home/emma/ports/sysutils/e2fsprogs/Makefile 2008-07-13 13:50:37.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= e2fsprogs -PORTVERSION= 1.40.11 +PORTVERSION= 1.41.0 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} @@ -16,6 +16,7 @@ COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems PATCH_STRIP= -p1 +USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \ @@ -32,8 +33,9 @@ MAN1= chattr.1 lsattr.1 MAN5= e2fsck.conf.5 mke2fs.conf.5 MAN8= badblocks.8 debugfs.8 dumpe2fs.8 e2fsck.8 e2image.8 e2label.8 \ - mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \ - fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \ + e2undo.8 mke2fs.8 mklost+found.8 resize2fs.8 tune2fs.8 \ + fsck.ext2.8 fsck.ext3.8 fsck.ext4.8 fsck.ext4dev.8 \ + mkfs.ext2.8 mkfs.ext3.8 mkfs.ext4.8 mkfs.ext4dev.8 \ findfs.8 blkid.8 logsave.8 fsck_ext2fs.8 post-extract: @@ -65,7 +67,7 @@ # else we're in trouble if e2fsck is needed for boot: # (we don't use e2fsck.static, since we can link libc.so dynamically) cd ${WRKSRC}/e2fsck && ${RM} -f e2fsck \ - && ${MAKE} e2fsck \ + && ${GMAKE} e2fsck \ STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \ ../lib/libblkid.a ../lib/libuuid.a" \ LIBINTL="${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a" @@ -81,7 +83,7 @@ echo 'FAIL' ; echo '===> e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi # Update translation binary files .if !defined(WITHOUT_NLS) - cd ${WRKSRC}/po && ${MAKE} update-gmo + cd ${WRKSRC}/po && ${GMAKE} update-gmo .endif # Build fsck(8) wrapper ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \ @@ -94,7 +96,7 @@ # There have been subtle failures induced by Linux-isms in the past. # -- Matthias Andree, package maintainer, 2007-09-18 @${ECHO_CMD} '===> Running e2fsprogs self-test suite' - cd ${WRKSRC}/tests && ${MAKE} check \ + cd ${WRKSRC}/tests && ${GMAKE} check \ || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; } post-install: diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/distinfo /usr/home/emma/ports/sysutils/e2fsprogs/distinfo --- /usr/ports/sysutils/e2fsprogs/distinfo 2008-06-19 01:47:28.000000000 +0200 +++ /usr/home/emma/ports/sysutils/e2fsprogs/distinfo 2008-07-13 12:48:38.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (e2fsprogs-1.40.11.tar.gz) = 004cea70d724fdc7f1a952dffe4c9db8 -SHA256 (e2fsprogs-1.40.11.tar.gz) = 3eeb0c3513b3b251f5d51ec3413bc77e3a21cb8bc84a1979022a67fe733c897b -SIZE (e2fsprogs-1.40.11.tar.gz) = 4116013 +MD5 (e2fsprogs-1.41.0.tar.gz) = 83144fa7e0e63647f920b77650ea1836 +SHA256 (e2fsprogs-1.41.0.tar.gz) = db02fb36dae963eda7e8d8c11d1e178e5992f53893c5f0e76493d412758a1675 +SIZE (e2fsprogs-1.41.0.tar.gz) = 4260246 diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c --- /usr/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c 2008-06-19 01:47:29.000000000 +0200 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-lib_ext2fs_bitmaps.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -# To fix bitops related crash -# patch provided by Ted Ts'o to Frantisek Holop (OpenBSD porter) - -diff --git a/lib/ext2fs/bitmaps.c b/lib/ext2fs/bitmaps.c -index 696baad..843a75f 100644 ---- a/lib/ext2fs/bitmaps.c -+++ b/lib/ext2fs/bitmaps.c -@@ -56,7 +56,7 @@ static errcode_t make_bitmap(__u32 start, __u32 end, __u32 real_end, - } else - bitmap->description = 0; - -- size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1); -+ size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 2); - retval = ext2fs_get_mem(size, &bitmap->bitmap); - if (retval) { - ext2fs_free_mem(&bitmap->description); diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in --- /usr/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in 2008-04-29 13:09:27.000000000 +0200 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-misc_Makefile.in 2008-07-13 12:57:37.000000000 +0200 @@ -1,15 +1,15 @@ ---- a/misc/Makefile.in.orig Tue Jan 1 04:35:42 2008 -+++ b/misc/Makefile.in Sun Jan 13 10:46:31 2008 +--- a/misc/Makefile.in.orig 2008-06-18 05:53:42.000000000 +0200 ++++ b/misc/Makefile.in 2008-07-13 12:55:25.000000000 +0200 @@ -19,14 +19,14 @@ SPROGS= mke2fs badblocks tune2fs dumpe2fs blkid logsave \ - $(E2IMAGE_PROG) @FSCK_PROG@ + $(E2IMAGE_PROG) @FSCK_PROG@ e2undo -USPROGS= mklost+found filefrag $(UUIDD_PROG) +USPROGS= mklost+found SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \ e2label.8 findfs.8 blkid.8 $(E2IMAGE_MAN) \ -- logsave.8 filefrag.8 $(UUIDD_MAN) @FSCK_MAN@ -+ logsave.8 @FSCK_MAN@ +- logsave.8 filefrag.8 e2undo.8 $(UUIDD_MAN) @FSCK_MAN@ ++ logsave.8 e2undo.8 @FSCK_MAN@ FMANPAGES= mke2fs.conf.5 -UPROGS= chattr lsattr uuidgen @@ -19,7 +19,7 @@ LPROGS= @E2INITRD_PROG@ -@@ -315,11 +314,9 @@ +@@ -337,11 +337,9 @@ echo " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/files/patch-tests-md5sum /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-tests-md5sum --- /usr/ports/sysutils/e2fsprogs/files/patch-tests-md5sum 1970-01-01 01:00:00.000000000 +0100 +++ /usr/home/emma/ports/sysutils/e2fsprogs/files/patch-tests-md5sum 2008-07-13 13:41:34.000000000 +0200 @@ -0,0 +1,44 @@ +--- a/tests/u_mke2fs/script.orig 2008-06-18 05:53:42.000000000 +0200 ++++ b/tests/u_mke2fs/script 2008-07-13 13:31:23.000000000 +0200 +@@ -10,16 +10,16 @@ + + echo mke2fs -q -F -o Linux -b 1024 test.img > $OUT + $MKE2FS -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1 +-md5=$(md5sum $TMPFILE | cut -d " " -f 1) ++md5=$(md5 -q $TMPFILE) + echo md5sum before mke2fs $md5 >> $OUT + + echo using mke2fs to test e2undo >> $OUT + $MKE2FS -q -F -o Linux -I 256 -O uninit_bg -E lazy_itable_init=1 -b 1024 $TMPFILE >> $OUT 2>&1 +-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) ++new_md5=$(md5 -q $TMPFILE) + echo md5sum after mke2fs $new_md5 >> $OUT + + $E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1 +-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) ++new_md5=$(md5 -q $TMPFILE) + echo md5sum after e2undo $new_md5 >> $OUT + + if [ $md5 = $new_md5 ]; then +--- a/tests/u_tune2fs/script.orig 2008-06-18 05:53:42.000000000 +0200 ++++ b/tests/u_tune2fs/script 2008-07-13 13:32:10.000000000 +0200 +@@ -10,16 +10,16 @@ + + echo mke2fs -q -F -o Linux -b 1024 $TMPFILE > $OUT + $MKE2FS -q -F -o Linux -I 128 -b 1024 $TMPFILE >> $OUT 2>&1 +-md5=$(md5sum $TMPFILE | cut -d " " -f 1) ++md5=$(md5 -q $TMPFILE) + echo md5sum before tune2fs $md5 >> $OUT + + echo using tune2fs to test e2undo >> $OUT + $TUNE2FS -I 256 $TMPFILE >> $OUT 2>&1 +-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) ++new_md5=$(md5 -q $TMPFILE) + echo md5sum after tune2fs $new_md5 >> $OUT + + $E2UNDO_EXE $TDB_FILE $TMPFILE >> $OUT 2>&1 +-new_md5=$(md5sum $TMPFILE | cut -d " " -f 1) ++new_md5=$(md5 -q $TMPFILE) + echo md5sum after e2undo $new_md5 >> $OUT + + if [ $md5 = $new_md5 ]; then diff -ruN --exclude=CVS /usr/ports/sysutils/e2fsprogs/pkg-plist /usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist --- /usr/ports/sysutils/e2fsprogs/pkg-plist 2008-02-05 19:40:51.000000000 +0100 +++ /usr/home/emma/ports/sysutils/e2fsprogs/pkg-plist 2008-07-13 13:53:17.000000000 +0200 @@ -11,9 +11,12 @@ sbin/e2fsck sbin/e2image sbin/e2label +sbin/e2undo sbin/findfs sbin/fsck.ext2 sbin/fsck.ext3 +sbin/fsck.ext4 +sbin/fsck.ext4dev sbin/fsck_ext2fs @exec ln -f %D/sbin/e2fsck /sbin 2>/dev/null || cp -p %D/sbin/e2fsck /sbin @exec ln -f %D/sbin/fsck_ext2fs /sbin 2>/dev/null || cp -p %D/sbin/fsck_ext2fs /sbin @@ -22,6 +25,8 @@ sbin/mke2fs sbin/mkfs.ext2 sbin/mkfs.ext3 +sbin/mkfs.ext4 +sbin/mkfs.ext4dev sbin/mklost+found sbin/resize2fs sbin/tune2fs --- e2fsprogs-1.41.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: