feat: update util-linux to 2.40.4-5

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,35 @@
-util-linux (2.40.4-3deepin8) unstable; urgency=medium
+util-linux (2.40.4-5deepin1) unstable; urgency=medium
 
-  * fix lscpu wrong at Phytium.
-  * revert fix var/run/utmp don't be updated after logout/login
+  * add debian/usec-umac-adapt.patch
+  * add uniontech-backward-lsblk.patch
+  * add add-sunway-support.patch
+  * add uniontech-fix-arm-lscpu-modename.patch
 
- -- xinpeng.wang <[email protected]>  Thu, 19 Jun 2025 17:50:42 +0800
+ -- lichenggang <[email protected]>  Thu, 04 Sep 2025 15:50:49 +0800
 
-util-linux (2.40.4-3deepin7) unstable; urgency=medium
+util-linux (2.40.4-5) unstable; urgency=medium
 
-  * feat: add sw64 support
+  * Apply upstream patch to avoid agetty crash (Closes: #1098694)
 
- -- Deepin Packages Builder <packages@deepin.org>  Fri, 13 Jun 2025 11:14:41 +0800
+ -- Chris Hofstaedtler <zeha@debian.org>  Tue, 25 Feb 2025 11:34:50 +0100
 
-util-linux (2.40.4-3deepin6) unstable; urgency=medium
+util-linux (2.40.4-4) unstable; urgency=medium
 
-  * fix var/run/utmp don't be updated after logout
+  [ Jörg Behrmann ]
+  * Install exch (Closes: #1095655)
 
- -- 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

@@ -458,10 +458,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 +480,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/debian/salsa-ci-skip-tests.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
+ }

debian/patches/series

@@ -6,6 +6,7 @@ debian/sensible-pager.patch
 debian/login-support-LOG_OK_LOGINS.patch
 debian/login-do-not-print-motd-done-by-PAM.patch
 debian/login-turn-off-btmp-utmp-lastlog-writing.patch
+debian/salsa-ci-skip-tests.patch
 upstream-master/fsck-warn-if-fsck.-type-not-found-and-device-is-specified.patch
 upstream-master/libmount-Fix-atime-remount-for-new-API.patch
 upstream-master/swapoff-avoid-being-killed-by-OOM.patch
@@ -23,6 +24,7 @@ upstream-master/sys-utils-setpriv-fix-potential-memory-leak.patch
 upstream-master/lscpu-fix-incorrect-number-of-sockets-during-hotplug.patch
 upstream-master/fallocate-forbid-posix-with-special-options.patch
 upstream-master/lib-colors-fix-fallback-to-system-directory.patch
+upstream-master/agetty-fix-stdin-conversion-to-tty-name.patch
 debian/usec-umac-adapt.patch
 uniontech-backward-lsblk.patch
 add-sunway-support.patch

debian/patches/upstream-master/agetty-fix-stdin-conversion-to-tty-name.patch

@@ -0,0 +1,33 @@
+From: Karel Zak <[email protected]>
+Date: Mon, 24 Feb 2025 13:37:04 +0100
+Subject: agetty: fix stdin conversion to tty name
+
+Addresses: https://github.com/util-linux/util-linux/issues/3304
+Signed-off-by: Karel Zak <[email protected]>
+---
+ term-utils/agetty.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/term-utils/agetty.c b/term-utils/agetty.c
+index a382313..34a39a5 100644
+--- a/term-utils/agetty.c
++++ b/term-utils/agetty.c
+@@ -928,11 +928,15 @@ static void parse_args(int argc, char **argv, struct options *op)
+
+ 	/* resolve the tty path in case it was provided as stdin */
+ 	if (strcmp(op->tty, "-") == 0) {
++		int fd;
++		const char *name = op->tty;
++
+ 		op->tty_is_stdin = 1;
+-		int fd = get_terminal_name(NULL, &op->tty, NULL);
+-		if (fd < 0) {
++		fd = get_terminal_name(NULL, &name, NULL);
++		if (fd >= 0)
++			op->tty = name;	/* set real device name */
++		else
+ 			log_warn(_("could not get terminal name: %d"), fd);
+-		}
+ 	}
+
+ 	/* On virtual console remember the line which is used for */

debian/rules

@@ -27,10 +27,8 @@ endif
 endif
 
 # As a result of CVE-2024-28085, we no longer install mesg/write.
-#CONFOPTS += --disable-mesg
-#CONFOPTS += --disable-write
-
-CONFOPTS += --enable-write
+CONFOPTS += --disable-mesg
+CONFOPTS += --disable-write
 
 # build static versions of programs used in fdisk-udeb and util-linux-udeb
 CONFOPTS += --enable-static-programs=fdisk,sfdisk,blkid
@@ -47,15 +45,11 @@ CONFOPTS += --disable-chfn-chsh
 # => bsdmainutils
 CONFOPTS += --disable-cal
 # => wtmpdb
-#CONFOPTS += --disable-last --disable-utmpdump
-CONFOPTS += --disable-last
+CONFOPTS += --disable-last --disable-utmpdump
 
 # Keep hwclock as GPLv2 (and others)
 CONFOPTS += --disable-hwclock-gplv3
 
-# Reduce setgid programs (cf. CVE-2024-28085)
-CONFOPTS += --disable-use-tty-group
-
 ifeq ($(DEB_HOST_ARCH),hurd-i386)
 # hurd porters plan to drop 32bit before 2038
 	CONFOPTS += --disable-year2038

debian/tests/control

@@ -1,17 +1,3 @@
-Tests:
- oversized-chunks,
-Depends:
- bash,
- bc,
- bsdextrautils,
- bsdutils,
- dpkg,
- grep,
- mount,
- util-linux,
-Restrictions:
- allow-stderr,
-
 Tests:
  libblkid-dev,
 Depends:
@@ -61,4 +47,5 @@ Depends:
 Restrictions:
  allow-stderr,
  breaks-testbed,
+ flaky,
  needs-root,

debian/tests/login

@@ -13,6 +13,6 @@ useradd --password '$y$j9T$ZLi71y6HSLZJfI4icrkue1$JJlJEL9y7BVuWYthlQ7tNiFMCXHKNl
 groupadd -f jedi
 
 # Let obiwan not be a jedi when logging in, but get promoted after enough time to log in
-(sleep 2 && usermod -aG jedi obiwan) &
+(sleep 4 && usermod -aG jedi obiwan) &
 
 expect ./debian/tests/login.exp

debian/tests/login.exp

@@ -5,6 +5,8 @@ expect_before {
 }
 
 spawn login
+# Let `login` start even when things are slow
+sleep 2
 expect "login:"
 send -- "obiwan\r"
 expect "assword:"

debian/util-linux-extra.install

@@ -9,11 +9,13 @@ sbin/mkfs.bfs usr/sbin/
 sbin/mkfs.cramfs usr/sbin/
 sbin/mkfs.minix usr/sbin/
 [linux-any] usr/bin/enosys
+[linux-any] usr/bin/exch
 [linux-any] usr/bin/fadvise
 [linux-any] usr/bin/fincore
 [linux-any] usr/bin/lsfd
 [linux-any] usr/bin/lsirq
 [linux-any] usr/bin/waitpid
+[linux-any] usr/sbin/resizepart usr/bin/
 [linux-any] usr/share/bash-completion/completions/fadvise
 [linux-any] usr/share/bash-completion/completions/pipesz
 [linux-any] usr/share/bash-completion/completions/waitpid
@@ -24,6 +26,7 @@ sbin/mkfs.minix usr/sbin/
 <!nodoc> usr/share/man/man8/mkfs.cramfs.8
 <!nodoc> usr/share/man/man8/mkfs.minix.8
 [linux-any] <!nodoc> usr/share/man/man1/enosys.1
+[linux-any] <!nodoc> usr/share/man/man1/exch.1
 [linux-any] <!nodoc> usr/share/man/man1/fadvise.1
 [linux-any] <!nodoc> usr/share/man/man1/fincore.1
 [linux-any] <!nodoc> usr/share/man/man1/lsfd.1
@@ -32,3 +35,4 @@ sbin/mkfs.minix usr/sbin/
 [linux-any] <!nodoc> usr/share/man/man1/waitpid.1
 [linux-any] <!nodoc> usr/share/man/man8/blkpr.8
 [linux-any] <!nodoc> usr/share/man/man8/ctrlaltdel.8
+[linux-any] <!nodoc> usr/share/man/man8/resizepart.8

debian/util-linux-locales.install

@@ -9,7 +9,6 @@ usr/share/locale/*/*/util-linux.mo
 <!nodoc> debian/tmp/usr/share/man/*/man1/hexdump.1
 <!nodoc> debian/tmp/usr/share/man/*/man1/look.1
 <!nodoc> debian/tmp/usr/share/man/*/man1/ul.1
-<!nodoc> debian/tmp/usr/share/man/*/man1/write.1
 
 # bsdutils
 <!nodoc> debian/tmp/usr/share/man/*/man1/logger.1
@@ -107,7 +106,6 @@ usr/share/locale/*/*/util-linux.mo
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/partx.8
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/pivot_root.8
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/readprofile.8
-[linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/resizepart.8
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/rtcwake.8
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/setarch.8
 <!nodoc> debian/tmp/usr/share/man/*/man8/sulogin.8
@@ -118,10 +116,12 @@ usr/share/locale/*/*/util-linux.mo
 
 # util-linux-extra
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man1/enosys.1
+[linux-any] <!nodoc> debian/tmp/usr/share/man/*/man1/exch.1
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man1/fincore.1
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man1/lsirq.1
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man1/waitpid.1
 [linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/blkpr.8
+[linux-any] <!nodoc> debian/tmp/usr/share/man/*/man8/resizepart.8
 <!nodoc> debian/tmp/usr/share/man/*/man8/hwclock.8
 
 # uuid-dev