From owner-svn-ports-branches@freebsd.org Tue Feb 2 23:24:05 2021 Return-Path: Delivered-To: svn-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 59CEA4F8F37; Tue, 2 Feb 2021 23:24:05 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DVgqn23sdz4jFs; Tue, 2 Feb 2021 23:24:05 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3969216CB8; Tue, 2 Feb 2021 23:24:05 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 112NO5CT051210; Tue, 2 Feb 2021 23:24:05 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 112NO3Iv051202; Tue, 2 Feb 2021 23:24:03 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202102022324.112NO3Iv051202@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 2 Feb 2021 23:24:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r563850 - in branches/2021Q1: misc/e2fsprogs-libblkid sysutils/e2fsprogs sysutils/e2fsprogs/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2021Q1: misc/e2fsprogs-libblkid sysutils/e2fsprogs sysutils/e2fsprogs/files X-SVN-Commit-Revision: 563850 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Feb 2021 23:24:05 -0000 Author: mandree Date: Tue Feb 2 23:24:03 2021 New Revision: 563850 URL: https://svnweb.freebsd.org/changeset/ports/563850 Log: MFH: r563848 sysutils/e2fsprogs: update to new 1.45.7 upstream release Changelog: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/plain/doc/RelNotes/v1.45.7.txt?h=v1.45.7 Added: branches/2021Q1/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in - copied unchanged from r563848, head/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in Deleted: branches/2021Q1/sysutils/e2fsprogs/files/patch-0-tytso-1-Use-ext2_loff_t-instead-of-loff_t.patch branches/2021Q1/sysutils/e2fsprogs/files/patch-0-tytso-2-e2fsck-fix-various-gcc-Wall-nits.patch branches/2021Q1/sysutils/e2fsprogs/files/patch-0-tytso-3-tests-use-grep-E-for-better-portability-in-r_inline_.patch Modified: branches/2021Q1/misc/e2fsprogs-libblkid/Makefile branches/2021Q1/sysutils/e2fsprogs/Makefile branches/2021Q1/sysutils/e2fsprogs/distinfo branches/2021Q1/sysutils/e2fsprogs/files/patch-e2fsck__unix.c branches/2021Q1/sysutils/e2fsprogs/files/patch-misc__Makefile.in branches/2021Q1/sysutils/e2fsprogs/files/patch-tests_Makefile.in Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/misc/e2fsprogs-libblkid/Makefile ============================================================================== --- branches/2021Q1/misc/e2fsprogs-libblkid/Makefile Tue Feb 2 23:15:26 2021 (r563849) +++ branches/2021Q1/misc/e2fsprogs-libblkid/Makefile Tue Feb 2 23:24:03 2021 (r563850) @@ -1,7 +1,7 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= misc devel PKGNAMESUFFIX= -libblkid Modified: branches/2021Q1/sysutils/e2fsprogs/Makefile ============================================================================== --- branches/2021Q1/sysutils/e2fsprogs/Makefile Tue Feb 2 23:15:26 2021 (r563849) +++ branches/2021Q1/sysutils/e2fsprogs/Makefile Tue Feb 2 23:24:03 2021 (r563850) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= e2fsprogs -PORTVERSION= 1.45.6 -PORTREVISION?= 5 +PORTVERSION= 1.45.7 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -213,19 +213,16 @@ _CHECK_JOBS=${_MAKE_JOBS} _CHECK_JOBS= .endif +_checkaddargs= .if ${PORT_OPTIONS:MBASHTESTS} _CHECK_SHELL=${SHELL} +_checkaddargs+=--eval SHELL:=${BASH_CMD} .else _CHECK_SHELL=${LOCALBASE}/bin/bash .endif -_checkaddargs= .if !defined(TMPDIR) _checkaddargs+=TMPDIR=${WRKDIR}/tmp -.endif - -.if ${PORT_OPTIONS:MBASHTESTS} -_checkaddargs+=--eval SHELL:=${BASH_CMD} .endif .if ${PORT_OPTIONS:MSLOWTESTS} Modified: branches/2021Q1/sysutils/e2fsprogs/distinfo ============================================================================== --- branches/2021Q1/sysutils/e2fsprogs/distinfo Tue Feb 2 23:15:26 2021 (r563849) +++ branches/2021Q1/sysutils/e2fsprogs/distinfo Tue Feb 2 23:24:03 2021 (r563850) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584954798 -SHA256 (e2fsprogs-1.45.6.tar.xz) = ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256 -SIZE (e2fsprogs-1.45.6.tar.xz) = 5572144 +TIMESTAMP = 1612301930 +SHA256 (e2fsprogs-1.45.7.tar.xz) = 62d49c86d9d4becf305093edd65464484dc9ea41c6ff9ae4f536e4a341b171a2 +SIZE (e2fsprogs-1.45.7.tar.xz) = 5570052 Modified: branches/2021Q1/sysutils/e2fsprogs/files/patch-e2fsck__unix.c ============================================================================== --- branches/2021Q1/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Tue Feb 2 23:15:26 2021 (r563849) +++ branches/2021Q1/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Tue Feb 2 23:24:03 2021 (r563850) @@ -2,7 +2,7 @@ // remove the #define _XOPEN_SOURCE 600 // It would hide all non-POSIX declarations, including SIGINFO. ---- e2fsck/unix.c.orig 2020-03-21 04:24:04 UTC +--- e2fsck/unix.c.orig 2021-01-29 05:51:02 UTC +++ e2fsck/unix.c @@ -9,8 +9,6 @@ * %End-Header% @@ -13,6 +13,15 @@ #include "config.h" #include #ifdef HAVE_STDLIB_H +@@ -37,7 +35,7 @@ extern int optind; + #include + #endif + #ifdef HAVE_MALLOC_H +-#include ++#include + #endif + #ifdef HAVE_SYS_TYPES_H + #include @@ -602,6 +600,24 @@ static int e2fsck_update_progress(e2fsck_t ctx, int pa return 0; } Copied: branches/2021Q1/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in (from r563848, head/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2021Q1/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in Tue Feb 2 23:24:03 2021 (r563850, copy of r563848, head/sysutils/e2fsprogs/files/patch-lib_support_Makefile.in) @@ -0,0 +1,11 @@ +--- lib/support/Makefile.in.orig 2021-01-29 05:51:02 UTC ++++ lib/support/Makefile.in +@@ -44,7 +44,7 @@ LIBDIR= support + @MAKEFILE_LIBRARY@ + @MAKEFILE_PROFILE@ + +-COMPILE_ET= _ET_DIR_OVERRIDE=$(srcdir)/../et ../et/compile_et ++COMPILE_ET= /usr/bin/env _ET_DIR_OVERRIDE=$(srcdir)/../et ../et/compile_et + + .c.o: + $(E) " CC $<" Modified: branches/2021Q1/sysutils/e2fsprogs/files/patch-misc__Makefile.in ============================================================================== --- branches/2021Q1/sysutils/e2fsprogs/files/patch-misc__Makefile.in Tue Feb 2 23:15:26 2021 (r563849) +++ branches/2021Q1/sysutils/e2fsprogs/files/patch-misc__Makefile.in Tue Feb 2 23:24:03 2021 (r563850) @@ -1,6 +1,6 @@ ---- misc/Makefile.in.orig 2020-01-06 23:10:17 UTC +--- misc/Makefile.in.orig 2021-01-29 05:51:02 UTC +++ misc/Makefile.in -@@ -34,17 +34,17 @@ INSTALL = @INSTALL@ +@@ -35,17 +35,17 @@ MKDIR_P = @MKDIR_P@ SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ $(E2IMAGE_PROG) @FSCK_PROG@ e2undo @@ -23,7 +23,7 @@ UMANPAGES+= @FUSE_CMT@ fuse2fs.1 LPROGS= @E2INITRD_PROG@ -@@ -147,14 +147,14 @@ profiled: +@@ -148,14 +148,14 @@ profiled: mke2fs.conf: $(srcdir)/mke2fs.conf.in if test -f $(srcdir)/mke2fs.conf.custom.in ; then \ @@ -41,7 +41,7 @@ > default_profile.c findsuper: findsuper.o $(E) " LD $@" -@@ -605,34 +605,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs +@@ -606,34 +606,9 @@ install: all $(SMANPAGES) $(UMANPAGES) installdirs (cd $(DESTDIR)$(man5dir); \ $(LN) $(LINK_INSTALL_FLAGS) ext4.5 $$i.5); \ done Modified: branches/2021Q1/sysutils/e2fsprogs/files/patch-tests_Makefile.in ============================================================================== --- branches/2021Q1/sysutils/e2fsprogs/files/patch-tests_Makefile.in Tue Feb 2 23:15:26 2021 (r563849) +++ branches/2021Q1/sysutils/e2fsprogs/files/patch-tests_Makefile.in Tue Feb 2 23:24:03 2021 (r563850) @@ -1,6 +1,6 @@ ---- tests/Makefile.in.orig 2019-07-15 01:03:14 UTC +--- tests/Makefile.in.orig 2021-01-29 05:51:02 UTC +++ tests/Makefile.in -@@ -16,7 +16,7 @@ all:: @DO_TEST_SUITE@ test_one test_script +@@ -17,7 +17,7 @@ all:: @DO_TEST_SUITE@ test_one test_script test_one: $(srcdir)/test_one.in Makefile mke2fs.conf test_data.tmp @echo "Creating test_one script..." @[ -f test_one ] && chmod u+w test_one || true