Commit Debian 3.0 (quilt) metadata

[dgit (9.6) quilt-fixup]

diff --git a/debian/patches/merge-branch-maint-into-debianmaster.patch b/debian/patches/merge-branch-maint-into-debianmaster.patch
new file mode 100644 (file)
index 0000000..dea42a5
--- /dev/null
+++ b/debian/patches/merge-branch-maint-into-debianmaster.patch
@@ -0,0 +1,77 @@
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Wed, 7 Aug 2019 07:53:02 -0400
+X-Dgit-Generated: 1.45.3-4 7b00c4704e9eac30cd2fa2c50c548f4ccdf0892d
+Subject: Merge branch 'maint' into debian/master
+
+
+---
+
+--- e2fsprogs-1.45.3.orig/lib/blkid/devname.c
++++ e2fsprogs-1.45.3/lib/blkid/devname.c
+@@ -126,7 +126,7 @@ static int is_dm_leaf(const char *devnam
+ {
+       struct dirent   *de, *d_de;
+       DIR             *dir, *d_dir;
+-      char            path[256];
++      char            path[300];
+       int             ret = 1;
+ 
+       if ((dir = opendir("/sys/block")) == NULL)
+@@ -162,7 +162,7 @@ static char *get_dm_name(const char *ptn
+ {
+       FILE    *f;
+       size_t  sz;
+-      char    path[256], name[256], *res = NULL;
++      char    path[300], name[256], *res = NULL;
+ 
+       snprintf(path, sizeof(path), "/sys/block/%s/dm/name", ptname);
+       if ((f = fopen(path, "r")) == NULL)
+--- e2fsprogs-1.45.3.orig/lib/blkid/probe.c
++++ e2fsprogs-1.45.3/lib/blkid/probe.c
+@@ -892,12 +892,13 @@ static int probe_luks(struct blkid_probe
+                      struct blkid_magic *id __BLKID_ATTR((unused)),
+                      unsigned char *buf)
+ {
+-      char uuid[40];
++      char uuid[41];
+ 
+       /* 168 is the offset to the 40 character uuid:
+        * http://luks.endorphin.org/LUKS-on-disk-format.pdf */
+       strncpy(uuid, (char *) buf+168, 40);
+-      blkid_set_tag(probe->dev, "UUID", uuid, sizeof(uuid));
++      uuid[40] = 0;
++      blkid_set_tag(probe->dev, "UUID", uuid, 40);
+       return 0;
+ }
+ 
+@@ -1503,24 +1504,25 @@ static struct exfat_entry_label *find_ex
+     return NULL;
+ }
+ 
+-static int probe_exfat(struct blkid_probe *probe, struct blkid_magic *id,
++static int probe_exfat(struct blkid_probe *probe,
++                     struct blkid_magic *id __BLKID_ATTR((unused)),
+                        unsigned char *buf)
+ {
+     struct exfat_super_block *sb;
+     struct exfat_entry_label *label;
+-    uuid_t uuid;
++    char uuid[40];
+ 
+     sb = (struct exfat_super_block *)buf;
+-    if (!sb || !CLUSTER_SIZE(sb)) {
++    if (!sb || CLUSTER_SIZE(sb) == 0) {
+         DBG(DEBUG_PROBE, printf("bad exfat superblock.\n"));
+         return errno ? - errno : 1;
+     }
+ 
+     label = find_exfat_entry_label(probe, sb);
+     if (label) {
+-        char utf8_label[128];
++        unsigned char utf8_label[128];
+         unicode_16le_to_utf8(utf8_label, sizeof(utf8_label), label->name, label->length * 2);
+-        blkid_set_tag(probe->dev, "LABEL", utf8_label, 0);
++        blkid_set_tag(probe->dev, "LABEL", (char *) utf8_label, 0);
+     } else {
+         blkid_set_tag(probe->dev, "LABEL", "disk", 4);
+     }

diff --git a/debian/patches/series b/debian/patches/series
index c56dee6..1ba5b38 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ po-update-pt.po-from-translationproject.org
 po-update-sv.po-from-translationproject.org
 po-update-uk.po-from-translationproject.org
 set-E2FSCK_TIME-correctly-on-a-32-bit-arch-with-64bit-time_t
+merge-branch-maint-into-debianmaster.patch