feat: update util-linux to 2.40.4-5

Author: deepin-community-bot[bot]

debian/bsdextrautils.install

@@ -6,12 +6,10 @@ usr/bin/column
 usr/bin/hexdump
 usr/bin/look
 usr/bin/ul
-usr/bin/write
 <!nodoc> usr/share/man/man1/col.1
 <!nodoc> usr/share/man/man1/colcrt.1
 <!nodoc> usr/share/man/man1/colrm.1
 <!nodoc> usr/share/man/man1/column.1
 <!nodoc> usr/share/man/man1/hexdump.1
 <!nodoc> usr/share/man/man1/look.1
 <!nodoc> usr/share/man/man1/ul.1
-<!nodoc> usr/share/man/man1/write.1

debian/changelog

@@ -1,52 +1,26 @@
-util-linux (2.40.4-3deepin8) unstable; urgency=medium
+util-linux (2.40.4-5) unstable; urgency=medium
 
-  * fix lscpu wrong at Phytium.
-  * revert fix var/run/utmp don't be updated after logout/login
+  * Apply upstream patch to avoid agetty crash (Closes: #1098694)
 
- -- xinpeng.wang <[email protected]>  Thu, 19 Jun 2025 17:50:42 +0800
+ -- Chris Hofstaedtler <[email protected]>  Tue, 25 Feb 2025 11:34:50 +0100
 
-util-linux (2.40.4-3deepin7) unstable; urgency=medium
+util-linux (2.40.4-4) unstable; urgency=medium
 
-  * feat: add sw64 support
+  [ Jörg Behrmann ]
+  * Install exch (Closes: #1095655)
 
- -- Deepin Packages Builder <[email protected]>  Fri, 13 Jun 2025 11:14:41 +0800
-
-util-linux (2.40.4-3deepin6) unstable; urgency=medium
-
-  * fix var/run/utmp don't be updated after logout
-
- -- jiahao.luo <[email protected]>  Fri, 06 Jun 2025 15:06:55 +0800
-
-util-linux (2.40.4-3deepin5) unstable; urgency=medium
-
-  * fix var/run/utmp don't be updated after login
-
- -- jiahao.luo <[email protected]>  Fri, 16 May 2025 17:14:50 +0800
-
-util-linux (2.40.4-3deepin4) unstable; urgency=medium
-
-  * backward old version lsblk for show hotplug flag bug.
-
- -- xinpeng.wang <[email protected]>  Wed, 19 Feb 2025 15:49:13 +0800
-
-util-linux (2.40.4-3deepin3) unstable; urgency=medium
-
-  * Use reduce setgid to fix CVE-2024-28085, compile and 
-  *     install write, utmpdump, mesg.
-
- -- xinpeng.wang <[email protected]>  Thu, 13 Feb 2025 14:10:34 +0800
-
-util-linux (2.40.4-3deepin2) unstable; urgency=medium
-
-  * Port the code about umac to V25 of UOS.
-
- -- lichenggang <[email protected]>  Tue, 11 Feb 2025 16:01:00 +0800
-
-util-linux (2.40.4-3deepin1) unstable; urgency=medium
+  [ Chris Hofstaedtler ]
+  * Set Multi-Arch: same for liblastlog2-dev
+  * Mark "login" test as flaky
+  * Install localized manpages for exch(1)
+  * debian/tests: drop oversized-chunks
+  * Skip fadvise/drop test in salsa ci
+  * Move resizepart from util-linux to util-linux-extra
 
-  * revert t64.
+  [ Florent 'Skia' Jacquet ]
+  * d/tests: fix login test in case things™ are slow
 
- -- lichenggang <lichenggang@deepin.org>  Tue, 11 Feb 2025 15:58:33 +0800
+ -- Chris Hofstaedtler <zeha@debian.org>  Mon, 17 Feb 2025 14:21:56 +0100
 
 util-linux (2.40.4-3) unstable; urgency=medium
 

debian/control

@@ -346,7 +346,11 @@ Architecture: any
 Section: libs
 Priority: optional
 Breaks:
- libuuid1 (<< ${source:Version}),
+ 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],
 Suggests:
  uuid-runtime,
 Multi-Arch: same
@@ -458,10 +462,10 @@ Package: util-linux-extra
 Architecture: any
 Build-Profiles: <!stage1>
 Replaces:
- util-linux (<< 2.40-0~),
+ util-linux (<< 2.40.4-4~),
 Breaks:
  initscripts (<< 3.08-2~),
- util-linux (<< 2.40-0~),
+ util-linux (<< 2.40.4-4~),
 Priority: standard
 Multi-Arch: foreign
 Description: interactive login tools
@@ -480,6 +484,7 @@ Package: liblastlog2-dev
 Architecture: any
 Priority: optional
 Section: libdevel
+Multi-Arch: same
 Description: liblastlog2 development files
  Y2038 safe lastlog database implementation, development files.
 

debian/patches/add-sunway-support.patch

@@ -0,0 +1,23 @@
+From: Chris Hofstaedtler <[email protected]>
+Date: Sun, 16 Feb 2025 18:44:03 +0100
+Subject: Skip fadvise/drop test in Salsa CI
+
+---
+ tests/ts/fadvise/drop | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/ts/fadvise/drop b/tests/ts/fadvise/drop
+index ac7ce01..00cc53a 100755
+--- a/tests/ts/fadvise/drop
++++ b/tests/ts/fadvise/drop
+@@ -24,6 +24,10 @@ if [[ "$FS" = "tmpfs" || "$FS" = "overlay" || "$FS" = "" ]]; then
+ 	ts_skip "fincore does not work on tmpfs or unknown fs"
+ fi
+ 
++if [[ -n "$GITLAB_CI" ]]; then
++    ts_skip "fadvise test does not work in Debians salsa CI"
++fi
++
+ create_file() {
+     dd if=/dev/zero of="$FILE" bs=$BS count=$COUNT conv=fsync >& /dev/null
+ }