debian: update for v1.45.1-3 to fix e2scrub_all bugs

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

diff --git a/debian/changelog b/debian/changelog
index 5ee6281..647b911 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+e2fsprogs (1.45.1-3) unstable; urgency=medium
+
+  * Fix e2scrub_all cron failures (Closes: #9292870)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 20 May 2019 21:48:40 -0400
+
 e2fsprogs (1.45.1-2) unstable; urgency=medium
 
   * Avoid spurious e2scrub_all error messages spamming administrators from

diff --git a/debian/patches/0003-e2scrub_all-fix-missing-getopts-argument-which-broke.patch b/debian/patches/0003-e2scrub_all-fix-missing-getopts-argument-which-broke.patch
new file mode 100644 (file)
index 0000000..23b13ef
--- /dev/null
+++ b/debian/patches/0003-e2scrub_all-fix-missing-getopts-argument-which-broke.patch
@@ -0,0 +1,29 @@
+From cf62b892ebe0b4fef82057939979417014427882 Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Mon, 20 May 2019 20:34:59 -0400
+Subject: [PATCH] e2scrub_all: fix missing getopts argument which broke
+ e2scrub_all -C
+
+Addresses-Debian-Bug: #929287
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ scrub/e2scrub_all.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in
+index abc237e42..d99c81978 100644
+--- a/scrub/e2scrub_all.in
++++ b/scrub/e2scrub_all.in
+@@ -69,7 +69,7 @@ exitcode() {
+       exit "${ret}"
+ }
+ 
+-while getopts "nrAV" opt; do
++while getopts "nrACV" opt; do
+       case "${opt}" in
+       "n") DBG="echo Would execute: " ;;
+       "r") scrub_args="${scrub_args} -r"; reap=1;;
+-- 
+2.19.1
+

diff --git a/debian/patches/series b/debian/patches/series
index 3c24d42..15a3b0b 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-e2scrub-stop-cron-spam-if-lvm2-is-not-installed.patch
 0002-e2scrub_all-avoid-scrubbing-all-devices-when-there-i.patch
+0003-e2scrub_all-fix-missing-getopts-argument-which-broke.patch