Update upstream source from tag 'upstream/2.33'

Update to upstream version '2.33'
with Debian dir 450f54000df827bd9512c17870bbd2c47930a78e

.tarball-version

-2.32.1
+2.33

.version

-2.32.1
+2.33

AUTHORS

@@ -92,6 +92,7 @@ CONTRIBUTORS:
       Alan Curry <pacman@TheWorld.com>
       Alan Jenkins <alan.christopher.jenkins@gmail.com>
       Alan Wendt <alan@ezlink.com>
+      Alban Crequy <alban@kinvolk.io>
       Alden Tondettar <alden.tondettar@gmail.com>
       Alejandro Martinez Ruiz <alex@nowcomputing.com>
       Alexander F Rødseth <xyproto@archlinux.org>
@@ -138,6 +139,7 @@ CONTRIBUTORS:
       Attila Áfra <attila.afra@gmail.com>
       Aurelien Aptel <aaptel@suse.com>
       Aurelien Jarno <aurel32@debian.org>
+      Awal Garg <awalgarg@gmail.com>
       Balint Cristian <cbalint@redhat.com>
       Bastian Friedrich <bastian.friedrich@collax.com>
       Ben Hutchings <ben@decadent.org.uk>
@@ -252,10 +254,12 @@ CONTRIBUTORS:
       François Revol <revol@free.fr>
       Fran Diéguez <frandieguez@ubuntu.com>
       Frank Mayhar <fmayhar@google.com>
+      Frank Schaefer <kelledin@gmail.com>
       Frédéric Bothamy <frederic.bothamy@free.fr>
       Frederick Grose <fgrose@sugarlabs.org>
       Frédéric Marchal <fmarchal@perso.be>
       Frederik "Freso" S. Olesen <freso@freso.dk>
+      Fred Mora <fmora@datto.com>
       fREW Schmidt <frioux@gmail.com>
       Fridolin Pokorny <fpokorny@redhat.com>
       Gabor Kelemen <kelemeng@gnome.hu>
@@ -285,6 +289,7 @@ CONTRIBUTORS:
       Hamish Coleman <hamish@zot.org>
       Hannes Reinecke <hare@suse.de>
       Harald Hoyer <harald@redhat.com>
+      Harry Mallon <hjmallon@gmail.com>
       Hayden James <hayden.james@gmail.com>
       Heiko Carstens <heiko.carstens@de.ibm.com>
       Helge Deller <deller@gmx.de>
@@ -375,6 +380,7 @@ CONTRIBUTORS:
       Kirill Elagin <kirelagin@gmail.com>
       Kir Kolyshkin <kir@openvz.org>
       Kunihiko IMAI <kimai@iodata.jp>
+      KyleMahlkuch <Kyle.Mahlkuch@ibm.com>
       Lada Trimasova <ltrimas@synopsys.com>
       LaMont Jones <lamont@debian.org>
       Lars Wirzenius
@@ -405,6 +411,7 @@ CONTRIBUTORS:
       Marek Polacek <mmpolacek@gmail.com>
       Mario Blättermann <mario.blaettermann@gmail.com>
       Mark McLoughlin <markmc@redhat.com>
+      Mark Sheppard <mark@ddf.net>
       Mark Tinguely <mark.tinguely@hpe.com>
       Markus Rinne <markus.ka.rinne@gmail.com>
       Martin K. Petersen <martin.petersen@oracle.com>
@@ -413,9 +420,11 @@ CONTRIBUTORS:
       Martin Steigerwald <ms@teamix.de>
       Masanari Iida <standby24x7@gmail.com>
       Masatake YAMATO <yamato@redhat.com>
+      Masato Suzuki <masato.suzuki@wdc.com>
       Matthew Garrett <mjg59@srcf.ucam.org>
       Matthias Gerstner <matthias.gerstner@suse.de>
       Matthias König <mk@phasorlab.de>
+      Matti Niemenmaa <matti.niemenmaa+git@iki.fi>
       Maurizio Lombardi <m.lombardi85@gmail.com>
       maximilian attems <max@stro.at>
       Maxim Levitsky <maximlevitsky@gmail.com>
@@ -482,6 +491,7 @@ CONTRIBUTORS:
       Paul Fox <pgf@laptop.org>
       Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
       Paul Menzel <paulepanter@users.sourceforge.net>
+      Paul M <paul@chezp4ul.fr>
       Pavel Butsykin <pbutsykin@virtuozzo.com>
       Pavel Maryanov <acid@jack.kiev.ua>
       pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
