From owner-svn-ports-all@FreeBSD.ORG Thu Jun 27 22:41:13 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A08A5977; Thu, 27 Jun 2013 22:41:13 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9108F133E; Thu, 27 Jun 2013 22:41:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RMfDux007465; Thu, 27 Jun 2013 22:41:13 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RMfBx8007454; Thu, 27 Jun 2013 22:41:11 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201306272241.r5RMfBx8007454@svn.freebsd.org> From: Matthias Andree Date: Thu, 27 Jun 2013 22:41:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321911 - in head/sysutils/e2fsprogs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 22:41:13 -0000 Author: mandree Date: Thu Jun 27 22:41:11 2013 New Revision: 321911 URL: http://svnweb.freebsd.org/changeset/ports/321911 Log: Update to new upstream release 1.42.8. ChangeLog: Switch to KERNEL_ORG site and enable USE_XZ for 25 % smaller download. Switch to USE_CSTD=gnu99 (was gnu89). Disable 2TB r_*_big_expand tests due to their space requirements, reenable m_bigjournal, and also skip f_extent_oobounds which breaks inside Tinderbox but is fine outside. Deleted: head/sysutils/e2fsprogs/files/patch-lib__ext2fs__gen_bitmap64.c Modified: head/sysutils/e2fsprogs/Makefile head/sysutils/e2fsprogs/distinfo head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c (contents, props changed) head/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h (contents, props changed) head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c (contents, props changed) head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c (contents, props changed) head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c (contents, props changed) head/sysutils/e2fsprogs/files/patch-misc__Makefile.in (contents, props changed) head/sysutils/e2fsprogs/pkg-message (contents, props changed) Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/Makefile Thu Jun 27 22:41:11 2013 (r321911) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.42.7 +PORTVERSION= 1.42.8 PORTREVISION?= 0 CATEGORIES?= sysutils -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION} +MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} MAINTAINER?= mandree@FreeBSD.org COMMENT?= Utilities & library to manipulate ext2/3/4 filesystems @@ -14,8 +14,9 @@ LICENSE= GPLv2 PATCH_STRIP= -p1 USE_GMAKE= yes -USE_CSTD= gnu89 +USE_CSTD= gnu99 USE_LDCONFIG= yes +USE_XZ= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \ --with-root-prefix='${PREFIX}' @@ -73,8 +74,10 @@ post-patch:: @${REINPLACE_CMD} -E -e 's/md5sum ([^ ]*)/printf "%s %s\\n" $$(md5 -q \1) \1/' \ -e "s/ == 0/ = 0/" ${WRKSRC}/tests/[a-t]_*/script @${REINPLACE_CMD} -e 's///' ${WRKSRC}/*/*.c -# disable f_mmp_garbage, fails on FreeBSD -.for i in f_mmp_garbage m_bigjournal +# disable f_mmp_garbage, fails on FreeBSD, and the resize*big_expand tests, +# which are too unwieldy to run automatically (need too much free space). +# f_extent_oobounds fails in Tinderbox and is fine outside, reason unclear. +.for i in f_mmp_garbage f_extent_oobounds r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand @${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i} .endfor Modified: head/sysutils/e2fsprogs/distinfo ============================================================================== --- head/sysutils/e2fsprogs/distinfo Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/distinfo Thu Jun 27 22:41:11 2013 (r321911) @@ -1,2 +1,2 @@ -SHA256 (e2fsprogs-1.42.7.tar.gz) = dc6501b2e75d205e425196d753d92b129c568525d8aad08085c0aa69ee9e7345 -SIZE (e2fsprogs-1.42.7.tar.gz) = 5981006 +SHA256 (e2fsprogs-1.42.8.tar.xz) = 2dd295a5b225e6fbdd0d6f3e266c4adaaa5188e863ddcc61c78012c9fac60578 +SIZE (e2fsprogs-1.42.8.tar.xz) = 4599820 Modified: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c ============================================================================== --- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Thu Jun 27 22:41:11 2013 (r321911) @@ -1,5 +1,5 @@ ---- ./e2fsck/unix.c.orig 2012-03-23 14:15:37.000000000 +0100 -+++ ./e2fsck/unix.c 2012-04-01 17:15:48.000000000 +0200 +--- ./e2fsck/unix.c.orig 2013-06-21 04:43:42.000000000 +0200 ++++ ./e2fsck/unix.c 2013-06-27 00:38:52.000000000 +0200 @@ -9,8 +9,6 @@ * %End-Header% */ @@ -9,7 +9,16 @@ #include "config.h" #include #ifdef HAVE_STDLIB_H -@@ -560,6 +558,24 @@ +@@ -37,7 +35,7 @@ + #include + #endif + #ifdef HAVE_MALLOC_H +-#include ++#include + #endif + #ifdef HAVE_SYS_TYPES_H + #include +@@ -582,6 +580,24 @@ return 0; } @@ -34,7 +43,7 @@ #define PATH_SET "PATH=/sbin" /* -@@ -592,6 +608,17 @@ +@@ -614,6 +630,17 @@ ctx->progress = e2fsck_update_progress; } @@ -52,7 +61,7 @@ static void signal_progress_off(int sig EXT2FS_ATTR((unused))) { e2fsck_t ctx = e2fsck_global_ctx; -@@ -960,6 +987,8 @@ +@@ -991,6 +1018,8 @@ sigaction(SIGUSR1, &sa, 0); sa.sa_handler = signal_progress_off; sigaction(SIGUSR2, &sa, 0); Modified: head/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h ============================================================================== --- head/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h Thu Jun 27 22:41:11 2013 (r321911) @@ -1,6 +1,6 @@ ---- ./lib/ext2fs/ext2_fs.h.orig 2012-03-23 14:15:37.000000000 +0100 -+++ ./lib/ext2fs/ext2_fs.h 2012-04-01 17:15:48.000000000 +0200 -@@ -455,7 +455,7 @@ +--- ./lib/ext2fs/ext2_fs.h.orig 2013-06-21 04:43:42.000000000 +0200 ++++ ./lib/ext2fs/ext2_fs.h 2013-06-27 00:38:52.000000000 +0200 +@@ -456,7 +456,7 @@ #define i_dir_acl i_size_high Modified: head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c ============================================================================== --- head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c Thu Jun 27 22:41:11 2013 (r321911) @@ -1,5 +1,5 @@ ---- ./lib/ext2fs/tdb.c.orig 2012-03-18 19:18:33.000000000 +0100 -+++ ./lib/ext2fs/tdb.c 2012-04-01 17:15:49.000000000 +0200 +--- ./lib/ext2fs/tdb.c.orig 2012-07-06 15:37:27.000000000 +0200 ++++ ./lib/ext2fs/tdb.c 2013-06-27 00:38:52.000000000 +0200 @@ -36,7 +36,6 @@ #define HAVE_UTIME_H #define HAVE_UTIME Modified: head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c ============================================================================== --- head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c Thu Jun 27 22:41:11 2013 (r321911) @@ -1,5 +1,5 @@ ---- ./lib/ext2fs/tst_bitops.c.orig 2012-03-18 19:18:33.000000000 +0100 -+++ ./lib/ext2fs/tst_bitops.c 2012-04-01 17:15:49.000000000 +0200 +--- ./lib/ext2fs/tst_bitops.c.orig 2012-07-06 15:37:27.000000000 +0200 ++++ ./lib/ext2fs/tst_bitops.c 2013-06-27 00:38:52.000000000 +0200 @@ -104,7 +104,7 @@ bigarray = malloc(1 << 29); if (!bigarray) { Modified: head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c ============================================================================== --- head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Thu Jun 27 22:41:11 2013 (r321911) @@ -1,5 +1,5 @@ ---- ./lib/uuid/gen_uuid.c.orig 2012-03-18 19:18:33.000000000 +0100 -+++ ./lib/uuid/gen_uuid.c 2012-04-01 17:15:49.000000000 +0200 +--- ./lib/uuid/gen_uuid.c.orig 2013-04-22 01:05:50.000000000 +0200 ++++ ./lib/uuid/gen_uuid.c 2013-06-27 00:38:52.000000000 +0200 @@ -91,6 +91,7 @@ #ifdef HAVE_SYS_RESOURCE_H #include @@ -8,7 +8,7 @@ #include "uuidP.h" #include "uuidd.h" -@@ -297,6 +298,28 @@ +@@ -300,6 +301,28 @@ } } close(sd); Modified: head/sysutils/e2fsprogs/files/patch-misc__Makefile.in ============================================================================== --- head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Thu Jun 27 22:41:11 2013 (r321911) @@ -1,5 +1,5 @@ ---- ./misc/Makefile.in.orig 2012-07-17 07:21:04.000000000 +0200 -+++ ./misc/Makefile.in 2012-08-02 19:59:09.000000000 +0200 +--- ./misc/Makefile.in.orig 2013-04-22 01:05:50.000000000 +0200 ++++ ./misc/Makefile.in 2013-06-27 00:38:52.000000000 +0200 @@ -28,15 +28,15 @@ SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ @@ -21,7 +21,7 @@ LPROGS= @E2INITRD_PROG@ -@@ -123,14 +123,14 @@ +@@ -124,14 +124,14 @@ mke2fs.conf: $(srcdir)/mke2fs.conf.in if test -f $(srcdir)/mke2fs.conf.custom.in ; then \ @@ -39,7 +39,7 @@ > default_profile.c profile.o: $(E) " CC $<" -@@ -482,34 +482,9 @@ +@@ -488,34 +488,9 @@ $(ES) " INSTALL_DATA $(man5dir)/$$i"; \ $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ done Modified: head/sysutils/e2fsprogs/pkg-message ============================================================================== --- head/sysutils/e2fsprogs/pkg-message Thu Jun 27 22:22:05 2013 (r321910) +++ head/sysutils/e2fsprogs/pkg-message Thu Jun 27 22:41:11 2013 (r321911) @@ -1,5 +1,5 @@ =========================================================================== Note: this is a modified version of the e2fsprogs package, not the official package. Report all building and run-time trouble that originates in the -package to the port maintainer, mandree@FreeBSD.org +package to the port maintainer, mandree@FreeBSD.org. ===========================================================================