Update debian/changelog and debian/patches for the 1.46.5-2 release

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 3b6124b..647c75b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+e2fsprogs (1.46.5-2) unstable; urgency=medium
+
+  * Fix build on GNU/kFreeBSD (caused by the fact that the Debian port has
+    an ancient version of coreutils, so the timeout program doesn't support
+    the -v option.
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 03 Jan 2022 23:48:13 -0500
+
 e2fsprogs (1.46.5-1) unstable; urgency=medium
 
   * New upstream release

diff --git a/debian/patches/0001-tests-support-older-versions-of-timeout-in-r_corrupt b/debian/patches/0001-tests-support-older-versions-of-timeout-in-r_corrupt
new file mode 100644 (file)
index 0000000..f2395e8
--- /dev/null
+++ b/debian/patches/0001-tests-support-older-versions-of-timeout-in-r_corrupt
@@ -0,0 +1,31 @@
+From 8535250a8eeeb441cf466124cc420724935022eb Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Mon, 3 Jan 2022 22:45:37 -0500
+Subject: [PATCH] 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 <tytso@mit.edu>
+---
+ tests/r_corrupt_fs/script | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/r_corrupt_fs/script b/tests/r_corrupt_fs/script
+index 08af91ed..f6d3a89d 100644
+--- a/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=
+-- 
+2.31.0
+

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..227144f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-tests-support-older-versions-of-timeout-in-r_corrupt