[Midnightbsd-cvs] mports [17556] e2fsprogs 1.42.10

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Sep 27 10:05:43 EDT 2014 

Revision: 17556
          http://svnweb.midnightbsd.org/mports/?rev=17556
Author:   laffer1
Date:     2014-09-27 10:05:41 -0400 (Sat, 27 Sep 2014)
Log Message:
-----------
e2fsprogs 1.42.10

Modified Paths:
--------------
    trunk/sysutils/e2fsprogs/Makefile
    trunk/sysutils/e2fsprogs/distinfo
    trunk/sysutils/e2fsprogs/files/fsck_ext2fs.8
    trunk/sysutils/e2fsprogs/files/fsck_ext2fs.c
    trunk/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
    trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h
    trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c
    trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
    trunk/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
    trunk/sysutils/e2fsprogs/files/patch-misc__Makefile.in
    trunk/sysutils/e2fsprogs/files/patch-misc__tune2fs.c
    trunk/sysutils/e2fsprogs/pkg-plist

Added Paths:
-----------
    trunk/sysutils/e2fsprogs/files/patch-350897

Property Changed:
----------------
    trunk/sysutils/e2fsprogs/files/fsck_ext2fs.8
    trunk/sysutils/e2fsprogs/files/fsck_ext2fs.c
    trunk/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
    trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h
    trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c
    trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
    trunk/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
    trunk/sysutils/e2fsprogs/files/patch-misc__Makefile.in
    trunk/sysutils/e2fsprogs/files/patch-misc__tune2fs.c
    trunk/sysutils/e2fsprogs/files/patch-tests-md5sum
    trunk/sysutils/e2fsprogs/pkg-descr
    trunk/sysutils/e2fsprogs/pkg-install
    trunk/sysutils/e2fsprogs/pkg-message

Modified: trunk/sysutils/e2fsprogs/Makefile
===================================================================
--- trunk/sysutils/e2fsprogs/Makefile	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/Makefile	2014-09-27 14:05:41 UTC (rev 17556)
@@ -1,23 +1,26 @@
 # $MidnightBSD$
 
 PORTNAME=	e2fsprogs
-PORTVERSION=	1.42.8
+PORTVERSION=	1.42.10
 CATEGORIES?=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	Utilities & library to manipulate ext2/3/4 filesystems
+
 LICENSE=	gpl2
 
 PATCH_STRIP=	-p1
-USES=		gmake tar:xz
+USES=		gmake pkgconfig tar:xz
 USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-fsck --disable-e2initrd-helper \
+		--enable-quota \
 		--with-root-prefix='${PREFIX}'
 CPPFLAGS+=	-I${WRKSRC}/lib -I${LOCALBASE}/include # -D_EXT2_USE_C_VERSIONS
-MAKE_ARGS+=	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib'
+MAKE_ARGS+=	LDFLAGS='${LDFLAGS} -L${LOCALBASE}/lib' pkgconfigdir='${PREFIX}/libdata/pkgconfig'
+MAKE_ENV+=	CHECK_CMD=@true
 
 .if !defined(MASTERDIR)
 OPTIONS_DEFINE=		DOCS NLS
@@ -24,13 +27,6 @@
 OPTIONS_DEFAULT=	NLS
 OPTIONS_EXCLUDE+=	EXAMPLES
 
-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 \
-		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 e2freefrag.8
 PORTDOCS=	COPYING RELEASE-NOTES
 
 post-extract:
@@ -48,9 +44,18 @@
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
+USES+=		gettext iconv:build
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB=	NLS=""
+. if empty(ICONV_LIB)
+libintl=	"${LOCALBASE}/lib/libintl.a"
+. else
 libintl=	"${LOCALBASE}/lib/libintl.a ${LOCALBASE}/lib/libiconv.a"
+. endif
 .else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB=	NLS="@comment "
