Update util-linux based on 2.36.1-8
It has taken a while, here is a new MR for updating util-linux based on the current version in Debian stable 2.36.1-8.
Marked again as Draft as a new branch pureos/latest was created.
In all "just" a version bump did happen from the technical side, upstream sorted the pacthes now into topics so I did the same with the one PureOS specific patch, I adjusted also some PureOS related things in the debian/ folder to uniform content.
The following diff is a cut off from the real full diff, but is probably the most interesting part of the changes within debian/.
$ git diff 7d6214a0a50c097af0aadbeec6395ab0d10016bc debian
diff --git a/debian/changelog b/debian/changelog
index 0c02584c7..76c3f76fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,130 @@
+util-linux (2.36.1-8pureos1) byzantium; urgency=medium
+
+ * Merge in 2.36.1 from Debian stable, remaining change:
+ - Add sulogin-lockedpwd.patch: Permit root rescue login on PureOS
+ * Rebuild patch queue from patchqueue branch
+ No source specific modifications, just put PureOS specific patch into
+ own dedicated topic folder.
+ * d/control: Remove Uploaders field
+ * d/control: Adjust Maintainer/Vcs to PureOS fork
+ * Add d/pureos-ci.yml for CI
+
+ -- Carsten Schoenert <carsten.schoenert@puri.sm> Fri, 10 Dec 2021 08:17:51 +0100
+
+util-linux (2.36.1-8) unstable; urgency=medium
+
+ * Apply upstream patch for CVE-2021-37600 (Closes: #991619)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Wed, 28 Jul 2021 19:09:07 +0000
+
+util-linux (2.36.1-7) unstable; urgency=medium
+
+ * libmount: allow --read-only for not-root users.
+ Apply patch from upstream. (Closes: #980828)
+ * Cleanup Uploaders
+
+ -- Chris Hofstaedtler <zeha@debian.org> Sun, 07 Feb 2021 14:38:19 +0000
+
+util-linux (2.36.1-6) unstable; urgency=medium
+
+ * libmount: do not canonicalize ZFS source dataset.
+ Upstream patch. (Closes: #980273)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Sun, 17 Jan 2021 20:27:00 +0000
+
+util-linux (2.36.1-5) unstable; urgency=medium
+
+ * hwclock-set: remove useless source /etc/default/rcS
+ * hwclock-set: remove stamp file.
+ Since initramfs-tools 0.119 (jessie), hwclock-set is not installed
+ in the initramfs anymore. This was the original reason for having
+ the stamp file.
+ * man cfdisk: Add upstream patch documenting resize command.
+ Thanks to Vincent McIntyre <Vincent.Mcintyre@csiro.au>
+ (Closes: #915971, #906918)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Mon, 11 Jan 2021 22:03:06 +0000
+
+util-linux (2.36.1-4) unstable; urgency=medium
+
+ * bsdextrautils: Install colcrt (Closes: #977871)
+ * hwclock.sh: remove obsolete startup code.
+ Let the on startup code always be handled by the udev rule we install.
+ On any normal system, systemd or sysvinit, "hwclock.sh start" was a
+ no-op for the last few Debian releases already. Also, with initramfs,
+ hwclock.sh never got executed *before* fsck for root.
+ If your system does not have udev but has an RTC in localtime or one
+ needing drift adjustments, you will need to handle this yourself.
+ * hwclock: remove all broken settings.
+ Since buster, BADYEAR was broken, because upstream removed the code in
+ v2.30-rc1.
+ Since buster, the alpha cmos support was broken, because upstream
+ removed the code.
+ Since stretch, HWCLOCKACCESS=no was broken on udev systems, because the
+ helper ignored it.
+ Remove all those settings; also remove HCTOSYS_DEVICE from the
+ default-shipped /etc/default/hwclock, as changing it is extremely
+ difficult to get right.
+ * hwclock.sh: add comments when to use this init script
+ * Update advice on ALWAYS_SET_PATH to use /etc/default/su (Closes: #905564)
+ * Remove Suggests: console-tools. Gone since 2013.
+
+ -- Chris Hofstaedtler <zeha@debian.org> Tue, 29 Dec 2020 15:46:26 +0000
+
+util-linux (2.36.1-3) unstable; urgency=medium
+
+ [ Quentin PAGÈS ]
+ * Occitan translation for eject
+
+ [ Chris Hofstaedtler ]
+ * Bump Standards-Version to 4.5.1
+ * Refresh patches
+
+ [ Matthew Vernon ]
+ * getopt(1): explicitly say where examples are on Debian (Closes: #913049)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Sat, 19 Dec 2020 13:42:03 +0000
+
+util-linux (2.36.1-2) unstable; urgency=medium
+
+ [ Pino Toscano ]
+ * Register /bin/more as pager alternative only on Linux.
+ * Fix build on non-Linux architectures (Closes: #975008)
+
+ [ Chris Hofstaedtler ]
+ * Add upstream patch fixing user mounts on kernel < 5.10 (Closes: #975727)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Wed, 25 Nov 2020 21:07:38 +0000
+
+util-linux (2.36.1-1) unstable; urgency=medium
+
+ * New upstream stable release
+ * Remove upstream applied patches
+
+ -- Chris Hofstaedtler <zeha@debian.org> Mon, 16 Nov 2020 14:01:03 +0000
+
+util-linux (2.36-4) unstable; urgency=medium
+
+ [ Holger Wansing ]
+ * Re-add Tajik debconf translation file (somehow lost from eject package).
+ Taken from bug #890079.
+ * Update Norwegian Bokmål debconf translation according to last state in
+ eject package (taken from bug #923919).
+
+ [ Slimane Selyan Amiri ]
+ * Add Kabyle translation for eject (via Hoger Wansing)
+
+ [ Chris Hofstaedtler ]
+ * flock: keep -E exit status more restrictive (Closes: #973751)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Mon, 16 Nov 2020 09:18:06 +0000
+
+util-linux (2.36-3) unstable; urgency=medium
+
+ * Fix sfdisk regression with upstream patch (Closes: #966992)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Sat, 29 Aug 2020 12:32:39 +0000
+
util-linux (2.36-2pureos1) landing; urgency=medium
* Merge with Debian unstable, remaining changes:
diff --git a/debian/control b/debian/control
index f5f2aeeb5..787afb9af 100644
--- a/debian/control
+++ b/debian/control
@@ -22,14 +22,14 @@ Build-Depends: bc <!stage1 !nocheck>,
Build-Conflicts: libcryptsetup-dev
Section: base
Priority: required
-Maintainer: util-linux packagers <util-linux@packages.debian.org>
-Uploaders: Adam Conrad <adconrad@0c3.net>,
- Chris Hofstaedtler <zeha@debian.org>,
- LaMont Jones <lamont@debian.org>
-Standards-Version: 4.5.0
+Maintainer: PureOS Maintainers <pureos-project@lists.puri.sm>
+XBSC-Oiginal-Maintainer: util-linux packagers <util-linux@packages.debian.org>
+Standards-Version: 4.5.1
Rules-Requires-Root: binary-targets
-Vcs-Browser: https://salsa.debian.org/debian/util-linux
-Vcs-Git: https://salsa.debian.org/debian/util-linux.git
+Vcs-Browser: https://source.puri.sm/pureos/core/util-linux
+Vcs-Git: https://source.puri.sm/pureos/core/util-linux.git
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/util-linux.git
+XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/util-linux.git
Homepage: http://www.kernel.org/pub/linux/utils/util-linux/
Package: util-linux
@@ -42,7 +42,7 @@ Pre-Depends: ${misc:Pre-Depends},
Depends: login (>= 1:4.5-1.1~),
${misc:Depends}
Suggests: dosfstools,
- kbd | console-tools,
+ kbd,
util-linux-locales
Replaces: bash-completion (<< 1:2.8),
initscripts (<< 2.88dsf-59.2~),
@@ -121,8 +121,8 @@ Replaces: bsdmainutils (<< 12.1.3)
Breaks: bsdmainutils (<< 12.1.3)
Multi-Arch: foreign
Description: extra utilities from 4.4BSD-Lite
- This package contains some extra BSD utilities: col, colrm, column, hexdump,
- hd, look, ul and write.
+ This package contains some extra BSD utilities: col, colcrt, colrm, column,
+ hd, hexdump, look, ul and write.
Other BSD utilities are provided by bsdutils and calendar.
Package: fdisk
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 23f684472..344c239c0 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = pureos/master
+debian-branch = pureos/latest
upstream-branch = upstream
pristine-tar = True
compression = xz@guido.gunther @jeremiah.foster @matthias.klumpp Please have a look.