svn commit: r418578 - in head/sysutils/e2fsprogs: . files
Matthias Andree
mandree at FreeBSD.org
Fri Jul 15 12:16:03 UTC 2016
Author: mandree
Date: Fri Jul 15 12:16:01 2016
New Revision: 418578
URL: https://svnweb.freebsd.org/changeset/ports/418578
Log:
Update to new upstream release 1.43.1.
1.43.1 has seen several FreeBSD portability fixes upstream, so we could
finally upgrade the port. Tweaking the test set for non-high-end
computers took a while.
Make set of self-tests configurable. Add Perl and GNU dd to build
dependency list when needed so tests can pass in a poudriere build.
Assorted other tweaks.
Upstream's change log:
http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43.1 and
http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.43
Deleted:
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_blkid_getsize.c
head/sysutils/e2fsprogs/files/patch-misc__tune2fs.c
head/sysutils/e2fsprogs/files/patch-zzz-f449486d
Modified:
head/sysutils/e2fsprogs/Makefile
head/sysutils/e2fsprogs/distinfo
head/sysutils/e2fsprogs/files/patch-e2fsck__unix.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/pkg-plist
Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile Fri Jul 15 12:01:19 2016 (r418577)
+++ head/sysutils/e2fsprogs/Makefile Fri Jul 15 12:16:01 2016 (r418578)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= e2fsprogs
-PORTVERSION= 1.42.13
+PORTVERSION= 1.43.1
PORTREVISION?= 0
CATEGORIES?= sysutils
MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION}
@@ -20,7 +20,6 @@ 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' pkgconfigdir='${PREFIX}/libdata/pkgconfig'
@@ -30,7 +29,9 @@ MAKE_ENV+= CHECK_CMD=@true
OPTIONS_DEFINE= DOCS NLS
OPTIONS_EXCLUDE+= EXAMPLES
-PORTDOCS= COPYING RELEASE-NOTES
+BUILD_DEPENDS+= gdd:sysutils/coreutils
+
+PORTDOCS= NOTICE README RELEASE-NOTES SUBMITTING-PATCHES
post-extract:
@${CHMOD} u+w ${WRKSRC}/po/*.po ${WRKSRC}/po/*.pot \
@@ -44,12 +45,27 @@ PKGDEINSTALL= ${PKGINSTALL}
MAKE_ARGS+= V=1
.endif
+OPTIONS_DEFINE= PARALLELTESTS
+OPTIONS_SINGLE= SELFTEST
+OPTIONS_SINGLE_SELFTEST= NOTESTS SMALLTESTS ALLTESTS
+OPTIONS_DEFAULT= SMALLTESTS
+SELFTEST_DESC= Choose which set of self-tests to run
+NOTESTS_DESC= Do not run any self-tests (DISCOURAGED)
+SMALLTESTS_DESC=Run sets that fit into 500 MB disk space (DEFAULT)
+ALLTESTS_DESC= Run all self-tests
+PARALLELTESTS_DESC= Run self-tests in parallel (requires more disk space)
+
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
USES+= gettext iconv:build
.endif
+.if empty(PORT_OPTIONS:MNOTESTS)
+USES+= perl5
+USE_PERL5= build
+.endif
+
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MNLS}
@@ -69,21 +85,64 @@ post-patch::
# 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/' \
- -e "s/ == 0/ = 0/" ${WRKSRC}/tests/[a-t]_*/script
+ -e "s/ == 0/ = 0/" -e "s/tar x$$/tar xf -/" -e "s/\<dd\>/gdd/" \
+ ${WRKSRC}/tests/[a-z]_*/script
@${REINPLACE_CMD} -e 's/<malloc\.h>/<stdlib.h>/' ${WRKSRC}/*/*.c
-# 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 appears to have differences in screen output, reason
-# unclear.
-.for i in f_mmp_garbage m_bigjournal r_64bit_big_expand r_bigalloc_big_expand r_ext4_big_expand f_extent_oobounds
+.if empty(PORT_OPTIONS:MALLTESTS)
+.for i in \
+ f_baddir \
+ f_bbfile \
+ f_convert_bmap \
+ f_detect_junk \
+ f_inode_ea_collision \
+ f_lpffile \
+ f_no_cache_corrupt_inode \
+ f_opt_extent \
+ j_corrupt_descr_csum \
+ m_bigjournal \
+ m_hugefile_slack \
+ m_offset \
+ m_raid_opt \
+ r_32to64bit \
+ r_32to64bit_expand_full \
+ r_32to64bit_meta \
+ r_32to64bit_move_itable \
+ r_64to32bit \
+ r_64to32bit_meta \
+ r_expand_full \
+ r_min_itable \
+ t_change_uuid_mounted \
+ t_dangerous \
+ t_disable_changed_csum_seed_mounted \
+ t_disable_mcsum \
+ t_disable_mcsum_noinitbg \
+ t_disable_mcsum_yesinitbg \
+ t_enable_mcsum \
+ t_enable_mcsum_initbg \
+ t_iexpand_full \
+ t_iexpand_mcsum \
+ t_uninit_bg_rm \
+ u_dryrun \
+ u_mke2fs_opt_offset
@${MV} ${WRKSRC}/tests/${i} ${WRKSRC}/tests/disabled_test-${i}
.endfor
+.endif
.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
+ cd ${WRKSRC}/lib/support && ${DO_MAKE_BUILD} prof_err.h
+
+.if ${PORT_OPTIONS:MPARALLELTESTS}
+_CHECK_JOBS=${_MAKE_JOBS}
+.else
+_CHECK_JOBS=
+.endif
+
+.if !defined(TMPDIR)
+_checkaddargs=TMPDIR=${WRKDIR}/tmp
+.endif
post-build:
# Relink e2fsck statically - We need to make sure that tools for the root file
@@ -94,16 +153,15 @@ post-build:
&& ${MAKE_CMD} e2fsck \
STATIC_LIBS="../lib/libext2fs.a ../lib/libcom_err.a \
../lib/libblkid.a ../lib/libuuid.a" \
- LIBINTL=${libintl}
+ LIBINTL=${libintl} LIBMAGIC=/usr/lib/libmagic.a\ -lz
# Regression check: avoid a port (not upstream!) regression from 1.40.5,
# check that e2fsck isn't dynalinked against anything but libc.so:
- @${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects beyond libc and libgcc: "
+ @${ECHO_CMD} -n "===> checking that e2fsck depends on no shared objects outside /lib: "
@a="$$(ldd ${WRKSRC}/e2fsck/e2fsck 2>/dev/null \
| ${GREP} -v 'not a dynamic executable' \
| ${GREP} '=>' \
| ${AWK} '{print $$3;}' \
- | ${EGREP} -v '^/lib/libgcc(_s)?\.so\.' \
- | ${GREP} -v '^/lib/libc\.so\.' || :)"; \
+ | ${EGREP} -v '^/lib/lib.*\.so\.' || :)"; \
if test "x$$a" = "x" ; then echo 'PASS' ; else \
echo 'FAIL' ; echo '===> e2fsck depends on:' ; echo "$$a" ; exit 1 ; fi
# Update translation binary files
@@ -121,9 +179,9 @@ post-build:
# 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'
-# do not add -j options to ${MAKE_CMD} below, this might break
+# do not add -j options unconditionally to ${MAKE_CMD} below, this might break
# due to excessive disk space use.
- cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} check TMPDIR=${WRKDIR}/tmp \
+ cd ${WRKSRC}/tests && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} check ${_CHECK_JOBS} ${_checkaddargs} \
|| { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; }
post-install:
Modified: head/sysutils/e2fsprogs/distinfo
==============================================================================
--- head/sysutils/e2fsprogs/distinfo Fri Jul 15 12:01:19 2016 (r418577)
+++ head/sysutils/e2fsprogs/distinfo Fri Jul 15 12:16:01 2016 (r418578)
@@ -1,2 +1,3 @@
-SHA256 (e2fsprogs-1.42.13.tar.xz) = e16474b5a3a30f9197160c4b91bd48d5a463583049c0fcc405b6f0f7075aa0c7
-SIZE (e2fsprogs-1.42.13.tar.xz) = 4802740
+TIMESTAMP = 1466265501
+SHA256 (e2fsprogs-1.43.1.tar.xz) = 97e36a029224e2606baa6e9ea693b04a4d192ccd714572a1b50a2df9c687b23d
+SIZE (e2fsprogs-1.43.1.tar.xz) = 5078696
Modified: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Fri Jul 15 12:01:19 2016 (r418577)
+++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Fri Jul 15 12:16:01 2016 (r418578)
@@ -1,4 +1,4 @@
---- e2fsck/unix.c.orig 2014-08-12 18:19:37 UTC
+--- e2fsck/unix.c.orig 2016-05-09 02:18:14 UTC
+++ e2fsck/unix.c
@@ -9,8 +9,6 @@
* %End-Header%
@@ -9,7 +9,7 @@
#include "config.h"
#include <stdio.h>
#ifdef HAVE_STDLIB_H
-@@ -37,7 +35,7 @@
+@@ -37,7 +35,7 @@ extern int optind;
#include <sys/ioctl.h>
#endif
#ifdef HAVE_MALLOC_H
@@ -18,7 +18,7 @@
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-@@ -590,6 +588,24 @@
+@@ -593,6 +591,24 @@ static int e2fsck_update_progress(e2fsck
return 0;
}
@@ -43,7 +43,7 @@
#define PATH_SET "PATH=/sbin"
/*
-@@ -622,6 +638,17 @@
+@@ -625,6 +641,17 @@ static void signal_progress_on(int sig E
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;
-@@ -1001,6 +1028,8 @@
+@@ -1062,6 +1089,8 @@ static errcode_t PRS(int argc, char *arg
sigaction(SIGUSR1, &sa, 0);
sa.sa_handler = signal_progress_off;
sigaction(SIGUSR2, &sa, 0);
Modified: head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c Fri Jul 15 12:01:19 2016 (r418577)
+++ head/sysutils/e2fsprogs/files/patch-lib__ext2fs__tst_bitops.c Fri Jul 15 12:16:01 2016 (r418578)
@@ -1,6 +1,6 @@
---- lib/ext2fs/tst_bitops.c.orig 2014-06-25 19:19:15 UTC
+--- lib/ext2fs/tst_bitops.c.orig 2014-10-16 00:29:23 UTC
+++ lib/ext2fs/tst_bitops.c
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ int main(int argc, char **argv)
bigarray = malloc(1 << 29);
if (!bigarray) {
fprintf(stderr, "Failed to allocate scratch memory!\n");
Modified: head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Fri Jul 15 12:01:19 2016 (r418577)
+++ head/sysutils/e2fsprogs/files/patch-lib__uuid__gen_uuid.c Fri Jul 15 12:16:01 2016 (r418578)
@@ -1,6 +1,6 @@
---- lib/uuid/gen_uuid.c.orig 2014-07-03 14:33:48 UTC
+--- lib/uuid/gen_uuid.c.orig 2016-03-21 17:21:03 UTC
+++ lib/uuid/gen_uuid.c
-@@ -91,6 +91,7 @@
+@@ -92,6 +92,7 @@
#ifdef HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
@@ -8,7 +8,7 @@
#include "uuidP.h"
#include "uuidd.h"
-@@ -300,6 +301,28 @@
+@@ -301,6 +302,28 @@ static int get_node_id(unsigned char *no
}
}
close(sd);
Modified: head/sysutils/e2fsprogs/files/patch-misc__Makefile.in
==============================================================================
--- head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Fri Jul 15 12:01:19 2016 (r418577)
+++ head/sysutils/e2fsprogs/files/patch-misc__Makefile.in Fri Jul 15 12:16:01 2016 (r418578)
@@ -1,27 +1,28 @@
---- misc/Makefile.in.orig 2014-08-02 23:41:18 UTC
+--- misc/Makefile.in.orig 2016-03-18 19:14:18 UTC
+++ misc/Makefile.in
-@@ -28,15 +28,15 @@
+@@ -34,16 +34,16 @@ INSTALL = @INSTALL@
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 $(UUIDD_PROG) $(E4DEFRAG_PROG)
+-USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \
++USPROGS= mklost+found e2freefrag $(UUIDD_PROG) \
+ $(E4DEFRAG_PROG) $(E4CRYPT_PROG) $(FUSE_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@
+- $(UUIDD_MAN) $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@
+ logsave.8 e2freefrag.8 e2undo.8 \
-+ $(E4DEFRAG_MAN) @FSCK_MAN@
++ $(E4DEFRAG_MAN) $(E4CRYPT_MAN) @FSCK_MAN@
FMANPAGES= mke2fs.conf.5 ext4.5
-UPROGS= chattr lsattr @UUID_CMT@ uuidgen
--UMANPAGES= chattr.1 lsattr.1 @UUID_CMT@ uuidgen.1
+-UMANPAGES= chattr.1 fuse2fs.1 lsattr.1 @UUID_CMT@ uuidgen.1
+UPROGS= chattr lsattr
-+UMANPAGES= chattr.1 lsattr.1
++UMANPAGES= chattr.1 fuse2fs.1 lsattr.1
LPROGS= @E2INITRD_PROG@
-@@ -127,14 +127,14 @@
+@@ -143,14 +143,14 @@ profiled:
mke2fs.conf: $(srcdir)/mke2fs.conf.in
if test -f $(srcdir)/mke2fs.conf.custom.in ; then \
@@ -37,9 +38,9 @@
- $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf \
+ $(Q) $(AWK) -f $(srcdir)/profile-to-c.awk < mke2fs.conf.dist \
> default_profile.c
- profile.o:
- $(E) " CC $<"
-@@ -515,34 +515,9 @@
+ findsuper: findsuper.o
+ $(E) " LD $@"
+@@ -575,34 +575,9 @@ install: all $(SMANPAGES) $(UMANPAGES) i
(cd $(DESTDIR)$(man5dir); \
$(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \
done
Modified: head/sysutils/e2fsprogs/pkg-plist
==============================================================================
--- head/sysutils/e2fsprogs/pkg-plist Fri Jul 15 12:01:19 2016 (r418577)
+++ head/sysutils/e2fsprogs/pkg-plist Fri Jul 15 12:16:01 2016 (r418578)
@@ -2,6 +2,7 @@ bin/chattr
bin/lsattr
etc/mke2fs.conf.dist
man/man1/chattr.1.gz
+man/man1/fuse2fs.1.gz
man/man1/lsattr.1.gz
man/man5/e2fsck.conf.5.gz
man/man5/mke2fs.conf.5.gz
More information about the svn-ports-all
mailing list