Bug#1064796: e2fsprogs: NMU diff for 64-bit time_t transition
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
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru e2fsprogs-1.47.0/debian/changelog e2fsprogs-1.47.0/debian/changelog
--- e2fsprogs-1.47.0/debian/changelog 2023-03-05 03:16:08.0 +
+++ e2fsprogs-1.47.0/debian/changelog 2024-02-28 23:35:48.0 +
@@ -1,3 +1,10 @@
+e2fsprogs (1.47.0-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1064796
+
+ -- Michael Hudson-Doyle Wed, 28 Feb 2024 23:35:48 +
+
e2fsprogs (1.47.0-2) unstable; urgency=medium
* Don't enable metadata_csum_seed and orhpan_file by default (Closes:
diff -Nru e2fsprogs-1.47.0/debian/control e2fsprogs-1.47.0/debian/control
--- e2fsprogs-1.47.0/debian/control 2023-03-05 03:16:08.0 +
+++ e2fsprogs-1.47.0/debian/control 2024-02-28 23:35:48.0 +
@@ -64,13 +64,13 @@
This package provides translations for messages for programs found in
the 'e2fsprogs' package.
-Package: libcom-err2
+Package: libcom-err2t64
Section: libs
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libcomerr2 (<< 1.43.9-1~)
-Breaks: libcomerr2 (<< 1.43.9-1~)
-Provides: libcomerr2 (= ${binary:Version})
+Replaces: libcom-err2, libcomerr2 (<< 1.43.9-1~)
+Breaks: libcom-err2 (<< ${source:Version}), libcomerr2 (<< 1.43.9-1~)
+Provides: ${t64:Provides}, libcomerr2 (= ${binary:Version})
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -82,7 +82,7 @@
Package: comerr-dev
Section: libdevel
Priority: optional
-Depends: libc6-dev | libc-dev, libcom-err2 (= ${mainBinary}), ${misc:Depends}
+Depends: libc6-dev | libc-dev, libcom-err2t64 (= ${mainBinary}),
${misc:Depends}
Suggests: doc-base
Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3)
Architecture: any
@@ -94,11 +94,13 @@
.
This package contains the development environment for the com_err library.
-Package: libss2
+Package: libss2t64
+Provides: ${t64:Provides}
+Breaks: libss2 (<< ${source:Version})
Section: libs
Priority: optional
-Depends: libcom-err2, ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fsprogs (<< 1.34-1)
+Depends: libcom-err2t64, ${shlibs:Depends}, ${misc:Depends}
+Replaces: libss2, e2fsprogs (<< 1.34-1)
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -112,7 +114,7 @@
Package: ss-dev
Section: libdevel
Priority: optional
-Depends: libc6-dev | libc-dev, libss2 (= ${mainBinary}), comerr-dev,
${misc:Depends}
+Depends: libc6-dev | libc-dev, libss2t64 (= ${mainBinary}), comerr-dev,
${misc:Depends}
Architecture: any
Multi-Arch: same
Description: command-line interface parsing library - headers and static
libraries
@@ -138,13 +140,13 @@
Don't attempt to install this package, it has no support for a couple of
features you surely want. Anyway it should refuse to install.
-Package: libext2fs2
+Package: libext2fs2t64
Section: libs
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fslibs (<< 1.43.9-1~)
-Breaks: e2fslibs (<< 1.43.9-1~)
-Provides: e2fslibs (= ${binary:Version})
+Replaces: libext2fs2, e2fslibs (<< 1.43.9-1~)
+Breaks: libext2fs2 (<< ${source:Version}), e2fslibs (<< 1.43.9-1~)
+Provides: ${t64:Provides}, e2fslibs (= ${binary:Version})
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -161,7 +163,7 @@
Package: libext2fs-dev
Section: libdevel
Priority: optional
-Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2 (= ${binary:Version}),
${misc:Depends}
+Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2t64 (=
${binary:Version}), ${misc:Depends}
Replaces: e2fslibs-dev (<< 1.43.9-1~)
Breaks: e2fslibs-dev (<< 1.43.9-1~)
Provides: e2fslibs-dev (= ${binary:Version})
diff -Nru e2fsprogs-1.47.0/debian/.gitignore e2fsprogs-1.47.0/debian/.gitignore
--- e2fsprogs-1.47.0/debian/.gitignore 2023-03-05 03:16:08.0 +
+++ e2fsprogs-1.47.0/debian/.gitignore 1970-01-01 00:00:00.0 +
@@ -1 +0,0 @@
-!patches
diff -Nru e2fsprogs-1.47.0/debian/libcom-err2.install
e2fsprogs-1.47.0/debian/libcom-err2.install
--- e2fsprogs-1.47.0/debian/libcom-err2.install 2023-03-05 03:16:08.0
+
+++ e2fsprogs-1.47.0/debian/libcom-err2.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-lib/*/libcom_err*.so.*
diff -Nru
Bug#1064796: e2fsprogs: NMU diff for 64-bit time_t transition
Source: e2fsprogs
Version: 1.47.0-2
Severity: important
Tags: patch pending sid trixie
User: debian-...@lists.debian.org
Usertags: time-t
NOTICE: these changes must not be uploaded to unstable yet!
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
e2fsprogs 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 e2fsprogs
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'), (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
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru e2fsprogs-1.47.0/debian/changelog e2fsprogs-1.47.0/debian/changelog
--- e2fsprogs-1.47.0/debian/changelog 2023-03-05 03:16:08.0 +
+++ e2fsprogs-1.47.0/debian/changelog 2024-02-25 22:57:50.0 +
@@ -1,3 +1,16 @@
+e2fsprogs (1.47.0-2.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Helmut Grohne ]
+ * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1053111)
+
+ [ Michael Hudson-Doyle ]
+ * Account for changes in udevudevdir as well.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle Sun, 25 Feb 2024 22:57:50 +
+
e2fsprogs (1.47.0-2) unstable; urgency=medium
* Don't enable metadata_csum_seed and orhpan_file by default (Closes:
diff -Nru e2fsprogs-1.47.0/debian/control e2fsprogs-1.47.0/debian/control
--- e2fsprogs-1.47.0/debian/control 2023-03-05 03:16:08.0 +
+++ e2fsprogs-1.47.0/debian/control 2024-02-25 22:57:50.0 +
@@ -2,7 +2,7 @@
Section: admin
Priority: required
Maintainer: Theodore Y. Ts'o
-Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any
kfreebsd-any] , debhelper-compat (= 12), dh-exec,
libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], cron
[linux-any]
+Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any
kfreebsd-any] , debhelper-compat (= 12), dh-exec,
libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev
[linux-any], cron [linux-any]
Rules-Requires-Root: no
Standards-Version: 4.6.2
Homepage: http://e2fsprogs.sourceforge.net
@@ -64,13 +64,13 @@
This package provides translations for messages for programs found in
the 'e2fsprogs' package.
-Package: libcom-err2
+Package: libcom-err2t64
Section: libs
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libcomerr2 (<< 1.43.9-1~)
-Breaks: libcomerr2 (<< 1.43.9-1~)
-Provides: libcomerr2 (= ${binary:Version})
+Replaces: libcom-err2, libcomerr2 (<< 1.43.9-1~)
+Breaks: libcom-err2 (<< ${source:Version}), libcomerr2 (<< 1.43.9-1~)
+Provides: ${t64:Provides}, libcomerr2 (= ${binary:Version})
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -82,7 +82,7 @@
Package: comerr-dev
Section: libdevel
Priority: optional
-Depends: libc6-dev | libc-dev, libcom-err2 (= ${mainBinary}), ${misc:Depends}
+Depends: libc6-dev | libc-dev, libcom-err2t64 (= ${mainBinary}),
${misc:Depends}
Suggests: doc-base
Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3)
Architecture: any
@@ -94,11 +94,13 @@
.
This package contains the development environment for the com_err library.
-Package: libss2
+Package: libss2t64
+Provides: ${t64:Provides}
+Breaks: libss2 (<< ${source:Version})
Section: libs
Priority: optional
-Depends: libcom-err2, ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fsprogs (<< 1.34-1)
