Merge ~liushuyu-011/ubuntu/+source/sleuthkit:ubuntu/devel into ubuntu/+source/sleuthkit:ubuntu/devel

[Zixing Liu]

This MP fixes the FTBFS by aliasing the off64_t to a type that is available on 32-bit systems after the time_t transition.

[Steve Langasek (vorlon)]

review: Needs Information

[Steve Langasek (vorlon)]

sorry, my memory is short and over the course of a half hour I had forgotten that you were proposing a fix for this very package that LocutusOfBorg pinged about on IRC. We worked up a different fix which I think is more correct (don't define _LARGEFILE64_SOURCE in the source, that's just wrong).

[Steve Langasek (vorlon)]

review: Disapprove

Unmerged commits

ef4c47d... by Zixing Liu on 2024-03-14

d/p/70_off64_t-fix-on-32-bit-system.patch: add a patch to fix build ...

... on 32-bit systems after time_t transition

diff --git a/debian/changelog b/debian/changelog
index 4f06c12..18481ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sleuthkit (4.12.1+dfsg-1.1ubuntu1) noble; urgency=medium
+
+  * d/p/70_off64_t-fix-on-32-bit-system.patch: add a patch so that 64-bit
+    file offsets are properly used on 32-bit systems
+
+ -- Zixing Liu <[e-mail]>  Thu, 14 Mar 2024 09:18:15 -0600
+
 sleuthkit (4.12.1+dfsg-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 9c41540..3e05ba5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sleuthkit
 Section: admin
 Priority: optional
-Maintainer: Debian Security Tools <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Security Tools <[e-mail]>
 Build-Depends: dpkg-dev (>= 1.22.5), ant,
                debhelper-compat (= 13),
                libafflib-dev (>= 3.6.6),
diff --git a/debian/patches/70_off64_t-fix-on-32-bit-system.patch b/debian/patches/70_off64_t-fix-on-32-bit-system.patch
 new file mode 100644
index 0000000..33c40e5
--- /dev/null
+++ b/debian/patches/70_off64_t-fix-on-32-bit-system.patch
@@ -0,0 +1,14 @@
+Description: Fix large file offset usage on 32-bit systems
+ This patch aliases off64_t to __off64_t on 32-bit systems where off64_t
+ is not available.
+Forwarded: not-needed
+Last-Update: 2024-03-14
+
+--- sleuthkit-4.12.1+dfsg.orig/tsk/fs/Makefile.am
++++ sleuthkit-4.12.1+dfsg/tsk/fs/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = $(OPENSSL_INCLUDES) -I../.. -I$(srcdir)/../..
++AM_CPPFLAGS = $(OPENSSL_INCLUDES) -I../.. -I$(srcdir)/../.. -Doff64_t=__off64_t
+ EXTRA_DIST = .indent.pro
+ 
+ noinst_LTLIBRARIES = libtskfs.la
diff --git a/debian/patches/series b/debian/patches/series
index 32375aa..19b0ef1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 60_fix-FTBFS-HURD.patch
 0005-Disable-test_libraries.sh.patch
 
+70_off64_t-fix-on-32-bit-system.patch