Bug#1061970: ganglia: 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 ganglia-3.7.2/debian/changelog ganglia-3.7.2/debian/changelog
--- ganglia-3.7.2/debian/changelog 2021-10-29 21:08:58.0 +
+++ ganglia-3.7.2/debian/changelog 2024-02-28 09:48:18.0 +
@@ -1,3 +1,10 @@
+ganglia (3.7.2-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061970
+
+ -- Michael Hudson-Doyle Wed, 28 Feb 2024 09:48:18 +
+
ganglia (3.7.2-6) unstable; urgency=medium
* Fix dep-8 tests.
diff -Nru ganglia-3.7.2/debian/control ganglia-3.7.2/debian/control
--- ganglia-3.7.2/debian/control2021-10-29 21:08:58.0 +
+++ ganglia-3.7.2/debian/control2024-02-28 09:48:18.0 +
@@ -4,7 +4,7 @@
Maintainer: Marcos Fouces
Uploaders: Stuart Teasdale
Homepage: http://ganglia.info/
-Build-Depends: debhelper-compat (=13), librrd-dev, libapr1-dev, libexpat1-dev,
libconfuse-dev, po-debconf, libxml2-dev, libdbi0-dev, libpcre3-dev, gperf,
rsync, libkvm-dev [kfreebsd-any], pkg-config, libz-dev, libtirpc-dev
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (=13), librrd-dev,
libapr1-dev, libexpat1-dev, libconfuse-dev, po-debconf, libxml2-dev,
libdbi0-dev, libpcre3-dev, gperf, rsync, libkvm-dev [kfreebsd-any], pkg-config,
libz-dev, libtirpc-dev
Standards-Version: 4.6.0
Vcs-Git: https://salsa.debian.org/debian/ganglia.git
Vcs-Browser: https://salsa.debian.org/debian/ganglia
@@ -12,7 +12,7 @@
Package: ganglia-monitor
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1
(=${binary:Version}), lsb-base
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1t64
(=${binary:Version}), lsb-base
Pre-Depends: ${misc:Pre-Depends}
Description: cluster monitoring toolkit - node daemon
Ganglia is a scalable, real-time cluster monitoring environment
@@ -22,7 +22,7 @@
Package: gmetad
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1
(=${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1t64
(=${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Suggests: ganglia-monitor, ganglia-webfrontend
Description: cluster monitoring toolkit - Ganglia Meta-Daemon
@@ -32,7 +32,10 @@
This package contains the 'gmetad' daemon, which collects information from
ganglia monitor clients and writes it to RRD databases.
-Package: libganglia1
+Package: libganglia1t64
+Provides: ${t64:Provides}
+Replaces: libganglia1
+Breaks: libganglia1 (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -45,7 +48,7 @@
Package: libganglia1-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, libganglia1 (=${binary:Version}), ${shlibs:Depends}
+Depends: ${misc:Depends}, libganglia1t64 (=${binary:Version}),
${shlibs:Depends}
Description: cluster monitoring toolkit - development libraries
Ganglia is a scalable, real-time cluster monitoring environment
that collects cluster statistics in an open and well-defined XML format.
diff -Nru ganglia-3.7.2/debian/libganglia1.dirs
ganglia-3.7.2/debian/libganglia1.dirs
--- ganglia-3.7.2/debian/libganglia1.dirs 2021-10-29 21:08:58.0
+
+++ ganglia-3.7.2/debian/libganglia1.dirs 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib
diff -Nru ganglia-3.7.2/debian/libganglia1.install
ganglia-3.7.2/debian/libganglia1.install
--- ganglia-3.7.2/debian/libganglia1.install2021-10-29 21:08:58.0
+
+++ ganglia-3.7.2/debian/libganglia1.install1970-01-01 00:00:00.0
+
@@ -1,2 +0,0 @@
-usr/lib/*/libganglia*.so.*
-usr/lib/*/ganglia/*.so
diff -Nru ganglia-3.7.2/debian/libganglia1t64.dirs
ganglia-3.7.2/debian/libganglia1t64.dirs
--- ganglia-3.7.2/debian/libganglia1t64.dirs1970-01-01 00:00:00.0
+
+++ ganglia-3.7.2/debian/libganglia1t64.dirs2021-10-29 21:08:58.0
+
@@ -0,0 +1 @@
+usr/lib
diff -Nru ganglia-3.7.2/debian/libganglia1t64.install
ganglia-3.7.2/debian/libganglia1t64.install
--- ganglia-3.7.2/debian/libganglia1t64.install 1970-01-01 00:00:00.0
+
+++ ganglia-3.7.2/debian/libganglia1t64.install 2021-10-29 21:08:58.0
+
@@ -0,0 +1,2 @@
Bug#1061970: ganglia: NMU diff for 64-bit time_t transition
Source: ganglia
Version: 3.7.2-6
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
ganglia 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 ganglia
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')
Architecture: amd64 (x86_64)
Kernel: Linux 6.5.0-14-generic (SMP w/8 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 ganglia-3.7.2/debian/changelog ganglia-3.7.2/debian/changelog
--- ganglia-3.7.2/debian/changelog 2021-10-29 21:08:58.0 +
+++ ganglia-3.7.2/debian/changelog 2024-01-30 14:56:58.0 +
@@ -1,3 +1,10 @@
+ganglia (3.7.2-6.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Lukas Märdian Tue, 30 Jan 2024 14:56:58 +
+
ganglia (3.7.2-6) unstable; urgency=medium
* Fix dep-8 tests.
diff -Nru ganglia-3.7.2/debian/control ganglia-3.7.2/debian/control
--- ganglia-3.7.2/debian/control2021-10-29 21:08:58.0 +
+++ ganglia-3.7.2/debian/control2024-01-30 14:56:58.0 +
@@ -12,7 +12,7 @@
Package: ganglia-monitor
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1
(=${binary:Version}), lsb-base
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1t64
(=${binary:Version}), lsb-base
Pre-Depends: ${misc:Pre-Depends}
Description: cluster monitoring toolkit - node daemon
Ganglia is a scalable, real-time cluster monitoring environment
@@ -22,7 +22,7 @@
Package: gmetad
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1
(=${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1t64
(=${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
Suggests: ganglia-monitor, ganglia-webfrontend
Description: cluster monitoring toolkit - Ganglia Meta-Daemon
@@ -32,7 +32,10 @@
This package contains the 'gmetad' daemon, which collects information from
ganglia monitor clients and writes it to RRD databases.
-Package: libganglia1
+Package: libganglia1t64
+Provides: ${t64:Provides}
+Replaces: libganglia1
+Breaks: libganglia1 (<< ${source:Version})
Architecture: any
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -45,7 +48,7 @@
Package: libganglia1-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}, libganglia1 (=${binary:Version}), ${shlibs:Depends}
+Depends: ${misc:Depends}, libganglia1t64 (=${binary:Version}),
${shlibs:Depends}
Description: cluster monitoring toolkit - development libraries
Ganglia is a scalable, real-time cluster monitoring environment
that collects cluster statistics in an open and well-defined XML format.
diff -Nru ganglia-3.7.2/debian/libganglia1.dirs
ganglia-3.7.2/debian/libganglia1.dirs
--- ganglia-3.7.2/debian/libganglia1.dirs 2021-10-29 21:08:58.0
+
+++ ganglia-3.7.2/debian/libganglia1.dirs 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib
diff -Nru ganglia-3.7.2/debian/libganglia1.install
ganglia-3.7.2/debian/libganglia1.install
--- ganglia-3.7.2/debian/libganglia1.install2021-10-29 21:08:58.0
+
+++ ganglia-3.7.2/debian/libganglia1.install1970-01-01 00:00:00.0
+
@@ -1,2 +0,0 @@
-usr/lib/*/libganglia*.so.*
