Hi Ted, On Sun, Mar 10, 2024 at 09:56:46PM +0100, Helmut Grohne wrote: > I've uploaded this to experimental directly to clear NEW and to get a > dumat report quickly. Barring your opposition, I'll NMU this to unstable > as well.
Given reviews from Michael Hudson-Doyle, Matthias Klose and Steve Langasek, I'm moving to unstable without delay as this reduces the need for binNMUs. I'm also improving Breaks/Provides given feedback from Matthias. Helmut
diff --minimal -Nru e2fsprogs-1.47.0/debian/changelog e2fsprogs-1.47.0/debian/changelog --- e2fsprogs-1.47.0/debian/changelog 2024-02-29 20:01:06.000000000 +0100 +++ e2fsprogs-1.47.0/debian/changelog 2024-03-13 07:20:06.000000000 +0100 @@ -1,3 +1,20 @@ +e2fsprogs (1.47.0-2.4) unstable; urgency=medium + + * Non-maintainer upload. + * Upload to unstable. + * Version Provides and Breaks (thanks to Matthias Klose). + + -- Helmut Grohne <hel...@subdivi.de> Wed, 13 Mar 2024 07:20:06 +0100 + +e2fsprogs (1.47.0-2.4~exp1) experimental; urgency=medium + + * Non-maintainer upload. + * Revert time64 transitions for libss2 and libcom-err2. + * Enable dh_movetousr (DEP17). (Closes: #1060000) + + Mitigate file loss in libext2fs2 -> libext2fs2t64 upgrade and /usr-move. + + -- Helmut Grohne <hel...@subdivi.de> Sun, 10 Mar 2024 21:02:48 +0100 + e2fsprogs (1.47.0-2.3) unstable; urgency=medium * Non-maintainer upload. diff --minimal -Nru e2fsprogs-1.47.0/debian/control e2fsprogs-1.47.0/debian/control --- e2fsprogs-1.47.0/debian/control 2024-02-29 19:03:22.000000000 +0100 +++ e2fsprogs-1.47.0/debian/control 2024-03-13 07:20:06.000000000 +0100 @@ -2,7 +2,7 @@ Section: admin Priority: required Maintainer: Theodore Y. Ts'o <ty...@mit.edu> -Build-Depends: dpkg-dev (>= 1.22.5), gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev [linux-any], cron [linux-any] +Build-Depends: dpkg-dev (>= 1.22.5), gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, debhelper-compat (= 12), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], systemd-dev [linux-any], cron [linux-any], dh-sequence-movetousr Rules-Requires-Root: no Standards-Version: 4.6.2 Homepage: http://e2fsprogs.sourceforge.net @@ -64,13 +64,13 @@ This package provides translations for messages for programs found in the 'e2fsprogs' package. -Package: libcom-err2t64 +Package: libcom-err2 Section: libs Priority: optional Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcom-err2, libcomerr2 (<< 1.43.9-1~) -Breaks: libcom-err2 (<< ${source:Version}), libcomerr2 (<< 1.43.9-1~) -Provides: ${t64:Provides}, libcomerr2 (= ${binary:Version}) +Replaces: libcom-err2t64, libcomerr2 (<< 1.43.9-1~) +Breaks: libcom-err2t64 (<< 1.47.0-2.4~exp1~), libcomerr2 (<< 1.43.9-1~) +Provides: libcom-err2t64 (= ${binary:Version}), libcomerr2 (= ${binary:Version}) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -82,7 +82,7 @@ Package: comerr-dev Section: libdevel Priority: optional -Depends: libc6-dev | libc-dev, libcom-err2t64 (= ${mainBinary}), ${misc:Depends} +Depends: libc6-dev | libc-dev, libcom-err2 (= ${mainBinary}), ${misc:Depends} Suggests: doc-base Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3) Architecture: any @@ -94,13 +94,13 @@ . This package contains the development environment for the com_err library. -Package: libss2t64 -Provides: ${t64:Provides} -Breaks: libss2 (<< ${source:Version}) +Package: libss2 +Provides: libss2t64 (= ${binary:Version}) +Breaks: libss2t64 (<< 1.47.0-2.4~exp1~) Section: libs Priority: optional -Depends: libcom-err2t64, ${shlibs:Depends}, ${misc:Depends} -Replaces: libss2, e2fsprogs (<< 1.34-1) +Depends: libcom-err2, ${shlibs:Depends}, ${misc:Depends} +Replaces: libss2t64, e2fsprogs (<< 1.34-1) Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -114,7 +114,7 @@ Package: ss-dev Section: libdevel Priority: optional -Depends: libc6-dev | libc-dev, libss2t64 (= ${mainBinary}), comerr-dev, ${misc:Depends} +Depends: libc6-dev | libc-dev, libss2 (= ${mainBinary}), comerr-dev, ${misc:Depends} Architecture: any Multi-Arch: same Description: command-line interface parsing library - headers and static libraries diff --minimal -Nru e2fsprogs-1.47.0/debian/libcom-err2.install e2fsprogs-1.47.0/debian/libcom-err2.install --- e2fsprogs-1.47.0/debian/libcom-err2.install 1970-01-01 01:00:00.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libcom-err2.install 2024-02-29 19:03:22.000000000 +0100 @@ -0,0 +1 @@ +lib/*/libcom_err*.so.* diff --minimal -Nru e2fsprogs-1.47.0/debian/libcom-err2.symbols e2fsprogs-1.47.0/debian/libcom-err2.symbols --- e2fsprogs-1.47.0/debian/libcom-err2.symbols 1970-01-01 01:00:00.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libcom-err2.symbols 2024-03-10 20:51:48.000000000 +0100 @@ -0,0 +1,22 @@ +libcom_err.so.2 libcom-err2 #MINVER# +* Build-Depends-Package: comerr-dev + _et_dynamic_list@Base 1.43.9 + _et_list@Base 1.43.9 + add_error_table@Base 1.43.9 + add_to_error_table@Base 1.43.9 + com_err@Base 1.43.9 + com_err_hook@Base 1.43.9 + com_err_va@Base 1.43.9 + com_right@Base 1.43.9 + com_right_r@Base 1.43.9 + error_message@Base 1.43.9 + error_table_name@Base 1.43.9 + et_list_lock@Base 1.43.9 + et_list_unlock@Base 1.43.9 + free_error_table@Base 1.43.9 + init_error_table@Base 1.43.9 + initialize_error_table_r@Base 1.43.9 + remove_error_table@Base 1.43.9 + reset_com_err_hook@Base 1.43.9 + set_com_err_gettext@Base 1.43.9 + set_com_err_hook@Base 1.43.9 diff --minimal -Nru e2fsprogs-1.47.0/debian/libcom-err2t64.install e2fsprogs-1.47.0/debian/libcom-err2t64.install --- e2fsprogs-1.47.0/debian/libcom-err2t64.install 2024-02-29 19:03:22.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libcom-err2t64.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -lib/*/libcom_err*.so.* diff --minimal -Nru e2fsprogs-1.47.0/debian/libcom-err2t64.lintian-overrides e2fsprogs-1.47.0/debian/libcom-err2t64.lintian-overrides --- e2fsprogs-1.47.0/debian/libcom-err2t64.lintian-overrides 2024-02-29 19:03:22.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libcom-err2t64.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -libcom-err2t64: package-name-doesnt-match-sonames libcom-err2 diff --minimal -Nru e2fsprogs-1.47.0/debian/libcom-err2t64.symbols e2fsprogs-1.47.0/debian/libcom-err2t64.symbols --- e2fsprogs-1.47.0/debian/libcom-err2t64.symbols 2024-02-29 19:03:22.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libcom-err2t64.symbols 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -libcom_err.so.2 libcom-err2t64 #MINVER# -* Build-Depends-Package: comerr-dev - _et_dynamic_list@Base 1.43.9 - _et_list@Base 1.43.9 - add_error_table@Base 1.43.9 - add_to_error_table@Base 1.43.9 - com_err@Base 1.43.9 - com_err_hook@Base 1.43.9 - com_err_va@Base 1.43.9 - com_right@Base 1.43.9 - com_right_r@Base 1.43.9 - error_message@Base 1.43.9 - error_table_name@Base 1.43.9 - et_list_lock@Base 1.43.9 - et_list_unlock@Base 1.43.9 - free_error_table@Base 1.43.9 - init_error_table@Base 1.43.9 - initialize_error_table_r@Base 1.43.9 - remove_error_table@Base 1.43.9 - reset_com_err_hook@Base 1.43.9 - set_com_err_gettext@Base 1.43.9 - set_com_err_hook@Base 1.43.9 diff --minimal -Nru e2fsprogs-1.47.0/debian/libext2fs2t64.postrm e2fsprogs-1.47.0/debian/libext2fs2t64.postrm --- e2fsprogs-1.47.0/debian/libext2fs2t64.postrm 1970-01-01 01:00:00.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libext2fs2t64.postrm 2024-03-10 21:02:48.000000000 +0100 @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if test "$1" = remove; then + # DEP17 P1 mitigation. Remove these diversions via postinst once trixie is released. + for lib in e2p.so.2 e2p.so.2.3 ext2fs.so.2 ext2fs.so.2.4; do + dpkg-divert --package libext2fs2t64 --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --remove "/lib/#DEB_HOST_MULTIARCH#/lib$lib" + done +fi + +#DEBHELPER# diff --minimal -Nru e2fsprogs-1.47.0/debian/libext2fs2t64.preinst e2fsprogs-1.47.0/debian/libext2fs2t64.preinst --- e2fsprogs-1.47.0/debian/libext2fs2t64.preinst 1970-01-01 01:00:00.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libext2fs2t64.preinst 2024-03-10 21:02:48.000000000 +0100 @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if test "$1" = install -o "$1" = upgrade; then + # DEP17 P1 mitigation. Remove these diversions via postinst once trixie is released. + for lib in e2p.so.2 e2p.so.2.3 ext2fs.so.2 ext2fs.so.2.4; do + dpkg-divert --package libext2fs2t64 --no-rename --divert "/lib/#DEB_HOST_MULTIARCH#/lib$lib.usr-is-merged" --add "/lib/#DEB_HOST_MULTIARCH#/lib$lib" + done +fi + +#DEBHELPER# diff --minimal -Nru e2fsprogs-1.47.0/debian/libss2.install e2fsprogs-1.47.0/debian/libss2.install --- e2fsprogs-1.47.0/debian/libss2.install 1970-01-01 01:00:00.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libss2.install 2024-02-29 19:03:22.000000000 +0100 @@ -0,0 +1 @@ +lib/*/libss*.so.* diff --minimal -Nru e2fsprogs-1.47.0/debian/libss2.symbols e2fsprogs-1.47.0/debian/libss2.symbols --- e2fsprogs-1.47.0/debian/libss2.symbols 1970-01-01 01:00:00.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libss2.symbols 2024-03-10 20:53:32.000000000 +0100 @@ -0,0 +1,36 @@ +libss.so.2 libss2 #MINVER# +* Build-Depends-Package: ss-dev + _ss_pager_name@Base 1.01 + _ss_table@Base 1.01 + et_ss_error_table@Base 1.35 + initialize_ss_error_table@Base 1.01 + initialize_ss_error_table_r@Base 1.34 + ss_abort_subsystem@Base 1.01 + ss_add_info_dir@Base 1.01 + ss_add_request_table@Base 1.01 + ss_create_invocation@Base 1.01 + ss_delete_info_dir@Base 1.01 + ss_delete_invocation@Base 1.01 + ss_delete_request_table@Base 1.01 + ss_error@Base 1.01 + ss_execute_command@Base 1.01 + ss_execute_line@Base 1.01 + ss_get_prompt@Base 1.01 + ss_get_readline@Base 1.34 + ss_help@Base 1.01 + ss_list_requests@Base 1.01 + ss_listen@Base 1.01 + ss_name@Base 1.01 + ss_page_stdin@Base 1.01 + ss_pager_create@Base 1.01 + ss_parse@Base 1.01 + ss_perror@Base 1.01 + ss_quit@Base 1.01 + ss_rl_completion@Base 1.34 + ss_safe_getenv@Base 1.38 + ss_self_identify@Base 1.01 + ss_set_prompt@Base 1.01 + ss_std_requests@Base 1.01 + ss_subsystem_name@Base 1.01 + ss_subsystem_version@Base 1.01 + ss_unimplemented@Base 1.01 diff --minimal -Nru e2fsprogs-1.47.0/debian/libss2t64.install e2fsprogs-1.47.0/debian/libss2t64.install --- e2fsprogs-1.47.0/debian/libss2t64.install 2024-02-29 19:03:22.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libss2t64.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -lib/*/libss*.so.* diff --minimal -Nru e2fsprogs-1.47.0/debian/libss2t64.lintian-overrides e2fsprogs-1.47.0/debian/libss2t64.lintian-overrides --- e2fsprogs-1.47.0/debian/libss2t64.lintian-overrides 2024-02-29 19:03:22.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libss2t64.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -libss2t64: package-name-doesnt-match-sonames libss2 diff --minimal -Nru e2fsprogs-1.47.0/debian/libss2t64.symbols e2fsprogs-1.47.0/debian/libss2t64.symbols --- e2fsprogs-1.47.0/debian/libss2t64.symbols 2024-02-29 19:03:22.000000000 +0100 +++ e2fsprogs-1.47.0/debian/libss2t64.symbols 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -libss.so.2 libss2t64 #MINVER# -* Build-Depends-Package: ss-dev - _ss_pager_name@Base 1.01 - _ss_table@Base 1.01 - et_ss_error_table@Base 1.35 - initialize_ss_error_table@Base 1.01 - initialize_ss_error_table_r@Base 1.34 - ss_abort_subsystem@Base 1.01 - ss_add_info_dir@Base 1.01 - ss_add_request_table@Base 1.01 - ss_create_invocation@Base 1.01 - ss_delete_info_dir@Base 1.01 - ss_delete_invocation@Base 1.01 - ss_delete_request_table@Base 1.01 - ss_error@Base 1.01 - ss_execute_command@Base 1.01 - ss_execute_line@Base 1.01 - ss_get_prompt@Base 1.01 - ss_get_readline@Base 1.34 - ss_help@Base 1.01 - ss_list_requests@Base 1.01 - ss_listen@Base 1.01 - ss_name@Base 1.01 - ss_page_stdin@Base 1.01 - ss_pager_create@Base 1.01 - ss_parse@Base 1.01 - ss_perror@Base 1.01 - ss_quit@Base 1.01 - ss_rl_completion@Base 1.34 - ss_safe_getenv@Base 1.38 - ss_self_identify@Base 1.01 - ss_set_prompt@Base 1.01 - ss_std_requests@Base 1.01 - ss_subsystem_name@Base 1.01 - ss_subsystem_version@Base 1.01 - ss_unimplemented@Base 1.01 diff --minimal -Nru e2fsprogs-1.47.0/debian/rules e2fsprogs-1.47.0/debian/rules --- e2fsprogs-1.47.0/debian/rules 2024-02-29 19:06:33.000000000 +0100 +++ e2fsprogs-1.47.0/debian/rules 2024-03-10 21:02:48.000000000 +0100 @@ -35,7 +35,7 @@ INSTALL_PROGRAM ?= $(INSTALL) -p -m 0755 ifneq (,$(findstring update-symbols,$(DEB_BUILD_OPTIONS))) -SYMBOL_LIBS := libext2fst64 libcomerr2t64 libss2t64 +SYMBOL_LIBS := libext2fst64 libcomerr2 libss2 endif CFLAGS_SHLIB = $(CFLAGS) diff --minimal -Nru e2fsprogs-1.47.0/debian/shlibs.local e2fsprogs-1.47.0/debian/shlibs.local --- e2fsprogs-1.47.0/debian/shlibs.local 2024-02-29 19:21:04.000000000 +0100 +++ e2fsprogs-1.47.0/debian/shlibs.local 2024-03-10 20:52:29.000000000 +0100 @@ -1,6 +1,6 @@ libext2fst64 2 libe2p 2 libuuid 1 -libcom_err64 2 -libsst64 2 +libcom_err 2 +libss 2 libblkid 1