@@ -57,12 +62,7 @@
 libintl=
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-patch::
-	@${REINPLACE_CMD} -E -e \
-		's:\$$\(libdir\)/pkgconfig:${PREFIX}/libdata/pkgconfig:' \
-		${WRKSRC}/lib/*/Makefile.in
 # don't build/install libext2fs.info
 	@${REINPLACE_CMD} -e 's/ install-doc-libs$$//' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E -e 's/md5sum ([^ ]*)/printf "%s  %s\\n" $$(md5 -q \1) \1/' \
@@ -71,11 +71,16 @@
 # 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 
+.for i in f_mmp_garbage m_bigjournal r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand
 	@${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i}
 .endfor
 
 .if ${MASTERDIR} == ${.CURDIR}
+pre-build:
+# fix up Makefile ordering for parallel builds
+	cd ${WRKSRC}/lib/et && ${DO_MAKE_BUILD} compile_et
+	cd ${WRKSRC}/e2fsck && ${DO_MAKE_BUILD} prof_err.h
+
 post-build:
 # Relink e2fsck statically - We need to make sure that tools for the root file
 # system are statically linked against anything that is outside the root fs,
@@ -82,7 +87,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 \
-		&& ${GMAKE} e2fsck \
+		&& ${MAKE_CMD} e2fsck \
 		STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
 		../lib/libblkid.a  ../lib/libuuid.a" \
 		LIBINTL=${libintl}
@@ -99,7 +104,7 @@
 	    echo 'FAIL' ; echo '===>  e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
 # Update translation binary files
 .if ${PORT_OPTIONS:MNLS}
-	cd ${WRKSRC}/po && ${GMAKE} update-gmo
+	cd ${WRKSRC}/po && ${MAKE_CMD} update-gmo
 .endif
 # Build fsck(8) wrapper
 	${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -s ${LIBS} \
@@ -112,12 +117,13 @@
 # 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 && ${MKDIR} ${WRKDIR}/tmp && ${GMAKE} -j${MAKE_JOBS_NUMBER} check TMPDIR=${WRKDIR}/tmp \
+	cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} check TMPDIR=${WRKDIR}/tmp \
 	    || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fsck_ext2fs ${PREFIX}/sbin/
-	${INSTALL_MAN} ${FILESDIR}/fsck_ext2fs.8 ${PREFIX}/man/man8/
+	${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}
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
@@ -124,8 +130,6 @@
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-	@${ECHO_MSG} ; ${CAT} ${PKGMESSAGE} ; ${ECHO_MSG}
 # the next line closes .if ${MASTERDIR} == ${.CURDIR}
 .endif
 

Modified: trunk/sysutils/e2fsprogs/distinfo
===================================================================
--- trunk/sysutils/e2fsprogs/distinfo	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/distinfo	2014-09-27 14:05:41 UTC (rev 17556)
@@ -1,2 +1,2 @@
-SHA256 (e2fsprogs-1.42.8.tar.xz) = 2dd295a5b225e6fbdd0d6f3e266c4adaaa5188e863ddcc61c78012c9fac60578
-SIZE (e2fsprogs-1.42.8.tar.xz) = 4599820
+SHA256 (e2fsprogs-1.42.10.tar.xz) = 1f3324e80b042e8b9c2791c5b5de57afa205989b170e5800764ea60cb3961599
+SIZE (e2fsprogs-1.42.10.tar.xz) = 4676804

Modified: trunk/sysutils/e2fsprogs/files/fsck_ext2fs.8
===================================================================
--- trunk/sysutils/e2fsprogs/files/fsck_ext2fs.8	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/fsck_ext2fs.8	2014-09-27 14:05:41 UTC (rev 17556)
@@ -7,8 +7,8 @@
 .\" License: This file may be redistributed in accordance with the terms
 .\" of the GNU General Public License v2.
 .\"
-.\" Upstream $Id: fsck_ext2fs.8,v 1.2 2013-02-26 04:48:19 laffer1 Exp $
-.\" $FreeBSD$
+.\" Upstream $Id: fsck_ext2fs.8,v 1.3 2006/07/02 11:45:21 emma Exp $
+.\" $FreeBSD: head/sysutils/e2fsprogs/files/fsck_ext2fs.8 340872 2014-01-24 00:14:07Z mat $
 .\"
 .SH NAME
 .B fsck_ext2fs


Property changes on: trunk/sysutils/e2fsprogs/files/fsck_ext2fs.8
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/fsck_ext2fs.c
===================================================================
--- trunk/sysutils/e2fsprogs/files/fsck_ext2fs.c	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/fsck_ext2fs.c	2014-09-27 14:05:41 UTC (rev 17556)
@@ -4,9 +4,9 @@
  * redistributable in accordance with the
  * GNU General Public License v2
  *
- * $FreeBSD$
+ * $FreeBSD: head/sysutils/e2fsprogs/files/fsck_ext2fs.c 340872 2014-01-24 00:14:07Z mat $
  *
- * Upstream: $Id: fsck_ext2fs.c,v 1.2 2013-02-26 04:48:19 laffer1 Exp $
+ * Upstream: $Id: fsck_ext2fs.c,v 1.6 2006/07/02 11:37:49 emma Exp $
  *
  * format: gindent -kr
  */


