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 util-linux-2.39.3/debian/changelog util-linux-2.39.3/debian/changelog
--- util-linux-2.39.3/debian/changelog 2024-01-05 14:25:05.000000000 +0000
+++ util-linux-2.39.3/debian/changelog 2024-02-28 21:32:09.000000000 +0000
@@ -1,3 +1,10 @@
+util-linux (2.39.3-6.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1063039
+
+ -- Steve Langasek <vor...@debian.org> Wed, 28 Feb 2024 21:32:09 +0000
+
util-linux (2.39.3-6) unstable; urgency=medium
* Upload to unstable.
diff -Nru util-linux-2.39.3/debian/control util-linux-2.39.3/debian/control
--- util-linux-2.39.3/debian/control 2024-01-05 14:25:05.000000000 +0000
+++ util-linux-2.39.3/debian/control 2024-02-28 21:32:09.000000000 +0000
@@ -1,5 +1,5 @@
Source: util-linux
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
asciidoctor <!stage1 !nodoc>,
bc <!stage1 !nocheck>,
bison,
@@ -406,7 +406,10 @@
.
This package contains the development environment for the mount library.
-Package: libuuid1
+Package: libuuid1t64
+Provides: ${t64:Provides}
+Replaces: libuuid1
+Breaks: libuuid1 (<< ${source:Version})
Architecture: any
Section: libs
Priority: optional
@@ -433,7 +436,7 @@
Section: utils
Priority: optional
Pre-Depends:
- libuuid1,
+ libuuid1t64,
${misc:Pre-Depends}
Depends:
adduser,
@@ -477,7 +480,7 @@
Priority: optional
Depends:
libc6-dev | libc-dev,
- libuuid1 (= ${binary:Version}),
+ libuuid1t64 (= ${binary:Version}),
${misc:Depends}
Multi-Arch: same
Description: Universally Unique ID library - headers and static libraries
diff -Nru util-linux-2.39.3/debian/libuuid1.install
util-linux-2.39.3/debian/libuuid1.install
--- util-linux-2.39.3/debian/libuuid1.install 2024-01-05 14:25:05.000000000
+0000
+++ util-linux-2.39.3/debian/libuuid1.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib/*/libuuid*.so.*
diff -Nru util-linux-2.39.3/debian/libuuid1.shlibs
util-linux-2.39.3/debian/libuuid1.shlibs
--- util-linux-2.39.3/debian/libuuid1.shlibs 2024-01-05 14:25:05.000000000
+0000
+++ util-linux-2.39.3/debian/libuuid1.shlibs 1970-01-01 00:00:00.000000000
+0000
@@ -1,2 +0,0 @@
-libuuid 1 libuuid1 (>= 2.31)
-udeb: libuuid 1 libuuid1-udeb (>= 2.31)
diff -Nru util-linux-2.39.3/debian/libuuid1.symbols
util-linux-2.39.3/debian/libuuid1.symbols
--- util-linux-2.39.3/debian/libuuid1.symbols 2024-01-05 14:25:05.000000000
+0000
+++ util-linux-2.39.3/debian/libuuid1.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -1,29 +0,0 @@
-libuuid.so.1 libuuid1 #MINVER#
-* Build-Depends-Package: uuid-dev
- UUIDD_PRIVATE@UUIDD_PRIVATE 2.20.1
- UUID_1.0@UUID_1.0 2.16
- UUID_2.20@UUID_2.20 2.20.1
- UUID_2.31@UUID_2.31 2.31.1
- UUID_2.36@UUID_2.36 2.36
- __uuid_generate_random@UUIDD_PRIVATE 2.20.1
- __uuid_generate_time@UUIDD_PRIVATE 2.20.1
- __uuid_generate_time_cont@UUIDD_PRIVATE 2.38.1-2~
- uuid_clear@UUID_1.0 2.16
- uuid_compare@UUID_1.0 2.16
- uuid_copy@UUID_1.0 2.16
- uuid_generate@UUID_1.0 2.16
- uuid_generate_md5@UUID_2.31 2.31.1
- uuid_generate_random@UUID_1.0 2.16
- uuid_generate_sha1@UUID_2.31 2.31.1
- uuid_generate_time@UUID_1.0 2.16
- uuid_generate_time_safe@UUID_2.20 2.20.1
- uuid_get_template@UUID_2.31 2.31.1
- uuid_is_null@UUID_1.0 2.16
- uuid_parse@UUID_1.0 2.16
- uuid_parse_range@UUID_2.36 2.36
- uuid_time@UUID_1.0 2.16
- uuid_type@UUID_1.0 2.16
- uuid_unparse@UUID_1.0 2.16
- uuid_unparse_lower@UUID_1.0 2.16
- uuid_unparse_upper@UUID_1.0 2.16
- uuid_variant@UUID_1.0 2.16
diff -Nru util-linux-2.39.3/debian/libuuid1t64.install
util-linux-2.39.3/debian/libuuid1t64.install
--- util-linux-2.39.3/debian/libuuid1t64.install 1970-01-01
00:00:00.000000000 +0000
+++ util-linux-2.39.3/debian/libuuid1t64.install 2024-01-05
14:25:05.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libuuid*.so.*
diff -Nru util-linux-2.39.3/debian/libuuid1t64.lintian-overrides
util-linux-2.39.3/debian/libuuid1t64.lintian-overrides
--- util-linux-2.39.3/debian/libuuid1t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ util-linux-2.39.3/debian/libuuid1t64.lintian-overrides 2024-02-28
21:31:35.000000000 +0000
@@ -0,0 +1 @@
+libuuid1t64: package-name-doesnt-match-sonames libuuid1
diff -Nru util-linux-2.39.3/debian/libuuid1t64.shlibs
util-linux-2.39.3/debian/libuuid1t64.shlibs
--- util-linux-2.39.3/debian/libuuid1t64.shlibs 1970-01-01 00:00:00.000000000
+0000
+++ util-linux-2.39.3/debian/libuuid1t64.shlibs 2024-02-28 21:31:35.000000000
+0000
@@ -0,0 +1,2 @@
+libuuid 1 libuuid1t64 (>= 2.31)
+udeb: libuuid 1 libuuid1t64-udeb (>= 2.31)
diff -Nru util-linux-2.39.3/debian/libuuid1t64.symbols
util-linux-2.39.3/debian/libuuid1t64.symbols
--- util-linux-2.39.3/debian/libuuid1t64.symbols 1970-01-01
00:00:00.000000000 +0000
+++ util-linux-2.39.3/debian/libuuid1t64.symbols 2024-02-28
21:31:35.000000000 +0000
@@ -0,0 +1,29 @@
+libuuid.so.1 libuuid1t64 #MINVER#
+* Build-Depends-Package: uuid-dev
+ UUIDD_PRIVATE@UUIDD_PRIVATE 2.20.1
+ UUID_1.0@UUID_1.0 2.16
+ UUID_2.20@UUID_2.20 2.20.1
+ UUID_2.31@UUID_2.31 2.31.1
+ UUID_2.36@UUID_2.36 2.36
+ __uuid_generate_random@UUIDD_PRIVATE 2.20.1
+ __uuid_generate_time@UUIDD_PRIVATE 2.20.1
+ __uuid_generate_time_cont@UUIDD_PRIVATE 2.38.1-2~
+ uuid_clear@UUID_1.0 2.16
+ uuid_compare@UUID_1.0 2.16
+ uuid_copy@UUID_1.0 2.16
+ uuid_generate@UUID_1.0 2.16
+ uuid_generate_md5@UUID_2.31 2.31.1
+ uuid_generate_random@UUID_1.0 2.16
+ uuid_generate_sha1@UUID_2.31 2.31.1
+ uuid_generate_time@UUID_1.0 2.16
+ uuid_generate_time_safe@UUID_2.20 2.20.1
+ uuid_get_template@UUID_2.31 2.31.1
+ uuid_is_null@UUID_1.0 2.16
+ uuid_parse@UUID_1.0 2.16
+ uuid_parse_range@UUID_2.36 2.36
+ uuid_time@UUID_1.0 2.16
+ uuid_type@UUID_1.0 2.16
+ uuid_unparse@UUID_1.0 2.16
+ uuid_unparse_lower@UUID_1.0 2.16
+ uuid_unparse_upper@UUID_1.0 2.16
+ uuid_variant@UUID_1.0 2.16