@@ -574,10 +584,12 @@ CONTRIBUTORS:
       Serge Hallyn <serge.hallyn@ubuntu.com>
       Sergei Antonov <saproj@gmail.com>
       Sergey Gusarov <laborer2008@gmail.com>
+      Sevan Janiyan <venture37@geeklan.co.uk>
       sgargel <sgargel@yahoo.it>
       Shachar Shemesh <shachar@debian.org>
       Shaun Tancheff <shaun@tancheff.com>
       Simon Mihevc <simonmihevc@email.si>
+      sluidfoe <sluidfoe@gmail.com>
       Søren Holm <sgh@sgh.dk>
       s.p@orbitalfox.com <s.p@orbitalfox.com>
       Stanislav Brabec <sbrabec@suse.cz>

ChangeLog

 See version control history.
 
-http://git.kernel.org/?p=utils/util-linux/util-linux.git;a=log;h=2.32.1
+http://git.kernel.org/?p=utils/util-linux/util-linux.git;a=log;h=2.33

Documentation/TODO

 
  Note that items with (!) have high priority.
 
-libsmartcols
-------------
-   - (!) add libscols_column->json_type and scols_column_set_jsontype()
-     to generate proper JSON output. Now the library uses quotes (= all is
-     string) for everything. See for example SIZE in "lsblk --json --bytes"
-     output.
-
-column
-------
-   - add option to NOT ignore empty lines
-     https://github.com/karelzak/util-linux/issues/593
+cal
+---
+   - add option to print calendar in vertical way
+     https://github.com/karelzak/util-linux/issues/604
+   - support another --reforms, see for example freebsd version
+     https://github.com/freebsd/freebsd/blob/master/usr.bin/ncal/ncal.c#L72
 
 script
 ------
-   - (!) add terminal type ($TERM), columns and lines to the header line, something like:
-
-		Script started on 2018-03-05 13:02:08+0100 [term="xterm-256color", lines=53, columns=190]
-
-     see https://github.com/karelzak/util-linux/issues/583
-
-   - think about optional "event" records in timing file to save information
-     about non-data changes like signals (SIGWINCH, SIGSTOP, SIGCONT, etc.)
-     in format:
-
-             <time> 0 <name>[: var=data, ...]
-
-     for example:
+   - introduce a new timing file format to record information about multiple
+     streams (stdout, stdin) and events (signals)
 
-	     0.001296 256
-	     0.001297   0 SIGWINCH: columns=50, lines=20
-	     0.000010 275
+   - add support for stdin loggin -- separated log file with raw input and timing
+     records in the timing file
 
-lsblk
------
-   The problem is NVMe-multipath driver where in /sys/.../slaves/ are nodes
-   that should be probably hidden for userspace. Note that kernel developers
-   promised to fix this issue in kernel *** so hold off from that for now***
-   [Mar 1, 2018].
-
-   Anyway, possible userspace solution is:
+   - for example timing file format:
+              
+             <type> <timestamp> [<offset> | <signal> ...]
 
-   - verify that slave/holder nodes points to the real block devices
-     (/sys/dev/block/<maj:min> for the node exists), otherwise silently ignore
-     the slave/holder node -- see set_cxt().
+	     O 0.001296 256
+	     S 0.001297 SIGWINCH: columns=50, lines=20
+	     I 0.000010 10
 
-   - the same verification we necessary for nodes in /sys/block/<name>. It means
-     verify result from sysfs_devname_to_devno() in set_cxt().
+     O - output, S - signal, I - input
 
 
-
-cleanup lib/path.c: [Karel Zak for v2.33]
-------------------
-   - always return rc from all functions
-   - introduce control struct and use openat() from top-level path 
-     (e.g. top-level is /proc, etc)
-   - use lib/path.c as low-level API for lib/sysfs.c
-   - now we duplicate code in functions like {path,sysfs}_read_u32, etc. 
-   - it would be also nice to have a way how to redirect sysfs.c functions 
-     to /sys snapshots (e.g. lsblk regression tests)
-	
-
 lscpu
 -----
   - read cpuid and uname information from file if --sysroot is specified, then
@@ -69,11 +34,21 @@ lscpu
 
 lsblk
 -----
