From nobody Wed Jan 26 23:01:56 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 55803198BC70; Wed, 26 Jan 2022 23:01:57 +0000 (UTC) (envelope-from git@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 4JkfP11Tp8z3MCk; Wed, 26 Jan 2022 23:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643238117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzHAPDnoYEwwoNpPEdzJfurV5wmRbJytXr2pZ3azV98=; b=v6bzvvJPp4C/4ZHhRnHoTkBsRXqyIyqnNOwk04t3qisf8yxnAhrDcBbrzxK5T32YQjmv9d Db5aIOIOU6iZzh6Aeq/peqhoK/i5PsHdtgP/xBWBx0XP3yX8yzOClemGmZutiGv8iBaUXj +QW2CkdWFrB+yc16wIcfitzNeV1CxSRe8kvIzUvjNx0NnNIAeR+wjXmW22xDDFgT1gqqro j54nVj85k8kogltvoq9aE5JsMYqyNc10gFOwNI+nUzgYPmOrkPF3+JPadrHHI1hay6FM51 ikHOdfURWQeSCO/MSDRomeymWVAvwFaVAaCxp+cGB7nSpgcRox97ofglXgPqNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 084FD3132; Wed, 26 Jan 2022 23:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20QN1uk7006406; Wed, 26 Jan 2022 23:01:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QN1uFk006405; Wed, 26 Jan 2022 23:01:56 GMT (envelope-from git) Date: Wed, 26 Jan 2022 23:01:56 GMT Message-Id: <202201262301.20QN1uFk006405@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: f35c75e711f3 - main - sysutils/e2fsprogs: update to 1.46.5 (bug fixes) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f35c75e711f3dad841b863a6017369dcde63982f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643238117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzHAPDnoYEwwoNpPEdzJfurV5wmRbJytXr2pZ3azV98=; b=UFh71EjehvUQg7e8+PB34dFgL/dtvjJilyz5XLHA1jc6iV8X3y7WQqHdjejQi3V6kw5vXc 8ybWSh4VJY0LXP2slKa/FWyTdNV35JZp89+0UM4fzrRsVOeDQzilCOh4cSKEkozR5NnrOn 4siOjf4RUlV4MiBatLuaqEKxOGR2eVItRLUYH6XWElJbmwsix/0fJ/E/pYGZQnSbOuAkyO 23jaba07W7Ly1AZC7HRX3AT1RCTRn1opQNUfIQT5X+zycNNvysJrO3KY5Z9gDVQNxQrCdI j2PCkd015wt4cA2TJ3+iWRGqF6LdbHPFfEAmDczNPsflMFQj0PivviFIp9ICGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643238117; a=rsa-sha256; cv=none; b=rJxC+zJZAy6O5dfu4kvK0QScKwW+UskS70IghMVAoA1q2KcLYC/704Xn/HPUZFFciGr/cw i1IfoMGaNQiecjAe+aa7Yqadq2i84c8NBX6IcO9mm28LeSltB2bmxzVmy9MZOiIPJA0Ucr uqGOzbEJVr8n/X+ZCpPla7jdavCOjtuggBNgFixWTrynxEGh0p+5SH47kqhpetV7MfBAhl vVl7ZRUpIiJf3lX28xeBNmN9bo4L2DtRHrCkgK9aas8/n2eJFzaFAnkb70p1T7Gbc2EpzZ xmUgfC/h99Ok/7K3bTU1loqlYfidp1XxLzmJAfHWEgtJAGkikkwFug8pzhe+6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=f35c75e711f3dad841b863a6017369dcde63982f commit f35c75e711f3dad841b863a6017369dcde63982f Author: Matthias Andree AuthorDate: 2022-01-26 22:26:20 +0000 Commit: Matthias Andree CommitDate: 2022-01-26 22:59:34 +0000 sysutils/e2fsprogs: update to 1.46.5 (bug fixes) Release notes: http://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.46.5 Workarounds: * patch CPPFLAGS to avoid __GNUC_PREREQ internal GCC macro, upstream regression in d55f8b8c 2021-08-17 | fix unused-function -Wall warnings (reported to Theodore Y. Ts'o by e-mail); macro is unavailable in clang. * timeout(1) not providing a -v; cherry-picking upstream's 8535250a 2022-01-03 | tests: support older versions of timeout in r_corrupt_fs --- sysutils/e2fsprogs/Makefile | 6 ++- sysutils/e2fsprogs/distinfo | 6 +-- sysutils/e2fsprogs/files/patch-ZZZ-g8535250a | 26 +++++++++++ sysutils/e2fsprogs/files/patch-slowtests | 66 ---------------------------- 4 files changed, 33 insertions(+), 71 deletions(-) diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index e73c4b14d5de..010d421b860b 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -13,8 +13,8 @@ # ext2/ext3/ext4 file systems at boot, before PREFIX is mounted PORTNAME= e2fsprogs -PORTVERSION= 1.46.4 -PORTREVISION?= 3 +PORTVERSION= 1.46.5 +PORTREVISION?= 0 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -61,6 +61,8 @@ CONFLICTS_INSTALL= e2fsprogs e2fsprogs-nobootfsck e2fsprogs-roothardlinks PORTSCOUT= ignore:1 # cannot handle the version in the directory .if !defined(MASTERDIR) +CPPFLAGS+= -D__GNUC_PREREQ\(a,b\)=1 + INSTALL_TARGET= install install-libs OPTIONS_DEFINE= DOCS NLS FUSEFS PARALLELTESTS SLOWTESTS BASHTESTS LIBUNWIND diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo index 0722d23204bc..0f7dd34cc74b 100644 --- a/sysutils/e2fsprogs/distinfo +++ b/sysutils/e2fsprogs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629558567 -SHA256 (e2fsprogs-1.46.4.tar.xz) = b11042533c1b1dcf17512f0da48e05b0c573dada1dd8b762864d10f4dc399713 -SIZE (e2fsprogs-1.46.4.tar.xz) = 7035200 +TIMESTAMP = 1643233594 +SHA256 (e2fsprogs-1.46.5.tar.xz) = 2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e +SIZE (e2fsprogs-1.46.5.tar.xz) = 7040672 diff --git a/sysutils/e2fsprogs/files/patch-ZZZ-g8535250a b/sysutils/e2fsprogs/files/patch-ZZZ-g8535250a new file mode 100644 index 000000000000..72820e4b67e6 --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-ZZZ-g8535250a @@ -0,0 +1,26 @@ +commit 8535250a8eeeb441cf466124cc420724935022eb +Author: Theodore Ts'o +Date: Mon Jan 3 22:45:37 2022 -0500 + + tests: support older versions of timeout in r_corrupt_fs + + Older versions of the timeout program in coreutils don't support the + -v option. (This is apparently still in use in the GNU/FreeBSD Debain + port since coreutils hasn't built successfully since Coreutils version + 8.28.) + + Signed-off-by: Theodore Ts'o + +diff --git a/tests/r_corrupt_fs/script b/tests/r_corrupt_fs/script +index 08af91ed..f6d3a89d 100644 +--- ./tests/r_corrupt_fs/script ++++ b/tests/r_corrupt_fs/script +@@ -17,7 +17,7 @@ $MKE2FS -q -F -t ext4 -o Linux -b 1024 $TMPFILE 32M >> $OUT.new 2>&1 + echo debugfs -w -R \"set_bg 1 free_blocks_count 65536\" /tmp/foo.img >> $OUT.new + $DEBUGFS -w -R "set_bg 1 free_blocks_count 65536" $TMPFILE > /dev/null 2>&1 + +-if type timeout > /dev/null 2>&1 ; then ++if timeout -v 1s true > /dev/null 2>&1 ; then + TIMEOUT="timeout -v 30s" + else + TIMEOUT= diff --git a/sysutils/e2fsprogs/files/patch-slowtests b/sysutils/e2fsprogs/files/patch-slowtests deleted file mode 100644 index ddde26f8f343..000000000000 --- a/sysutils/e2fsprogs/files/patch-slowtests +++ /dev/null @@ -1,66 +0,0 @@ -commit da33289073de254ab4bacb80b1b83cf9d27c76ea -Author: Lukas Czerner -Date: Tue Aug 24 14:10:20 2021 +0200 - - tests: update expect files for f_large_dir and f_large_dir_csum - - Update expect files for f_large_dir and f_large_dir_csum tests to - include the warning about missing y2038 support with 128-byte inodes. - - Fixes: a23b50cd ("mke2fs: warn about missing y2038 support when formatting fresh ext4 fs") - Signed-off-by: Lukas Czerner - Signed-off-by: Theodore Ts'o - -diff --git a/tests/f_large_dir/expect b/tests/f_large_dir/expect -index 028234cc..495ea85d 100644 ---- ./tests/f_large_dir/expect -+++ b/tests/f_large_dir/expect -@@ -1,3 +1,4 @@ -+128-byte inodes cannot handle dates beyond 2038 and are deprecated - Creating filesystem with 108341 1k blocks and 65072 inodes - Superblock backups stored on blocks: - 8193, 24577, 40961, 57345, 73729 -diff --git a/tests/f_large_dir_csum/expect b/tests/f_large_dir_csum/expect -index aa9f33f1..44770f7b 100644 ---- ./tests/f_large_dir_csum/expect -+++ b/tests/f_large_dir_csum/expect -@@ -1,3 +1,4 @@ -+128-byte inodes cannot handle dates beyond 2038 and are deprecated - Creating filesystem with 31002 1k blocks and 64 inodes - Superblock backups stored on blocks: - 8193, 24577 -commit 8b2beb24819a976f575e8cec04e3fe6ca8851017 -Author: Lukas Czerner -Date: Tue Aug 24 14:10:19 2021 +0200 - - tests: update expect files for f_mmp_garbage - - Update expect file for f_mmp_garbage test to work correctly with the - new default 256 inode size. - - Fixes: d730be5ceeba ("tests: update mke2fs.conf to create 256 byte inodes by default") - Signed-off-by: Lukas Czerner - Signed-off-by: Theodore Ts'o - -diff --git a/tests/f_mmp_garbage/expect.1 b/tests/f_mmp_garbage/expect.1 -index a8add101..4134eaea 100644 ---- ./tests/f_mmp_garbage/expect.1 -+++ b/tests/f_mmp_garbage/expect.1 -@@ -5,5 +5,5 @@ Pass 2: Checking directory structure - Pass 3: Checking directory connectivity - Pass 4: Checking reference counts - Pass 5: Checking group summary information --test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks -+test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks - Exit status is 0 -diff --git a/tests/f_mmp_garbage/expect.2 b/tests/f_mmp_garbage/expect.2 -index 66300025..3bca182e 100644 ---- ./tests/f_mmp_garbage/expect.2 -+++ b/tests/f_mmp_garbage/expect.2 -@@ -3,5 +3,5 @@ Pass 2: Checking directory structure - Pass 3: Checking directory connectivity - Pass 4: Checking reference counts - Pass 5: Checking group summary information --test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks -+test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks - Exit status is 0