diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:33:33 +0000 |
| commit | 98396d661d76a98491cf9de99fa50ae08894374d (patch) | |
| tree | cffdf812f06ee728717d39bffcb4f69833f4e578 /debian | |
| parent | Merging upstream version 2.40. (diff) | |
| download | util-linux-98396d661d76a98491cf9de99fa50ae08894374d.tar.xz util-linux-98396d661d76a98491cf9de99fa50ae08894374d.zip | |
Adding debian version 2.40-1.debian/2.40-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
33 files changed, 250 insertions, 817 deletions
diff --git a/debian/changelog b/debian/changelog index f5e1274..bd8ce81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +util-linux (2.40-1) experimental; urgency=medium + + * New upstream release 2.40. + * Drop upstream-applied patches + * Revert "Debug test_mkfds failure on buildds" + * Disable failing lsfd tests again, while upstream figures out + how to detect unix_diag.ko being absent + * Update libmount1.symbols + * Update util-linux-locales manpage list + + [ Niels Thykier ] + * debputy R³ support + * d/control: Remove unused and seemingly invalid `Section: base` + * d/control: Fix two typos in the description + * d/control: Bump dh-sequence-zz-debputy-rrr dependency + The automatic relationship substvars feature did not work prior to to + 0.1.23. + * Remove unnecessary relationship substvars, handled by debputy + + -- Chris Hofstaedtler <zeha@debian.org> Fri, 29 Mar 2024 13:08:52 +0100 + +util-linux (2.40~rc2-8) experimental; urgency=medium + + * Merge from unstable. + * Build-Depends: Replace pkg-config with pkgconf + * Enable ELF metadata stamping + * Debug test_mkfds failure on buildds + + -- Chris Hofstaedtler <zeha@debian.org> Thu, 28 Mar 2024 13:29:30 +0100 + util-linux (2.39.3-11) unstable; urgency=medium * Apply upstream patch fixing CVE-2024-28085 @@ -5,6 +35,49 @@ util-linux (2.39.3-11) unstable; urgency=medium -- Chris Hofstaedtler <zeha@debian.org> Wed, 27 Mar 2024 16:28:22 +0100 +util-linux (2.40~rc2-7) experimental; urgency=medium + + * Move ctrlaltdel, fsck.cramfs, fsck.minix, mkfs.bfs, mkfs.cramfs, + mkfs.minix to util-linux-extra + * Stop installing addpart, delpart, please use partx instead + * Mark more programs as not-installed + * uuid-runtime: install tmpfiles config + + -- Chris Hofstaedtler <zeha@debian.org> Sun, 24 Mar 2024 20:53:44 +0100 + +util-linux (2.40~rc2-6) experimental; urgency=medium + + * Fix incomplete upstream patch for sockdiag_unix + + -- Chris Hofstaedtler <zeha@debian.org> Thu, 21 Mar 2024 12:41:43 +0100 + +util-linux (2.40~rc2-5) experimental; urgency=medium + + * Add upstream patch to skip lsfd test if sockdiag_unix is unavailable + https://github.com/util-linux/util-linux/issues/2822 + + -- Chris Hofstaedtler <zeha@debian.org> Thu, 21 Mar 2024 09:50:09 +0100 + +util-linux (2.40~rc2-4) experimental; urgency=medium + + * Reduce uuid-runtime Recommends to Suggests (Closes: #1065569) + * Revert marking sockdiag test, add ss/sysctl debug + + -- Chris Hofstaedtler <zeha@debian.org> Sat, 16 Mar 2024 00:19:22 +0100 + +util-linux (2.40~rc2-3) experimental; urgency=medium + + * Mark lsfd/mkfds-unix-stream-requiring-sockdiag as failing too + + -- Chris Hofstaedtler <zeha@debian.org> Sat, 02 Mar 2024 20:03:39 +0100 + +util-linux (2.40~rc2-2) experimental; urgency=medium + + * Disable another lsfd test which is broken on the buildds. + * Merge with unstable. + + -- Chris Hofstaedtler <zeha@debian.org> Sat, 02 Mar 2024 15:20:41 +0100 + util-linux (2.39.3-10) unstable; urgency=medium * Tighten dependencies between programs and our own shlibs @@ -38,6 +111,16 @@ util-linux (2.39.3-7) unstable; urgency=medium -- Chris Hofstaedtler <zeha@debian.org> Fri, 01 Mar 2024 11:20:22 +0100 +util-linux (2.40~rc2-1) experimental; urgency=medium + + * New upstream version, target experimental. + * Add new Build-Depends: flex + * Do not build liblastlog2 for now + * Disable newly failing lsfd test + * Drop no-longer localized manpages + + -- Chris Hofstaedtler <zeha@debian.org> Fri, 01 Mar 2024 00:02:17 +0100 + util-linux (2.39.3-6.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 7457da5..13e3a5c 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,12 @@ Build-Depends: bc <!stage1 !nocheck>, bison, debhelper-compat (= 13), + dh-sequence-zz-debputy-rrr (>= 0.1.23~), dh-exec, + dh-package-notes, + flex, gettext, + iproute2, libaudit-dev [linux-any] <!stage1>, libcap-ng-dev [linux-any] <!stage1>, libcrypt-dev <!stage1>, @@ -18,22 +22,22 @@ Build-Depends: libtool, libudev-dev [linux-any] <!stage1>, netbase <!stage1 !nocheck>, - pkg-config, + pkgconf, po-debconf, po4a, + procps, socat <!stage1 !nocheck>, systemd [linux-any] <!stage1>, systemd-dev [linux-any] <!stage1>, zlib1g-dev Build-Conflicts: libedit-dev -Section: base Priority: required Maintainer: util-linux packagers <util-linux@packages.debian.org> Uploaders: Chris Hofstaedtler <zeha@debian.org> Standards-Version: 4.6.0 -Rules-Requires-Root: binary-targets +Rules-Requires-Root: no Vcs-Browser: https://salsa.debian.org/debian/util-linux Vcs-Git: https://salsa.debian.org/debian/util-linux.git Homepage: https://www.kernel.org/pub/linux/utils/util-linux/ @@ -43,11 +47,6 @@ Architecture: any Build-Profiles: <!stage1> Section: utils Essential: yes -Pre-Depends: - ${misc:Pre-Depends}, - ${shlibs:Depends} -Depends: - ${misc:Depends} Recommends: sensible-utils Suggests: @@ -75,8 +74,7 @@ Build-Profiles: <!stage1> Section: localization Priority: optional Depends: - util-linux (>= ${source:Upstream-Version}), - ${misc:Depends} + util-linux (>= ${source:Upstream-Version}) Breaks: manpages-cs (<< 4.19.0-7~), manpages-da (<< 4.19.0-7~), @@ -129,10 +127,7 @@ Architecture: linux-any Build-Profiles: <!stage1> Section: admin Pre-Depends: - ${misc:Pre-Depends}, ${shlibs:Depends} -Depends: - ${misc:Depends} Suggests: nfs-common Multi-Arch: foreign @@ -145,11 +140,6 @@ Architecture: any Build-Profiles: <!stage1> Essential: yes Section: utils -Pre-Depends: - ${misc:Pre-Depends}, - ${shlibs:Depends} -Depends: - ${misc:Depends} Recommends: bsdextrautils Multi-Arch: foreign @@ -163,11 +153,6 @@ Architecture: any Build-Profiles: <!stage1> Section: utils Priority: optional -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Replaces: bsdmainutils (<< 12.1.3), nwrite @@ -187,11 +172,6 @@ Architecture: any Build-Profiles: <!stage1> Section: utils Priority: important -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Recommends: sensible-utils Multi-Arch: foreign @@ -204,7 +184,7 @@ Description: collection of partitioning utilities partition tables (eg. GPT, MBR, etc). . The fdisk utility is the classical text-mode utility. - The cfdisk utilitity gives a more userfriendly curses based interface. + The cfdisk utility gives a more userfriendly curses based interface. The sfdisk utility is mostly for automation and scripting uses. Package: fdisk-udeb @@ -212,9 +192,6 @@ Architecture: hurd-any linux-any Build-Profiles: <!stage1 !noudeb> Priority: optional Section: debian-installer -Depends: - ${misc:Depends}, - ${shlibs:Depends} Package-Type: udeb XB-Installer-Menu-Item: 99999 Description: Manually partition a hard drive (fdisk) @@ -223,11 +200,6 @@ Package: libblkid1 Architecture: any Section: libs Priority: optional -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Multi-Arch: same Description: block device ID library The blkid library allows system programs such as fsck and mount to @@ -239,9 +211,6 @@ Package: libblkid1-udeb Architecture: any Section: debian-installer Priority: optional -Depends: - ${misc:Depends}, - ${shlibs:Depends} Package-Type: udeb Build-Profiles: <!noudeb> Description: stripped down block device ID library, for debian-installer @@ -256,13 +225,10 @@ Package: libblkid-dev Architecture: any Section: libdevel Priority: optional -Pre-Depends: - ${misc:Pre-Depends} Depends: libblkid1 (= ${binary:Version}), libc6-dev | libc-dev, - uuid-dev, - ${misc:Depends} + uuid-dev Multi-Arch: same Description: block device ID library - headers The blkid library allows system programs such as fsck and mount to @@ -276,11 +242,6 @@ Package: libfdisk1 Architecture: any Section: libs Priority: optional -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Multi-Arch: same Description: fdisk partitioning library The libfdisk library is used for manipulating partition tables. It is @@ -290,9 +251,6 @@ Package: libfdisk1-udeb Architecture: any Section: debian-installer Priority: optional -Depends: - ${misc:Depends}, - ${shlibs:Depends} Package-Type: udeb Build-Profiles: <!noudeb> Description: stripped down fdisk partitioning library, for debian-installer @@ -305,14 +263,11 @@ Package: libfdisk-dev Architecture: any Section: libdevel Priority: optional -Pre-Depends: - ${misc:Pre-Depends} Depends: libblkid-dev, libc6-dev | libc-dev, libfdisk1 (= ${binary:Version}), - uuid-dev, - ${misc:Depends} + uuid-dev Multi-Arch: same Description: fdisk partitioning library - headers The libfdisk library is used for manipulating partition tables. It is @@ -324,11 +279,6 @@ Package: libmount1 Architecture: any Section: libs Priority: optional -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Suggests: cryptsetup-bin [linux-any] Multi-Arch: same @@ -340,9 +290,6 @@ Package-Type: udeb Build-Profiles: <!noudeb> Section: debian-installer Priority: optional -Depends: - ${misc:Depends}, - ${shlibs:Depends} Architecture: linux-any Description: stripped down device mounting library, for debian-installer The device mounting library, used by mount and umount helpers. @@ -357,8 +304,7 @@ Depends: libblkid-dev, libc6-dev | libc-dev, libmount1 (= ${binary:Version}), - libselinux1-dev, - ${misc:Depends} + libselinux1-dev Multi-Arch: same Description: device mounting library - headers This device mounting library is used by mount and umount helpers. @@ -369,11 +315,6 @@ Package: libsmartcols1 Architecture: any Section: libs Priority: optional -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Multi-Arch: same Description: smart column output alignment library This smart column output alignment library is used by fdisk utilities. @@ -382,12 +323,9 @@ Package: libsmartcols1-udeb Architecture: any Section: debian-installer Priority: optional -Depends: - ${misc:Depends}, - ${shlibs:Depends} Package-Type: udeb Build-Profiles: <!noudeb> -Description: stripped down smart column output aligment library, for debian-installer +Description: stripped down smart column output alignment library, for debian-installer This smart column output alignment library is used by fdisk utilities. . This is a minimal package for debian-installer. @@ -398,8 +336,7 @@ Section: libdevel Priority: optional Depends: libc6-dev | libc-dev, - libsmartcols1 (= ${binary:Version}), - ${misc:Depends} + libsmartcols1 (= ${binary:Version}) Multi-Arch: same Description: smart column output alignment library - headers This smart column output alignment library is used by fdisk utilities. @@ -410,18 +347,13 @@ Package: libuuid1 Architecture: any Section: libs Priority: optional -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Breaks: libuuid1t64 (<< ${source:Version}) Replaces: libuuid1t64 Provides: libuuid1t64 (= ${binary:Version}) [!arm !armeb !armel !armhf !hppa !hurd-i386 !kfreebsd-i386 !m68k !mips !mipsel !mipsn32 !mipsn32el !mipsn32r6 !mipsn32r6el !mipsr6 !mipsr6el !nios2 !powerpc !powerpcel !powerpcspe !s390 !sh3 !sh3eb !sh4 !sh4eb !sparc] -Recommends: +Suggests: uuid-runtime Multi-Arch: same Description: Universally Unique ID library @@ -439,12 +371,9 @@ Build-Profiles: <!stage1> Section: utils Priority: optional Pre-Depends: - libuuid1, - ${misc:Pre-Depends} + libuuid1 Depends: - adduser, - ${misc:Depends}, - ${shlibs:Depends} + adduser Multi-Arch: foreign Description: runtime components for the Universally Unique ID library The libuuid library generates and parses 128-bit Universally Unique @@ -466,9 +395,6 @@ Package: libuuid1-udeb Architecture: any Section: debian-installer Priority: optional -Depends: - ${misc:Depends}, - ${shlibs:Depends} Package-Type: udeb Build-Profiles: <!noudeb> Description: stripped down Universally Unique ID library, for debian-installer @@ -483,8 +409,7 @@ Section: libdevel Priority: optional Depends: libc6-dev | libc-dev, - libuuid1 (= ${binary:Version}), - ${misc:Depends} + libuuid1 (= ${binary:Version}) Multi-Arch: same Description: Universally Unique ID library - headers and static libraries The libuuid library generates and parses 128-bit Universally Unique IDs @@ -497,9 +422,6 @@ Architecture: any Build-Profiles: <!stage1 !noudeb> Priority: optional Section: debian-installer -Depends: - ${misc:Depends}, - ${shlibs:Depends} Package-Type: udeb Description: stripped down miscellaneous system utilities, for debian-installer This is a minimal version of util-linux for debian-installer. It only @@ -510,11 +432,6 @@ Architecture: linux-any Build-Profiles: <!stage1> Section: utils Priority: optional -Pre-Depends: - ${misc:Pre-Depends} -Depends: - ${misc:Depends}, - ${shlibs:Depends} Multi-Arch: foreign Description: tool for enabling and disabling wireless devices rfkill is a simple tool for accessing the Linux rfkill device interface, @@ -525,9 +442,6 @@ Package: eject Architecture: linux-any Build-Profiles: <!stage1> Section: utils -Depends: - ${misc:Depends}, - ${shlibs:Depends} Priority: optional Multi-Arch: foreign Description: ejects CDs and operates CD-Changers under Linux @@ -544,9 +458,6 @@ Package: eject-udeb Architecture: linux-any Build-Profiles: <!stage1 !noudeb> Section: debian-installer -Depends: - ${misc:Depends}, - ${shlibs:Depends} Priority: optional Package-Type: udeb XB-Installer-Menu-Item: 96000 @@ -556,9 +467,6 @@ Package: util-linux-extra Architecture: any Build-Profiles: <!stage1> Section: utils -Depends: - ${misc:Depends}, - ${shlibs:Depends} Replaces: util-linux (<< 2.38~) Breaks: diff --git a/debian/debputy.manifest b/debian/debputy.manifest new file mode 100644 index 0000000..b5775ac --- /dev/null +++ b/debian/debputy.manifest @@ -0,0 +1,17 @@ +manifest-version: '0.1' +packages: + util-linux: + transformations: + - path-metadata: + path: usr/bin/su + mode: "u=rwxs,go=rx" + bsdutils: + binary-version: 1:{{DEB_VERSION_UPSTREAM_REVISION}} + mount: + transformations: + - path-metadata: + path: usr/bin/mount + mode: "u=rwxs,go=rx" + - path-metadata: + path: usr/bin/umount + mode: "u=rwxs,go=rx" diff --git a/debian/gbp.conf b/debian/gbp.conf index b58e1d3..1756df7 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/unstable +debian-branch = master upstream-branch = upstream pristine-tar = True compression = xz diff --git a/debian/libblkid1.symbols b/debian/libblkid1.symbols index 4fd0d68..603fd5c 100644 --- a/debian/libblkid1.symbols +++ b/debian/libblkid1.symbols @@ -13,6 +13,7 @@ libblkid.so.1 libblkid1 #MINVER# BLKID_2_36@BLKID_2_36 2.36 BLKID_2_37@BLKID_2_37 2.37.2 BLKID_2_39@BLKID_2_39 2.39.1 + BLKID_2_40@BLKID_2_40 2.40~rc2 blkid_dev_devname@BLKID_1.0 2.16 blkid_dev_has_tag@BLKID_1.0 2.16 blkid_dev_iterate_begin@BLKID_1.0 2.16 @@ -123,3 +124,4 @@ libblkid.so.1 libblkid1 #MINVER# blkid_topology_get_optimal_io_size@BLKID_2.17 2.17.2 blkid_topology_get_physical_sector_size@BLKID_2.17 2.17.2 blkid_verify@BLKID_1.0 2.16 + blkid_wipe_all@BLKID_2_40 2.40~rc2 diff --git a/debian/libfdisk1.symbols b/debian/libfdisk1.symbols index 345eb9b..4693982 100644 --- a/debian/libfdisk1.symbols +++ b/debian/libfdisk1.symbols @@ -11,6 +11,7 @@ libfdisk.so.1 libfdisk1 #MINVER# FDISK_2.35@FDISK_2.35 2.35 FDISK_2.36@FDISK_2.36 2.36 FDISK_2.38@FDISK_2.38 2.38 + FDISK_2.40@FDISK_2.40 2.40~rc2 fdisk_add_partition@FDISK_2.26 2.26.2 fdisk_align_lba@FDISK_2.26 2.26.2 fdisk_align_lba_in_range@FDISK_2.26 2.26.2 @@ -174,6 +175,7 @@ libfdisk.so.1 libfdisk1 #MINVER# fdisk_partition_end_is_default@FDISK_2.26 2.26.2 fdisk_partition_get_attrs@FDISK_2.26 2.26.2 fdisk_partition_get_end@FDISK_2.26 2.26.2 + fdisk_partition_get_max_size@FDISK_2.40 2.40~rc2 fdisk_partition_get_name@FDISK_2.26 2.26.2 fdisk_partition_get_parent@FDISK_2.26 2.26.2 fdisk_partition_get_partno@FDISK_2.26 2.26.2 diff --git a/debian/libmount1.symbols b/debian/libmount1.symbols index b3a2d31..f06a13e 100644 --- a/debian/libmount1.symbols +++ b/debian/libmount1.symbols @@ -16,6 +16,7 @@ libmount.so.1 libmount1 #MINVER# MOUNT_2_37@MOUNT_2_37 2.37.2 MOUNT_2_38@MOUNT_2_38 2.38 MOUNT_2_39@MOUNT_2_39 2.39.1 + MOUNT_2_40@MOUNT_2_40 2.40~rc2 mnt_cache_device_has_tag@MOUNT_2.19 2.19.1 mnt_cache_find_tag_value@MOUNT_2.19 2.19.1 mnt_cache_read_tags@MOUNT_2.19 2.19.1 @@ -81,6 +82,7 @@ libmount.so.1 libmount1 #MINVER# (arch=linux-any)mnt_context_is_nocanonicalize@MOUNT_2.22 2.24.2 (arch=linux-any)mnt_context_is_nohelpers@MOUNT_2.22 2.24.2 (arch=linux-any)mnt_context_is_nomtab@MOUNT_2.19 2.19.1 + (arch=linux-any)mnt_context_is_onlyonce@MOUNT_2_39 2.40 (arch=linux-any)mnt_context_is_parent@MOUNT_2.21 2.24.2 (arch=linux-any)mnt_context_is_rdonly_umount@MOUNT_2.19 2.19.1 (arch=linux-any)mnt_context_is_restricted@MOUNT_2.19 2.19.1 @@ -218,6 +220,7 @@ libmount.so.1 libmount1 #MINVER# (arch=linux-any)mnt_monitor_event_cleanup@MOUNT_2.26 2.26.2 (arch=linux-any)mnt_monitor_get_fd@MOUNT_2.26 2.26.2 (arch=linux-any)mnt_monitor_next_change@MOUNT_2.26 2.26.2 + (arch=linux-any)mnt_monitor_veil_kernel@MOUNT_2_40 2.40~rc2 (arch=linux-any)mnt_monitor_wait@MOUNT_2.26 2.26.2 mnt_new_cache@MOUNT_2.19 2.19.1 (arch=linux-any)mnt_new_context@MOUNT_2.19 2.19.1 @@ -244,6 +247,7 @@ libmount.so.1 libmount1 #MINVER# mnt_pretty_path@MOUNT_2.20 2.20.1 mnt_ref_cache@MOUNT_2.24 2.24.2 mnt_ref_fs@MOUNT_2.24 2.24.2 + mnt_ref_lock@MOUNT_2_40 2.40~rc2 (arch=linux-any)mnt_ref_monitor@MOUNT_2.26 2.26.2 mnt_ref_table@MOUNT_2.24 2.24.2 (arch=linux-any)mnt_reset_context@MOUNT_2.19 2.19.1 @@ -309,6 +313,7 @@ libmount.so.1 libmount1 #MINVER# mnt_unmangle@MOUNT_2.19 2.19.1 mnt_unref_cache@MOUNT_2.24 2.24.2 mnt_unref_fs@MOUNT_2.24 2.24.2 + mnt_unref_lock@MOUNT_2_40 2.40~rc2 (arch=linux-any)mnt_unref_monitor@MOUNT_2.26 2.26.2 mnt_unref_table@MOUNT_2.24 2.24.2 mnt_update_force_rdonly@MOUNT_2.19 2.19.1 diff --git a/debian/libsmartcols1.symbols b/debian/libsmartcols1.symbols index 76af030..3b8e585 100644 --- a/debian/libsmartcols1.symbols +++ b/debian/libsmartcols1.symbols @@ -11,19 +11,23 @@ libsmartcols.so.1 libsmartcols1 #MINVER# SMARTCOLS_2.35@SMARTCOLS_2.35 2.35 SMARTCOLS_2.38@SMARTCOLS_2.38 2.38 SMARTCOLS_2.39@SMARTCOLS_2.39 2.39.1 + SMARTCOLS_2.40@SMARTCOLS_2.40 2.40~rc2 scols_cell_copy_content@SMARTCOLS_2.25 2.25 scols_cell_get_alignment@SMARTCOLS_2.30 2.30.2 scols_cell_get_color@SMARTCOLS_2.25 2.25 scols_cell_get_data@SMARTCOLS_2.25 2.25 + scols_cell_get_datasiz@SMARTCOLS_2.40 2.40~rc2 scols_cell_get_flags@SMARTCOLS_2.28 2.28~rc1 scols_cell_get_userdata@SMARTCOLS_2.25 2.25 scols_cell_refer_data@SMARTCOLS_2.25 2.25 + scols_cell_refer_memory@SMARTCOLS_2.40 2.40~rc2 scols_cell_set_color@SMARTCOLS_2.25 2.25 scols_cell_set_data@SMARTCOLS_2.25 2.25 scols_cell_set_flags@SMARTCOLS_2.28 2.28~rc1 scols_cell_set_userdata@SMARTCOLS_2.25 2.25 scols_cmpstr_cells@SMARTCOLS_2.25 2.25 scols_column_get_color@SMARTCOLS_2.25 2.25 + scols_column_get_data_type@SMARTCOLS_2.40 2.40~rc2 scols_column_get_flags@SMARTCOLS_2.25 2.25 scols_column_get_header@SMARTCOLS_2.25 2.25 scols_column_get_json_type@SMARTCOLS_2.33 2.33 @@ -33,6 +37,8 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_column_get_table@SMARTCOLS_2.29 2.29~rc2 scols_column_get_whint@SMARTCOLS_2.25 2.25 scols_column_get_width@SMARTCOLS_2.29 2.29~rc2 + scols_column_get_wrap_data@SMARTCOLS_2.40 2.40~rc2 + scols_column_has_data_func@SMARTCOLS_2.40 2.40~rc2 scols_column_is_customwrap@SMARTCOLS_2.29 2.29~rc2 scols_column_is_hidden@SMARTCOLS_2.27 2.28~rc1 scols_column_is_noextremes@SMARTCOLS_2.25 2.25 @@ -43,6 +49,8 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_column_is_wrap@SMARTCOLS_2.28 2.28~rc1 scols_column_set_cmpfunc@SMARTCOLS_2.25 2.25 scols_column_set_color@SMARTCOLS_2.25 2.25 + scols_column_set_data_func@SMARTCOLS_2.40 2.40~rc2 + scols_column_set_data_type@SMARTCOLS_2.40 2.40~rc2 scols_column_set_flags@SMARTCOLS_2.25 2.25 scols_column_set_json_type@SMARTCOLS_2.33 2.33 scols_column_set_name@SMARTCOLS_2.38 2.38 @@ -54,12 +62,28 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_copy_line@SMARTCOLS_2.25 2.25 scols_copy_symbols@SMARTCOLS_2.25 2.25 scols_copy_table@SMARTCOLS_2.25 2.25 + scols_counter_get_name@SMARTCOLS_2.40 2.40~rc2 + scols_counter_get_result@SMARTCOLS_2.40 2.40~rc2 + scols_counter_set_func@SMARTCOLS_2.40 2.40~rc2 + scols_counter_get_result@SMARTCOLS_2.40 2.40~rc2 00:08:40 [17/45916] + scols_counter_set_func@SMARTCOLS_2.40 2.40~rc2 + scols_counter_set_name@SMARTCOLS_2.40 2.40~rc2 + scols_counter_set_param@SMARTCOLS_2.40 2.40~rc2 + scols_dump_filter@SMARTCOLS_2.40 2.40~rc2 + scols_filter_assign_column@SMARTCOLS_2.40 2.40~rc2 + scols_filter_get_errmsg@SMARTCOLS_2.40 2.40~rc2 + scols_filter_new_counter@SMARTCOLS_2.40 2.40~rc2 + scols_filter_next_counter@SMARTCOLS_2.40 2.40~rc2 + scols_filter_next_holder@SMARTCOLS_2.40 2.40~rc2 + scols_filter_parse_string@SMARTCOLS_2.40 2.40~rc2 + scols_filter_set_filler_cb@SMARTCOLS_2.40 2.40~rc2 scols_free_iter@SMARTCOLS_2.25 2.25 scols_get_library_version@SMARTCOLS_2.25 2.25 scols_init_debug@SMARTCOLS_2.25 2.25 scols_iter_get_direction@SMARTCOLS_2.25 2.25 scols_line_add_child@SMARTCOLS_2.25 2.25 scols_line_alloc_cells@SMARTCOLS_2.25 2.25 + scols_line_apply_filter@SMARTCOLS_2.40 2.40~rc2 scols_line_free_cells@SMARTCOLS_2.25 2.25 scols_line_get_cell@SMARTCOLS_2.25 2.25 scols_line_get_color@SMARTCOLS_2.25 2.25 @@ -70,6 +94,7 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_line_get_userdata@SMARTCOLS_2.25 2.25 scols_line_has_children@SMARTCOLS_2.25 2.25 scols_line_is_ancestor@SMARTCOLS_2.30 2.30.2 + scols_line_is_filled@SMARTCOLS_2.40 2.40~rc2 scols_line_link_group@SMARTCOLS_2.34 2.34 scols_line_next_child@SMARTCOLS_2.25 2.25 scols_line_refer_column_data@SMARTCOLS_2.28 2.28~rc1 @@ -80,6 +105,7 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_line_set_data@SMARTCOLS_2.25 2.25 scols_line_set_userdata@SMARTCOLS_2.25 2.25 scols_new_column@SMARTCOLS_2.25 2.25 + scols_new_filter@SMARTCOLS_2.40 2.40~rc2 scols_new_iter@SMARTCOLS_2.25 2.25 scols_new_line@SMARTCOLS_2.25 2.25 scols_new_symbols@SMARTCOLS_2.25 2.25 @@ -93,6 +119,7 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_ref_table@SMARTCOLS_2.25 2.25 scols_reset_cell@SMARTCOLS_2.25 2.25 scols_reset_iter@SMARTCOLS_2.25 2.25 + scols_shellvar_name@SMARTCOLS_2.40 2.40~rc2 scols_sort_table@SMARTCOLS_2.25 2.25 scols_sort_table_by_tree@SMARTCOLS_2.30 2.30.2 scols_symbols_set_branch@SMARTCOLS_2.25 2.25 @@ -126,6 +153,7 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_table_get_column@SMARTCOLS_2.25 2.25 scols_table_get_column_by_name@SMARTCOLS_2.39 2.39.1 scols_table_get_column_separator@SMARTCOLS_2.25 2.25 + scols_table_get_cursor@SMARTCOLS_2.40 2.40~rc2 scols_table_get_line@SMARTCOLS_2.25 2.25 scols_table_get_line_separator@SMARTCOLS_2.25 2.25 scols_table_get_name@SMARTCOLS_2.29 2.29~rc2 @@ -175,8 +203,10 @@ libsmartcols.so.1 libsmartcols1 #MINVER# scols_table_set_termheight@SMARTCOLS_2.31 2.31.1 scols_table_set_termwidth@SMARTCOLS_2.29 2.29~rc2 scols_unref_column@SMARTCOLS_2.25 2.25 + scols_unref_filter@SMARTCOLS_2.40 2.40~rc2 scols_unref_line@SMARTCOLS_2.25 2.25 scols_unref_symbols@SMARTCOLS_2.25 2.25 scols_unref_table@SMARTCOLS_2.25 2.25 scols_wrapnl_chunksize@SMARTCOLS_2.29 2.29~rc2 scols_wrapnl_nextchunk@SMARTCOLS_2.29 2.29~rc2 + scols_wrapzero_nextchunk@SMARTCOLS_2.40 2.40~rc2 diff --git a/debian/patches/debian/lsfd-usrbin.patch b/debian/patches/debian/lsfd-usrbin.patch index 8ba6ffe..af8fa8b 100644 --- a/debian/patches/debian/lsfd-usrbin.patch +++ b/debian/patches/debian/lsfd-usrbin.patch @@ -7,10 +7,10 @@ Subject: Install lsfd into /usr/bin 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am -index 71548c9..67af544 100644 +index 0720dda..562d114 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am -@@ -248,7 +248,7 @@ hardlink_CFLAGS = $(AM_CFLAGS) +@@ -274,7 +274,7 @@ hardlink_CFLAGS = $(AM_CFLAGS) endif if BUILD_LSFD diff --git a/debian/patches/debian/man-getopt-examples.patch b/debian/patches/debian/man-getopt-examples.patch index aac4a79..e335f69 100644 --- a/debian/patches/debian/man-getopt-examples.patch +++ b/debian/patches/debian/man-getopt-examples.patch @@ -9,7 +9,7 @@ Debian BTS #913049 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc-utils/getopt.1 b/misc-utils/getopt.1 -index 4921add..89adecf 100644 +index fe9003e..571fe83 100644 --- a/misc-utils/getopt.1 +++ b/misc-utils/getopt.1 @@ -155,7 +155,7 @@ In compatibility mode, leading \*(Aq\fB\-\fP\*(Aq and \*(Aq\fB+\fP\*(Aq characte diff --git a/debian/patches/debian/sensible-pager.patch b/debian/patches/debian/sensible-pager.patch index 7c0ae6f..56641f4 100644 --- a/debian/patches/debian/sensible-pager.patch +++ b/debian/patches/debian/sensible-pager.patch @@ -8,10 +8,10 @@ Closes: #1014368 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pager.c b/lib/pager.c -index 9429032..f6dfd44 100644 +index 98814b5..5f62a78 100644 --- a/lib/pager.c +++ b/lib/pager.c -@@ -219,7 +219,7 @@ static void __setup_pager(void) +@@ -231,7 +231,7 @@ static void __setup_pager(void) return; if (!pager) diff --git a/debian/patches/debian/tests-mark-lsfd-tests-failing-in-sbuild.patch b/debian/patches/debian/tests-mark-lsfd-tests-failing-in-sbuild.patch new file mode 100644 index 0000000..df27cbb --- /dev/null +++ b/debian/patches/debian/tests-mark-lsfd-tests-failing-in-sbuild.patch @@ -0,0 +1,52 @@ +From: Chris Hofstaedtler <zeha@debian.org> +Date: Thu, 29 Feb 2024 23:22:41 +0100 +Subject: tests: mark some lsfd as failing in sbuild + +--- + tests/ts/lsfd/mkfds-inotify | 3 +++ + tests/ts/lsfd/mkfds-socketpair | 3 +++ + tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag | 3 +++ + 3 files changed, 9 insertions(+) + +diff --git a/tests/ts/lsfd/mkfds-inotify b/tests/ts/lsfd/mkfds-inotify +index a44fd77..05f2c00 100755 +--- a/tests/ts/lsfd/mkfds-inotify ++++ b/tests/ts/lsfd/mkfds-inotify +@@ -25,6 +25,9 @@ ts_check_test_command "$TS_CMD_FINDMNT" + ts_check_prog "stat" + ts_check_prog "sed" + ++# fails for unknown reasons in sbuild, https://github.com/util-linux/util-linux/issues/2819 ++TS_KNOWN_FAIL="yes" ++ + ts_cd "$TS_OUTDIR" + + PID= +diff --git a/tests/ts/lsfd/mkfds-socketpair b/tests/ts/lsfd/mkfds-socketpair +index 3ef60c7..b1003e9 100755 +--- a/tests/ts/lsfd/mkfds-socketpair ++++ b/tests/ts/lsfd/mkfds-socketpair +@@ -27,6 +27,9 @@ ts_check_test_command "$TS_HELPER_MKFDS" + + ts_check_prog "sed" + ++# fails for unknown reasons in sbuild, https://github.com/util-linux/util-linux/issues/2822 ++TS_KNOWN_FAIL="yes" ++ + ts_cd "$TS_OUTDIR" + + lsfd_check_sockdiag "unix" +diff --git a/tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag b/tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag +index 6189d0d..04c985a 100755 +--- a/tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag ++++ b/tests/ts/lsfd/mkfds-unix-stream-requiring-sockdiag +@@ -21,6 +21,9 @@ TS_DESC="UNIX stream sockets" + ts_init "$*" + ts_skip_qemu_user + ++# fails for unknown reasons in sbuild, https://github.com/util-linux/util-linux/issues/2822 ++TS_KNOWN_FAIL="yes" ++ + . "$TS_SELF/lsfd-functions.bash" + + ts_check_test_command "$TS_CMD_LSFD" diff --git a/debian/patches/debian/verbose-tests.patch b/debian/patches/debian/verbose-tests.patch index 1dfc2da..ccb412b 100644 --- a/debian/patches/debian/verbose-tests.patch +++ b/debian/patches/debian/verbose-tests.patch @@ -9,7 +9,7 @@ Enable verbose tests and print content of failing tests output file. 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/Makemodule.am b/tests/Makemodule.am -index d5422be..a3462fb 100644 +index 3a66f27..9843c10 100644 --- a/tests/Makemodule.am +++ b/tests/Makemodule.am @@ -13,7 +13,7 @@ clean-local-tests: @@ -19,13 +19,13 @@ index d5422be..a3462fb 100644 -TESTS_OPTIONS = --nonroot --show-diff +TESTS_OPTIONS = --nonroot --show-diff --verbose --parallel=1 TESTS_PARALLEL = --parallel + TESTS_COMPONENTS = TESTS_COMMAND = $(top_srcdir)/tests/run.sh \ - --srcdir=$(abs_top_srcdir) \ diff --git a/tests/functions.sh b/tests/functions.sh -index 5a562a3..493c1d7 100644 +index 5fe5ba0..f8f18b9 100644 --- a/tests/functions.sh +++ b/tests/functions.sh -@@ -183,6 +183,17 @@ function ts_failed_subtest { +@@ -195,6 +195,17 @@ function ts_failed_subtest { ts_report " $msg ($1)" fi diff --git a/debian/patches/series b/debian/patches/series index d58f635..fb24ec3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,15 +3,4 @@ debian/verbose-tests.patch debian/hardlink-tests-known-failed.patch debian/lsfd-usrbin.patch debian/sensible-pager.patch -upstream/fincore-tests-fix-double-log-output.patch -upstream/enosys-fix-build-on-hppa.patch -upstream/fadvise-test-dynamically-calculate-expected-test-values.patch -upstream/fadvise-tests-factor-out-calls-to-fincore.patch -upstream/fadvise-test-don-t-compare-fincore-page-counts.patch -upstream/fadvise-test-test-with-64k-blocks.patch -upstream/setarch-add-riscv64-riscv32-support.patch -upstream/cfdisk-fix-menu-behavior-after-writing-changes.patch -upstream/fincore-tests-also-use-nosize-error-file.patch -upstream/build-only-build-test_enosys-if-an-audit-arch-exists.patch -upstream/libuuid-Add-uuid_time64-for-64bit-time_t-on-32bit.patch -upstream/wall-fix-escape-sequence-Injection-CVE-2024-28085.patch +debian/tests-mark-lsfd-tests-failing-in-sbuild.patch diff --git a/debian/patches/upstream/build-only-build-test_enosys-if-an-audit-arch-exists.patch b/debian/patches/upstream/build-only-build-test_enosys-if-an-audit-arch-exists.patch deleted file mode 100644 index 0bb9992..0000000 --- a/debian/patches/upstream/build-only-build-test_enosys-if-an-audit-arch-exists.patch +++ /dev/null @@ -1,84 +0,0 @@ -From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <thomas@t-8ch.de> -Date: Fri, 1 Dec 2023 09:35:02 +0100 -Subject: build: only build test_enosys if an audit arch exists -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Link: https://lore.kernel.org/util-linux/9211accf8670f28778166a1acdc186e8dd28f2e8.camel@physik.fu-berlin.de/ -Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> ---- - configure.ac | 13 +++++++++++++ - meson.build | 13 ++++++++----- - tests/helpers/Makemodule.am | 2 ++ - 3 files changed, 23 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 36c24b4..c84d295 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1878,6 +1878,19 @@ UL_REQUIRES_LINUX([waitpid]) - UL_REQUIRES_SYSCALL_CHECK([waitpid], [UL_CHECK_SYSCALL([pidfd_open])], [pidfd_open]) - AM_CONDITIONAL([BUILD_WAITPID], [test "x$build_waitpid" = xyes]) - -+UL_BUILD_INIT([test_enosys], [check]) -+UL_REQUIRES_LINUX([test_enosys]) -+AS_IF([test "x$build_test_enosys" = xyes], [ -+ AC_MSG_CHECKING([for valid audit arch]) -+ AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[#include "${srcdir}/include/audit-arch.h"]])], -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_RESULT([no]) -+ build_test_enosys=no -+ ]) -+]) -+AM_CONDITIONAL([BUILD_TEST_ENOSYS], [test "x$build_test_enosys" = xyes]) -+ - UL_BUILD_INIT([getopt], [yes]) - AM_CONDITIONAL([BUILD_GETOPT], [test "x$build_getopt" = xyes]) - -diff --git a/meson.build b/meson.build -index baca755..b10028f 100644 ---- a/meson.build -+++ b/meson.build -@@ -3,6 +3,7 @@ project('util-linux', 'c', - meson_version: '>=0.57.0', - license : 'GPLv2+') - -+fs = import('fs') - pkgconfig = import('pkgconfig') - - libblkid_version = '1.1.0' -@@ -3285,11 +3286,13 @@ if LINUX - exes += exe - endif - --exe = executable( -- 'test_enosys', -- 'tests/helpers/test_enosys.c', -- include_directories : includes) --exes += exe -+if cc.compiles(fs.read('include/audit-arch.h'), name : 'has AUDIT_ARCH_NATIVE') -+ exe = executable( -+ 'test_enosys', -+ 'tests/helpers/test_enosys.c', -+ include_directories : includes) -+ exes += exe -+endif - - ############################################################ - -diff --git a/tests/helpers/Makemodule.am b/tests/helpers/Makemodule.am -index 2b1df3c..6705eaf 100644 ---- a/tests/helpers/Makemodule.am -+++ b/tests/helpers/Makemodule.am -@@ -34,7 +34,9 @@ test_uuid_namespace_SOURCES = tests/helpers/test_uuid_namespace.c \ - if LINUX - check_PROGRAMS += test_mkfds - test_mkfds_SOURCES = tests/helpers/test_mkfds.c -+endif - -+if BUILD_TEST_ENOSYS - check_PROGRAMS += test_enosys - test_enosys_SOURCES = tests/helpers/test_enosys.c - endif diff --git a/debian/patches/upstream/cfdisk-fix-menu-behavior-after-writing-changes.patch b/debian/patches/upstream/cfdisk-fix-menu-behavior-after-writing-changes.patch deleted file mode 100644 index 71d466c..0000000 --- a/debian/patches/upstream/cfdisk-fix-menu-behavior-after-writing-changes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Karel Zak <kzak@redhat.com> -Date: Mon, 26 Jun 2023 13:25:11 +0200 -Subject: cfdisk: fix menu behavior after writing changes - -Florian wrote: - after a successful write, cfdisk remains on the "Write" cursor and - furthermore when navigating to "Quit" will continue to show - "...without writing changes", despite there were writes. This patch - addresses that. - -Based on patch from Florian Zimmermann <florian.zimmermann@gmail.com> - -Signed-off-by: Karel Zak <kzak@redhat.com> -Closes: #927041 ---- - disk-utils/cfdisk.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c -index fde2029..3fe852a 100644 ---- a/disk-utils/cfdisk.c -+++ b/disk-utils/cfdisk.c -@@ -2525,11 +2525,15 @@ static int main_menu_action(struct cfdisk *cf, int key) - if (rc) - warn = _("Failed to write disklabel."); - else { -+ size_t q_idx = 0; -+ - if (cf->device_is_used) - fdisk_reread_changes(cf->cxt, cf->original_layout); - else - fdisk_reread_partition_table(cf->cxt); - info = _("The partition table has been altered."); -+ if (menu_get_menuitem_by_key(cf, 'q', &q_idx)) -+ ui_menu_goto(cf, q_idx); - } - cf->nwrites++; - break; diff --git a/debian/patches/upstream/enosys-fix-build-on-hppa.patch b/debian/patches/upstream/enosys-fix-build-on-hppa.patch deleted file mode 100644 index a4739f5..0000000 --- a/debian/patches/upstream/enosys-fix-build-on-hppa.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: John David Anglin <dave@parisc-linux.org> -Date: Mon, 7 Aug 2023 15:37:17 +0000 -Subject: enosys: fix build on hppa - -The following patch fixes the definition of SECCOMP_ARCH_NATIVE -on hppa. - -Signed-off-by: John David Anglin <dave.anglin@bell.net> ---- - include/audit-arch.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/include/audit-arch.h b/include/audit-arch.h -index db14560..679964f 100644 ---- a/include/audit-arch.h -+++ b/include/audit-arch.h -@@ -59,6 +59,12 @@ - # else - # define SECCOMP_ARCH_NATIVE AUDIT_ARCH_LOONGARCH64 - # endif -+#elif __hppa__ -+# if __SIZEOF_POINTER__ == 4 -+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PARISC -+# else -+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PARISC64 -+# endif - #else - # error Unknown target architecture - #endif diff --git a/debian/patches/upstream/fadvise-test-don-t-compare-fincore-page-counts.patch b/debian/patches/upstream/fadvise-test-don-t-compare-fincore-page-counts.patch deleted file mode 100644 index ef2801c..0000000 --- a/debian/patches/upstream/fadvise-test-don-t-compare-fincore-page-counts.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <thomas@t-8ch.de> -Date: Sun, 21 May 2023 21:44:20 +0200 -Subject: fadvise: (test) don't compare fincore page counts -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -These depend on the machines pagesize and are therefore not a good -comparision. - -Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> ---- - tests/expected/fadvise/drop | 20 ++++++++++---------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index f2360b5..25f23e0 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES PAGES SIZE FILE -- 32K 8 32K ddtest -+ RES SIZE FILE -+ 32K 32K ddtest - - whole file - status: 0 --RES PAGES SIZE FILE -- 0B 0 32K ddtest -+RES SIZE FILE -+ 0B 32K ddtest - - offset: 8192 - status: 0 --RES PAGES SIZE FILE -- 8K 2 32K ddtest -+RES SIZE FILE -+ 8K 32K ddtest - - length: 16384 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - - offset: 8192, length: 16384 fd: 42 - status: 0 -- RES PAGES SIZE FILE -- 16K 4 32K ddtest -+ RES SIZE FILE -+ 16K 32K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 8869b7d..6c4298e 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -29,7 +29,7 @@ create_file() { - } - - do_fincore() { -- "$TS_CMD_FINCORE" "$FILE" -+ "$TS_CMD_FINCORE" -o RES,SIZE,FILE "$FILE" - } - - { diff --git a/debian/patches/upstream/fadvise-test-dynamically-calculate-expected-test-values.patch b/debian/patches/upstream/fadvise-test-dynamically-calculate-expected-test-values.patch deleted file mode 100644 index bd84ee5..0000000 --- a/debian/patches/upstream/fadvise-test-dynamically-calculate-expected-test-values.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <thomas@t-8ch.de> -Date: Sun, 21 May 2023 21:42:14 +0200 -Subject: fadvise: (test) dynamically calculate expected test values -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> ---- - tests/ts/fadvise/drop | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 7c7eee5..86c0d5b 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4k -+BS=4096 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" -@@ -41,22 +41,22 @@ create_file() { - echo - - create_file -- echo "offset: 8192" -- "$TS_CMD_FADVISE" -o 8192 "$FILE" -+ echo "offset: $(( 2 * $BS ))" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "length: 16384" -- "$TS_CMD_FADVISE" -l 16384 "$FILE" -+ echo "length: $(( 4 * $BS ))" -+ "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo - - create_file -- echo "offset: 8192, length: 16384 fd: 42" -- "$TS_CMD_FADVISE" -o 8192 -l 16384 --fd 42 42<"$FILE" -+ echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" -+ "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? - "$TS_CMD_FINCORE" "$FILE" - echo diff --git a/debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch b/debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch deleted file mode 100644 index 772784c..0000000 --- a/debian/patches/upstream/fadvise-test-test-with-64k-blocks.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <thomas@t-8ch.de> -Date: Sun, 21 May 2023 21:45:10 +0200 -Subject: fadvise: (test) test with 64k blocks -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -This will allow the tests to also pass on systems with 64k pagesizes. - -Closes #2249 -Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> ---- - tests/expected/fadvise/drop | 26 +++++++++++++------------- - tests/ts/fadvise/drop | 2 +- - 2 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/tests/expected/fadvise/drop b/tests/expected/fadvise/drop -index 25f23e0..e7bb26b 100644 ---- a/tests/expected/fadvise/drop -+++ b/tests/expected/fadvise/drop -@@ -1,23 +1,23 @@ -- RES SIZE FILE -- 32K 32K ddtest -+ RES SIZE FILE -+ 512K 512K ddtest - - whole file - status: 0 --RES SIZE FILE -- 0B 32K ddtest -+RES SIZE FILE -+ 0B 512K ddtest - --offset: 8192 -+offset: 131072 - status: 0 --RES SIZE FILE -- 8K 32K ddtest -+ RES SIZE FILE -+ 128K 512K ddtest - --length: 16384 -+length: 262144 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - --offset: 8192, length: 16384 fd: 42 -+offset: 131072, length: 262144 fd: 42 - status: 0 -- RES SIZE FILE -- 16K 32K ddtest -+ RES SIZE FILE -+ 256K 512K ddtest - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 6c4298e..45dcb91 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -16,7 +16,7 @@ ts_check_prog "sleep" - ts_cd "$TS_OUTDIR" - - FILE="ddtest" --BS=4096 -+BS=65536 - COUNT=8 - - FILE_FS="$("$TS_CMD_FINDMNT" -nr -o FSTYPE -T "$PWD")" diff --git a/debian/patches/upstream/fadvise-tests-factor-out-calls-to-fincore.patch b/debian/patches/upstream/fadvise-tests-factor-out-calls-to-fincore.patch deleted file mode 100644 index a2ed7c3..0000000 --- a/debian/patches/upstream/fadvise-tests-factor-out-calls-to-fincore.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <thomas@t-8ch.de> -Date: Sun, 21 May 2023 21:43:38 +0200 -Subject: fadvise: (tests) factor out calls to "fincore" -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -This will make it easier to pass argument later. - -Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> ---- - tests/ts/fadvise/drop | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop -index 86c0d5b..8869b7d 100755 ---- a/tests/ts/fadvise/drop -+++ b/tests/ts/fadvise/drop -@@ -28,37 +28,41 @@ create_file() { - dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null - } - -+do_fincore() { -+ "$TS_CMD_FINCORE" "$FILE" -+} -+ - { - create_file -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "whole file" - "$TS_CMD_FADVISE" "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS ))" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "length: $(( 4 * $BS ))" - "$TS_CMD_FADVISE" -l $(( 4 * $BS )) "$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - create_file - echo "offset: $(( 2 * $BS )), length: $(( 4 * $BS )) fd: 42" - "$TS_CMD_FADVISE" -o $(( 2 * $BS )) -l $(( 4 * $BS )) --fd 42 42<"$FILE" - echo status: $? -- "$TS_CMD_FINCORE" "$FILE" -+ do_fincore - echo - - rm "$FILE" diff --git a/debian/patches/upstream/fincore-tests-also-use-nosize-error-file.patch b/debian/patches/upstream/fincore-tests-also-use-nosize-error-file.patch deleted file mode 100644 index 80a1ef1..0000000 --- a/debian/patches/upstream/fincore-tests-also-use-nosize-error-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= <thomas@t-8ch.de> -Date: Mon, 13 Nov 2023 21:05:59 +0100 -Subject: fincore: (tests) also use nosize error file -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Link: https://lore.kernel.org/util-linux/b8cafd0d89878949705782312dfe800ec2779035.camel@physik.fu-berlin.de/ -Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> ---- - tests/ts/fincore/count | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count -index c89ad9f..caf9c3a 100755 ---- a/tests/ts/fincore/count -+++ b/tests/ts/fincore/count -@@ -107,6 +107,7 @@ if test -f "$TS_EXPECTED.$PAGE_SIZE"; then - OUT_COLUMNS="PAGES,SIZE,FILE" - else - TS_EXPECTED+=".nosize" -+ TS_EXPECTED_ERR+=".nosize" - OUT_COLUMNS="PAGES,FILE" - fi - diff --git a/debian/patches/upstream/fincore-tests-fix-double-log-output.patch b/debian/patches/upstream/fincore-tests-fix-double-log-output.patch deleted file mode 100644 index 0cb738a..0000000 --- a/debian/patches/upstream/fincore-tests-fix-double-log-output.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Chris Hofstaedtler <zeha@debian.org> -Date: Tue, 18 Jul 2023 23:34:51 +0200 -Subject: fincore: (tests) fix double log output - -The fincore tests call ts_log_both inside an output redirection of both stdout -and stderr, leading to the ts_log_both output ending up twice in both stdout -and stderr. -Call ts_log_both before setting up the output redirection. - -Signed-off-by: Chris Hofstaedtler <zeha@debian.org> ---- - tests/ts/fincore/count | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/ts/fincore/count b/tests/ts/fincore/count -index ba5f6cd..c89ad9f 100755 ---- a/tests/ts/fincore/count -+++ b/tests/ts/fincore/count -@@ -119,11 +119,11 @@ check_dd_fs_feat - INPUT= - input= - -+ts_log_both "[ NO EXCITING FILE ]" - { - input=no_such_file - INPUT="${INPUT} ${input}" - -- ts_log_both "[ NO EXCITING FILE ]" - $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes --noheadings $input - footer "$?" - } >> $TS_OUTPUT 2>> $TS_ERRLOG -@@ -220,8 +220,8 @@ input= - "oflag=append seek=$hole_count" - } >> $TS_OUTPUT 2>> $TS_ERRLOG - -+ts_log_both "[ MULTIPLE FILES ]" - { -- ts_log_both "[ MULTIPLE FILES ]" - $TS_CMD_FINCORE --output $OUT_COLUMNS --bytes $INPUT - footer "$?" - } >> $TS_OUTPUT 2>> $TS_ERRLOG diff --git a/debian/patches/upstream/libuuid-Add-uuid_time64-for-64bit-time_t-on-32bit.patch b/debian/patches/upstream/libuuid-Add-uuid_time64-for-64bit-time_t-on-32bit.patch deleted file mode 100644 index 84a2a0e..0000000 --- a/debian/patches/upstream/libuuid-Add-uuid_time64-for-64bit-time_t-on-32bit.patch +++ /dev/null @@ -1,129 +0,0 @@ -From: Thorsten Kukuk <kukuk@suse.com> -Date: Thu, 30 Nov 2023 16:28:53 +0100 -Subject: libuuid: Add uuid_time64 for 64bit time_t on 32bit - -Signed-off-by: Thorsten Kukuk <kukuk@suse.com> ---- - libuuid/src/libuuid.sym | 9 ++++++++ - libuuid/src/uuid.h | 3 +++ - libuuid/src/uuid_time.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 70 insertions(+), 1 deletion(-) - -diff --git a/libuuid/src/libuuid.sym b/libuuid/src/libuuid.sym -index 96372a8..0f67ede 100644 ---- a/libuuid/src/libuuid.sym -+++ b/libuuid/src/libuuid.sym -@@ -52,6 +52,15 @@ global: - uuid_parse_range; - } UUID_2.31; - -+/* -+ * version(s) since util-linux.2.40 -+ */ -+UUID_2.40 { -+global: -+ uuid_time64; /* only on 32bit architectures with 64bit time_t */ -+} UUID_2.36; -+ -+ - - /* - * __uuid_* this is not part of the official API, this is -diff --git a/libuuid/src/uuid.h b/libuuid/src/uuid.h -index e791abf..2e3642c 100644 ---- a/libuuid/src/uuid.h -+++ b/libuuid/src/uuid.h -@@ -109,6 +109,9 @@ extern void uuid_unparse_lower(const uuid_t uu, char *out); - extern void uuid_unparse_upper(const uuid_t uu, char *out); - - /* uuid_time.c */ -+#if defined(__USE_TIME_BITS64) && defined(__GLIBC__) -+# define uuid_time uuid_time64 -+#endif - extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv); - extern int uuid_type(const uuid_t uu); - extern int uuid_variant(const uuid_t uu); -diff --git a/libuuid/src/uuid_time.c b/libuuid/src/uuid_time.c -index 6f07d51..9b415b3 100644 ---- a/libuuid/src/uuid_time.c -+++ b/libuuid/src/uuid_time.c -@@ -40,6 +40,7 @@ - #define UUID MYUUID - #endif - -+#include <errno.h> - #include <stdio.h> - #ifdef HAVE_UNISTD_H - #include <unistd.h> -@@ -53,7 +54,15 @@ - - #include "uuidP.h" - --time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) -+#undef uuid_time -+ -+/* prototype to make compiler happy */ -+time_t __uuid_time(const uuid_t uu, struct timeval *ret_tv); -+ -+ -+/* this function could be 32bit time_t and 32bit timeval or 64bit, -+ depending on compiler flags and architecture. */ -+time_t __uuid_time(const uuid_t uu, struct timeval *ret_tv) - { - struct timeval tv; - struct uuid uuid; -@@ -74,6 +83,54 @@ time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) - - return tv.tv_sec; - } -+#if defined(__USE_TIME_BITS64) && defined(__GLIBC__) -+extern time_t uuid_time64(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); -+#else -+extern time_t uuid_time(const uuid_t uu, struct timeval *ret_tv) __attribute__((weak, alias("__uuid_time"))); -+#endif -+ -+#if defined(__USE_TIME_BITS64) && defined(__GLIBC__) -+struct timeval32 -+{ -+ int32_t tv_sec; -+ int32_t tv_usec; -+}; -+ -+/* prototype to make compiler happy */ -+int32_t __uuid_time32(const uuid_t uu, struct timeval32 *ret_tv); -+ -+/* Check whether time fits in 32bit time_t. */ -+static inline int -+in_time32_t_range(time_t t) -+{ -+ int32_t s; -+ -+ s = t; -+ -+ return s == t; -+} -+ -+int32_t __uuid_time32(const uuid_t uu, struct timeval32 *ret_tv) -+{ -+ struct timeval tv; -+ time_t ret_time = __uuid_time(uu, &tv); -+ -+ if (! in_time32_t_range(ret_time)) { -+ ret_tv->tv_sec = -1; -+ ret_tv->tv_usec = -1; -+ errno = EOVERFLOW; -+ return -1; -+ } -+ -+ if (ret_tv) { -+ ret_tv->tv_sec = tv.tv_sec; -+ ret_tv->tv_usec = tv.tv_usec; -+ } -+ -+ return tv.tv_sec; -+} -+extern int32_t uuid_time(const uuid_t uu, struct timeval32 *ret_tv) __attribute__((weak, alias("__uuid_time32"))); -+#endif - - int uuid_type(const uuid_t uu) - { diff --git a/debian/patches/upstream/setarch-add-riscv64-riscv32-support.patch b/debian/patches/upstream/setarch-add-riscv64-riscv32-support.patch deleted file mode 100644 index c0daa0f..0000000 --- a/debian/patches/upstream/setarch-add-riscv64-riscv32-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michal Biesek <michalbiesek@gmail.com> -Date: Mon, 14 Aug 2023 02:37:45 +0200 -Subject: setarch: add riscv64/riscv32 support - -Signed-off-by: Michal Biesek <michalbiesek@gmail.com> ---- - sys-utils/setarch.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c -index 1a255e4..0a6af83 100644 ---- a/sys-utils/setarch.c -+++ b/sys-utils/setarch.c -@@ -270,6 +270,12 @@ static struct arch_domain *init_arch_domains(void) - {PER_LINUX32, "arm", "arm"}, - {PER_LINUX, "arm64", "aarch64"}, - {PER_LINUX, "aarch64", "aarch64"}, -+#endif -+#if defined(__riscv) -+ {PER_LINUX32, "riscv32", "riscv32"}, -+ {PER_LINUX32, "rv32", "riscv32"}, -+ {PER_LINUX, "riscv64", "riscv64"}, -+ {PER_LINUX, "rv64", "riscv64"}, - #endif - /* place holder, will be filled up at runtime */ - {-1, NULL, NULL}, diff --git a/debian/patches/upstream/wall-fix-escape-sequence-Injection-CVE-2024-28085.patch b/debian/patches/upstream/wall-fix-escape-sequence-Injection-CVE-2024-28085.patch deleted file mode 100644 index 1a0acd7..0000000 --- a/debian/patches/upstream/wall-fix-escape-sequence-Injection-CVE-2024-28085.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Karel Zak <kzak@redhat.com> -Date: Thu, 21 Mar 2024 11:16:20 +0100 -Subject: wall: fix escape sequence Injection [CVE-2024-28085] - -Let's use for all cases the same output function. - -Reported-by: Skyler Ferrante <sjf5462@rit.edu> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - term-utils/wall.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/term-utils/wall.c b/term-utils/wall.c -index 377db45..1e7e9ab 100644 ---- a/term-utils/wall.c -+++ b/term-utils/wall.c -@@ -328,7 +328,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz, - int i; - - for (i = 0; i < mvecsz; i++) { -- fputs(mvec[i], fs); -+ fputs_careful(mvec[i], fs, '^', true, TERM_WIDTH); - if (i < mvecsz - 1) - fputc(' ', fs); - } diff --git a/debian/rules b/debian/rules index e61e41c..9724ec1 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,10 @@ include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/pkg-info.mk +include /usr/share/debhelper/dh_package_notes/package-notes.mk CONFOPTS += --enable-usrdir-path - +CONFOPTS += --disable-makeinstall-chown ifeq ($(DEB_HOST_ARCH_OS),linux) CONFOPTS += --with-selinux CONFOPTS += --with-smack @@ -50,6 +51,9 @@ CONFOPTS += --disable-hwclock-gplv3 # Reduce setgid programs (cf. CVE-2024-28085) CONFOPTS += --disable-use-tty-group +CONFOPTS += --disable-liblastlog2 +CONFOPTS += --disable-pam-liblastlog2 + # Get the list of binary package, except lib* and *-udeb, from # debian/control instead of hardcoding the list when installing # bash-completions below. @@ -71,6 +75,8 @@ override_dh_autoreconf: AM_OPTS=--copy LT_OPTS=--copy dh_autoreconf ./autogen.sh override_dh_auto_configure: + ss -xp + sysctl kernel.modules_disabled dh_auto_configure -- $(CONFOPTS) override_dh_auto_install: @@ -82,6 +88,16 @@ override_dh_auto_install: # Avoid shipping static libraries. # - libblkid.a is used by e2fsprogs. find debian/tmp/usr/lib -name 'lib*.a' \! -name 'libuuid.a' \! -name 'libblkid.a' -delete + # + # Remove programs we do not install + find debian/tmp/ -name 'addpart*' -delete + find debian/tmp/ -name 'delpart*' -delete + find debian/tmp/ -name 'enosys*' -delete + find debian/tmp/ -name 'irqtop*' -delete + find debian/tmp/ -name 'setpgid*' -delete + # + # show installed man pages + find debian/tmp/usr/share/man override_dh_auto_clean: dh_auto_clean @@ -141,12 +157,6 @@ endif override_dh_missing: dh_missing --list-missing -override_dh_gencontrol: -ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) - dh_gencontrol --package=bsdutils -- -v1:$(DEB_VERSION_UPSTREAM_REVISION) -endif - dh_gencontrol --remaining-packages - override_dh_installinit: ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),) # install uuidd sysvinit script @@ -162,9 +172,6 @@ override_dh_installpam: dh_installpam --package=util-linux --name=su dh_installpam --package=util-linux --name=su-l -override_dh_fixperms: - dh_fixperms -i -a -Xusr/bin/wall -Xusr/bin/write -Xusr/bin/mount -Xusr/bin/umount -Xusr/bin/su - ifeq (linux,$(DEB_HOST_ARCH_OS)) override_dh_installsystemd: dh_installsystemd -putil-linux fstrim.timer diff --git a/debian/util-linux-extra.install b/debian/util-linux-extra.install index 86b3dbb..a22f017 100755 --- a/debian/util-linux-extra.install +++ b/debian/util-linux-extra.install @@ -1,7 +1,13 @@ #!/usr/bin/dh-exec bin/pipesz => /usr/bin/pipesz [linux-any] sbin/blkpr => /usr/sbin/blkpr [linux-any] +sbin/ctrlaltdel usr/sbin/ [linux-any] +sbin/fsck.cramfs usr/sbin/ +sbin/fsck.minix usr/sbin/ sbin/hwclock => /usr/sbin/hwclock +sbin/mkfs.bfs usr/sbin/ +sbin/mkfs.cramfs usr/sbin/ +sbin/mkfs.minix usr/sbin/ usr/bin/fadvise [linux-any] usr/bin/fincore [linux-any] usr/bin/lsfd [linux-any] diff --git a/debian/util-linux-extra.manpages b/debian/util-linux-extra.manpages index 0e3a41d..c37322d 100755 --- a/debian/util-linux-extra.manpages +++ b/debian/util-linux-extra.manpages @@ -6,4 +6,10 @@ debian/tmp/usr/share/man/man1/lsirq.1 [linux-any] debian/tmp/usr/share/man/man1/pipesz.1 [linux-any] debian/tmp/usr/share/man/man1/waitpid.1 [linux-any] debian/tmp/usr/share/man/man8/blkpr.8 [linux-any] +debian/tmp/usr/share/man/man8/ctrlaltdel.8 [linux-any] +debian/tmp/usr/share/man/man8/fsck.cramfs.8 +debian/tmp/usr/share/man/man8/fsck.minix.8 debian/tmp/usr/share/man/man8/hwclock.8 +debian/tmp/usr/share/man/man8/mkfs.bfs.8 +debian/tmp/usr/share/man/man8/mkfs.cramfs.8 +debian/tmp/usr/share/man/man8/mkfs.minix.8 diff --git a/debian/util-linux-locales.install b/debian/util-linux-locales.install index c1a2d52..46c9a45 100755 --- a/debian/util-linux-locales.install +++ b/debian/util-linux-locales.install @@ -65,7 +65,6 @@ debian/tmp/usr/share/man/*/man1/more.1 <!nodoc> [linu debian/tmp/usr/share/man/*/man1/mountpoint.1 <!nodoc> debian/tmp/usr/share/man/*/man1/namei.1 <!nodoc> debian/tmp/usr/share/man/*/man1/nsenter.1 <!nodoc> [linux-any] -debian/tmp/usr/share/man/*/man1/prlimit.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/de/man1/rename.1 => /usr/share/man/de/man1/rename.ul.1 <!nodoc> debian/tmp/usr/share/man/fr/man1/rename.1 => /usr/share/man/fr/man1/rename.ul.1 <!nodoc> debian/tmp/usr/share/man/sr/man1/rename.1 => /usr/share/man/sr/man1/rename.ul.1 <!nodoc> @@ -76,14 +75,12 @@ debian/tmp/usr/share/man/*/man1/setpriv.1 <!nodoc> [linu debian/tmp/usr/share/man/*/man1/setsid.1 <!nodoc> debian/tmp/usr/share/man/*/man1/setterm.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man1/su.1 <!nodoc> -debian/tmp/usr/share/man/*/man1/taskset.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man1/uclampset.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man1/unshare.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man1/utmpdump.1 <!nodoc> debian/tmp/usr/share/man/*/man1/whereis.1 <!nodoc> debian/tmp/usr/share/man/*/man5/adjtime_config.5 <!nodoc> debian/tmp/usr/share/man/*/man5/terminal-colors.d.5 <!nodoc> -debian/tmp/usr/share/man/*/man8/addpart.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/agetty.8 <!nodoc> debian/tmp/usr/share/man/*/man8/blkdiscard.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/blkid.8 <!nodoc> @@ -92,7 +89,6 @@ debian/tmp/usr/share/man/*/man8/blockdev.8 <!nodoc> [linu debian/tmp/usr/share/man/*/man8/chcpu.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/chmem.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/ctrlaltdel.8 <!nodoc> [linux-any] -debian/tmp/usr/share/man/*/man8/delpart.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/findfs.8 <!nodoc> debian/tmp/usr/share/man/*/man8/findmnt.8 <!nodoc> debian/tmp/usr/share/man/*/man8/fsck.8 <!nodoc> @@ -120,14 +116,12 @@ debian/tmp/usr/share/man/*/man8/rtcwake.8 <!nodoc> [linu debian/tmp/usr/share/man/*/man8/setarch.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/sulogin.8 <!nodoc> debian/tmp/usr/share/man/*/man8/swaplabel.8 <!nodoc> -debian/tmp/usr/share/man/*/man8/switch_root.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/wdctl.8 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/wipefs.8 <!nodoc> debian/tmp/usr/share/man/*/man8/zramctl.8 <!nodoc> [linux-any] # util-linux-extra debian/tmp/usr/share/man/*/man1/fincore.1 <!nodoc> [linux-any] -debian/tmp/usr/share/man/*/man1/lsfd.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man1/lsirq.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man1/waitpid.1 <!nodoc> [linux-any] debian/tmp/usr/share/man/*/man8/blkpr.8 <!nodoc> [linux-any] diff --git a/debian/util-linux.install b/debian/util-linux.install index 50bcb38..5347d2a 100755 --- a/debian/util-linux.install +++ b/debian/util-linux.install @@ -16,12 +16,7 @@ sbin/agetty usr/sbin/ sbin/blkid usr/sbin/ sbin/findfs usr/sbin/ sbin/fsck usr/sbin/ -sbin/fsck.cramfs usr/sbin/ -sbin/fsck.minix usr/sbin/ sbin/mkfs usr/sbin/ -sbin/mkfs.bfs usr/sbin/ -sbin/mkfs.cramfs usr/sbin/ -sbin/mkfs.minix usr/sbin/ sbin/runuser usr/sbin/ sbin/sulogin usr/sbin/ sbin/swaplabel usr/sbin/ @@ -63,13 +58,10 @@ bin/wdctl usr/bin/ [linux-any] sbin/blkdiscard usr/sbin/ [linux-any] sbin/blockdev usr/sbin/ [linux-any] sbin/chcpu usr/sbin/ [linux-any] -sbin/ctrlaltdel usr/sbin/ [linux-any] sbin/fsfreeze usr/sbin/ [linux-any] sbin/fstrim usr/sbin/ [linux-any] sbin/pivot_root usr/sbin/ [linux-any] sbin/switch_root usr/sbin/ [linux-any] -usr/sbin/addpart usr/bin/ [linux-any] -usr/sbin/delpart usr/bin/ [linux-any] usr/bin/fallocate [linux-any] usr/bin/ionice [linux-any] usr/bin/linux32 [linux-any] diff --git a/debian/util-linux.manpages b/debian/util-linux.manpages index 098ef02..3a75c18 100755 --- a/debian/util-linux.manpages +++ b/debian/util-linux.manpages @@ -37,7 +37,6 @@ debian/tmp/usr/share/man/man1/utmpdump.1 debian/tmp/usr/share/man/man1/whereis.1 debian/tmp/usr/share/man/man5/adjtime_config.5 debian/tmp/usr/share/man/man5/terminal-colors.d.5 -debian/tmp/usr/share/man/man8/addpart.8 [linux-any] debian/tmp/usr/share/man/man8/agetty.8 debian/tmp/usr/share/man/man8/blkdiscard.8 [linux-any] debian/tmp/usr/share/man/man8/blkid.8 @@ -45,13 +44,9 @@ debian/tmp/usr/share/man/man8/blkzone.8 [linux-any] debian/tmp/usr/share/man/man8/blockdev.8 [linux-any] debian/tmp/usr/share/man/man8/chcpu.8 [linux-any] debian/tmp/usr/share/man/man8/chmem.8 [linux-any] -debian/tmp/usr/share/man/man8/ctrlaltdel.8 [linux-any] -debian/tmp/usr/share/man/man8/delpart.8 [linux-any] debian/tmp/usr/share/man/man8/findfs.8 debian/tmp/usr/share/man/man8/findmnt.8 debian/tmp/usr/share/man/man8/fsck.8 -debian/tmp/usr/share/man/man8/fsck.cramfs.8 -debian/tmp/usr/share/man/man8/fsck.minix.8 debian/tmp/usr/share/man/man8/fsfreeze.8 [linux-any] debian/tmp/usr/share/man/man8/fstrim.8 [linux-any] debian/tmp/usr/share/man/man8/i386.8 [amd64 i386] @@ -66,9 +61,6 @@ debian/tmp/usr/share/man/man8/mips.8 [mips mipsel] debian/tmp/usr/share/man/man8/mips32.8 [mips mipsel] debian/tmp/usr/share/man/man8/mips64.8 [mips mipsel] debian/tmp/usr/share/man/man8/mkfs.8 -debian/tmp/usr/share/man/man8/mkfs.bfs.8 -debian/tmp/usr/share/man/man8/mkfs.cramfs.8 -debian/tmp/usr/share/man/man8/mkfs.minix.8 # Rename mkswap to mkswap.linux on non-linux. debian/tmp/usr/share/man/man8/mkswap.8 [linux-any] debian/tmp/usr/share/man/man8/mkswap.8 => /usr/share/man/man8/mkswap.linux.8 [!linux-any] diff --git a/debian/uuid-runtime.install b/debian/uuid-runtime.install index 22224de..2339156 100755 --- a/debian/uuid-runtime.install +++ b/debian/uuid-runtime.install @@ -2,4 +2,5 @@ ${deb_systemdsystemunitdir}/uuidd.* [linux-any] usr/bin/uuidgen usr/bin/uuidparse +usr/lib/tmpfiles.d/uuidd-tmpfiles.conf [linux-any] usr/sbin/uuidd [linux-any] |