Date: Tue, 7 Jan 2014 00:00:23 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338962 - in head/sysutils/e2fsprogs: . files Message-ID: <201401070000.s0700NVp010372@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Jan 7 00:00:23 2014 New Revision: 338962 URL: http://svnweb.freebsd.org/changeset/ports/338962 Log: - Update to new upstream release 1.42.9, release notes: <http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.42.9>; - Add MAKE_ENV+=CHECK_CMD=@true to avoid build failures in intl/, which apparently does not include MCONFIG currently. - Regenerate (and in two cases, modify) patches. Modified: head/sysutils/e2fsprogs/Makefile head/sysutils/e2fsprogs/distinfo head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c head/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c head/sysutils/e2fsprogs/files/patch-misc__Makefile.in head/sysutils/e2fsprogs/files/patch-misc__tune2fs.c head/sysutils/e2fsprogs/pkg-plist Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/Makefile Tue Jan 7 00:00:23 2014 (r338962) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.42.8 +PORTVERSION= 1.42.9 PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -22,6 +22,7 @@ CONFIGURE_ARGS+=--disable-fsck --disable --with-root-prefix='${PREFIX}' CPPFLAGS+= -I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS MAKE_ARGS+= LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' +MAKE_ENV+= CHECK_CMD=@true .if !defined(MASTERDIR) OPTIONS_DEFINE= DOCS NLS @@ -120,6 +121,7 @@ post-build: || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; } post-install: + ${RM} -f ${STAGEDIR}${PREFIX}/sbin/uuidd ${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${STAGEDIR}${PREFIX}/sbin/ ${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${STAGEDIR}${PREFIX}/man/man8/ .if ${PORT_OPTIONS:MDOCS} Modified: head/sysutils/e2fsprogs/distinfo ============================================================================== --- head/sysutils/e2fsprogs/distinfo Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/distinfo Tue Jan 7 00:00:23 2014 (r338962) @@ -1,2 +1,2 @@ -SHA256 (e2fsprogs-1.42.8.tar.xz) = 2dd295a5b225e6fbdd0d6f3e266c4adaaa5188e863ddcc61c78012c9fac60578 -SIZE (e2fsprogs-1.42.8.tar.xz) = 4599820 +SHA256 (e2fsprogs-1.42.9.tar.xz) = b63e95f71209c3d8b07e320a4c602eedb9eaf5b1f565807ad92f519299cd8868 +SIZE (e2fsprogs-1.42.9.tar.xz) = 4656468 Modified: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c ============================================================================== --- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Tue Jan 7 00:00:23 2014 (r338962) @@ -1,5 +1,5 @@ ---- ./e2fsck/unix.c.orig 2013-06-21 04:43:42.000000000 +0200 -+++ ./e2fsck/unix.c 2013-06-27 00:38:52.000000000 +0200 +--- ./e2fsck/unix.c.orig 2013-12-29 05:18:02.000000000 +0100 ++++ ./e2fsck/unix.c 2014-01-06 23:26:48.000000000 +0100 @@ -9,8 +9,6 @@ * %End-Header% */ @@ -18,7 +18,7 @@ #endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> -@@ -582,6 +580,24 @@ +@@ -584,6 +582,24 @@ return 0; } @@ -43,7 +43,7 @@ #define PATH_SET "PATH=/sbin" /* -@@ -614,6 +630,17 @@ +@@ -616,6 +632,17 @@ ctx->progress = e2fsck_update_progress; } @@ -61,7 +61,7 @@ static void signal_progress_off(int sig EXT2FS_ATTR((unused))) { e2fsck_t ctx = e2fsck_global_ctx; -@@ -991,6 +1018,8 @@ +@@ -995,6 +1022,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 Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h Tue Jan 7 00:00:23 2014 (r338962) @@ -1,5 +1,5 @@ ---- ./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 +--- ./lib/ext2fs/ext2_fs.h.orig 2013-12-29 05:18:02.000000000 +0100 ++++ ./lib/ext2fs/ext2_fs.h 2014-01-06 23:26:48.000000000 +0100 @@ -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 Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c Tue Jan 7 00:00:23 2014 (r338962) @@ -1,5 +1,5 @@ --- ./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 ++++ ./lib/ext2fs/tdb.c 2014-01-06 23:26:48.000000000 +0100 @@ -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 Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c Tue Jan 7 00:00:23 2014 (r338962) @@ -1,5 +1,5 @@ --- ./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 ++++ ./lib/ext2fs/tst_bitops.c 2014-01-06 23:26:48.000000000 +0100 @@ -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 Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Tue Jan 7 00:00:23 2014 (r338962) @@ -1,5 +1,5 @@ ---- ./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 +--- ./lib/uuid/gen_uuid.c.orig 2013-12-16 07:32:00.000000000 +0100 ++++ ./lib/uuid/gen_uuid.c 2014-01-06 23:26:48.000000000 +0100 @@ -91,6 +91,7 @@ #ifdef HAVE_SYS_RESOURCE_H #include <sys/resource.h> Modified: head/sysutils/e2fsprogs/files/patch-misc__Makefile.in ============================================================================== --- head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Tue Jan 7 00:00:23 2014 (r338962) @@ -1,18 +1,18 @@ ---- ./misc/Makefile.in.orig 2013-04-22 01:05:50.000000000 +0200 -+++ ./misc/Makefile.in 2013-06-27 00:38:52.000000000 +0200 +--- ./misc/Makefile.in.orig 2013-12-26 06:26:22.000000000 +0100 ++++ ./misc/Makefile.in 2014-01-06 23:26:48.000000000 +0100 @@ -28,15 +28,15 @@ SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ $(E2IMAGE_PROG) @FSCK_PROG@ e2undo -USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG) -+USPROGS= mklost+found e2freefrag $(E4DEFRAG_PROG) ++USPROGS= mklost+found e2freefrag $(UUIDD_PROG) $(E4DEFRAG_PROG) SMANPAGES= tune2fs.8 mklost+found.8 mke2fs.8 dumpe2fs.8 badblocks.8 \ e2label.8 $(FINDFS_MAN) $(BLKID_MAN) $(E2IMAGE_MAN) \ - logsave.8 filefrag.8 e2freefrag.8 e2undo.8 \ - $(UUIDD_MAN) $(E4DEFRAG_MAN) @FSCK_MAN@ + logsave.8 e2freefrag.8 e2undo.8 \ + $(E4DEFRAG_MAN) @FSCK_MAN@ - FMANPAGES= mke2fs.conf.5 + FMANPAGES= mke2fs.conf.5 ext4.5 -UPROGS= chattr lsattr @UUID_CMT@ uuidgen -UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1 @@ -21,7 +21,7 @@ LPROGS= @E2INITRD_PROG@ -@@ -124,14 +124,14 @@ +@@ -125,14 +125,14 @@ mke2fs.conf: $(srcdir)/mke2fs.conf.in if test -f $(srcdir)/mke2fs.conf.custom.in ; then \ @@ -39,9 +39,9 @@ > default_profile.c profile.o: $(E) " CC $<" -@@ -488,34 +488,9 @@ - $(ES) " INSTALL_DATA $(man5dir)/$$i"; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(man5dir)/$$i; \ +@@ -498,34 +498,9 @@ + (cd $(DESTDIR)$(man5dir); \ + $(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \ done - $(Q) if test -f $(DESTDIR)$(root_sysconfdir)/mke2fs.conf; then \ - if cmp -s $(DESTDIR)$(root_sysconfdir)/mke2fs.conf \ Modified: head/sysutils/e2fsprogs/files/patch-misc__tune2fs.c ============================================================================== --- head/sysutils/e2fsprogs/files/patch-misc__tune2fs.c Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/files/patch-misc__tune2fs.c Tue Jan 7 00:00:23 2014 (r338962) @@ -1,15 +1,14 @@ ---- ./misc/tune2fs.c.orig 2013-06-21 04:43:42.000000000 +0200 -+++ ./misc/tune2fs.c 2013-06-28 01:08:29.000000000 +0200 -@@ -25,8 +25,6 @@ +--- ./misc/tune2fs.c.orig 2013-12-29 05:18:02.000000000 +0100 ++++ ./misc/tune2fs.c 2014-01-06 23:43:47.000000000 +0100 +@@ -25,7 +25,6 @@ * 94/03/06 - Added the checks interval from Uwe Ohse (uwe@tirka.gun.de) */ -#define _XOPEN_SOURCE 600 /* for inclusion of strptime() */ --#define _BSD_SOURCE /* for inclusion of strcasecmp() */ #include "config.h" #include <fcntl.h> #include <grp.h> -@@ -48,6 +46,9 @@ +@@ -52,6 +51,9 @@ #include <libgen.h> #include <limits.h> Modified: head/sysutils/e2fsprogs/pkg-plist ============================================================================== --- head/sysutils/e2fsprogs/pkg-plist Mon Jan 6 23:55:38 2014 (r338961) +++ head/sysutils/e2fsprogs/pkg-plist Tue Jan 7 00:00:23 2014 (r338962) @@ -5,6 +5,9 @@ man/man1/chattr.1.gz man/man1/lsattr.1.gz man/man5/e2fsck.conf.5.gz man/man5/mke2fs.conf.5.gz +man/man5/ext2.5.gz +man/man5/ext3.5.gz +man/man5/ext4.5.gz man/man8/badblocks.8.gz man/man8/debugfs.8.gz man/man8/dumpe2fs.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401070000.s0700NVp010372>