Property changes on: trunk/sysutils/e2fsprogs/files/fsck_ext2fs.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/sysutils/e2fsprogs/files/patch-350897
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-350897	                        (rev 0)
+++ trunk/sysutils/e2fsprogs/files/patch-350897	2014-09-27 14:05:41 UTC (rev 17556)
@@ -0,0 +1,68 @@
+http://patchwork.ozlabs.org/patch/350897/
+debugfs: fix string_to_time for MacOS strptime()
+
+The strptime() function does not update fields in struct tm that are
+not specified in the input format.  The glibc implementation sets the
+tm_yday field (%j) when any of the year (%Y), month (%m), or day (%d)
+fields are changed, but the MacOS strptime() does not set tm_yday in
+this case.  This caused string_to_time() to calculate the wrong Unix
+epoch on MacOS. If tm_yday is unset, compute it in string_to_time().
+
+Signed-off-by: Andreas Dilger <adilger at dilger.ca>
+---
+ debugfs/util.c                    | 14 ++++++++++++++
+ tests/f_dup_resize/script         |  2 +-
+ tests/f_uninit_last_uninit/script |  2 +-
+ 3 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/debugfs/util.c b/debugfs/util.c
+index 9ddfe0b..20c6c61 100644
+--- a/debugfs/util.c
++++ b/debugfs/util.c
+@@ -245,6 +245,20 @@ time_t string_to_time(const char *arg)
+ 		ts.tm_mday = 0;
+ #endif
+ 	ts.tm_isdst = -1;
++	/* strptime() may only update the specified fields, which does not
++	 * necessarily include ts.tm_yday (%j).  Calculate this if unset:
++	 *
++	 * Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec
++	 * 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
++	 *
++	 * Start with 31 days per month.  Even months have only 30 days, but
++	 * reverse in August, subtract one day for those months. February has
++	 * only 28 days, not 30, subtract two days. Add day of month, minus
++	 * one, since day is not finished yet.  Leap years handled afterward. */
++	if (ts.tm_yday == 0)
++		ts.tm_yday = (ts.tm_mon * 31) -
++			((ts.tm_mon - (ts.tm_mon > 7)) / 2) -
++			2 * (ts.tm_mon > 1) + ts.tm_mday - 1;
+ 	ret = ts.tm_sec + ts.tm_min*60 + ts.tm_hour*3600 + ts.tm_yday*86400 +
+ 		(ts.tm_year-70)*31536000 + ((ts.tm_year-69)/4)*86400 -
+ 		((ts.tm_year-1)/100)*86400 + ((ts.tm_year+299)/400)*86400;
+diff --git a/tests/f_dup_resize/script b/tests/f_dup_resize/script
+index 659c92e..19fa120 100644
+--- a/tests/f_dup_resize/script
++++ b/tests/f_dup_resize/script
+@@ -12,7 +12,7 @@ freeb 4 4
+ freeb 8195 4
+ write $TEST_DATA debugfs
+ set_current_time 20050411000000
+-set_inode_field debugfs mtime 2005041100000000
++set_inode_field debugfs mtime 20050411000000
+ q
+ EOF
+ 
+diff --git a/tests/f_uninit_last_uninit/script b/tests/f_uninit_last_uninit/script
+index 2fe4f3a..376c978 100644
+--- a/tests/f_uninit_last_uninit/script
++++ b/tests/f_uninit_last_uninit/script
+@@ -5,7 +5,7 @@ SKIP_GUNZIP="true"
+ touch $TMPFILE
+ $MKE2FS -N 32 -F -o Linux -O uninit_bg -b 1024 $TMPFILE 10000 > /dev/null 2>&1 
+ $DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
+-set_current_time 200704102100
++set_current_time 20070410210000
+ set_super_value lastcheck 0
+ set_super_value hash_seed null
+ set_super_value mkfs_time 0


