Bug#1061901: compiz: NMU diff for 64-bit time_t transition
Unfortunately, compiz FTBFS on armel and armhf because
libstartup-notification is not 64-bit time_t-safe. I have uploaded a
follow-up NMU to fix this. Please find attached the comprehensive NMU
patch.
On Wed, Feb 28, 2024 at 05:32:03PM +, Steve Langasek wrote:
> 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-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)
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
diff -Nru compiz-0.8.18/debian/changelog compiz-0.8.18/debian/changelog
--- compiz-0.8.18/debian/changelog 2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/changelog 2024-03-16 01:19:57.0 +
@@ -1,3 +1,18 @@
+compiz (2:0.8.18-5.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/64-bit-time-t-compat.patch: fix build with
+_TIME_BITS=64.
+
+ -- Steve Langasek Sat, 16 Mar 2024 01:19:57 +
+
+compiz (2:0.8.18-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061901
+
+ -- Steve Langasek Wed, 28 Feb 2024 17:31:21 +
+
compiz (2:0.8.18-5) unstable; urgency=medium
[ Samuel Thibault ]
diff -Nru compiz-0.8.18/debian/control compiz-0.8.18/debian/control
--- compiz-0.8.18/debian/control2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/control2024-02-28 17:31:21.0 +
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hypra Team
Uploaders: Samuel Thibault
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
intltool,
libcairo2-dev,
libglib2.0-dev,
@@ -159,7 +159,10 @@
This package contains the standard plugins that come with compiz. Compiz
without these plugins is not very useful.
-Package: libdecoration0
+Package: libdecoration0t64
+Provides: ${t64:Provides}
+Replaces: libdecoration0
+Breaks: libdecoration0 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
@@ -174,7 +177,7 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libdecoration0 (= ${binary:Version}),
+Depends: libdecoration0t64 (= ${binary:Version}),
${misc:Depends},
libx11-dev,
libxrender-dev
diff -Nru compiz-0.8.18/debian/libdecoration0.install
compiz-0.8.18/debian/libdecoration0.install
--- compiz-0.8.18/debian/libdecoration0.install 2018-10-27 12:09:18.0
+
+++ compiz-0.8.18/debian/libdecoration0.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.install
compiz-0.8.18/debian/libdecoration0t64.install
--- compiz-0.8.18/debian/libdecoration0t64.install 1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.install 2018-10-27
12:09:18.0 +
@@ -0,0 +1 @@
+usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
--- compiz-0.8.18/debian/libdecoration0t64.lintian-overrides1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.lintian-overrides2024-02-28
17:29:20.0 +
@@ -0,0 +1 @@
+libdecoration0t64: package-name-doesnt-match-sonames libdecoration0
diff -Nru compiz-0.8.18/debian/patches/64-bit-time-t-compat.patch
compiz-0.8.18/debian/patches/64-bit-time-t-compat.patch
--- compiz-0.8.18/debian/patches/64-bit-time-t-compat.patch 1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/patches/64-bit-time-t-compat.patch 2024-03-16
01:19:57.0 +
@@ -0,0 +1,30 @@
+Description: fix build with _TIME_BITS=64
+ The startup-notification API takes a long * where it ought to have always
+ taken a time_t *. As a consequence, changing the size of time_t makes
+ callers fail to build. Work around this by safely casting to a long.
+ This will continue to work on 32-bit systems until 2038, by which time
+ all the 32-bit systems will be dead or no longer running GUIs or at least
+ not using libstartup-notification0.
Bug#1061901: compiz: 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-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 compiz-0.8.18/debian/changelog compiz-0.8.18/debian/changelog
--- compiz-0.8.18/debian/changelog 2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/changelog 2024-02-28 17:31:21.0 +
@@ -1,3 +1,10 @@
+compiz (2:0.8.18-5.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1061901
+
+ -- Steve Langasek Wed, 28 Feb 2024 17:31:21 +
+
compiz (2:0.8.18-5) unstable; urgency=medium
[ Samuel Thibault ]
diff -Nru compiz-0.8.18/debian/control compiz-0.8.18/debian/control
--- compiz-0.8.18/debian/control2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/control2024-02-28 17:31:21.0 +
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Hypra Team
Uploaders: Samuel Thibault
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
intltool,
libcairo2-dev,
libglib2.0-dev,
@@ -159,7 +159,10 @@
This package contains the standard plugins that come with compiz. Compiz
without these plugins is not very useful.
-Package: libdecoration0
+Package: libdecoration0t64
+Provides: ${t64:Provides}
+Replaces: libdecoration0
+Breaks: libdecoration0 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
@@ -174,7 +177,7 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libdecoration0 (= ${binary:Version}),
+Depends: libdecoration0t64 (= ${binary:Version}),
${misc:Depends},
libx11-dev,
libxrender-dev
diff -Nru compiz-0.8.18/debian/libdecoration0.install
compiz-0.8.18/debian/libdecoration0.install
--- compiz-0.8.18/debian/libdecoration0.install 2018-10-27 12:09:18.0
+
+++ compiz-0.8.18/debian/libdecoration0.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.install
compiz-0.8.18/debian/libdecoration0t64.install
--- compiz-0.8.18/debian/libdecoration0t64.install 1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.install 2018-10-27
12:09:18.0 +
@@ -0,0 +1 @@
+usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
--- compiz-0.8.18/debian/libdecoration0t64.lintian-overrides1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.lintian-overrides2024-02-28
17:29:20.0 +
@@ -0,0 +1 @@
+libdecoration0t64: package-name-doesnt-match-sonames libdecoration0
diff -Nru compiz-0.8.18/debian/rules compiz-0.8.18/debian/rules
--- compiz-0.8.18/debian/rules 2021-09-26 11:10:56.0 +
+++ compiz-0.8.18/debian/rules 2024-02-28 17:31:20.0 +
@@ -31,8 +31,8 @@
dh_install
! mkdir debian/compiz-dev/usr/lib/$(DEB_HOST_MULTIARCH) || \
mv debian/compiz-dev/usr/lib/pkgconfig
debian/compiz-dev/usr/lib/$(DEB_HOST_MULTIARCH)/
- ! mkdir debian/libdecoration0/usr/lib/$(DEB_HOST_MULTIARCH) || \
- mv debian/libdecoration0/usr/lib/libdecoration*
debian/libdecoration0/usr/lib/$(DEB_HOST_MULTIARCH)/
+ ! mkdir debian/libdecoration0t64/usr/lib/$(DEB_HOST_MULTIARCH) || \
+ mv debian/libdecoration0t64/usr/lib/libdecoration*
debian/libdecoration0t64/usr/lib/$(DEB_HOST_MULTIARCH)/
! mkdir debian/libdecoration0-dev/usr/lib/$(DEB_HOST_MULTIARCH) || \
( mv debian/libdecoration0-dev/usr/lib/pkgconfig
debian/libdecoration0-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ && \
mv debian/libdecoration0-dev/usr/lib/libdecoration*
debian/libdecoration0-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ )
@@ -46,7 +46,7 @@
rm -f debian/compiz-plugins/usr/share/compiz/core.xml
override_dh_makeshlibs:
- dh_makeshlibs -plibdecoration0 -V'libdecoration0 (>= 2:0.8.14-0~)'
+ dh_makeshlibs -plibdecoration0t64 -V'libdecoration0t64 (>= 2:0.8.14-0~)'
override_dh_gencontrol:
dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
Bug#1061901: compiz: NMU diff for 64-bit time_t transition
Source: compiz
Followup-For: Bug #1061901
Apologies, an oversight in the conversion script caused us to fail to
update strict versioned dependencies on the previous package name.
Please find attached a fixed patch.
This has also now been uploaded to experimental.
diff -Nru compiz-0.8.18/debian/changelog compiz-0.8.18/debian/changelog
--- compiz-0.8.18/debian/changelog 2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/changelog 2024-01-31 07:20:10.0 +
@@ -1,3 +1,11 @@
+compiz (2:0.8.18-5.1~exp2) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+ * Fix uninstallable packages from the previous upload.
+
+ -- Steve Langasek Wed, 31 Jan 2024 07:20:10 +
+
compiz (2:0.8.18-5) unstable; urgency=medium
[ Samuel Thibault ]
diff -Nru compiz-0.8.18/debian/control compiz-0.8.18/debian/control
--- compiz-0.8.18/debian/control2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/control2024-01-31 07:20:10.0 +
@@ -159,7 +159,10 @@
This package contains the standard plugins that come with compiz. Compiz
without these plugins is not very useful.
-Package: libdecoration0
+Package: libdecoration0t64
+Provides: ${t64:Provides}
+Replaces: libdecoration0
+Breaks: libdecoration0 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
@@ -174,7 +177,7 @@
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libdecoration0 (= ${binary:Version}),
+Depends: libdecoration0t64 (= ${binary:Version}),
${misc:Depends},
libx11-dev,
libxrender-dev
diff -Nru compiz-0.8.18/debian/libdecoration0.install
compiz-0.8.18/debian/libdecoration0.install
--- compiz-0.8.18/debian/libdecoration0.install 2018-10-27 12:09:18.0
+
+++ compiz-0.8.18/debian/libdecoration0.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.install
compiz-0.8.18/debian/libdecoration0t64.install
--- compiz-0.8.18/debian/libdecoration0t64.install 1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.install 2018-10-27
12:09:18.0 +
@@ -0,0 +1 @@
+usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
--- compiz-0.8.18/debian/libdecoration0t64.lintian-overrides1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.lintian-overrides2024-01-31
07:20:10.0 +
@@ -0,0 +1 @@
+libdecoration0t64: package-name-doesnt-match-sonames libdecoration0
diff -Nru compiz-0.8.18/debian/rules compiz-0.8.18/debian/rules
--- compiz-0.8.18/debian/rules 2021-09-26 11:10:56.0 +
+++ compiz-0.8.18/debian/rules 2024-01-31 07:20:10.0 +
@@ -31,8 +31,8 @@
dh_install
! mkdir debian/compiz-dev/usr/lib/$(DEB_HOST_MULTIARCH) || \
mv debian/compiz-dev/usr/lib/pkgconfig
debian/compiz-dev/usr/lib/$(DEB_HOST_MULTIARCH)/
- ! mkdir debian/libdecoration0/usr/lib/$(DEB_HOST_MULTIARCH) || \
- mv debian/libdecoration0/usr/lib/libdecoration*
debian/libdecoration0/usr/lib/$(DEB_HOST_MULTIARCH)/
+ ! mkdir debian/libdecoration0t64/usr/lib/$(DEB_HOST_MULTIARCH) || \
+ mv debian/libdecoration0t64/usr/lib/libdecoration*
debian/libdecoration0t64/usr/lib/$(DEB_HOST_MULTIARCH)/
! mkdir debian/libdecoration0-dev/usr/lib/$(DEB_HOST_MULTIARCH) || \
( mv debian/libdecoration0-dev/usr/lib/pkgconfig
debian/libdecoration0-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ && \
mv debian/libdecoration0-dev/usr/lib/libdecoration*
debian/libdecoration0-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ )
@@ -46,7 +46,7 @@
rm -f debian/compiz-plugins/usr/share/compiz/core.xml
override_dh_makeshlibs:
- dh_makeshlibs -plibdecoration0 -V'libdecoration0 (>= 2:0.8.14-0~)'
+ dh_makeshlibs -plibdecoration0t64 -V'libdecoration0t64 (>= 2:0.8.14-0~)'
override_dh_gencontrol:
dh_gencontrol -- -Vcoreabiversion=$(CORE_ABIVERSION)
Bug#1061901: compiz: NMU diff for 64-bit time_t transition
Hello,
mwhud...@debian.org, le mar. 30 janv. 2024 01:24:00 +, a ecrit:
> diff -Nru compiz-0.8.18/debian/control compiz-0.8.18/debian/control
> --- compiz-0.8.18/debian/control 2023-01-01 21:58:27.0 +
> +++ compiz-0.8.18/debian/control 2024-01-30 01:22:56.0 +
> @@ -159,7 +159,10 @@
> This package contains the standard plugins that come with compiz. Compiz
> without these plugins is not very useful.
>
> -Package: libdecoration0
> +Package: libdecoration0t64
> +Provides: ${t64:Provides}
> +Replaces: libdecoration0
> +Breaks: libdecoration0 (<< ${source:Version})
> Section: libs
> Architecture: any
> Multi-Arch: same
This seems to be missing updating the Depends: libdecoration0?
Samuel
Bug#1061901:
Apologies, previous version of patch was incorrect. nmu_compiz.debdiff Description: Binary data
Bug#1061901: compiz: NMU diff for 64-bit time_t transition
Source: compiz
Version: 2:0.8.18-5
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
compiz 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 compiz
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-15-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_WARN, 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 compiz-0.8.18/debian/changelog compiz-0.8.18/debian/changelog
--- compiz-0.8.18/debian/changelog 2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/changelog 2024-01-30 01:22:56.0 +
@@ -1,3 +1,10 @@
+compiz (2:0.8.18-5.1) experimental; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle Tue, 30 Jan 2024 01:22:56 +
+
compiz (2:0.8.18-5) unstable; urgency=medium
[ Samuel Thibault ]
diff -Nru compiz-0.8.18/debian/control compiz-0.8.18/debian/control
--- compiz-0.8.18/debian/control2023-01-01 21:58:27.0 +
+++ compiz-0.8.18/debian/control2024-01-30 01:22:56.0 +
@@ -159,7 +159,10 @@
This package contains the standard plugins that come with compiz. Compiz
without these plugins is not very useful.
-Package: libdecoration0
+Package: libdecoration0t64
+Provides: ${t64:Provides}
+Replaces: libdecoration0
+Breaks: libdecoration0 (<< ${source:Version})
Section: libs
Architecture: any
Multi-Arch: same
diff -Nru compiz-0.8.18/debian/libdecoration0.install
compiz-0.8.18/debian/libdecoration0.install
--- compiz-0.8.18/debian/libdecoration0.install 2018-10-27 12:09:18.0
+
+++ compiz-0.8.18/debian/libdecoration0.install 1970-01-01 00:00:00.0
+
@@ -1 +0,0 @@
-usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.install
compiz-0.8.18/debian/libdecoration0t64.install
--- compiz-0.8.18/debian/libdecoration0t64.install 1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.install 2018-10-27
12:09:18.0 +
@@ -0,0 +1 @@
+usr/lib/libdecoration*.so.*
diff -Nru compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
compiz-0.8.18/debian/libdecoration0t64.lintian-overrides
--- compiz-0.8.18/debian/libdecoration0t64.lintian-overrides1970-01-01
00:00:00.0 +
+++ compiz-0.8.18/debian/libdecoration0t64.lintian-overrides2024-01-30
01:22:56.0 +
@@ -0,0 +1 @@
+libdecoration0t64: package-name-doesnt-match-sonames libdecoration0
