From 937948e5bafa61c968dd5071a0df2213d021c2b9 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Fri, 6 Aug 2021 11:35:07 +0300
Subject: [PATCH] e2fsprogs-1.46.3

---
 .../files/0001-remove-local-PATH.patch        | 26 +++++++++++++++++++
 ...sts-skip-u_direct_io-if-losetup-fails.diff | 16 ++++++++++++
 system/base/e2fsprogs/pspec.xml               | 12 ++++++++-
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 system/base/e2fsprogs/files/0001-remove-local-PATH.patch
 create mode 100644 system/base/e2fsprogs/files/RESEND-tests-skip-u_direct_io-if-losetup-fails.diff

diff --git a/system/base/e2fsprogs/files/0001-remove-local-PATH.patch b/system/base/e2fsprogs/files/0001-remove-local-PATH.patch
new file mode 100644
index 00000000..0f38eb18
--- /dev/null
+++ b/system/base/e2fsprogs/files/0001-remove-local-PATH.patch
@@ -0,0 +1,26 @@
+Index: e2fsprogs-1.45.6/scrub/e2scrub.in
+===================================================================
+--- e2fsprogs-1.45.6.orig/scrub/e2scrub.in
++++ e2fsprogs-1.45.6/scrub/e2scrub.in
+@@ -23,7 +23,7 @@
+ # check filesystems in VGs that have at least 256MB (or so) of
+ # free space.
+ 
+-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
++PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
+ 
+ if (( $EUID != 0 )); then
+     echo "e2scrub must be run as root"
+Index: e2fsprogs-1.45.6/scrub/e2scrub_all.in
+===================================================================
+--- e2fsprogs-1.45.6.orig/scrub/e2scrub_all.in
++++ e2fsprogs-1.45.6/scrub/e2scrub_all.in
+@@ -18,7 +18,7 @@
+ #  along with this program; if not, write the Free Software Foundation,
+ #  Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
++PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
+ 
+ if (( $EUID != 0 )); then
+     echo "e2scrub_all must be run as root"
diff --git a/system/base/e2fsprogs/files/RESEND-tests-skip-u_direct_io-if-losetup-fails.diff b/system/base/e2fsprogs/files/RESEND-tests-skip-u_direct_io-if-losetup-fails.diff
new file mode 100644
index 00000000..544bd78f
--- /dev/null
+++ b/system/base/e2fsprogs/files/RESEND-tests-skip-u_direct_io-if-losetup-fails.diff
@@ -0,0 +1,16 @@
+diff --git a/tests/u_direct_io/script b/tests/u_direct_io/script
+index 0b5d7083..b4f07752 100644
+--- a/tests/u_direct_io/script
++++ b/tests/u_direct_io/script
+@@ -9,6 +9,11 @@ elif test ! -x $DEBUGFS_EXE; then
+ else
+     dd if=/dev/zero of=$TMPFILE bs=1M count=128 > /dev/null 2>&1
+     LOOP=$(losetup --show --sector-size 4096 -f $TMPFILE)
++    if [ ! -b "$LOOP" ]; then
++        echo "$test_name: $DESCRIPTION: skipped (no loop devices)"
++        rm -f $TMPFILE
++        exit 0
++    fi
+     echo mke2fs -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D \$LOOP > $OUT
+     $MKE2FS -F -o Linux -t ext4 -O ^metadata_csum,^uninit_bg -D $LOOP 2>&1 | \
+ 	sed -f $cmd_dir/filter.sed >> $OUT
diff --git a/system/base/e2fsprogs/pspec.xml b/system/base/e2fsprogs/pspec.xml
index c5a0ac2d..15ea3676 100644
--- a/system/base/e2fsprogs/pspec.xml
+++ b/system/base/e2fsprogs/pspec.xml
@@ -12,16 +12,19 @@
         <IsA>app:console</IsA>
         <Summary>Standard ext2/3/4 filesystem utilities</Summary>
         <Description>e2fsprogs provides the filesystem utilities for use with the ext2 filesystem. It also supports the ext3/4 filesystem with journaling support.</Description>
-        <Archive sha1sum="4f2eb83d9fd96d61355c10f1223e47cc8df71229" type="targz">mirrors://sourceforge/e2fsprogs/e2fsprogs-1.45.6.tar.gz</Archive>
+        <Archive sha1sum="4eaeaa0dd3fe8e5d915ff241903a78f8b28c6b20" type="targz">mirrors://sourceforge/e2fsprogs/e2fsprogs-1.46.3.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>libutil-linux-devel</Dependency>
             <!-- The first release shipped within util-linux -->
             <Dependency>gettext</Dependency>
+            <Dependency>texinfo</Dependency>
             <Dependency>util-linux</Dependency>
             <Dependency>fuse-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">ntfs-3g.patch</Patch>
+            <Patch level="1">0001-remove-local-PATH.patch</Patch>
+            <Patch level="1">RESEND-tests-skip-u_direct_io-if-losetup-fails.diff</Patch>
             <!-- strip references to workDir() from /usr/bin/mk_cmds and /usr/bin/compile_et -->
             <!--<Patch level="1">e2fsprogs-1.41.8-strip-me.patch</Patch>-->
         </Patches>
@@ -67,6 +70,13 @@
     </Package>
 
     <History>
+        <Update release="11">
+            <Date>2021-08-06</Date>
+            <Version>1.46.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="10">
             <Date>2020-12-09</Date>
             <Version>1.45.6</Version>