Property changes on: trunk/sysutils/e2fsprogs/files/patch-350897
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-e2fsck__unix.c	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-e2fsck__unix.c	2014-09-27 14:05:41 UTC (rev 17556)
@@ -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);


Property changes on: trunk/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h	2014-09-27 14:05:41 UTC (rev 17556)
@@ -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


Property changes on: trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__ext2_fs.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c	2014-09-27 14:05:41 UTC (rev 17556)
@@ -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


Property changes on: trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tdb.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c	2014-09-27 14:05:41 UTC (rev 17556)
@@ -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) {


Property changes on: trunk/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c	2014-09-27 14:05:41 UTC (rev 17556)
@@ -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>


Property changes on: trunk/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/patch-misc__Makefile.in
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-misc__Makefile.in	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-misc__Makefile.in	2014-09-27 14:05:41 UTC (rev 17556)
@@ -1,11 +1,11 @@
---- ./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 \
@@ -12,7 +12,7 @@
 -			$(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 \


Property changes on: trunk/sysutils/e2fsprogs/files/patch-misc__Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/files/patch-misc__tune2fs.c
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-misc__tune2fs.c	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-misc__tune2fs.c	2014-09-27 14:05:41 UTC (rev 17556)
@@ -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 at 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>
  


Property changes on: trunk/sysutils/e2fsprogs/files/patch-misc__tune2fs.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/e2fsprogs/files/patch-tests-md5sum
===================================================================
--- trunk/sysutils/e2fsprogs/files/patch-tests-md5sum	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/files/patch-tests-md5sum	2014-09-27 14:05:41 UTC (rev 17556)

Property changes on: trunk/sysutils/e2fsprogs/files/patch-tests-md5sum
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/e2fsprogs/pkg-descr
===================================================================
--- trunk/sysutils/e2fsprogs/pkg-descr	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/pkg-descr	2014-09-27 14:05:41 UTC (rev 17556)

Property changes on: trunk/sysutils/e2fsprogs/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/e2fsprogs/pkg-install
===================================================================
--- trunk/sysutils/e2fsprogs/pkg-install	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/pkg-install	2014-09-27 14:05:41 UTC (rev 17556)

Property changes on: trunk/sysutils/e2fsprogs/pkg-install
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/sysutils/e2fsprogs/pkg-message
===================================================================
--- trunk/sysutils/e2fsprogs/pkg-message	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/pkg-message	2014-09-27 14:05:41 UTC (rev 17556)

Property changes on: trunk/sysutils/e2fsprogs/pkg-message
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/sysutils/e2fsprogs/pkg-plist
===================================================================
--- trunk/sysutils/e2fsprogs/pkg-plist	2014-09-27 14:01:37 UTC (rev 17555)
+++ trunk/sysutils/e2fsprogs/pkg-plist	2014-09-27 14:05:41 UTC (rev 17556)
@@ -1,6 +1,37 @@
 bin/chattr
 bin/lsattr
 etc/mke2fs.conf.dist
+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
+man/man8/e2fsck.8.gz
+man/man8/e2image.8.gz
+man/man8/e2label.8.gz
+man/man8/e2undo.8.gz
+man/man8/mke2fs.8.gz
+man/man8/mklost+found.8.gz
+man/man8/resize2fs.8.gz
+man/man8/tune2fs.8.gz
+man/man8/fsck.ext2.8.gz
+man/man8/fsck.ext3.8.gz
+man/man8/fsck.ext4.8.gz
+man/man8/fsck.ext4dev.8.gz
+man/man8/mkfs.ext2.8.gz
+man/man8/mkfs.ext3.8.gz
+man/man8/mkfs.ext4.8.gz
+man/man8/mkfs.ext4dev.8.gz
+man/man8/findfs.8.gz
+man/man8/blkid.8.gz
+man/man8/logsave.8.gz
+man/man8/fsck_ext2fs.8.gz
+man/man8/e2freefrag.8.gz
 sbin/badblocks
 sbin/blkid
 sbin/debugfs
@@ -38,4 +69,3 @@
 %%NLS%%share/locale/tr/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/e2fsprogs.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/e2fsprogs.mo
-%%NLS%%@unexec for i in ca cs de es fr id it nl pl sv tr vi zh_CN ; do rmdir -p %D/share/locale/$i/LC_MESSAGES 2>/dev/null || true ; done

More information about the Midnightbsd-cvs mailing list