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 zeroc-ice-3.7.10/debian/changelog zeroc-ice-3.7.10/debian/changelog
--- zeroc-ice-3.7.10/debian/changelog 2024-02-28 09:13:28.000000000 +0000
+++ zeroc-ice-3.7.10/debian/changelog 2024-03-01 00:14:45.000000000 +0000
@@ -1,3 +1,10 @@
+zeroc-ice (3.7.10-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063309
+
+ -- Steve Langasek <vor...@debian.org> Fri, 01 Mar 2024 00:14:45 +0000
+
zeroc-ice (3.7.10-2) unstable; urgency=medium
* Set javaTargetRelease for java-compat builds using $java_compat_level
(Closes: #1057672)
diff -Nru zeroc-ice-3.7.10/debian/control zeroc-ice-3.7.10/debian/control
--- zeroc-ice-3.7.10/debian/control 2023-11-07 09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/control 2024-03-01 00:14:44.000000000 +0000
@@ -8,7 +8,7 @@
gradle-ice-builder-plugin (>= 1.3.13),
libjgoodies-forms-java (>= 1.6.0),
libjgoodies-looks-java (>= 2.5.2)
-Build-Depends: debhelper,
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper,
debhelper-compat (= 10),
dh-exec,
dh-php (>= 0.20),
@@ -43,7 +43,7 @@
Section: libdevel
Replaces: libice++-dev,
libzeroc-ice35-dev
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
zeroc-ice-compilers (= ${binary:Version}),
zeroc-ice-slice (= ${source:Version}),
${misc:Depends}
@@ -69,7 +69,10 @@
network programming interfaces and allows you to focus your efforts on
your application logic.
-Package: libzeroc-ice3.7
+Package: libzeroc-ice3.7t64
+Provides: ${t64:Provides}
+Replaces: libzeroc-ice3.7
+Breaks: libzeroc-ice3.7 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: libs
@@ -85,12 +88,15 @@
network programming interfaces and allows you to focus your efforts on
your application logic.
-Package: libzeroc-icestorm3.7
+Package: libzeroc-icestorm3.7t64
+Provides: ${t64:Provides}
+Replaces: libzeroc-icestorm3.7
+Breaks: libzeroc-icestorm3.7 (<< ${source:Version})
Architecture: any
Multi-Arch: same
Section: net
Pre-Depends: ${misc:Pre-Depends}
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: IceStorm publish-subscribe event distribution service
@@ -110,7 +116,7 @@
Package: php-zeroc-ice
Architecture: any
Section: php
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
${misc:Depends},
${php:Depends},
${shlibs:Depends}
@@ -126,7 +132,7 @@
Package: python3-zeroc-ice
Architecture: any
Section: python
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
@@ -144,7 +150,7 @@
Section: net
Replaces: glacier2,
ice35-services
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Glacier2 router
@@ -178,8 +184,8 @@
Architecture: all
Section: net
Depends: libzeroc-ice3.7-java (= ${source:Version}),
- libzeroc-ice3.7 (>= ${source:Version}),
- libzeroc-icestorm3.7 (>= ${source:Version}),
+ libzeroc-ice3.7t64 (>= ${source:Version}),
+ libzeroc-icestorm3.7t64 (>= ${source:Version}),
php-zeroc-ice (>= ${source:Version}),
python3-zeroc-ice (>= ${source:Version}),
zeroc-glacier2 (>= ${source:Version}),
@@ -203,7 +209,7 @@
Architecture: any
Multi-Arch: foreign
Section: devel
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
zeroc-ice-slice (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
@@ -232,8 +238,8 @@
Architecture: any
Multi-Arch: foreign
Section: admin
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
- libzeroc-icestorm3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
+ libzeroc-icestorm3.7t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Ice utilities and admin tools
@@ -268,7 +274,7 @@
Architecture: any
Multi-Arch: foreign
Section: net
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: IceBox server, a framework for Ice application services
@@ -286,8 +292,8 @@
Section: net
Replaces: ice35-services,
icegrid
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
- libzeroc-icestorm3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
+ libzeroc-icestorm3.7t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Locate, deploy, and manage Ice servers
@@ -305,7 +311,7 @@
Section: net
Replaces: ice35-services,
icepatch2
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: File distribution and patching
@@ -322,7 +328,7 @@
Architecture: any
Multi-Arch: foreign
Section: net
-Depends: libzeroc-ice3.7 (= ${binary:Version}),
+Depends: libzeroc-ice3.7t64 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Bridge service
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7.dirs
zeroc-ice-3.7.10/debian/libzeroc-ice3.7.dirs
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7.dirs 2023-11-07
09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7.dirs 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-/var/lib/ice
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7.install
zeroc-ice-3.7.10/debian/libzeroc-ice3.7.install
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7.install 2023-11-07
09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7.install 1970-01-01
00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-usr/lib/*/libGlacier2++11.so.*
-usr/lib/*/libGlacier2.so.*
-usr/lib/*/libGlacier2CryptPermissionsVerifier.so.*
-usr/lib/*/libIce++11.so.*
-usr/lib/*/libIce.so.*
-usr/lib/*/libIceBT++11.so.*
-usr/lib/*/libIceBT.so.*
-usr/lib/*/libIceBox++11.so.*
-usr/lib/*/libIceBox.so.*
-usr/lib/*/libIceDB.so.*
-usr/lib/*/libIceDiscovery++11.so.*
-usr/lib/*/libIceDiscovery.so.*
-usr/lib/*/libIceGrid++11.so.*
-usr/lib/*/libIceGrid.so.*
-usr/lib/*/libIceLocatorDiscovery++11.so.*
-usr/lib/*/libIceLocatorDiscovery.so.*
-usr/lib/*/libIcePatch2.so.*
-usr/lib/*/libIceSSL++11.so.*
-usr/lib/*/libIceSSL.so.*
-usr/lib/*/libIceStorm++11.so.*
-usr/lib/*/libIceStorm.so.*
-usr/lib/*/libIceXML.so.*
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7.lintian-overrides
zeroc-ice-3.7.10/debian/libzeroc-ice3.7.lintian-overrides
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7.lintian-overrides 2023-11-07
09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-libzeroc-ice3.7: package-name-doesnt-match-sonames *
-libzeroc-ice3.7: dev-pkg-without-shlib-symlink usr/lib/*/libIceXML.so.*
usr/lib/*/libIceXML.so
-libzeroc-ice3.7: dev-pkg-without-shlib-symlink usr/lib/*/libIceDB.so.*
usr/lib/*/libIceDB.so
-libzeroc-ice3.7: dev-pkg-without-shlib-symlink
usr/lib/*/libGlacier2CryptPermissionsVerifier.so.*
usr/lib/*/libGlacier2CryptPermissionsVerifier.so
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postinst
zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postinst
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postinst 2023-11-07
09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postinst 1970-01-01
00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-#!/bin/sh
-# postinst script for libzeroc-ice3.6
-set -e
-
-if [ "$1" = "configure" ]; then
- if ! getent passwd ice > /dev/null; then
- adduser --quiet --system --group --no-create-home --home /var/lib/ice
--gecos "Ice Service account" ice
- fi
-
- # Make /var/lib/ice writeable by ice:adm user
- if ! dpkg-statoverride --list /var/lib/ice >/dev/null; then
- dpkg-statoverride --update --add ice adm 0770 /var/lib/ice >/dev/null
2>/dev/null || true
- fi
-fi
-
-#DEBHELPER#
-
-exit 0
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postrm
zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postrm
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postrm 2023-11-07
09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7.postrm 1970-01-01
00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh
-# postrm script for libzeroc-ice3.7
-set -e
-
-if [ "$1" = "purge" ]; then
- # We remove /var/lib/ice on purge
- rm -rf /var/lib/ice
-
- # Remove /var/lib/ice override
- dpkg-statoverride --remove /var/lib/ice >/dev/null 2>/dev/null || true
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.dirs
zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.dirs
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.dirs 1970-01-01
00:00:00.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.dirs 2023-11-07
09:45:43.000000000 +0000
@@ -0,0 +1 @@
+/var/lib/ice
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.install
zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.install
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.install 1970-01-01
00:00:00.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.install 2023-11-07
09:45:43.000000000 +0000
@@ -0,0 +1,22 @@
+usr/lib/*/libGlacier2++11.so.*
+usr/lib/*/libGlacier2.so.*
+usr/lib/*/libGlacier2CryptPermissionsVerifier.so.*
+usr/lib/*/libIce++11.so.*
+usr/lib/*/libIce.so.*
+usr/lib/*/libIceBT++11.so.*
+usr/lib/*/libIceBT.so.*
+usr/lib/*/libIceBox++11.so.*
+usr/lib/*/libIceBox.so.*
+usr/lib/*/libIceDB.so.*
+usr/lib/*/libIceDiscovery++11.so.*
+usr/lib/*/libIceDiscovery.so.*
+usr/lib/*/libIceGrid++11.so.*
+usr/lib/*/libIceGrid.so.*
+usr/lib/*/libIceLocatorDiscovery++11.so.*
+usr/lib/*/libIceLocatorDiscovery.so.*
+usr/lib/*/libIcePatch2.so.*
+usr/lib/*/libIceSSL++11.so.*
+usr/lib/*/libIceSSL.so.*
+usr/lib/*/libIceStorm++11.so.*
+usr/lib/*/libIceStorm.so.*
+usr/lib/*/libIceXML.so.*
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.lintian-overrides
zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.lintian-overrides
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.lintian-overrides
2024-03-01 00:13:33.000000000 +0000
@@ -0,0 +1,5 @@
+libzeroc-ice3.7t64: package-name-doesnt-match-sonames *
+libzeroc-ice3.7t64: dev-pkg-without-shlib-symlink usr/lib/*/libIceXML.so.*
usr/lib/*/libIceXML.so
+libzeroc-ice3.7t64: dev-pkg-without-shlib-symlink usr/lib/*/libIceDB.so.*
usr/lib/*/libIceDB.so
+libzeroc-ice3.7t64: dev-pkg-without-shlib-symlink
usr/lib/*/libGlacier2CryptPermissionsVerifier.so.*
usr/lib/*/libGlacier2CryptPermissionsVerifier.so
+libzeroc-ice3.7t64: package-name-doesnt-match-sonames libzeroc-ice3.7
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postinst
zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postinst
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postinst 1970-01-01
00:00:00.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postinst 2023-11-07
09:45:43.000000000 +0000
@@ -0,0 +1,18 @@
+#!/bin/sh
+# postinst script for libzeroc-ice3.6
+set -e
+
+if [ "$1" = "configure" ]; then
+ if ! getent passwd ice > /dev/null; then
+ adduser --quiet --system --group --no-create-home --home /var/lib/ice
--gecos "Ice Service account" ice
+ fi
+
+ # Make /var/lib/ice writeable by ice:adm user
+ if ! dpkg-statoverride --list /var/lib/ice >/dev/null; then
+ dpkg-statoverride --update --add ice adm 0770 /var/lib/ice >/dev/null
2>/dev/null || true
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postrm
zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postrm
--- zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postrm 1970-01-01
00:00:00.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-ice3.7t64.postrm 2023-11-07
09:45:43.000000000 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+# postrm script for libzeroc-ice3.7
+set -e
+
+if [ "$1" = "purge" ]; then
+ # We remove /var/lib/ice on purge
+ rm -rf /var/lib/ice
+
+ # Remove /var/lib/ice override
+ dpkg-statoverride --remove /var/lib/ice >/dev/null 2>/dev/null || true
+
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.install
zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.install
--- zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.install 2023-11-07
09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.install 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libIceStormService.so.*
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.lintian-overrides
zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.lintian-overrides
--- zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.lintian-overrides
2023-11-07 09:45:43.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-libzeroc-icestorm3.7: package-name-doesnt-match-sonames *
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.install
zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.install
--- zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.install 1970-01-01
00:00:00.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.install 2023-11-07
09:45:43.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libIceStormService.so.*
diff -Nru zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.lintian-overrides
zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.lintian-overrides
--- zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.lintian-overrides
1970-01-01 00:00:00.000000000 +0000
+++ zeroc-ice-3.7.10/debian/libzeroc-icestorm3.7t64.lintian-overrides
2024-03-01 00:13:33.000000000 +0000
@@ -0,0 +1,2 @@
+libzeroc-icestorm3.7t64: package-name-doesnt-match-sonames *
+libzeroc-icestorm3.7t64: package-name-doesnt-match-sonames libzeroc-icestorm3.7
