Package: util-linux
Version: 2.36-3+b2
Severity: important
Tags: patch
Hello,
util-linux 2.36 currently doesn't build on !linux, the attached patch
(submitted upstream) fixes it.
Then it is non-installable :) because the postinst/rm scripts are
managing alternatives for more. The attached patch2 does this on Linux
only, fixing the installability there.
Samuel
-- System Information:
Debian Release: bullseye/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500,
'testing-debug'), (500, 'stable-debug'), (500, 'proposed-updates-debug'), (500,
'proposed-updates'), (500, 'oldoldstable'), (500, 'buildd-unstable'), (500,
'unstable'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental-debug'),
(1, 'buildd-experimental'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.9.0-1-amd64 (SMP w/8 CPU threads)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages util-linux depends on:
ii libaudit1 1:2.8.5-3.1
ii libblkid1 2.36-3+b2
ii libc6 2.31-4
ii libcap-ng0 0.7.9-2.2
ii libcrypt1 1:4.4.17-1
ii libmount1 2.36-3+b2
ii libpam0g 1.3.1-5
ii libselinux1 3.1-2+b1
ii libsmartcols1 2.36-3+b2
ii libsystemd0 246.6-2
ii libtinfo6 6.2+20200918-1
ii libudev1 246.6-2
ii libuuid1 2.36-3+b2
ii login 1:4.8.1-1
ii zlib1g 1:1.2.11.dfsg-2
util-linux recommends no packages.
Versions of packages util-linux suggests:
ii dosfstools 4.1-2
ii kbd 2.3.0-3
ii util-linux-locales 2.36-3
-- Configuration Files:
/etc/default/hwclock changed:
HWCLOCKACCESS=yes
-- no debconf information
--
Samuel
<N> (* If you have a precise idea of the intended use of the following code,
please
<N> write to eduardo.gime...@inria.fr and ask for the prize :-)
<N> -- Eduardo (11/8/97) *)
-+- N sur #ens-mim - et c'était un des développeurs -+-
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index 4f52cea3c..8bc3ee37e 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -31,8 +31,10 @@ dist_man_MANS += login-utils/sulogin.8
sulogin_SOURCES = \
login-utils/sulogin.c \
login-utils/sulogin-consoles.c \
- login-utils/sulogin-consoles.h \
- lib/plymouth-ctrl.c
+ login-utils/sulogin-consoles.h
+if USE_PLYMOUTH_SUPPORT
+sulogin_SOURCES += lib/plymouth-ctrl.c
+endif
sulogin_LDADD = $(LDADD) libcommon.la
if HAVE_LIBCRYPT
diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 1f7ef3317..db448687d 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -678,7 +678,7 @@ display_time(struct timeval hwctime)
#ifndef SYS_settimeofday
# ifdef __NR_settimeofday
# define SYS_settimeofday __NR_settimeofday
-# else
+# elif defined(__NR_settimeofday_time32)
# define SYS_settimeofday __NR_settimeofday_time32
# endif
#endif
diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
index 92df7dbc8..c424dbdf8 100644
--- a/term-utils/Makemodule.am
+++ b/term-utils/Makemodule.am
@@ -42,8 +42,10 @@ endif # BUILD_SCRIPTLIVE
if BUILD_AGETTY
sbin_PROGRAMS += agetty
dist_man_MANS += term-utils/agetty.8
-agetty_SOURCES = term-utils/agetty.c \
- lib/plymouth-ctrl.c
+agetty_SOURCES = term-utils/agetty.c
+if USE_PLYMOUTH_SUPPORT
+agetty_SOURCES += lib/plymouth-ctrl.c
+endif
agetty_LDADD = $(LDADD) libcommon.la
if BSD
agetty_LDADD += -lutil
--- debian/util-linux.postinst.original 2020-11-17 20:26:36.000000000 +0000
+++ debian/util-linux.postinst 2020-11-17 20:26:38.000000000 +0000
@@ -1,6 +1,7 @@
#!/bin/sh
set -e
+[ `uname -s` != Linux ] || \
update-alternatives --install /usr/bin/pager pager /bin/more 50 \
--slave /usr/share/man/man1/pager.1.gz pager.1.gz \
/usr/share/man/man1/more.1.gz
--- debian/util-linux.prerm.original 2020-11-17 20:26:49.000000000 +0000
+++ debian/util-linux.prerm 2020-11-17 20:27:01.000000000 +0000
@@ -3,6 +3,7 @@
case "$1" in
remove)
+ [ `uname -s` != Linux ] || \
update-alternatives --remove pager /bin/more
;;