+  - re-write the way how lsblk internally holds info about devices. Now we
+    compose only output (by libsmartcols). It would be better to have in memory
+    complete tree of the devices and generate the output from this tree. It will
+    make code more readable and allow to generate output in more ways -- for
+    example for RAIDs (https://github.com/karelzak/util-linux/issues/616)
+
   - currently it does not show mountpoint for all devices in btrfs RAID. It's because
     /proc/#/mountinfo contains reference to the one device only. Maybe we can add some
     btrfs specific code to provide a better output for FS based stacks. Not sure.
     https://bugzilla.redhat.com/show_bug.cgi?id=1084453
 
+  - think about free/used space columns; the problem is that such info is about FS
+    and it may be confusing for end-users when FS to DEV mapping is not 1:1 (RAIDs, btrfs, 
+    ...)
+
 nsenter(1)
 ----------
  - read the default UID and GID from the target process.
@@ -117,25 +92,20 @@ libmount (mount/umount)
    set and allow to use it for simple tasks where no another operation is
    necessary.
 
- - allow to execute mount(2) in another namespace, something like:
-	mount --namespace=/proc/$n/ns/mnt  /dev/sda2 /bar
-   see https://bugzilla.redhat.com/show_bug.cgi?id=1199554 for more details.
-
- - add options to control fstab/mtab mount options usage, something like:
-
-   --options-mode={ignore,append,prepend,replace}      MNT_OMODE_{IGNORE, ...}
-   --options-source={fstab,mtab,disable}               MNT_OMODE_{FSTAB,MTAB,NOTAB}
-   --options-source-force                              MNT_OMODE_FORCE
-
-   (all this already supported by libmount)
-
-
 partx
 -----
 
  - support mapping by device-mapper if argv[0] is "kpartx" or --dm option is used.
      
 
+getopt
+------
+  It would be great if getopt could optionally ignore unknown options.
+  Currently, it outputs -- for every option it doesn't recognize but leaving the
+  option as it is could beneficial wrapper scripts which could then pass the
+  options they don't recognize as they are to the command they are wrapping.
+  https://github.com/karelzak/util-linux/issues/701
+
 docs
 ----
 
@@ -143,13 +113,6 @@ docs
 
  - (!) add API documentation to libuuid
 
-exit codes
-----------
-
-  - we need coreutils-like exit codes for failed exec(). See:
-    https://www.spinics.net/lists/util-linux-ng/msg12776.html
-    and original attempt:
-    https://github.com/karelzak/util-linux/pull/311
 
 login-utils:
 -----------
@@ -168,10 +131,9 @@ login-utils:
 libblkid
 --------
 
- - (!) don't use internally blkid_loff_t, rather use off_t, size_t, ssize_t,
-       stdint.h types and so on...
-
- - add FSSIZE value  -- filesystem size (klibc requirement)
+ - (!) add support for BitLocker Drive Encryption 
+   https://github.com/karelzak/util-linux/issues/617
+   https://github.com/libyal/libbde/blob/master/documentation/BitLocker%20Drive%20Encryption%20(BDE)%20format.asciidoc
 
  - (!) add support for dasd PT (used for example on s390)
 
@@ -181,6 +143,7 @@ libfdisk
  - add support for Apple Partition Map (see libblkid/src/partitions/mac.c)
    http://en.wikipedia.org/wiki/Apple_Partition_Map
 
+
 misc
 ----
 

Documentation/blkid.txt

@@ -68,7 +68,7 @@ function is used:
 
 The second parameter of blkid_get_cache (if non-zero) is the alternate filename
 of the blkid cache file (see blkid man page for more information about the
-default cach file location).
+default cache file location).
 
 Normally, programs should just pass in NULL.
 

Documentation/howto-compilation.txt

@@ -36,6 +36,25 @@ Compiling
 
 	FIXME: add notes about klib and uClib.
 
+
+Compile certain portion
+
+	See ./configure --help and use --disable-* and --enable-* options.
+
+        It's also possible to disable all the programs and enable only wanted.
+        For example:
+	
+	./configure --disable-all-programs --enable-fallocate
+
+	Note that the configure script tracks dependencies between libs and
+        tools. Always see warning messages and follow error messages if any
+        dependence is necessary. For example to compile mount(8) you need also
+        libmount, libblkid and libuuid:
+
+	./configure --disable-all-programs --enable-mount --enable-libmount \
+                    --enable-libblkid --enable-libuuid
+
+
 Static linking
 
 	Use --enable-static-programs[=LIST] configure option when

Documentation/howto-contribute.txt

@@ -35,6 +35,29 @@ Sending Patches
 	  Packages like RPMs, DEBs, and the rest, are not provided. They should
 	  be available from the distribution.
 
