Bug#1062301: libfshfs: NMU diff for 64-bit time_t transition

2024-02-28 Thread Benjamin Drung
Source: libfshfs
Dear maintainer,

Please find attached a final version of this patch for the time_t
transition.  This patch is being uploaded to unstable.

Note that this adds a versioned build-dependency on dpkg-dev, to guard
against accidental backports with a wrong ABI.

Thanks!


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-21-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, 
TAINT_UNSIGNED_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
diff -Nru libfshfs-20201104/debian/changelog libfshfs-20201104/debian/changelog
--- libfshfs-20201104/debian/changelog  2020-12-05 12:12:12.0 +
+++ libfshfs-20201104/debian/changelog  2024-02-28 12:07:43.0 +
@@ -1,3 +1,10 @@
+libfshfs (20201104-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1062301
+
+ -- Benjamin Drung   Wed, 28 Feb 2024 12:07:43 +
+
 libfshfs (20201104-1) unstable; urgency=low
 
   * Initial release (Closes: #976460)
diff -Nru libfshfs-20201104/debian/control libfshfs-20201104/debian/control
--- libfshfs-20201104/debian/control2020-12-05 12:12:12.0 +
+++ libfshfs-20201104/debian/control2024-02-28 12:07:42.0 +
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Debian Security Tools 
 Uploaders: Hilko Bengen 
-Build-Depends: debhelper-compat (= 11), pkg-config, dh-python, python3-dev, 
libbfio-dev,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 11), pkg-config, 
dh-python, python3-dev, libbfio-dev,
 Standards-Version: 4.5.0
 Section: libs
 Homepage: https://github.com/libyal/libfshfs
@@ -14,13 +14,16 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libfshfs1 (= ${binary:Version})
+ libfshfs1t64 (= ${binary:Version})
 Description: library to access the Mac OS Hierarchical File System -- 
development files
  libfshfs is a library to access the Mac OS Hierarchical File System (HFS).
  .
  This package includes the development support files.
 
-Package: libfshfs1
+Package: libfshfs1t64
+Provides: ${t64:Provides}
+Replaces: libfshfs1
+Breaks: libfshfs1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -36,7 +39,7 @@
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libfshfs1,
+ libfshfs1t64,
 Description: library to access the Mac OS Hierarchical File System -- Utilities
  libfshfs is a library to access the Mac OS Hierarchical File System (HFS).
  .
@@ -45,7 +48,7 @@
 Package: python3-libfshfs
 Section: python
 Architecture: any
-Depends: libfshfs1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, 
${python3:Depends}
+Depends: libfshfs1t64 (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, ${python3:Depends}
 Description: library to access the Mac OS Hierarchical File System -- Python 3 
bindings
  libfshfs is a library to access the Mac OS Hierarchical File System (HFS).
  .
diff -Nru libfshfs-20201104/debian/libfshfs1.install 
libfshfs-20201104/debian/libfshfs1.install
--- libfshfs-20201104/debian/libfshfs1.install  2020-12-05 12:09:04.0 
+
+++ libfshfs-20201104/debian/libfshfs1.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*-*/lib*.so.*
diff -Nru libfshfs-20201104/debian/libfshfs1.symbols 
libfshfs-20201104/debian/libfshfs1.symbols
--- libfshfs-20201104/debian/libfshfs1.symbols  2020-12-05 12:12:12.0 
+
+++ libfshfs-20201104/debian/libfshfs1.symbols  1970-01-01 00:00:00.0 
+
@@ -1,335 +0,0 @@
-libfshfs.so.1 libfshfs1 #MINVER#
- (optional|regex)^libcdata_.* 0
- (optional|regex)^libcerror_.* 0
- (optional|regex)^libcfile_.* 0
- (optional|regex)^libclocale_.* 0
- (optional|regex)^libcnotify_.* 0
- (optional|regex)^libcpath_.* 0
- (optional|regex)^libcsplit_.* 0
- (optional|regex)^libcthreads_.* 0
- (optional|regex)^libfcache_.* 0
- (optional|regex)^libfdata_.* 0
- (optional|regex)^libfdatetime_.* 0
- (optional|regex)^libfguid_.* 0
- (optional|regex)^libhmac_.* 0
- (optional|regex)^libuna_.* 0
- (optional|regex)^libuna_.* 0
- (optional|regex)^libfshfs_internal.* 0
- fshfs_volume_signature_hfsplus@Base 20201104
- fshfs_volume_signature_hfsx@Base 20201104
- libfshfs_attribute_record_compare_name_with_utf16_string@Base 20201104
- libfshfs_attribute_record_compare_name_with_utf8_string@Base 20201104
- libfshfs_attribute_record_free@Base 20201104
- libfshfs_attribute_record_get_utf16_name@Base 20201104
- libfshfs_attribute_record_get_utf16_name_size@Base 20201104
- libfshfs_attribute_record_get_utf8_name@Base 20201104
- libfshfs_attribute_record_get_utf8_name_size@Base 20201104
- libfshfs_attribute_record_initialize@Base 20201104
- libfshfs_attribute_record_read_data@Base 

Bug#1062301: libfshfs: NMU diff for 64-bit time_t transition

2024-01-31 Thread Steve Langasek
Source: libfshfs
Version: 20201104-1
Severity: serious
Tags: patch pending
Justification: library ABI skew on upgrade
User: debian-...@lists.debian.org
Usertags: time-t

Dear maintainer,

As part of the 64-bit time_t transition required to support 32-bit
architectures in 2038 and beyond
(https://wiki.debian.org/ReleaseGoals/64bit-time), we have identified
libfshfs as a source package shipping runtime libraries whose ABI
either is affected by the change in size of time_t, or could not be
analyzed via abi-compliance-checker (and therefore to be on the safe
side we assume is affected).

To ensure that inconsistent combinations of libraries with their
reverse-dependencies are never installed together, it is necessary to
have a library transition, which is most easily done by renaming the
runtime library package.

Since turning on 64-bit time_t is being handled centrally through a change
to the default dpkg-buildflags (https://bugs.debian.org/1037136), it is
important that libraries affected by this ABI change all be uploaded close
together in time.  Therefore I have prepared a 0-day NMU for libfshfs
which will initially be uploaded to experimental if possible, then to
unstable after packages have cleared binary NEW.

Please find the patch for this NMU attached.

If you have any concerns about this patch, please reach out ASAP.  Although
this package will be uploaded to experimental immediately, there will be a
period of several days before we begin uploads to unstable; so if information
becomes available that your package should not be included in the transition,
there is time for us to amend the planned uploads.



-- System Information:
Debian Release: trixie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 6.5.0-14-generic (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=C, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru libfshfs-20201104/debian/changelog libfshfs-20201104/debian/changelog
--- libfshfs-20201104/debian/changelog  2020-12-05 12:12:12.0 +
+++ libfshfs-20201104/debian/changelog  2024-02-01 00:44:20.0 +
@@ -1,3 +1,10 @@
+libfshfs (20201104-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Steve Langasek   Thu, 01 Feb 2024 00:44:20 +
+
 libfshfs (20201104-1) unstable; urgency=low
 
   * Initial release (Closes: #976460)
diff -Nru libfshfs-20201104/debian/control libfshfs-20201104/debian/control
--- libfshfs-20201104/debian/control2020-12-05 12:12:12.0 +
+++ libfshfs-20201104/debian/control2024-02-01 00:44:20.0 +
@@ -14,13 +14,16 @@
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libfshfs1 (= ${binary:Version})
+ libfshfs1t64 (= ${binary:Version})
 Description: library to access the Mac OS Hierarchical File System -- 
development files
  libfshfs is a library to access the Mac OS Hierarchical File System (HFS).
  .
  This package includes the development support files.
 
-Package: libfshfs1
+Package: libfshfs1t64
+Provides: ${t64:Provides}
+Replaces: libfshfs1
+Breaks: libfshfs1 (<< ${source:Version})
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -36,7 +39,7 @@
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libfshfs1,
+ libfshfs1t64,
 Description: library to access the Mac OS Hierarchical File System -- Utilities
  libfshfs is a library to access the Mac OS Hierarchical File System (HFS).
  .
@@ -45,7 +48,7 @@
 Package: python3-libfshfs
 Section: python
 Architecture: any
-Depends: libfshfs1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, 
${python3:Depends}
+Depends: libfshfs1t64 (= ${binary:Version}), ${shlibs:Depends}, 
${misc:Depends}, ${python3:Depends}
 Description: library to access the Mac OS Hierarchical File System -- Python 3 
bindings
  libfshfs is a library to access the Mac OS Hierarchical File System (HFS).
  .
diff -Nru libfshfs-20201104/debian/libfshfs1.install 
libfshfs-20201104/debian/libfshfs1.install
--- libfshfs-20201104/debian/libfshfs1.install  2020-12-05 12:09:04.0 
+
+++ libfshfs-20201104/debian/libfshfs1.install  1970-01-01 00:00:00.0 
+
@@ -1 +0,0 @@
-usr/lib/*-*/lib*.so.*
diff -Nru libfshfs-20201104/debian/libfshfs1.symbols 
libfshfs-20201104/debian/libfshfs1.symbols
--- libfshfs-20201104/debian/libfshfs1.symbols  2020-12-05 12:12:12.0 
+
+++ libfshfs-20201104/debian/libfshfs1.symbols  1970-01-01 00:00:00.0 
+
@@ -1,335 +0,0 @@
-libfshfs.so.1 libfshfs1 #MINVER#
- (optional|regex)^libcdata_.* 0
- (optional|regex)^libcerror_.* 0
- (optional|regex)^libcfile_.* 0
- (optional|regex)^libclocale_.* 0
- (optional|regex)^libcnotify_.* 0
-