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 dislocker-0.7.3/debian/changelog dislocker-0.7.3/debian/changelog
--- dislocker-0.7.3/debian/changelog 2023-02-27 17:51:20.000000000 +0000
+++ dislocker-0.7.3/debian/changelog 2024-02-28 21:32:10.000000000 +0000
@@ -1,3 +1,10 @@
+dislocker (0.7.3-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle <mwhud...@debian.org> Wed, 28 Feb 2024 21:32:10 +0000
+
dislocker (0.7.3-3) unstable; urgency=medium
* Team upload.
diff -Nru dislocker-0.7.3/debian/control dislocker-0.7.3/debian/control
--- dislocker-0.7.3/debian/control 2023-02-27 17:51:20.000000000 +0000
+++ dislocker-0.7.3/debian/control 2024-02-28 21:32:10.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Security Tools <team+pkg-secur...@tracker.debian.org>
Uploaders: Giovani Augusto Ferreira <giov...@debian.org>
-Build-Depends: cmake,
+Build-Depends: dpkg-dev (>= 1.22.5), cmake,
debhelper-compat (=13),
libfuse-dev | libfuse-hurd-dev,
libmbedtls-dev,
@@ -14,11 +14,12 @@
Vcs-Git: https://salsa.debian.org/pkg-security-team/dislocker.git
Vcs-Browser: https://salsa.debian.org/pkg-security-team/dislocker
-Package: libdislocker0.7
+Package: libdislocker0.7t64
+Provides: ${t64:Provides}
Section: libs
Architecture: any
-Replaces: libdislocker0.6 (<< 0.7~)
-Breaks: libdislocker0.6 (<< 0.7~)
+Replaces: libdislocker0.7, libdislocker0.6 (<< 0.7~)
+Breaks: libdislocker0.7 (<< ${source:Version}), libdislocker0.6 (<< 0.7~)
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: read/write encrypted BitLocker volumes (shared library)
Dislocker has been designed to read BitLocker encrypted partitions under
@@ -38,7 +39,7 @@
Package: libdislocker0-dev
Architecture: any
Section: libdevel
-Depends: libdislocker0.7 (= ${binary:Version}), ${misc:Depends}
+Depends: libdislocker0.7t64 (= ${binary:Version}), ${misc:Depends}
Multi-Arch: foreign
Description: read/write encrypted BitLocker volumes (development files)
Dislocker has been designed to read BitLocker encrypted partitions under
diff -Nru dislocker-0.7.3/debian/libdislocker0.7.dirs
dislocker-0.7.3/debian/libdislocker0.7.dirs
--- dislocker-0.7.3/debian/libdislocker0.7.dirs 2023-02-27 17:48:43.000000000
+0000
+++ dislocker-0.7.3/debian/libdislocker0.7.dirs 1970-01-01 00:00:00.000000000
+0000
@@ -1 +0,0 @@
-usr/lib
diff -Nru dislocker-0.7.3/debian/libdislocker0.7.links
dislocker-0.7.3/debian/libdislocker0.7.links
--- dislocker-0.7.3/debian/libdislocker0.7.links 2023-02-27
17:48:43.000000000 +0000
+++ dislocker-0.7.3/debian/libdislocker0.7.links 1970-01-01
00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/libdislocker.so.0.7.2 usr/lib/libdislocker.so
-usr/lib/libdislocker.so.0.7.2 usr/lib/libdislocker.so.0.7
diff -Nru dislocker-0.7.3/debian/libdislocker0.7.symbols
dislocker-0.7.3/debian/libdislocker0.7.symbols
--- dislocker-0.7.3/debian/libdislocker0.7.symbols 2023-02-27
17:48:43.000000000 +0000
+++ dislocker-0.7.3/debian/libdislocker0.7.symbols 1970-01-01
00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-libdislocker.so.0.7 libdislocker0.7 #MINVER#
- EOW_INFORMATION_OFFSET_GUID@Base 0.7.3
- INFORMATION_OFFSET_GUID@Base 0.7.3
- Init_accesses@Base 0.7.3
- Init_datum@Base 0.7.3
- Init_guid@Base 0.7.3
- Init_libdislocker@Base 0.7.3
- Init_metadata@Base 0.7.3
- asciitoutf16@Base 0.7.3
- build_fvek_from_file@Base 0.7.3
- check_match_guid@Base 0.7.3
- check_state@Base 0.7.3
- chomp@Base 0.7.3
- cipherstr@Base 0.7.3
- close_input_fd@Base 0.7.3
- crc32@Base 0.7.3
- datum_value_type_must_be@Base 0.7.3
- datumvaluetypestr@Base 0.7.3
- decrypt_cbc_with_diffuser@Base 0.7.3
- decrypt_cbc_without_diffuser@Base 0.7.3
- decrypt_key@Base 0.7.3
- decrypt_sector@Base 0.7.3
- decrypt_xts@Base 0.7.3
- diffuserA_decrypt@Base 0.7.3
- diffuserA_encrypt@Base 0.7.3
- diffuserB_decrypt@Base 0.7.3
- diffuserB_encrypt@Base 0.7.3
- dis_aes_crypt_xex@Base 0.7.3
- dis_aes_crypt_xts@Base 0.7.3
- dis_close@Base 0.7.3
- dis_crypt_destroy@Base 0.7.3
- dis_crypt_new@Base 0.7.3
- dis_crypt_set_fvekey@Base 0.7.3
- dis_destroy@Base 0.7.3
- dis_errno@Base 0.7.3
- dis_free@Base 0.7.3
- dis_free_args@Base 0.7.3
- dis_get_access@Base 0.7.3
- dis_getopt@Base 0.7.3
- dis_getopts@Base 0.7.3
- dis_initialize@Base 0.7.3
- dis_inouts_sector_size@Base 0.7.3
- dis_inouts_volume_size@Base 0.7.3
- dis_is_read_only@Base 0.7.3
- dis_is_volume_state_checked@Base 0.7.3
- dis_lseek@Base 0.7.3
- dis_malloc@Base 0.7.3
- dis_metadata_backup_sectors_count@Base 0.7.3
- dis_metadata_config_destroy@Base 0.7.3
- dis_metadata_config_new@Base 0.7.3
- dis_metadata_destroy@Base 0.7.3
- dis_metadata_encrypted_volume_size@Base 0.7.3
- dis_metadata_get@Base 0.7.3
- dis_metadata_has_clear_key@Base 0.7.3
- dis_metadata_information_version@Base 0.7.3
- dis_metadata_initialize@Base 0.7.3
- dis_metadata_is_overwritten@Base 0.7.3
- dis_metadata_mftmirror@Base 0.7.3
- dis_metadata_new@Base 0.7.3
- dis_metadata_ntfs_sectors_address@Base 0.7.3
- dis_metadata_sector_size@Base 0.7.3
- dis_metadata_set_dataset@Base 0.7.3
- dis_metadata_set_volume_header@Base 0.7.3
- dis_metadata_vista_vbr_fve2ntfs@Base 0.7.3
- dis_metadata_vista_vbr_ntfs2fve@Base 0.7.3
- dis_metadata_volume_size_from_vbr@Base 0.7.3
- dis_new@Base 0.7.3
- dis_open@Base 0.7.3
- dis_print_args@Base 0.7.3
- dis_printf@Base 0.7.3
- dis_rb_classes@Base 0.7.3
- dis_rb_str_catf@Base 0.7.3
- dis_rb_str_vcatf@Base 0.7.3
- dis_read@Base 0.7.3
- dis_setopt@Base 0.7.3
- dis_stdio_end@Base 0.7.3
- dis_stdio_init@Base 0.7.3
- dis_usage@Base 0.7.3
- dis_vprintf@Base 0.7.3
- dis_write@Base 0.7.3
- dislock@Base 0.7.3
- encrypt_cbc_with_diffuser@Base 0.7.3
- encrypt_cbc_without_diffuser@Base 0.7.3
- encrypt_sector@Base 0.7.3
- encrypt_write_sectors@Base 0.7.3
- encrypt_xts@Base 0.7.3
- enlock@Base 0.7.3
- format_guid@Base 0.7.3
- get_bek_dataset@Base 0.7.3
- get_fvek@Base 0.7.3
- get_fvevol_fd@Base 0.7.3
- get_header_safe@Base 0.7.3
- get_input_fd@Base 0.7.3
- get_nested_datum@Base 0.7.3
- get_nested_datumvaluetype@Base 0.7.3
- get_next_datum@Base 0.7.3
- get_payload_safe@Base 0.7.3
- get_vmk@Base 0.7.3
- get_vmk_datum_from_guid@Base 0.7.3
- get_vmk_datum_from_range@Base 0.7.3
- get_vmk_from_bekfile2@Base 0.7.3
- get_vmk_from_bekfile@Base 0.7.3
- get_vmk_from_clearkey@Base 0.7.3
- get_vmk_from_file@Base 0.7.3
- get_vmk_from_rp2@Base 0.7.3
- get_vmk_from_rp@Base 0.7.3
- get_vmk_from_user_pass2@Base 0.7.3
- get_vmk_from_user_pass@Base 0.7.3
- hexdump@Base 0.7.3
- init_keys@Base 0.7.3
- intermediate_key@Base 0.7.3
- is_valid_key@Base 0.7.3
- memclean@Base 0.7.3
- ntfs2utc@Base 0.7.3
- prepare_crypt@Base 0.7.3
- print_data@Base 0.7.3
- print_dataset@Base 0.7.3
- print_datum_aes_ccm@Base 0.7.3
- print_datum_erased@Base 0.7.3
- print_datum_external@Base 0.7.3
- print_datum_generic@Base 0.7.3
- print_datum_key@Base 0.7.3
- print_datum_stretch_key@Base 0.7.3
- print_datum_tpmenc@Base 0.7.3
- print_datum_unicode@Base 0.7.3
- print_datum_use_key@Base 0.7.3
- print_datum_virtualization@Base 0.7.3
- print_datum_vmk@Base 0.7.3
- print_eow_infos@Base 0.7.3
- print_extended_info@Base 0.7.3
- print_header@Base 0.7.3
- print_information@Base 0.7.3
- print_intermediate_key@Base 0.7.3
- print_mac@Base 0.7.3
- print_nonce@Base 0.7.3
- print_one_datum@Base 0.7.3
- print_volume_header@Base 0.7.3
- prompt_rp@Base 0.7.3
- prompt_up@Base 0.7.3
- rb_cDislockerMetadataDatumPayload_to_s@Base 0.7.3
- rb_cDislockerMetadataDatum_new@Base 0.7.3
- rb_datum_aes_ccm_to_s@Base 0.7.3
- rb_datum_erased_to_s@Base 0.7.3
- rb_datum_external_to_s@Base 0.7.3
- rb_datum_generic_to_s@Base 0.7.3
- rb_datum_key_to_s@Base 0.7.3
- rb_datum_stretch_key_to_s@Base 0.7.3
- rb_datum_tpmenc_to_s@Base 0.7.3
- rb_datum_unicode_to_s@Base 0.7.3
- rb_datum_use_key_to_s@Base 0.7.3
- rb_datum_virtualization_extinfo_to_s@Base 0.7.3
- rb_datum_virtualization_to_s@Base 0.7.3
- rb_datum_vmk_to_s@Base 0.7.3
- rb_hexdump@Base 0.7.3
- read_decrypt_sectors@Base 0.7.3
- stretch_recovery_key@Base 0.7.3
- stretch_user_key@Base 0.7.3
- user_key@Base 0.7.3
- utf16towchars@Base 0.7.3
- valid_block@Base 0.7.3
- xor_buffer@Base 0.7.3
diff -Nru dislocker-0.7.3/debian/libdislocker0.7t64.dirs
dislocker-0.7.3/debian/libdislocker0.7t64.dirs
--- dislocker-0.7.3/debian/libdislocker0.7t64.dirs 1970-01-01
00:00:00.000000000 +0000
+++ dislocker-0.7.3/debian/libdislocker0.7t64.dirs 2024-02-28
21:32:07.000000000 +0000
@@ -0,0 +1 @@
+usr/lib
diff -Nru dislocker-0.7.3/debian/libdislocker0.7t64.links
dislocker-0.7.3/debian/libdislocker0.7t64.links
--- dislocker-0.7.3/debian/libdislocker0.7t64.links 1970-01-01
00:00:00.000000000 +0000
+++ dislocker-0.7.3/debian/libdislocker0.7t64.links 2024-02-28
21:32:07.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/libdislocker.so.0.7.2 usr/lib/libdislocker.so
+usr/lib/libdislocker.so.0.7.2 usr/lib/libdislocker.so.0.7
diff -Nru dislocker-0.7.3/debian/libdislocker0.7t64.lintian-overrides
dislocker-0.7.3/debian/libdislocker0.7t64.lintian-overrides
--- dislocker-0.7.3/debian/libdislocker0.7t64.lintian-overrides 1970-01-01
00:00:00.000000000 +0000
+++ dislocker-0.7.3/debian/libdislocker0.7t64.lintian-overrides 2024-02-28
21:32:07.000000000 +0000
@@ -0,0 +1 @@
+libdislocker0.7t64: package-name-doesnt-match-sonames libdislocker0.7
diff -Nru dislocker-0.7.3/debian/libdislocker0.7t64.symbols
dislocker-0.7.3/debian/libdislocker0.7t64.symbols
--- dislocker-0.7.3/debian/libdislocker0.7t64.symbols 1970-01-01
00:00:00.000000000 +0000
+++ dislocker-0.7.3/debian/libdislocker0.7t64.symbols 2024-02-28
21:32:07.000000000 +0000
@@ -0,0 +1,161 @@
+libdislocker.so.0.7 libdislocker0.7t64 #MINVER#
+ EOW_INFORMATION_OFFSET_GUID@Base 0.7.3
+ INFORMATION_OFFSET_GUID@Base 0.7.3
+ Init_accesses@Base 0.7.3
+ Init_datum@Base 0.7.3
+ Init_guid@Base 0.7.3
+ Init_libdislocker@Base 0.7.3
+ Init_metadata@Base 0.7.3
+ asciitoutf16@Base 0.7.3
+ build_fvek_from_file@Base 0.7.3
+ check_match_guid@Base 0.7.3
+ check_state@Base 0.7.3
+ chomp@Base 0.7.3
+ cipherstr@Base 0.7.3
+ close_input_fd@Base 0.7.3
+ crc32@Base 0.7.3
+ datum_value_type_must_be@Base 0.7.3
+ datumvaluetypestr@Base 0.7.3
+ decrypt_cbc_with_diffuser@Base 0.7.3
+ decrypt_cbc_without_diffuser@Base 0.7.3
+ decrypt_key@Base 0.7.3
+ decrypt_sector@Base 0.7.3
+ decrypt_xts@Base 0.7.3
+ diffuserA_decrypt@Base 0.7.3
+ diffuserA_encrypt@Base 0.7.3
+ diffuserB_decrypt@Base 0.7.3
+ diffuserB_encrypt@Base 0.7.3
+ dis_aes_crypt_xex@Base 0.7.3
+ dis_aes_crypt_xts@Base 0.7.3
+ dis_close@Base 0.7.3
+ dis_crypt_destroy@Base 0.7.3
+ dis_crypt_new@Base 0.7.3
+ dis_crypt_set_fvekey@Base 0.7.3
+ dis_destroy@Base 0.7.3
+ dis_errno@Base 0.7.3
+ dis_free@Base 0.7.3
+ dis_free_args@Base 0.7.3
+ dis_get_access@Base 0.7.3
+ dis_getopt@Base 0.7.3
+ dis_getopts@Base 0.7.3
+ dis_initialize@Base 0.7.3
+ dis_inouts_sector_size@Base 0.7.3
+ dis_inouts_volume_size@Base 0.7.3
+ dis_is_read_only@Base 0.7.3
+ dis_is_volume_state_checked@Base 0.7.3
+ dis_lseek@Base 0.7.3
+ dis_malloc@Base 0.7.3
+ dis_metadata_backup_sectors_count@Base 0.7.3
+ dis_metadata_config_destroy@Base 0.7.3
+ dis_metadata_config_new@Base 0.7.3
+ dis_metadata_destroy@Base 0.7.3
+ dis_metadata_encrypted_volume_size@Base 0.7.3
+ dis_metadata_get@Base 0.7.3
+ dis_metadata_has_clear_key@Base 0.7.3
+ dis_metadata_information_version@Base 0.7.3
+ dis_metadata_initialize@Base 0.7.3
+ dis_metadata_is_overwritten@Base 0.7.3
+ dis_metadata_mftmirror@Base 0.7.3
+ dis_metadata_new@Base 0.7.3
+ dis_metadata_ntfs_sectors_address@Base 0.7.3
+ dis_metadata_sector_size@Base 0.7.3
+ dis_metadata_set_dataset@Base 0.7.3
+ dis_metadata_set_volume_header@Base 0.7.3
+ dis_metadata_vista_vbr_fve2ntfs@Base 0.7.3
+ dis_metadata_vista_vbr_ntfs2fve@Base 0.7.3
+ dis_metadata_volume_size_from_vbr@Base 0.7.3
+ dis_new@Base 0.7.3
+ dis_open@Base 0.7.3
+ dis_print_args@Base 0.7.3
+ dis_printf@Base 0.7.3
+ dis_rb_classes@Base 0.7.3
+ dis_rb_str_catf@Base 0.7.3
+ dis_rb_str_vcatf@Base 0.7.3
+ dis_read@Base 0.7.3
+ dis_setopt@Base 0.7.3
+ dis_stdio_end@Base 0.7.3
+ dis_stdio_init@Base 0.7.3
+ dis_usage@Base 0.7.3
+ dis_vprintf@Base 0.7.3
+ dis_write@Base 0.7.3
+ dislock@Base 0.7.3
+ encrypt_cbc_with_diffuser@Base 0.7.3
+ encrypt_cbc_without_diffuser@Base 0.7.3
+ encrypt_sector@Base 0.7.3
+ encrypt_write_sectors@Base 0.7.3
+ encrypt_xts@Base 0.7.3
+ enlock@Base 0.7.3
+ format_guid@Base 0.7.3
+ get_bek_dataset@Base 0.7.3
+ get_fvek@Base 0.7.3
+ get_fvevol_fd@Base 0.7.3
+ get_header_safe@Base 0.7.3
+ get_input_fd@Base 0.7.3
+ get_nested_datum@Base 0.7.3
+ get_nested_datumvaluetype@Base 0.7.3
+ get_next_datum@Base 0.7.3
+ get_payload_safe@Base 0.7.3
+ get_vmk@Base 0.7.3
+ get_vmk_datum_from_guid@Base 0.7.3
+ get_vmk_datum_from_range@Base 0.7.3
+ get_vmk_from_bekfile2@Base 0.7.3
+ get_vmk_from_bekfile@Base 0.7.3
+ get_vmk_from_clearkey@Base 0.7.3
+ get_vmk_from_file@Base 0.7.3
+ get_vmk_from_rp2@Base 0.7.3
+ get_vmk_from_rp@Base 0.7.3
+ get_vmk_from_user_pass2@Base 0.7.3
+ get_vmk_from_user_pass@Base 0.7.3
+ hexdump@Base 0.7.3
+ init_keys@Base 0.7.3
+ intermediate_key@Base 0.7.3
+ is_valid_key@Base 0.7.3
+ memclean@Base 0.7.3
+ ntfs2utc@Base 0.7.3
+ prepare_crypt@Base 0.7.3
+ print_data@Base 0.7.3
+ print_dataset@Base 0.7.3
+ print_datum_aes_ccm@Base 0.7.3
+ print_datum_erased@Base 0.7.3
+ print_datum_external@Base 0.7.3
+ print_datum_generic@Base 0.7.3
+ print_datum_key@Base 0.7.3
+ print_datum_stretch_key@Base 0.7.3
+ print_datum_tpmenc@Base 0.7.3
+ print_datum_unicode@Base 0.7.3
+ print_datum_use_key@Base 0.7.3
+ print_datum_virtualization@Base 0.7.3
+ print_datum_vmk@Base 0.7.3
+ print_eow_infos@Base 0.7.3
+ print_extended_info@Base 0.7.3
+ print_header@Base 0.7.3
+ print_information@Base 0.7.3
+ print_intermediate_key@Base 0.7.3
+ print_mac@Base 0.7.3
+ print_nonce@Base 0.7.3
+ print_one_datum@Base 0.7.3
+ print_volume_header@Base 0.7.3
+ prompt_rp@Base 0.7.3
+ prompt_up@Base 0.7.3
+ rb_cDislockerMetadataDatumPayload_to_s@Base 0.7.3
+ rb_cDislockerMetadataDatum_new@Base 0.7.3
+ rb_datum_aes_ccm_to_s@Base 0.7.3
+ rb_datum_erased_to_s@Base 0.7.3
+ rb_datum_external_to_s@Base 0.7.3
+ rb_datum_generic_to_s@Base 0.7.3
+ rb_datum_key_to_s@Base 0.7.3
+ rb_datum_stretch_key_to_s@Base 0.7.3
+ rb_datum_tpmenc_to_s@Base 0.7.3
+ rb_datum_unicode_to_s@Base 0.7.3
+ rb_datum_use_key_to_s@Base 0.7.3
+ rb_datum_virtualization_extinfo_to_s@Base 0.7.3
+ rb_datum_virtualization_to_s@Base 0.7.3
+ rb_datum_vmk_to_s@Base 0.7.3
+ rb_hexdump@Base 0.7.3
+ read_decrypt_sectors@Base 0.7.3
+ stretch_recovery_key@Base 0.7.3
+ stretch_user_key@Base 0.7.3
+ user_key@Base 0.7.3
+ utf16towchars@Base 0.7.3
+ valid_block@Base 0.7.3
+ xor_buffer@Base 0.7.3
diff -Nru dislocker-0.7.3/debian/rules dislocker-0.7.3/debian/rules
--- dislocker-0.7.3/debian/rules 2023-02-27 17:48:43.000000000 +0000
+++ dislocker-0.7.3/debian/rules 2024-02-28 21:32:07.000000000 +0000
@@ -3,7 +3,7 @@
DESTDIRBIN=$(CURDIR)/debian/dislocker
-DESTDIRLIB=$(CURDIR)/debian/libdislocker0.7
+DESTDIRLIB=$(CURDIR)/debian/libdislocker0.7t64
TEMPDEB=$(CURDIR)/debian/tmp
export PVER=$(shell dpkg-parsechangelog --show-field version | cut -d"-" -f1)
