Apply patch by Yuezhang Mo to fix exfat.dump on armel, armhf and others. Resolves...

diff --git a/debian/changelog b/debian/changelog
index 3e175440bcbc7b3bac0f9b3ba68ee87aafe10fed..6288b26b4b614899a48d34ac8a09e334c01d5154 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+exfatprogs (1.2.7-2) UNRELEASED; urgency=medium
+
+  * Apply patch by Yuezhang Mo to fix exfat.dump on armel, armhf
+    and others. Resolves the build failures caused by failing upcase tests.
+    debian/patches/0001-dump-fix-print-format-of-entry-position.patch
+
+ -- Sven Hoexter <hoexter@debian.org>  Fri, 07 Feb 2025 08:30:46 +0100
+
 exfatprogs (1.2.7-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/debian/patches/0001-dump-fix-print-format-of-entry-position.patch b/debian/patches/0001-dump-fix-print-format-of-entry-position.patch
new file mode 100644 (file)
index 0000000..292fb5a
--- /dev/null
+++ b/debian/patches/0001-dump-fix-print-format-of-entry-position.patch
@@ -0,0 +1,47 @@
+From: Yuezhang Mo <Yuezhang.Mo@sony.com>
+Subject: [PATCH] dump: fix print format of entry position
+
+This commit changes the entry position to be printed with "%llx".
+
+Signed-off-by: Yuezhang Mo <Yuezhang.Mo@sony.com>
+
+Origin: upstream, https://github.com/YuezhangMo/exfatprogs/commit/485b16a891e396c4842cfd0d2a5f08d66407405c
+Bug: https://github.com/exfatprogs/exfatprogs/issues/290
+---
+ dump/dump.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dump/dump.c b/dump/dump.c
+index 0ac1fd3..6fa1636 100644
+--- a/dump/dump.c
++++ b/dump/dump.c
+@@ -167,7 +167,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd)
+               goto free_exfat;
+ 
+       if (ed.type == EXFAT_VOLUME) {
+-              exfat_info("Volume label entry position: \t\t0x%lx\n", off);
++              exfat_info("Volume label entry position: \t\t0x%llx\n", (unsigned long long)off);
+               exfat_info("Volume label character count: \t\t%u\n", ed.vol_char_cnt);
+               volume_label = exfat_conv_volume_label(&ed);
+               if (!volume_label)
+@@ -182,7 +182,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd)
+               goto free_exfat;
+ 
+       if (ed.type == EXFAT_UPCASE) {
+-              exfat_info("Upcase table entry position: \t\t0x%lx\n", off);
++              exfat_info("Upcase table entry position: \t\t0x%llx\n", (unsigned long long)off);
+               exfat_info("Upcase table start cluster: \t\t%x\n",
+                               le32_to_cpu(ed.upcase_start_clu));
+               exfat_info("Upcase table size: \t\t\t%" PRIu64 "\n",
+@@ -197,7 +197,7 @@ static int exfat_show_ondisk_all_info(struct exfat_blk_dev *bd)
+               bitmap_len = le64_to_cpu(ed.bitmap_size);
+               bitmap_clu = le32_to_cpu(ed.bitmap_start_clu);
+ 
+-              exfat_info("Bitmap entry position: \t\t\t0x%lx\n", off);
++              exfat_info("Bitmap entry position: \t\t\t0x%llx\n", (unsigned long long)off);
+               exfat_info("Bitmap start cluster: \t\t\t%x\n", bitmap_clu);
+               exfat_info("Bitmap size: \t\t\t\t%llu\n", bitmap_len);
+ 
+-- 
+2.47.2
+

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..dbed648
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-dump-fix-print-format-of-entry-position.patch