+Repositories & Branches
+
+	* Primary repository is on kernel.org:
+          git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
+
+	  We use this repository for master and stable branches only.
+
+	* Backup repository at github.com:
+	  git clone git://github.com/karelzak/util-linux.git
+
+	  We use this repository to backup kernel.org and for pull requests,
+	  issues tracking and topic branches. The master and stable branches are
+	  always pushed to the both repositories in the same time.
+
+	  It's recommended to use github.com for development.
+
+	* Branches:
+
+	  master	- development for the next release
+	  next		- optionally used when master branch is frozen due to -rcN releases
+	  topic/*	- long time development
+	  stable/*	- stable maintenance releases
+
 Patching Process
 
 	* announce it on the mailing list when you are going to work with some

Documentation/howto-tests.txt

@@ -80,7 +80,7 @@ TS_OPT_testdir_[testscript_]fake="<yes|no>"
 
     Evaluated by any test script to skip certain tests.
     Examples:
-      - skip all the tests within "fdisk" test-direcrory:
+      - skip all the tests within "fdisk" test-directory:
         $ make check TS_OPT_fdisk_fake="yes"
 
       - skip only "fdisk/bsd" test:

Documentation/releases/v2.32.1-ReleaseNotes

-util-linux 2.32.1 Release Notes
-===============================
-
-agetty:
-   - keep c_iflags unmodified on --autologin  [Karel Zak]
-blkid:
-   - (man) add note about udev encoding  [Karel Zak]
-blkzone:
-   - fix whole device detection  [Karel Zak]
-bugfix:
-   - fix possible segfault during umount -a  [Richard Fuchs]
-build-sys:
-   - extend "Could not locate the pkg-config" error message  [Karel Zak]
-   - improve bison version detection  [Karel Zak]
-cfdisk:
-   - fix compiler warnings, follow-up 7085f1e4 (#636)  [Ruediger Meier]
-   - fix missing prototype for `get_wch`  [Patrick Steinhardt]
-   - use uint64_t to avoid compiler warnings  [Karel Zak]
-chcpu:
-   - Fix maximal number of CPUs  [Stanislav Brabec]
-column:
-   - fix leading space characters bug  [Karel Zak]
-dmesg:
-   - fix raw output  [Karel Zak]
-   - link together with syslog(2) manual page  [Sami Kerola]
-docs:
-   - update AUTHORS file  [Karel Zak]
-exec_shell:
-   - prevent ".  applet not found" error when SHELL env is not set.  [osexp2000]
-fdisk:
-   - fix compiler warning [-Wmaybe-uninitialized]  [Karel Zak]
-fstrim:
-   - Return EXIT_FAILURE when FTRIM ioctl fails  [Karel Zak]
-   - cleanup includes  [Karel Zak]
-lib/strutils:
-   - fix strnlen() fallback  [Karel Zak]
-libblkid:
-   - (hfs) check allocation size  [Karel Zak]
-   - (ntfs) enlarge cluster limit to 2MB  [Karel Zak, Jean-Pierre André]
-   - (ntfs) fix cluster size check  [Karel Zak]
-   - (zfs) fix compiler warning [-Wmaybe-uninitialized]  [Karel Zak]
-   - udf  Fix reporting UDF 2.60 revision  [Pali Rohár]
-libfdisk:
-   - (docs) fix section name  [Karel Zak]
-   - fix compiler warning [-Wunused-parameter]  [Karel Zak]
-   - fix list_del after partition reset  [Vaclav Dolezal]
-   - use \x<hex> to read/write partition name  [Karel Zak]
-libmount:
-   - fix compiler warning [-Wunused-parameter]  [Karel Zak]
-   - fix mnt_table_is_fs_mounted() for NFS bind mounts.  [NeilBrown]
-   - improve docs about mnt_context_mount() return codes  [Karel Zak]
-   - include sys/mount.h on Linux only  [Karel Zak]
-   - include sys/mount.h only if necessary  [Karel Zak]
-libsmartcols:
-   - don't print empty column  [Karel Zak]
-logger:
-   - Define SD_JOURNAL_SUPPRESS_LOCATION.  [YmrDtnJu]
-lsblk:
-   - don't exclude RAM disks on --all  [Karel Zak]
-   - fix notes about RAM disks  [Karel Zak]
-lscpu, chcpu:
-   - Avoid use of the old CPU macros  [Stanislav Brabec]
-lslocks:
-   - add info about OFD  [Karel Zak]
-   - fix memory leak  [Karel Zak]
-lslogins:
-   - fix password verification  [Karel Zak]
-partx:
-   - exit with error code when partition read failed  [Andreas Henriksson]
-po:
-   - fix lsblk translation  [Karel Zak]
-   - merge changes  [Karel Zak]
-   - pt_BR  fix fallocate '-l' help msg  [Luiz Angelo Daros de Luca]
-   - update ja.po (from translationproject.org)  [Takeshi Hamasaki]
-   - update pt_BR.po (from translationproject.org)  [Rafael Fontenelle]
-rename:
-   - consolidate printing the symlink in addition to its target  [G.raud Meyer]
-   - fix/reverse the semantics of --no-overwrite in --symlink mode  [G.raud Meyer]
-rfkill:
-   - include <poll.h> instead of <sys/poll.h>  [Patrick Steinhardt]
-setarch:
-   - add another PER_LINUX32 aliases for ppcle  [Karel Zak]
-tests:
-   - update column(1) space-separator test  [Karel Zak]
-umount:
-   - add note about --lazy  [Karel Zak]
-zramctl:
-   - (man) explain that --find is necessary  [Karel Zak]
-
-- (man) explain that --find is necessary  [Karel Zak]

NEWS

-util-linux 2.32.1: Jul 16 2018
-* see Documentation/releases/v2.32-ReleaseNotes or the complete changelog at
-  https://www.kernel.org/pub/linux/utils/util-linux/v2.32/v2.32.1-ChangeLog
+util-linux 2.33: Nov 6 2018
+* see Documentation/releases/v2.33-ReleaseNotes or the complete changelog at
+  https://www.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33-ChangeLog
+
+util-linux 2.33-rc2: Oct 19 2018
+* see Documentation/releases/v2.33-ReleaseNotes or the complete changelog at
+  https://www.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33-rc2-ChangeLog
+
+util-linux 2.33-rc1: Sep 25 2018
+* see Documentation/releases/v2.33-ReleaseNotes or the complete changelog at
+  https://www.kernel.org/pub/linux/utils/util-linux/v2.33/v2.33-rc1-ChangeLog
 
 util-linux 2.32: Mar 21 2018
 * see Documentation/releases/v2.32-ReleaseNotes or the complete changelog at

README.licensing

@@ -2,19 +2,21 @@
 The project util-linux doesn't use the same license for all of the code.
 There is code under:
 
-   * GPLv2+ (GNU General Public License version 2, or any later version)
+   * GPL-2.0-or-later   - GNU General Public License version 2, or any later version
 
-   * GPLv2 (GNU General Public License version 2)
+   * GPL-2.0            - GNU General Public License version 2
 
-   * LGPLv2+ (GNU Lesser General Public License v2 (or 2.1) or any later version)
+   * LGPL-2.1-or-later  - GNU Lesser General Public License 2.1 or any later version
 
-   * BSD with advertising
+   * BSD-3-Clause       - BSD 3-Clause "New" or "Revised" License
+
+   * BSD-4-Clause-UC    - BSD 4-Clause University of California-Specific
 
    * Public Domain
 
 Please, check the source code for more details. A license is usually at the start
 of each source file.
 
-The ./COPYING file (GPLv2+) is the default license for code without an explicitly
-defined license.
+The ./COPYING file (GPL-2.0-or-later) is the default license for code without
+an explicitly defined license.
 

bash-completion/blockdev

@@ -33,7 +33,7 @@ _blockdev_module()
 			COMPREPLY=( $(compgen -W "bytes" -- $cur) )
 			return 0
 			;;
-		'--setbsz'|'--setfra')
+		'--setra'|'--setfra')
 			COMPREPLY=( $(compgen -W "sectors" -- $cur) )
 			return 0
 			;;

bash-completion/chcpu

@@ -12,7 +12,7 @@ _chcpu_module()
 			CPULIST_ALL=$(sed 's/^/{/; s/-/../g; s/,/} {/g; s/$/}/' /sys/devices/system/cpu/offline)
 			for WORD in $(eval echo $CPULIST_ALL); do
 				if ! [[ $prefix == *"$WORD"* ]]; then
-					CPULIST="$WORD $CPULIST"
+					CPULIST="$WORD ${CPULIST:-""}"
 				fi
 			done
 			compopt -o nospace
@@ -26,7 +26,7 @@ _chcpu_module()
 			CPULIST_ALL=$(sed 's/^/{/; s/-/../g; s/,/} {/g; s/$/}/' /sys/devices/system/cpu/online)
 			for WORD in $(eval echo $CPULIST_ALL); do
 				if ! [[ $prefix == *"$WORD"* ]]; then
-					CPULIST="$WORD $CPULIST"
+					CPULIST="$WORD ${CPULIST:-""}"
 				fi
 			done
 			compopt -o nospace

bash-completion/column

@@ -5,11 +5,19 @@ _column_module()
 	cur="${COMP_WORDS[COMP_CWORD]}"
 	prev="${COMP_WORDS[COMP_CWORD-1]}"
 	case $prev in
-		'-c'|'--columns')
+		'-c'|'--output-width')
 			COMPREPLY=( $(compgen -W "number" -- $cur) )
 			return 0
 			;;
-		'-s'|'--separator'|'-o'|'--output-separator')