tags 695473 + pending
thanks

Dear maintainer,

I've prepared an NMU for util-linux (versioned as 2.20.1-5.8) and
uploaded it to unstable.

Regards.

diff -u util-linux-2.20.1/debian/changelog util-linux-2.20.1/debian/changelog
--- util-linux-2.20.1/debian/changelog
+++ util-linux-2.20.1/debian/changelog
@@ -1,3 +1,16 @@
+util-linux (2.20.1-5.8) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [Martin Pitt]
+  * misc-utils/wipefs.c: In --all mode, wipe several times until no further
+    signatures are found. This is required for file systems like VFAT which
+    can be detected in multiple different ways. This is fixed properly in 2.21
+    (see LP #1012081), but does not backport well, so use this local hack for
+    now. (LP: #1046665, Closes: #695473)
+
+ -- intrigeri <intrig...@debian.org>  Mon, 02 Jun 2014 10:49:39 +0200
+
 util-linux (2.20.1-5.7) unstable; urgency=low
 
   * Non-maintainer upload.
only in patch2:
unchanged:
--- util-linux-2.20.1.orig/misc-utils/wipefs.c
+++ util-linux-2.20.1/misc-utils/wipefs.c
@@ -377,15 +377,21 @@
        if (optind != argc)
                errx(EXIT_FAILURE, _("only one device as argument is currently 
supported."));
 
-       wp = read_offsets(wp, fname, all);
+        /* we need to wipe several times for some file systems like VFAT, see
+         * https://launchpad.net/bugs/1046665 */
+        do {
+                wp = read_offsets(wp, fname, all);
 
-       if (wp) {
-               if (has_offset || all)
-                       do_wipe(wp, fname, noact);
-               else
-                       print_all(wp, mode);
+                if (wp) {
+                        if (has_offset || all)
+                                do_wipe(wp, fname, noact);
+                        else
+                                print_all(wp, mode);
 
-               free_wipe(wp);
-       }
+                        free_wipe(wp);
+                        wp = NULL;
+                } else
+                        break;
+        } while (!noact && all);
        return EXIT_SUCCESS;
 }


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to