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 btrfs-progs-6.6.3/debian/changelog btrfs-progs-6.6.3/debian/changelog
--- btrfs-progs-6.6.3/debian/changelog 2023-12-29 18:03:32.000000000 +0000
+++ btrfs-progs-6.6.3/debian/changelog 2024-02-28 05:21:59.000000000 +0000
@@ -1,3 +1,10 @@
+btrfs-progs (6.6.3-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition. Closes: #1062030
+
+ -- Steve Langasek <vor...@debian.org> Wed, 28 Feb 2024 05:21:59 +0000
+
btrfs-progs (6.6.3-1) unstable; urgency=medium
* New upstream release (closes: #1055372).
diff -Nru btrfs-progs-6.6.3/debian/control btrfs-progs-6.6.3/debian/control
--- btrfs-progs-6.6.3/debian/control 2023-12-29 18:02:57.000000000 +0000
+++ btrfs-progs-6.6.3/debian/control 2024-02-28 05:21:59.000000000 +0000
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Adam Borowski <kilob...@angband.pl>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13),
libext2fs-dev,
pkg-config,
libacl1-dev,
@@ -40,7 +40,10 @@
This package contains utilities (mkfs, fsck) used to work with btrfs
and an utility (btrfs-convert) to make a btrfs filesystem from an ext3.
-Package: libbtrfs0
+Package: libbtrfs0t64
+Provides: ${t64:Provides}
+Replaces: libbtrfs0
+Breaks: libbtrfs0 (<< ${source:Version})
Architecture: linux-any
Multi-Arch: same
Section: libs
@@ -56,7 +59,7 @@
Architecture: linux-any
Multi-Arch: same
Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfs0 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfs0t64 (= ${binary:Version})
Description: Checksumming Copy on Write Filesystem utilities (development
headers)
Btrfs is a copy on write filesystem for Linux aimed at implementing
advanced features while focusing on fault tolerance, repair and easy
@@ -64,7 +67,10 @@
.
This package contains development headers for the libbtrfs library.
-Package: libbtrfsutil1
+Package: libbtrfsutil1t64
+Provides: ${t64:Provides}
+Replaces: libbtrfsutil1
+Breaks: libbtrfsutil1 (<< ${source:Version})
Architecture: linux-any
Multi-Arch: same
Section: libs
@@ -80,7 +86,7 @@
Architecture: linux-any
Multi-Arch: same
Section: libdevel
-Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfsutil1 (=
${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libbtrfsutil1t64 (=
${binary:Version})
Description: Checksumming Copy on Write Filesystem utilities (util development
headers)
Btrfs is a copy on write filesystem for Linux aimed at implementing
advanced features while focusing on fault tolerance, repair and easy
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0.install
btrfs-progs-6.6.3/debian/libbtrfs0.install
--- btrfs-progs-6.6.3/debian/libbtrfs0.install 2023-12-29 13:16:04.000000000
+0000
+++ btrfs-progs-6.6.3/debian/libbtrfs0.install 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib/*/libbtrfs.so.0*
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0.symbols
btrfs-progs-6.6.3/debian/libbtrfs0.symbols
--- btrfs-progs-6.6.3/debian/libbtrfs0.symbols 2023-12-29 13:16:04.000000000
+0000
+++ btrfs-progs-6.6.3/debian/libbtrfs0.symbols 1970-01-01 00:00:00.000000000
+0000
@@ -1,7 +0,0 @@
-libbtrfs.so.0 libbtrfs0 #MINVER#
-* Build-Depends-Package: libbtrfs-dev
- LIBBTRFS_0.1@LIBBTRFS_0.1 5.3.1
- btrfs_read_and_process_send_stream@LIBBTRFS_0.1 5.3.1
- btrfs_subvolid_resolve@LIBBTRFS_0.1 5.3.1
- subvol_uuid_search@LIBBTRFS_0.1 5.3.1
- subvol_uuid_search_init@LIBBTRFS_0.1 5.3.1
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0t64.install
btrfs-progs-6.6.3/debian/libbtrfs0t64.install
--- btrfs-progs-6.6.3/debian/libbtrfs0t64.install 1970-01-01
00:00:00.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfs0t64.install 2023-12-29
13:16:04.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libbtrfs.so.0*
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides
btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides
--- btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfs0t64.lintian-overrides 2024-02-28
05:21:34.000000000 +0000
@@ -0,0 +1 @@
+libbtrfs0t64: package-name-doesnt-match-sonames libbtrfs0
diff -Nru btrfs-progs-6.6.3/debian/libbtrfs0t64.symbols
btrfs-progs-6.6.3/debian/libbtrfs0t64.symbols
--- btrfs-progs-6.6.3/debian/libbtrfs0t64.symbols 1970-01-01
00:00:00.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfs0t64.symbols 2024-02-28
05:21:34.000000000 +0000
@@ -0,0 +1,7 @@
+libbtrfs.so.0 libbtrfs0t64 #MINVER#
+* Build-Depends-Package: libbtrfs-dev
+ LIBBTRFS_0.1@LIBBTRFS_0.1 5.3.1
+ btrfs_read_and_process_send_stream@LIBBTRFS_0.1 5.3.1
+ btrfs_subvolid_resolve@LIBBTRFS_0.1 5.3.1
+ subvol_uuid_search@LIBBTRFS_0.1 5.3.1
+ subvol_uuid_search_init@LIBBTRFS_0.1 5.3.1
diff -Nru btrfs-progs-6.6.3/debian/libbtrfsutil1.install
btrfs-progs-6.6.3/debian/libbtrfsutil1.install
--- btrfs-progs-6.6.3/debian/libbtrfsutil1.install 2023-12-29
13:16:04.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfsutil1.install 1970-01-01
00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/*/libbtrfsutil.so.1*
diff -Nru btrfs-progs-6.6.3/debian/libbtrfsutil1.symbols
btrfs-progs-6.6.3/debian/libbtrfsutil1.symbols
--- btrfs-progs-6.6.3/debian/libbtrfsutil1.symbols 2023-12-29
13:16:04.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfsutil1.symbols 1970-01-01
00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-libbtrfsutil.so.1 libbtrfsutil1 #MINVER#
-* Build-Depends-Package: libbtrfsutil-dev
- LIBBTRFSUTIL_1.1@LIBBTRFSUTIL_1.1 5.6
- LIBBTRFSUTIL_1.2@LIBBTRFSUTIL_1.2 5.6
- btrfs_util_create_qgroup_inherit@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_create_snapshot@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_create_snapshot_fd2@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_create_snapshot_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_create_subvolume@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_create_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_create_subvolume_iterator@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_create_subvolume_iterator_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_delete_subvolume@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_delete_subvolume_by_id_fd@LIBBTRFSUTIL_1.2 5.6
- btrfs_util_delete_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_deleted_subvolumes@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_deleted_subvolumes_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_destroy_qgroup_inherit@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_destroy_subvolume_iterator@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_get_default_subvolume@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_get_default_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_get_subvolume_read_only@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_get_subvolume_read_only_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_is_subvolume@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_is_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_qgroup_inherit_add_group@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_qgroup_inherit_get_groups@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_set_default_subvolume@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_set_default_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_set_subvolume_read_only@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_set_subvolume_read_only_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_start_sync@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_start_sync_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_strerror@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_id@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_id_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_info@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_info_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_iterator_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_iterator_next@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_iterator_next_info@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_path@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_subvolume_path_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_sync@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_sync_fd@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_wait_sync@LIBBTRFSUTIL_1.1 5.6
- btrfs_util_wait_sync_fd@LIBBTRFSUTIL_1.1 5.6
diff -Nru btrfs-progs-6.6.3/debian/libbtrfsutil1t64.install
btrfs-progs-6.6.3/debian/libbtrfsutil1t64.install
--- btrfs-progs-6.6.3/debian/libbtrfsutil1t64.install 1970-01-01
00:00:00.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfsutil1t64.install 2023-12-29
13:16:04.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libbtrfsutil.so.1*
diff -Nru btrfs-progs-6.6.3/debian/libbtrfsutil1t64.lintian-overrides
btrfs-progs-6.6.3/debian/libbtrfsutil1t64.lintian-overrides
--- btrfs-progs-6.6.3/debian/libbtrfsutil1t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfsutil1t64.lintian-overrides 2024-02-28
05:21:34.000000000 +0000
@@ -0,0 +1 @@
+libbtrfsutil1t64: package-name-doesnt-match-sonames libbtrfsutil1
diff -Nru btrfs-progs-6.6.3/debian/libbtrfsutil1t64.symbols
btrfs-progs-6.6.3/debian/libbtrfsutil1t64.symbols
--- btrfs-progs-6.6.3/debian/libbtrfsutil1t64.symbols 1970-01-01
00:00:00.000000000 +0000
+++ btrfs-progs-6.6.3/debian/libbtrfsutil1t64.symbols 2024-02-28
05:21:34.000000000 +0000
@@ -0,0 +1,47 @@
+libbtrfsutil.so.1 libbtrfsutil1t64 #MINVER#
+* Build-Depends-Package: libbtrfsutil-dev
+ LIBBTRFSUTIL_1.1@LIBBTRFSUTIL_1.1 5.6
+ LIBBTRFSUTIL_1.2@LIBBTRFSUTIL_1.2 5.6
+ btrfs_util_create_qgroup_inherit@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_create_snapshot@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_create_snapshot_fd2@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_create_snapshot_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_create_subvolume@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_create_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_create_subvolume_iterator@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_create_subvolume_iterator_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_delete_subvolume@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_delete_subvolume_by_id_fd@LIBBTRFSUTIL_1.2 5.6
+ btrfs_util_delete_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_deleted_subvolumes@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_deleted_subvolumes_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_destroy_qgroup_inherit@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_destroy_subvolume_iterator@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_get_default_subvolume@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_get_default_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_get_subvolume_read_only@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_get_subvolume_read_only_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_is_subvolume@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_is_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_qgroup_inherit_add_group@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_qgroup_inherit_get_groups@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_set_default_subvolume@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_set_default_subvolume_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_set_subvolume_read_only@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_set_subvolume_read_only_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_start_sync@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_start_sync_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_strerror@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_id@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_id_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_info@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_info_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_iterator_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_iterator_next@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_iterator_next_info@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_path@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_subvolume_path_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_sync@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_sync_fd@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_wait_sync@LIBBTRFSUTIL_1.1 5.6
+ btrfs_util_wait_sync_fd@LIBBTRFSUTIL_1.1 5.6
