Control: tags 977410 + patch Control: tags 977410 + pending
Dear maintainer, I've prepared an NMU for rmlint (versioned as 2.9.0-2.3). The diff is attached to this message. I require a sponsor to have it uploaded. Regards. -- ⢀⣴⠾⠻⢶⣦⠀ ╭────────────────────────────────────────────────────╮ ⣾⠁⢠⠒⠀⣿⡁ │ Timo Röhling │ ⢿⡄⠘⠷⠚⠋⠀ │ 9B03 EBB9 8300 DF97 C2B1 23BF CC8C 6BDD 1403 F4CA │ ⠈⠳⣄⠀⠀⠀⠀ ╰────────────────────────────────────────────────────╯
diff -Nru rmlint-2.9.0/debian/changelog rmlint-2.9.0/debian/changelog
--- rmlint-2.9.0/debian/changelog 2020-12-01 21:37:43.000000000 +0100
+++ rmlint-2.9.0/debian/changelog 2021-04-15 23:03:37.000000000 +0200
@@ -1,3 +1,11 @@
+rmlint (2.9.0-2.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix data loss caused by faulty check in generated scripts (Closes: #977410)
+ - Use upstream patch
+
+ -- Timo Röhling <t...@gaussglocke.de> Thu, 15 Apr 2021 23:03:37 +0200
+
rmlint (2.9.0-2.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru rmlint-2.9.0/debian/patches/0010-apply-upstream-fix-for-data-loss-bug.patch rmlint-2.9.0/debian/patches/0010-apply-upstream-fix-for-data-loss-bug.patch
--- rmlint-2.9.0/debian/patches/0010-apply-upstream-fix-for-data-loss-bug.patch 1970-01-01 01:00:00.000000000 +0100
+++ rmlint-2.9.0/debian/patches/0010-apply-upstream-fix-for-data-loss-bug.patch 2021-04-15 23:03:37.000000000 +0200
@@ -0,0 +1,31 @@
+From: =?utf-8?q?Timo_R=C3=B6hling?= <t...@gaussglocke.de>
+Date: Fri, 19 Mar 2021 16:37:27 +0100
+Subject: apply upstream fix for data loss bug
+
+This is upstream commit b9d328be2041e42813119d060c86893853b8e250 that
+also includes a cosmetic fix (which I reused unchanged)
+---
+ lib/formats/sh.sh | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/formats/sh.sh b/lib/formats/sh.sh
+index 966f659..6db8d3b 100644
+--- a/lib/formats/sh.sh
++++ b/lib/formats/sh.sh
+@@ -150,7 +150,7 @@ original_check() {
+
+ # Check they are not the exact same file (hardlinks allowed):
+ if [ "$1" = "$2" ]; then
+- echo "${COL_RED}^^^^^^ Error: original and duplicate point to the *same* path - cancelling.....{COL_RESET}"
++ echo "${COL_RED}^^^^^^ Error: original and duplicate point to the *same* path - cancelling.....${COL_RESET}"
+ return 1
+ fi
+
+@@ -160,6 +160,7 @@ original_check() {
+ else
+ if [ "$(check_for_equality "$1" "$2")" -ne "0" ]; then
+ echo "${COL_RED}^^^^^^ Error: files no longer identical - cancelling.....${COL_RESET}"
++ return 1
+ fi
+ fi
+ }
diff -Nru rmlint-2.9.0/debian/patches/series rmlint-2.9.0/debian/patches/series
--- rmlint-2.9.0/debian/patches/series 2020-12-01 21:37:43.000000000 +0100
+++ rmlint-2.9.0/debian/patches/series 2021-04-15 23:03:37.000000000 +0200
@@ -7,3 +7,4 @@
python3.8.patch
glib-2_62.patch
0001-fix-link-error-on-compilers-with-fno-common-enabled.patch
+0010-apply-upstream-fix-for-data-loss-bug.patch
signature.asc
Description: PGP signature
