Browse Source

Imported new upstream version

upstream/2.26
nextime 5 years ago
parent
commit
6550a750b8
100 changed files with 4862 additions and 8333 deletions
  1. +25
    -4
      AUTHORS
  2. +1
    -1
      ChangeLog
  3. +38
    -3
      Documentation/TODO
  4. +21
    -4
      Documentation/deprecated.txt
  5. +18
    -9
      Documentation/howto-contribute.txt
  6. +4
    -2
      Documentation/howto-debug.txt
  7. +286
    -0
      Documentation/howto-pull-request.txt
  8. +1
    -1
      Documentation/releases/v2.25-ReleaseNotes
  9. +0
    -71
      Documentation/releases/v2.25.1-ReleaseNotes
  10. +0
    -85
      Documentation/releases/v2.25.2-ReleaseNotes
  11. +1042
    -0
      Documentation/releases/v2.26-ReleaseNotes
  12. +68
    -0
      Documentation/releases/v2.26.1-ReleaseNotes
  13. +126
    -0
      Documentation/releases/v2.26.2-ReleaseNotes
  14. +12
    -3
      Makefile.am
  15. +1638
    -943
      Makefile.in
  16. +67
    -63
      NEWS
  17. +99
    -38
      aclocal.m4
  18. +9
    -9
      autogen.sh
  19. +7
    -0
      bash-completion/Makemodule.am
  20. +1
    -3
      bash-completion/addpart
  21. +1
    -3
      bash-completion/blkdiscard
  22. +1
    -5
      bash-completion/blkid
  23. +1
    -1
      bash-completion/blockdev
  24. +1
    -5
      bash-completion/cfdisk
  25. +1
    -1
      bash-completion/chsh
  26. +1
    -5
      bash-completion/delpart
  27. +1
    -1
      bash-completion/eject
  28. +2
    -10
      bash-completion/fdisk
  29. +5
    -5
      bash-completion/findmnt
  30. +1
    -2
      bash-completion/fsck
  31. +1
    -2
      bash-completion/fsck.minix
  32. +1
    -1
      bash-completion/logger
  33. +2
    -2
      bash-completion/losetup
  34. +1
    -2
      bash-completion/lsblk
  35. +1
    -2
      bash-completion/mkfs
  36. +1
    -2
      bash-completion/mkfs.bfs
  37. +1
    -2
      bash-completion/mkfs.minix
  38. +1
    -5
      bash-completion/partx
  39. +1
    -5
      bash-completion/resizepart
  40. +1
    -1
      bash-completion/setarch
  41. +1
    -1
      bash-completion/setpriv
  42. +1
    -5
      bash-completion/sfdisk
  43. +1
    -1
      bash-completion/swapon
  44. +1
    -3
      bash-completion/wipefs
  45. +51
    -0
      bash-completion/zramctl
  46. +42
    -6
      config.h.in
  47. +99
    -214
      config/config.guess
  48. +32
    -24
      config/config.sub
  49. +2
    -2
      config/missing
  50. +16
    -4
      config/test-driver
  51. +994
    -218
      configure
  52. +133
    -22
      configure.ac
  53. +0
    -38
      debian/README.script
  54. +0
    -106
      debian/README.source
  55. +0
    -1
      debian/bsdutils.docs
  56. +0
    -26
      debian/bsdutils.install
  57. +0
    -1
      debian/bsdutils.lintian-overrides
  58. +0
    -8
      debian/bsdutils.postinst
  59. +0
    -8
      debian/bsdutils.prerm
  60. +0
    -2
      debian/cfdisk-udeb.install
  61. +0
    -4823
      debian/changelog
  62. +0
    -1
      debian/clean
  63. +0
    -1
      debian/compat
  64. +0
    -279
      debian/control
  65. +0
    -457
      debian/copyright
  66. +0
    -3
      debian/fdisk-udeb.install
  67. +0
    -39
      debian/fstab.example2
  68. +0
    -13
      debian/gbp.conf
  69. +0
    -33
      debian/hwclock-set
  70. +0
    -40
      debian/hwclock.5
  71. +0
    -4
      debian/hwclock.rules
  72. +0
    -5
      debian/libblkid-dev.install
  73. +0
    -1
      debian/libblkid-dev.maintscript
  74. +0
    -8
      debian/libblkid-dev.postinst
  75. +0
    -8
      debian/libblkid-dev.prerm
  76. +0
    -1
      debian/libblkid1-udeb.install
  77. +0
    -1
      debian/libblkid1.install
  78. +0
    -2
      debian/libblkid1.shlibs
  79. +0
    -111
      debian/libblkid1.symbols
  80. +0
    -4
      debian/libmount-dev.install
  81. +0
    -1
      debian/libmount1-udeb.install
  82. +0
    -1
      debian/libmount1.install
  83. +0
    -2
      debian/libmount1.shlibs
  84. +0
    -271
      debian/libmount1.symbols
  85. +0
    -4
      debian/libsmartcols-dev.install
  86. +0
    -1
      debian/libsmartcols1-udeb.install
  87. +0
    -1
      debian/libsmartcols1.install
  88. +0
    -2
      debian/libsmartcols1.shlibs
  89. +0
    -106
      debian/libsmartcols1.symbols
  90. +0
    -1
      debian/libuuid1-udeb.install
  91. +0
    -1
      debian/libuuid1.install
  92. +0
    -29
      debian/libuuid1.postinst
  93. +0
    -2
      debian/libuuid1.shlibs
  94. +0
    -21
      debian/libuuid1.symbols
  95. +0
    -8
      debian/mount.NEWS
  96. +0
    -1
      debian/mount.docs
  97. +0
    -2
      debian/mount.examples
  98. +0
    -39
      debian/mount.fstab
  99. +0
    -13
      debian/mount.install
  100. +0
    -2
      debian/mount.lintian-overrides

+ 25
- 4
AUTHORS View File

@@ -1,5 +1,5 @@

utils-linux
util-linux

MAINTAINER:

@@ -83,6 +83,7 @@ CONTRIBUTORS:
Alexander Shishkin <virtuoso@slind.org>
Alexander Troosh <trush@yandex.ru>
Alexandre Peixoto Ferreira <alexandref75@gmail.com>
Alexey Galakhov <agalakhov@gmail.com>
Alexey Gladkov <gladkov.alexey@gmail.com>
Alon Bar-Lev <alon.barlev@gmail.com>
Alvaro M. Echevarria
@@ -113,11 +114,13 @@ CONTRIBUTORS:
Bastian Friedrich <bastian.friedrich@collax.com>
Ben Hutchings <ben@decadent.org.uk>
Benjamin Robin <dev@benjarobin.fr>
Benno Schulenberg <benno@vertaalt.nl>
Benjamin Romer <benjamin.romer@unisys.com>
Benno Schulenberg <bensberg@justemail.net>
Bernardo Innocenti <bernie@codewiz.org>
Bernhard Voelker <mail@bernhard-voelker.de>
Bernhard Walle <bwalle@suse.de>
Bill Pemberton <wfp5p@virginia.edu>
Bill Pemberton <wfp5p@worldbroken.com>
Bill Reynolds <bill@goshawk.lanl.gov>
Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
Björn Jacke <bj@sernet.de>
@@ -189,6 +192,7 @@ CONTRIBUTORS:
Eryu Guan <guaneryu@gmail.com>
Eugene Yunak <eugene@yunak.eu>
Fabian Groffen <grobian@gentoo.org>
Federico Simoncelli <fsimonce@redhat.com>
Flávio Leitner <fleitner@redhat.com>
Florentin Duneau <fduneau@gmail.com>
Florian Zumbiehl <florz@florz.de>
@@ -199,10 +203,12 @@ CONTRIBUTORS:
Frank Mayhar <fmayhar@google.com>
Frédéric Bothamy <frederic.bothamy@free.fr>
Frederik "Freso" S. Olesen <freso@freso.dk>
Fridolin Pokorny <fpokorny@redhat.com>
Gabor Kelemen <kelemeng@gnome.hu>
Gabriel Barazer <gabriel@oxeva.fr>
Gabriel Burt <gburt@novell.com>
Gabriel de Perthuis <g2p.code@gmail.com>
Gabriele Giacone <1o5g4r8o@gmail.com>
Gabriel M. Schuyler <schuyler@easiest.com>
Gerhard Schneider <gs@ilfb.tuwien.ac.at>
Gerrit Renker <gerrit@erg.abdn.ac.uk>
@@ -233,6 +239,7 @@ CONTRIBUTORS:
ihno <ihno@suse.de>
Ilias Mamedov <arknir@yandex.ru>
Imre Kaloz <kaloz@openwrt.org>
Ingo Brückl <ib@wupperonline.de>
Jaakko Hyvätti <HYVATTI@cc.helsinki.fi>
Jakob Unterwurzacher <jakobunt@gmail.com>
Jakub Bogusz <qboosh@pld-linux.org>
@@ -246,6 +253,7 @@ CONTRIBUTORS:
Jan (yac) Matějka <JMatejka@suse.cz>
Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Jari Aalto <jari.aalto@cante.net>
Jaromir Capik <jcapik@redhat.com>
Jason Borden <jborden@bluehost.com>
Jason Vas Dias <jvdias@redhat.com>
Jeff Mahoney <jeffm@suse.com>
@@ -265,6 +273,7 @@ CONTRIBUTORS:
Jonathan Liu <net147@gmail.com>
Jon Grant <jg@jguk.org>
Jon Ringle <jon@ringle.org>
Jörg Jenderek <joerg.jen.der.ek@gmx.net>
Joseph Parmelee <jparmele@wildbear.com>
Josep Puigdemont <josep.puigdemont@gmail.com>
Josh Triplett <josh@joshtriplett.org>
@@ -272,6 +281,7 @@ CONTRIBUTORS:
Juha Laiho <jlaiho@ichaos.nullnet.fi>
Jun Hamano <junio@shadow.twinsun.com>
Justin B Rye <jbr@edlug.org.uk>
J William Piggott <elseifthen@gmx.com>
KaiGai Kohei <kaigai@kaigai.gr.jp>
Kalev Soikonen <ksop@hot.ee>
Kay Sievers <kay.sievers@vrfy.org>
@@ -330,6 +340,7 @@ CONTRIBUTORS:
Mike Frysinger <vapier@gentoo.org>
Mike Hommey <mh@glandium.org>
Mikel Olasagasti Uranga <hey_neken@mundurat.net>
Mike Place <mp@saltstack.com>
Mikhail Gusarov <dottedmag@dottedmag.net>
Miklos Szeredi <mszeredi@suse.cz>
Milan Bouchet-Valat <nalimilan@club.fr>
@@ -347,6 +358,7 @@ CONTRIBUTORS:
Nicolai Langfeldt <janl@math.uio.no>
Nicolas Boichat <nicolas@boichat.ch>
Nicolas Provost <nprovost@quadriv.com>
Nikolay Sivov <nsivov@codeweavers.com>
Nilgün Belma Bugüner <nilgun@buguner.name.tr>
Norbert Buchmuller <norbi@nix.hu>
Oliver Falk <oliver@linux-kernel.at>
@@ -354,17 +366,20 @@ CONTRIBUTORS:
Olivier Mengué <dolmen@cpan.org>
Ondrej Oprala <ooprala@redhat.com>
Pádraig Brady <P@draigBrady.com>
Pali Rohár <pali.rohar@gmail.com>
Pascal Terjan <pterjan@mandriva.com>
Patrice Dumas <pertusus@free.fr>
Patrick Plagwitz <patrick.plagwitz@fau.de>
Paul Eggert <eggert@cs.ucla.edu>
Paul Fox <pgf@laptop.org>
Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
Paul Menzel <paulepanter@users.sourceforge.net>
Pavel Maryanov <acid_jack@ukr.net>
Pavel Maryanov <acid@jack.kiev.ua>
pcpa <paulo.cesar.pereira.de.andrade@gmail.com>
Pedro Ribeiro <p.m42.ribeiro@gmail.com>
peppe <g1pi@libero.it>
Peter Breitenlohner <peb@mppmu.mpg.de>
Peter Cordes <peter@cordes.ca>
Peter De Wachter <pdewacht@gmail.com>
Peter Jones <pjones@redhat.com>
Peter Orbaek <poe@daimi.aau.dk>
@@ -384,6 +399,7 @@ CONTRIBUTORS:
Rafael Aquini <aquini@redhat.com>
Rafael Ferreira <rafael.f.f1@gmail.com>
Raghavendra D Prabhu <rprabhu@wnohang.net>
Rainer Gerhards <rgerhards@adiscon.com>
Rajeev V. Pillai <rajeevvp@gmail.com>
Ram Pai <linuxram@us.ibm.com>
Randolph Bentson <bentson@grieg.seaslug.org>
@@ -398,7 +414,6 @@ CONTRIBUTORS:
Rick Sladkey <jrs@world.std.com>
Rik van Riel <riel@redhat.com>
Robert Förster <Dessa@gmake.de>
Robert Millan <rmh@aybabtu.com>
Robert Millan <rmh@debian.org>
Robert Schiele <rschiele@gmail.com>
Rodrigo Campos <rodrigo@sdfg.com.ar>
@@ -419,6 +434,7 @@ CONTRIBUTORS:
Scott Moser <smoser@ubuntu.com>
Scott Telford <st@epcc.ed.ac.uk>
Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Sebastian Krahmer <krahmer@suse.de>
Sergei Antonov <saproj@gmail.com>
Sergey Gusarov <laborer2008@gmail.com>
Shachar Shemesh <shachar@debian.org>
@@ -427,6 +443,7 @@ CONTRIBUTORS:
s.p@orbitalfox.com <s.p@orbitalfox.com>
Stanislav Brabec <sbrabec@suse.cz>
Stefan Krah <stefan@bytereef.org>
Stef Walter <stef@thewalter.net>
Stepan Kasal <skasal@redhat.com>
Stephan Maka <stephan@spaceboyz.net>
Stephan Müller <fruktopus@gmail.com>
@@ -434,6 +451,7 @@ CONTRIBUTORS:
Stephen Hemminger <shemminger@vyatta.com>
Stephen Tweedie <sct@dcs.ed.ac.uk>
Steve Grubb <sgrubb@redhat.com>
Steven Honeyman <stevenhoneyman@users.noreply.github.com>
Steven J. Magnani <steve@digidescorp.com>
Steven S. Dick <ssd@nevets.oau.org>
Steve Philp
@@ -455,6 +473,7 @@ CONTRIBUTORS:
Timo Warns <Warns@Pre-Sense.DE>
Tim Waugh <twaugh@redhat.com>
Tobias Klauser <tklauser@distanz.ch>
Tobias Stoeckmann <tobias@stoeckmann.org>
Tom Gundersen <teg@jklm.no>
Tomislav Krznar <tomislav.krznar@gmail.com>
Tommi Kyntola <kynde@iki.fi>
@@ -470,12 +489,14 @@ CONTRIBUTORS:
Vladimir 'φ-coder/phcoder' Serbinenko <phcoder@gmail.com>
Volker Kuhlmann <v.kuhlmann@elec.canterbury.ac.nz>
Volker Schatz <oss@volkerschatz.com>
Waldemar Brodkorb <wbx@openadk.org>
Wanlong Gao <wanlong.gao@gmail.com>
Wei-Lun Chao <bluebat@member.fsf.org>
Werner Almesberger <almesber@bernina.ethz.ch>
Werner Fink <werner@suse.de>
Wieland Hoffmann <themineo@gmail.com>
William Pitcock <nenolod@dereferenced.org>
Will Johansson <will.johansson@gmail.com>
Wolfgang Richter <wolf@cs.cmu.edu>
WUEBBELS, Josef <Josef.WUEBBELS@mtu.de>
Wylmer Wang <wantinghard@gmail.com>


+ 1
- 1
ChangeLog View File

@@ -1,3 +1,3 @@
See version control history.

http://git.kernel.org/?p=utils/util-linux/util-linux.git;a=log;h=2.25.2
http://git.kernel.org/?p=utils/util-linux/util-linux.git;a=log;h=2.26.2

+ 38
- 3
Documentation/TODO View File

@@ -1,6 +1,44 @@

Note that items with (!) have high priority.

libblkid
--------
- (!) don't use fixed set of the static buffers for TAGs in blkid_probe,
allocate all on the fly. It seems that for example btrfs is crazy enough
to have LABELs longer than we have bufferes in libblkid
https://bugzilla.redhat.com/show_bug.cgi?id=1164708

cfdisk
------
- provide additional information about the current partitions (LABEL=, UUID=,
filesystem type, size, usage, mountpoint, ...) just optionally add extra
table between main menu and list of partitions.

- (!) add auto-sort support (sort partitions automatically) and
--sort={auto,never,always} command line option. This feature should be
enabled by default for logical partitions if we created all container (extended
partition) in the current session.

agetty
-----
- support default issue (/etc/issue) output for agetty to make it agetty
usable on systems with empty /etc.

This change is little bit controversial, because now agetty prints nothing
by default and it's probably used by admins to hide information about the
system to unauthorized users. We already have --noissue to disable issue
output. The question is if admins use this option, "rm /etc/issue" is
probably easer than modify inittab (or systemd unit file).

Maybe we can implement it by --enable-agetty-default-issue compile option and
move the decision to downstream maintainers ;-)

nsenter(1)
----------
- read the default UID and GID from the target process.
http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/9553/focus=9585

hwlock
------
- use /var/lib/hwclock/drift to store hw-clock drift numbers.
@@ -95,9 +133,6 @@ libfdisk
This feature seems very attractive to users who resizing their disks
(for example in virtual machines).

- sfdisk rounds to cylinders is -uM (megabyte units) is specified, this is
pretty stupid feature. It has to round to sectors if -uS or -uM is specified.

- use off_t instead "long long"

- catch SIGINT (Ctrl-C) and return to main menu.


+ 21
- 4
Documentation/deprecated.txt View File

@@ -3,11 +3,28 @@ deprecated utils are in maintenance mode and we keep them in source tree for
backward compatibility only.


what: "swapon --summary" output format
why: does not provide control on output data formatting. The recommended solution
is to use --show=<columns> in all scripts.
what: sfdisk --show-size
why: this does not belong to fdisk, use "blockdev --getsz"

what: "pid" as binary name for "kill --pid"
--------------------------

what: sfdisk --Linux
why: unnecessary option, only Linux (non-DOS mode) is supported

--------------------------

what: sfdisk --unit
why: unnecessary option, only 'S'ector unit is supported

--------------------------

what: "swapon --summary" output format
why: does not provide control on output data formatting. The recommended solution
is to use --show=<columns> in all scripts.

--------------------------

what: "pid" as binary name for "kill --pid"
why: too ugly, too obscure

--------------------------


+ 18
- 9
Documentation/howto-contribute.txt View File

@@ -1,9 +1,7 @@
Patches

* send your patches to the mailing list or to the upstream maintainer
(see the AUTHORS and README files)

* diff -u
(see the README file in project root directory).

* don't include generated (autotools) stuff to your patches (hint:
use git clean -Xd)
@@ -12,17 +10,22 @@ Patches
distribution-neutral. No RPMs/DEBs/... are provided - get yours
from your distributor.

* patches are delivered via email only. Downloading them from
internet servers is a pain.
* patches are delivered via email or git remote repository only.
Downloading them from internet servers is a pain. See
howto-pull-request.txt for remote repository instructions.

* one patch per email, with the changelog in the body of the email.

* mail attachments are difficult. Tip:
git send-email --to util-linux@vger.kernel.org origin/master..yourbranch

* many small patches are favoured over one big. Break down is done on
basis of logical functionality; for example #endif mark ups,
compiler warning and exit codes fixes all should be individual
small patches.

* Subject: [PATCH] subsystem: description
* 'Subject: [PATCH] subsystem: description'. See also 'Patching
process'.

* if someone else wrote the patch, they should be credited (and
blamed) for it. To communicate this, add a line:
@@ -74,8 +77,8 @@ Before sending a patch
errors.

* test that previously existed program behavior is not
unintentionally alterred. If you alter the behavior tell about in
commit message.
unintentionally alterred. If you alter the behavior tell about
it in commit message.

Coding style

@@ -86,7 +89,7 @@ Coding style

* Use `FIXME:' and a good description if want to inform others
something is not quite right, and you are unwilling to fix the
issue.
issue in the submitted change.

Patching process

@@ -107,6 +110,12 @@ Patching process
are needed here and there resubmit particular patches. When
comments cause greater effect resubmit everything again.

* Mark resubmission with [PATCH v2]. Hint:
git format-patch origin/master..yourbranch --subject-prefix='PATCH v2'

* Use of remote repository for resubmission can be good idea.
See also howto-pull-request.txt

* All patch submissions, big or small, are either commented, reject,
or merge. When maintainer rejects a patch (series) it is pointless
to resubmit.


+ 4
- 2
Documentation/howto-debug.txt View File

@@ -51,8 +51,10 @@ higher the debugging level. Search for `DEBUG' from files
to see what the different bits mean. At the time of writing this the following
enabled full debug.

export LIBBLKID_DEBUG=0xffff
export LIBMOUNT_DEBUG=0xffff
export LIBBLKID_DEBUG=all
export LIBMOUNT_DEBUG=all
export LIBFDISK_DEBUG=all
export LIBSMARTCOLS_DEBUG=all

The libblkid reads by default /etc/blkid.conf which can be overridden by the
environment variable BLKID_CONF. See manual libblkid/libblkid.3 for details


+ 286
- 0
Documentation/howto-pull-request.txt View File

@@ -0,0 +1,286 @@
Introduction
------------

These instructions are wrote to contributors who tend to send lots of
changes. The basics from howto-contribute.txt file are assumed to be
read and understood by the time this file becomes useful.


Setup
-----

1. Find a git server that can be reached from anywhere in internet
anonymously. Github is for example a popular choice.

2. Create your own util-linux contributor repository, and push a upstream
clone to there.

3. In these instructions the upstream remote repository is called
'origin' and the 'yourgit' is the contributor repo.

cd ~/projects
git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
cd util-linux
git remote add yourgit git@github.com:yourlogin/util-linux.git
git push yourgit


Branches
--------

1. Use the name of the subsystem, such as blkid, libmount, misc-utils,
that is the common thing for changes in in the change set.

2. If the changes do not have anything in common use some random name,
such as YYYY-MM-DD of the first patch in the branch. Name of the branch
does not really matter that much, with one exception.

3. Do not use 'master' branch to your contributions. The 'master' branch
is needed to stay up to date with upstream.

4. When done push your branch to your remote git server.

git checkout master
git branch textual
# spent here most of the effort
git push yourbranch textual:textual

5. Do not worry if you used stupid-and-wrong branch name, it can be fixed
before submission.

git branch -m stupid-and-wrong brilliant
git push yourgit brilliant:brilliant :stupid-and-wrong


Stay up to date
---------------

1. Ensure you have the latest from all remote repositories.

2. Merge upstream 'master' branch if needed to your local 'master'.

3. Rebase your working contribution branches.

4. Push the changes to 'yourgit'.

git fetch --all
git log --graph --decorate --pretty=oneline --abbrev-commit --all

5. If you notice upstream has changed while you were busy with your
changes rebase on top of the master, but before that:

6. Push a backup of your branch 'textual' to 'yourgit', then

git checkout master
git merge origin/master
git checkout textual
git rebase master

If rebase reports conflicts fix the conflicts. In case the rebase
conflict is difficult to fix rebase --abort is good option, or recover
from 'yourgit', either way there is some serious re-work ahead with the
change set.

7. Assuming rebase went fine push the latest to 'yourgit'.

git push yourgit master:master
git push yourgit --force textual:textual

The contributor branch tends to need --force every now and then, don't be
afraid using it.

8. Push error with master branch

If 'master' needs --force then something is really messed up. In that
case it is probably the wise to abandon(*) local clone, and start all
over from cloning upstream again. Once the upstream is cloned add again
'yourgit' remote and

git push --mirror yourgit

But be WARNED. The --mirror will nuke all of your stuff had in
'yourgit', that can cause data loss. (*)So don't remove the local clone,
just move the directory to broken repos area.


Sending pull request
--------------------

1. When you are happy with your changes sleep over night. This is not a
speed competition, and for some reason looking the changes the next day
often makes one to realize how things could be improved. The best this
way you avoid changing the changes (that is always confusing).

2. Check the next day the changes compile without errors or warnings, and
that regression tests run fine.

make clean &&
make -j3 &&
make check

Notice that regression tests will not cover all possible cases, so you
most likely need to use the commands, features, and fixes you did
manually.

3. If you need to change something.

git rebase -i master
# change something
git push -f yourgit textual:textual

4. Assuming the changes look good send them to mail list. Yes, the all
of them! Sending pull request with github is not visible for project
contributors, and they will not have change to review your changes.

Sending only the pull request, i.e., not each patch, to mail-list is also
bad. Nothing is as good as seeing the changes as they are, and being
able to find them from with your favourite web search engine from
mail-list archive. Obviously the pull request content does not get
indexed, and that is why it is worse.

git format-patch --cover-letter master..textual
git request-pull upstream/master git://github.com/yourlogin/util-linux.git textual > tempfile

Take from the 'tempfile' the header:

----------------------------------------------------------------
The following changes since commit 17bf9c1c39b4f35163ec5c443b8bbd5857386ddd:

ipcrm: fix usage (2015-01-06 11:55:21 +0100)

are available in the git repository at:

git://github.com/yourlogin/util-linux.git textual
----------------------------------------------------------------

and copy paste it to 0000-cover-letter.patch file somewhere near 'BLURB
HERE'. Rest of the 'request-pull' output should be ignored.

In same go fix the Subject: line to have reasonable description, for
example

Subject: [PATCH 00/15] pull: various textual improvements


Feedback and resubmissions
--------------------------

1. Since you sent each patch to mail-list you can see which ones got to
be responded. In case the feedback will result in changes to the
submission then rebase, perform the changes, and push again to your
remote.

# you probably should use 'Stay up to date' instructions now
git checkout textual
git rebase master -i
# edit something
git add files
git commit --amend
# Add 'Reviewed-by:', 'Tested-by:', 'Signed-off-by:', 'Reference:', and
# other lines near signoff when needed. Attributing the reviewers is a
# virtue, try to do it.
git rebase --continue
git push -f yourgit textual:textual

2. Send a message to mail-list that the submitted change has changed, and
that the new version can be found from

https://github.com/yourlogin/util-linux/commit/0123456789abcdef0123456789abcdef01234567

3. There is no need to update the pull request cover letter. The project
maintainer has done enough of this stuff to know what to do.


Repository maintenance
----------------------

1. When your remote branch is merged, or you got final reject, it is time
to clean it up.

git branch textual -d
git push yourgit :textual

2. If you have other contributor repositories configured you may also
want to clean up the branches the others are done with.

for I in $(git remote); do
echo "pruning: $I"
git remote prune $I
done

3. When all of your contributions are processed you should tidy up the
git's guts.

git reflog expire --all
git gc --aggressive --prune=now

Warning. That tidying is not good idea while you are actively working
with the change set. You never know when you need to recover something
from reflog, so keep that option available until you know the reflog is
not needed.


More branches, on top of branches, on top of ...
------------------------------------------------

Here is a one way of laying out multiple branches.

git log --graph --decorate --pretty=oneline --abbrev-commit --all
* 13bfff3 (HEAD, docs-update) docs: small improvements to howto-contribute.txt
* 5435d28 (sami/more, more) more: do not call fileno() for std{in,out,err} streams
* 3e1ac04 more: remove unnecessary braces
* c19f31c more: check open(3) return value
* 651ec1b more: move skipping forewards to a function from command()
* bf0c2a7 more: move skipping backwards to a function from command()
* 53a438d more: move editor execution to a function from command()
* b11628b more: move runtime usage output away from command()
* 6cab04e more: avoid long else segment in prbuf()
* a2d9fbb more: remove 'register' keywords
* c6b2d29 more: remove pointless functions
* b41fe34 more: remove function like preprocessor defines
* 1aaa1ce more: use paths.h to find bourne shell and vi editor
* 016a019 more: return is statement, not a function
* ff7019a more: remove dead code and useless comments
* 1705c76 more: add struct more_control and remove global variables
* 3ad4868 more: reorder includes, declarations, and global variables
* 7220e9d more: remove function declarations - BRANCH STATUS: WORK IN PROGRESS
* 04b9544 (sami/script) script: add noreturn function attributes
* e7b8d50 script: use gettime_monotonic() to get timing file timestamps
* 11289d2 script: use correct input type, move comment, and so on
* 524e3e7 script: replace strftime() workaround with CFLAGS = -Wno-format-y2k
* 0465e7f script: move do_io() content to small functions
* 751edca script: add 'Script started' line always to capture file
* f831657 script: remove io vs signal race
* eefc1b7 script: merge doinput() and output() functions to do_io()
* 9eba044 script: use poll() rather than select()
* a6f04ef script: use signalfd() to catch signals
* 4a86d9c script: add struct script_control and remove global variables
* d1cf19c script: remove function prototypes
* 6a7dce9 (sami/2015wk00) fsck.minix: fix segmentation fault
* 5e3bcf7 lslocks: fix type warning
* 3904423 maint: fix shadow declarations
* 17bf9c1 (upstream/master, sami/master, kzgh/master, master) ipcrm: fix usage
[...]

The above gives a hint to maintainer what is the preferred merge order.
The branches '2015wk00' and 'script' are ready to be merged, and they
were sent to mail-list.

The 'more' branch was not submitted at the time of writing this text.
Mark-up the branch is not ready is clearly marked in the commit subject,
that will need some rebaseing to before submission.

Good order of the branches is;

1. First the minor & safe changes.
2. Then the ready but less certain stuff.
3. Followed by work-in-progress.

If you go down this route you will get used to typing a lot of

git rebase previous-branch
git push -f yourgit branch:branch

Alternatively rebase each branch on top of origin/master, which is not
quite as good. How do you ensure your own changes are not in conflict
with each other? And there is no hint of preferred merging order.

+ 1
- 1
Documentation/releases/v2.25-ReleaseNotes View File

@@ -203,7 +203,7 @@ cal:
- mention where Gregorian reformation happen in September 1752 [Sami Kerola]
- remove optional from short arg -w [Tommi Kyntola]
- remove unnecessary static variables [Sami Kerola]
- remove unnused structure and definition [Sami Kerola]
- remove unused structure and definition [Sami Kerola]
- rename ascii_wnum() to ascii_weeknum() [Sami Kerola]
- simplify ascii_weeknum() function [Sami Kerola]
- use control structure for run time configuration [Sami Kerola]


+ 0
- 71
Documentation/releases/v2.25.1-ReleaseNotes View File

@@ -1,71 +0,0 @@
Util-linux 2.25.1 Release Notes
===============================

build-sys:
- create parent directory for $(PATHFILES) [Michael Marineau]
- fix double prefix with explict --libdir [Christoph Junghans]
- fix switch_root/pivot_root cut-n-paste error in configure.ac [Andreas Henriksson]
- release++ (v2.25.1-rc1) [Karel Zak]
cfdisk:
- fix typo in the previous commit [Karel Zak]
- reenable cursor when quitting [Karel Zak]
- wrong interpretation of yes in non-english language [Karel Zak]
docs:
- update AUTHORS file [Karel Zak]
- update v2.25.1-ReleaseNotes [Karel Zak]
fdisk:
- always print warning for mis-aligned partitions [Karel Zak]
- fix -l [<device>] [Karel Zak]
- update tests and clean up output [Karel Zak]
hexdump:
- Fix parse format of "byte count without repetition count" [HUANG Wei]
hwclock:
- check for permissions before use clock interface [Karel Zak]
- use pluralized translations. [Lauri Nurmi]
libblkid:
- (gpt) fix PT offset [Karel Zak]
- (gpt) use real sector size to set PTMAGIC_OFFSET [Karel Zak]
libfdisk:
- (dos) fix logical partitions add/delete code [Karel Zak]
- (gpt) add Microsoft Storage Spaces GUID [Sergei Antonov]
- (gpt) allow to specify attr bit by API [Karel Zak]
libmount:
- use -t for type.subtype in helpers API [Karel Zak]
lscpu:
- clean up vmware inline asm [Mike Frysinger]
mcookie:
- avoid format warning [Bernhard Voelker]
more:
- replace ad-hoc support for plurals with gettext plurals. [Lauri Nurmi]
po:
- merge changes [Karel Zak]
- update cs.po (from translationproject.org) [Petr Písař]
- update da.po (from translationproject.org) [Joe Hansen]
- update de.po (from translationproject.org) [Mario Blättermann]
- update es.po (from translationproject.org) [Antonio Ceballos Roa]
- update fr.po (from translationproject.org) [David Prévot]
- update nl.po (from translationproject.org) [Benno Schulenberg]
- update pl.po (from translationproject.org) [Jakub Bogusz]
- update pt_BR.po (from translationproject.org) [Rafael Ferreira]
- update uk.po (from translationproject.org) [Yuri Chornoivan]
- update vi.po (from translationproject.org) [Trần Ngọc Quân]
- update zh_CN.po (from translationproject.org) [Wylmer Wang]
- update zh_TW.po (from translationproject.org) [Wei-Lun Chao]
sfdisk:
- use pluralized translation. [Lauri Nurmi]
swapon:
- remove invalid error string print outs [Sami Kerola]
tests:
- Fall back on host/getent in ts_resolve_host [Andreas Henriksson]
- allow non-inotify tailf to keep up [Andreas Henriksson]
- apply travis clang PATH workaround [Sami Kerola]
- fix fdisk/bsd for the two possible sectors/offsets [Aurelien Jarno]
- kill output message change [Sami Kerola]
- make ipcs limit calculations work when numbers are large [Sami Kerola]
textual:
- fix some typos and inconsistencies in various messages [Benno Schulenberg]
- remove some inconsistent periods from error messages [Benno Schulenberg]
various:
- erase all traces of the long-obsolete xiafs [Benno Schulenberg]

- erase all traces of the long-obsolete xiafs [Benno Schulenberg]

+ 0
- 85
Documentation/releases/v2.25.2-ReleaseNotes View File

@@ -1,85 +0,0 @@
Util-linux 2.25.2 Release Notes
===============================

agetty:
- fixing FTBFS on !linux (Debian util-linux 2.20.1-1.2) [Christoph Egger]
blkdiscard:
- fix err->errx() [Karel Zak]
- fix underflow when offset is greater than device size [Raphael S. Carvalho]
blkid:
- remove extra trailing spaces in output [Karel Zak]
build-sys:
- build libmount everywhere [Andreas Henriksson]
- check for libtoolize rather than libtool [Helmut Grohne]
- use -lutil for BSD only [Karel Zak]
cal:
- `color` option documentation should match actual behaviour [Eugene Yunak]
cfdisk:
- don't modify ncurses LINES and COLS [Karel Zak]
docs:
- fix mess in Release notes [Karel Zak]
- remove obsolete READMEs for (s)fdisk [Karel Zak]
- update AUTHORS file [Karel Zak]
fdisk:
- add section about sizes to the man page [Karel Zak]
flock:
- zero timeout is valid [Karel Zak]
hexdump:
- remove deprecation message [Sami Kerola]
hwclock:
- use fabs() instead abs() when argument is double [Sami Kerola]
ipcrm:
- add hacks to avoid FTBFS [Andreas Henriksson]
ipcs:
- remaining kFreeBSD hackery for building. [Aurelien Jarno]
last:
- make is_phantom() when kernel config does not include audit support [Sami Kerola]
lib/blkdev:
- report correct disk size on GNU/kFreeBSD. Thanks Tuco. [Robert Millan]
libblkid:
- zeroize errno on blkid_probe_get_buffer() success [Karel Zak]
libfdisk:
- fix add_logical() assert [Karel Zak]
- make yes/no dialogs more robust [Karel Zak]
libmount:
- don't return root if path contains // or ending / [Søren Holm]
- fix mnt_is_readonly() #ifdef [Karel Zak]
- hide details about failed search in fstab/mtab [Karel Zak]
- only include context on linux [Andreas Henriksson]
- only invoke loopcxt on linux [Andreas Henriksson]
linfdisk:
- cleanup fsync usage [Karel Zak]
logger:
- gettimeofday needs <sys/time.h> [Andreas Henriksson]
losetup:
- improve man page -D docs [Karel Zak]
lsblk:
- add notes about udev to the man page [Karel Zak]
lscpu:
- fix cppcheck warnings [Boris Egorov]
lslogins:
- cleanup after error [coverity scan] [Karel Zak]
- free after error [coverity scan] [Karel Zak]
mkfs.minix:
- fix couple compiler warnings [Sami Kerola]
mount:
- don't ignore mtab for --bind -o remount [Karel Zak]
- improve --move docs [Karel Zak]
po:
- merge changes [Karel Zak]
- update es.po (from translationproject.org) [Antonio Ceballos Roa]
script:
- may be hangs [Andreas Henriksson]
setterm:
- fix dubious one-bit signed bitfield [smatch scan] [Sami Kerola]
su:
- print proper core dump message when killed [pcpa]
terminal-colors.d:
- fix filter by name [Karel Zak]
tests:
- fix the ipcs test for shmall being too big to show [Karel Zak]
umount:
- read mountinfo if --detach-loop given [Robert Schiele]
whereis:
- cleanup debug stuff, fix argv[] usage [Karel Zak]
- reset search mask more carefully [Karel Zak]

+ 1042
- 0
Documentation/releases/v2.26-ReleaseNotes
File diff suppressed because it is too large
View File


+ 68
- 0
Documentation/releases/v2.26.1-ReleaseNotes View File

@@ -0,0 +1,68 @@
Util-linux 2.26.1 Release Notes
===============================

agetty:
- make sure that reload file exists [Karel Zak]
- reload issue on --autologin --login-pause too [Karel Zak]
- support /usr/lib/os-release too [Karel Zak]
build-sys:
- add --disable-colors-default [Karel Zak]
cal:
- care about setuprterm() result [Karel Zak]
colors:
- cleanup man pages, add hint to usage() [Karel Zak]
docs:
- fix some spelling errors and typos in man pages [Bill Pemberton]
- fstab(5) grammar / English fixes, and some other updates [Peter Cordes]
- update AUTHORS file [Karel Zak]
findmnt:
- don't rely on st_dev for --target [Karel Zak]
last:
- fix utmplist usage [Karel Zak]
lib/colors:
- add USAGE_COLORS_DEFAULT [Karel Zak]
libfdisk:
- add {first,last}-lba header to sfdisk scritps [Karel Zak]
libmount:
- add mnt_table_get_fs_root() to header file [Karel Zak]
- cleanup fs root detection code [Karel Zak]
- mark overlay as pseudo-FS [Karel Zak]
logger:
- add --msgid option, permits to set RFC5424 MSGID field [Rainer Gerhards]
- add --skip-empty to prevent logging empty lines [Rainer Gerhards]
- add comment [Karel Zak]
- bugfix missing sanity checks with --prio-prefix option [Rainer Gerhards]
- bugfix tcp syslog framing is broken, -T unusable [Rainer Gerhards]
- check for ntp_gettime() rather than for timex.h [Karel Zak]
- fix -i argument parsing regression [Sami Kerola]
- fix -p kern.* priority is accepted regression [Rainer Gerhards]
- fix inconsistent format regression when logging locally [Rainer Gerhards]
- fix invalid timestamp in rfc5425 format [Rainer Gerhards]
- fix invalid timestamp regression in local format [Rainer Gerhards]
- fix multiple format bugs in rfc5424 formatter [Rainer Gerhards]
- fix whitespace and compiler warning [-Wunused-variable] [Karel Zak]
- link libsystemd-daemon.so [Ruediger Meier]
- messages are logged with kern.* priority by default [Rainer Gerhards]
- move /dev/log to pathnames.h [Sami Kerola]
- permit to send messages larger than 1024 characters [Rainer Gerhards]
- refactor message generation [Rainer Gerhards]
- refactor the way output is written [Rainer Gerhards]
- remove "interface to syslog(3)" from man page [Karel Zak]
- small change in usage() [Karel Zak]
- use username as the default tag [Karel Zak]
- use xstrdup() [Karel Zak]
logger man page:
- bump man page date to current [Rainer Gerhards]
- fix some "syslog(3) routine" remnants [Rainer Gerhards]
- fix typo [Rainer Gerhards]
- update --size doc [Rainer Gerhards]
po:
- merge changes [Karel Zak]
sfdisk:
- add missing --color [Karel Zak]
tests:
- fix fdisk/bsd for ppc64le [Ruediger Meier]
- improve readability for fdisk/bsd [Ruediger Meier]
- update sfdisk --dump test [Karel Zak]

- silence compiler warning [Rainer Gerhards]

+ 126
- 0
Documentation/releases/v2.26.2-ReleaseNotes View File

@@ -0,0 +1,126 @@
util-linux 2.26.2 Release Notes
===============================

blockdev:
- fix whole-disk start sector usage [Karel Zak]
build-sys:
- add new compiler warnings [Karel Zak]
- define cfdisk dependence on open_memstream [Karel Zak]
- ncurses is optional, don't fail when missing [Karel Zak]
- python is optional, don't fail when missing [Karel Zak]
dmesg:
- fix shadow declaration [Sami Kerola]
docs:
- update AUTHORS file [Karel Zak]
fdisk, sfdisk:
- fix -o <list> backend [Karel Zak]
fsck:
- fix fsck -C {fd} parsing [Stanislav Brabec]
hwclock:
- Remove TZUTC [J William Piggott]
- flush stdout in hwclock -c [Alexey Galakhov]
- regression fix [J William Piggott]
last:
- fix first (current) runlevel line [Ruediger Meier]
lib/strutils:
- fix string_add_to_idarray() int vs. size_t [Karel Zak]
lib/sysfs.c:
- use fcntl(..F_DUPFD_CLOEXEC) instead of dup(2) [Cristian Rodríguez]
libblkid:
- fix compiler warnings [Sami Kerola]
libfdisk:
- (dos) retain existing boot flag when resizing a partition [Karel Zak, awilliam@redhat.co]
- (gpt) add extra check for First/Last LBA [Karel Zak]
- (gpt) check header size before verify CRC [Karel Zak]
- (gpt) fix LE usage [Karel Zak]
- (gpt) fix end sector calculation on resize [Karel Zak]
- add fdisk_table_get_partition_by_partno() [Karel Zak]
- add warning to resize function [Karel Zak]
- allow to move start to first usable LBA [Karel Zak]
- don't resize in label drivers [Karel Zak]
- don't return empty strings from fdisk_partition_to_string() [Karel Zak]
- fix script parser to support resize operations [Karel Zak]
- fix scriptk parser to support alone signs [Karel Zak]
- fix symbols versioning script [Karel Zak]
- recognize FAT32 partitions hidden by Acronis software [Jörg Jenderek]
- support bootbits protection from (p)MBR [Karel Zak]
- support resize operation in fdisk_set_partition() [Karel Zak]
libmount:
- add note about flock() to docs [Karel Zak]
- add support for MS_LAZYTIME [Karel Zak]
logger:
- --stderr and --no-act turn "auto-errors" on [Ruediger Meier]
- Fix use of errno after strtol() without zeroing first [Stef Walter]
- add --no-act for testing [Karel Zak]
- add -DTEST_LOGGER [Karel Zak]
- check xgethostname() return value [Sami Kerola]
- fix LOGGER_TEST_TIMEOFDAY check [Karel Zak]
- fix memory leaks [Sami Kerola]
- fix rfc5424 format crash [Karel Zak]
- generate header when reading message from stdin [Patrick Plagwitz]
- tidy few indentation issues [Sami Kerola]
- use errx() when checking user input [Sami Kerola]
lsblk:
- add debug support [Karel Zak]
- don't ignore dependences for partitioned devies [Karel Zak]
- follow kernel for inverse tree [Karel Zak]
mount:
- don't remount read-only on --bind [Karel Zak]
- fix lazytime docs [Karel Zak]
po:
- merge changes [Karel Zak]
- update da.po (from translationproject.org) [Joe Hansen]
- update ja.po (from translationproject.org) [Takeshi Hamasaki]
setarch:
- fix regression for sparc builds [Waldemar Brodkorb]
sfdisk:
- accept empty partitions from dump [Karel Zak]
- don't use BLKRRPART to check loopdev usage [Karel Zak]
- enable bootbits protection [Karel Zak]
- fix -a vs. -A bug [Karel Zak]
- improve -N warnings [Karel Zak]
tests:
- add --skip-loopdevs [Karel Zak]
- add logger(1) command line options tests [Sami Kerola]
- add logger(1) error condition tests [Sami Kerola]
- add logger(1) journald test [Sami Kerola]
- add logger(1) message format tests [Sami Kerola]
- add old dump for sfdisk [Karel Zak]
- add sfdisk resize regression tests for MBR [Karel Zak]
- add sfdisk resize tests [Karel Zak]
- add sfdisk resize tests for GPT [Karel Zak]
- add subtests for invalid logger devive [Ruediger Meier]
- avoid &>> for bash compatibility [Ruediger Meier]
- config.h lives in build directory [Ruediger Meier]
- fix cramfs/mkfs for BE and different pagesizes [Ruediger Meier]
- fix getopt for old glibc [Ruediger Meier]
- fix logger device pathname too long [Ruediger Meier]
- fix sfdisk GPT test [Karel Zak]
- fix, don't call ts_die from subshell [Ruediger Meier]
- introduce TS_LOOP_DEVS for cleanup [Ruediger Meier]
- introduce ts_cleanup_on_exit() [Ruediger Meier]
- logger with socat device [Ruediger Meier]
- logger, validate written socket data [Ruediger Meier]
- logger/errors does not use --no-act [Ruediger Meier]
- loop tests, don't call ts_die() with DEVICE parameter [Ruediger Meier]
- make libmount context tests sensitive to USE_LIBMOUNT_FORCE_MOUNTINFO [Karel Zak]
- make libmount python context tests sensitive to USE_LIBMOUNT_FORCE_MOUNTINFO [Karel Zak]
- more(1) depends on terminal, force to TERM=linux [Karel Zak]
- mount/rlimit tries to restore mtab [Ruediger Meier]
- never use -o pipefail [Ruediger Meier]
- optionally skip tests where loop support is needed [Ruediger Meier]
- require wipefs for sfdisk/gpt [Karel Zak]
- scsi_debug tests, don't call ts_die() with DEVICE parameter [Ruediger Meier]
- simplify common logger options [Ruediger Meier]
- start script/race test only when --force specified [Karel Zak]
- ts_scsi_debug_init() sleeps a bit earlier [Ruediger Meier]
- use --no-act for logger tests [Karel Zak]
- use ts_skip for logger/journald [Karel Zak]
- verify logger return value [Ruediger Meier]
travis:
- add MAKE_CHECK_OPTS [Karel Zak]
- install socat >= 1.7.2 [Ruediger Meier]
- move install script to .travis-functions.sh [Ruediger Meier]
- whitelist travis* branches [Ruediger Meier]
whereis:
- trivial spelling and grammar fix [Mike Place]

+ 12
- 3
Makefile.am View File

@@ -18,14 +18,15 @@ LDADD = $(LTLIBINTL)
dist_noinst_DATA = $(dist_man_MANS)

# Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) Note
# that blkid.h, libmount.h and libsmartcols.h are generated and stored in build
# dirs.
# that blkid.h, libmount.h, libfdisk.h and libsmartcols.h are generated and
# stored in build dirs.
#
ul_libblkid_incdir = $(top_builddir)/libblkid/src
ul_libmount_incdir = $(top_builddir)/libmount/src
ul_libsmartcols_incdir = $(top_builddir)/libsmartcols/src
ul_libfdisk_incdir = $(top_builddir)/libfdisk/src

ul_libuuid_incdir = $(top_srcdir)/libuuid/src
ul_libfdisk_incdir = $(top_srcdir)/libfdisk/src

pkgconfigdir = $(usrlib_execdir)/pkgconfig

@@ -120,7 +121,15 @@ edit_cmd = sed \
-e 's|@ADJTIME_PATH[@]|$(ADJTIME_PATH)|g' \
-e 's|@LIBUUID_VERSION[@]|$(LIBUUID_VERSION)|g' \
-e 's|@LIBMOUNT_VERSION[@]|$(LIBMOUNT_VERSION)|g' \
-e 's|@LIBMOUNT_MAJOR_VERSION[@]|$(LIBMOUNT_MAJOR_VERSION)|g' \
-e 's|@LIBMOUNT_MINOR_VERSION[@]|$(LIBMOUNT_MINOR_VERSION)|g' \
-e 's|@LIBMOUNT_PATCH_VERSION[@]|$(LIBMOUNT_PATCH_VERSION)|g' \
-e 's|@LIBSMARTCOLS_VERSION[@]|$(LIBSMARTCOLS_VERSION)|g' \
-e 's|@LIBFDISK_PC_REQUIRES[@]|$(LIBFDISK_PC_REQUIRES)|g' \
-e 's|@LIBFDISK_VERSION[@]|$(LIBFDISK_VERSION)|g' \
-e 's|@LIBFDISK_MAJOR_VERSION[@]|$(LIBFDISK_MAJOR_VERSION)|g' \
-e 's|@LIBFDISK_MINOR_VERSION[@]|$(LIBFDISK_MINOR_VERSION)|g' \
-e 's|@LIBFDISK_PATCH_VERSION[@]|$(LIBFDISK_PATCH_VERSION)|g' \
-e 's|@LIBBLKID_VERSION[@]|$(LIBBLKID_VERSION)|g'

CLEANFILES += $(PATHFILES)


+ 1638
- 943
Makefile.in
File diff suppressed because it is too large
View File


+ 67
- 63
NEWS View File

@@ -1,189 +1,193 @@
util-linux 2.25.2: Oct 24 2014
* see Documentation/releases/v2.25.2-ReleaseNotes or complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/v2.25.2-ChangeLog
util-linux 2.26.2: Apr 30 2015
* see Documentation/releases/v2.26.2-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/v2.26.2-ChangeLog

util-linux 2.25.1: Sep 3 2014
* see Documentation/releases/v2.25.1-ReleaseNotes or complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/v2.25.1-ChangeLog
util-linux 2.26.1: Mar 13 2015
* see Documentation/releases/v2.26.1-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/v2.26.1-ChangeLog

util-linux 2.25.1-rc1: Aug 27 2014
* see Documentation/releases/v2.25.1-ReleaseNotes or complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/v2.25.1-rc1-ChangeLog
util-linux 2.26: Feb 19 2015
* see Documentation/releases/v2.26-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/v2.26-ChangeLog

util-linux 2.26-rc2: Feb 4 2015
* see Documentation/releases/v2.26-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/v2.26-rc2-ChangeLog

util-linux 2.26-rc1: Jan 14 2015
* see Documentation/releases/v2.26-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.26/v2.26-rc1-ChangeLog

util-linux 2.25: Jul 22 2014
* see Documentation/releases/v2.25-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.25-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/v2.25-ChangeLog

util-linux 2.25-rc2: Jul 2 2014
* see Documentation/releases/v2.25-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.25-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/v2.25-rc2-ChangeLog

util-linux 2.25-rc1: Jun 18 2014
* see Documentation/releases/v2.25-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.25-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/v2.25-rc1-ChangeLog

util-linux 2.24: Oct 21 2013
* see Documentation/releases/v2.24-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.24-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/v2.24-ChangeLog

util-linux 2.24-rc2: Oct 11 2013
* see Documentation/releases/v2.24-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.24-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/v2.24-rc2-ChangeLog

util-linux 2.24-rc1: Sep 27 2013
* see Documentation/releases/v2.24-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.24-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/v2.24-rc1-ChangeLog

util-linux 2.23: Apr 25 2013
* see Documentation/releases/v2.23-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.23-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23-ChangeLog

util-linux 2.23-rc2: Apr 10 2013
* see Documentation/releases/v2.23-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.23-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23-rc2-ChangeLog

util-linux 2.23-rc1: Mar 22 2013
* see Documentation/releases/v2.23-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.23-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23-rc1-ChangeLog

util-linux 2.22: Sep 04 2012
* see Documentation/releases/v2.22-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.22-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/v2.22-ChangeLog

util-linux 2.22-rc2: Aug 15 2012
* see Documentation/releases/v2.22-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.22-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/v2.22-rc2-ChangeLog

util-linux 2.22-rc1: Jul 27 2012
* see Documentation/releases/v2.22-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.22-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/v2.22-rc1-ChangeLog

util-linux 2.21: Feb 24 2012
* see Documentation/releases/v2.21-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.21-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/v2.21-ChangeLog

util-linux 2.21-rc2: Feb 06 2012
* see Documentation/releases/v2.21-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.21-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/v2.21-rc2-ChangeLog

util-linux 2.21-rc1: Jan 18 2012
* see Documentation/releases/v2.21-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.21-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.21/v2.21-rc1-ChangeLog

util-linux 2.20: Aug 29 2011
* see docs/v2.20-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.20-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-ChangeLog

util-linux 2.20-rc2: Aug 17 2011
* see docs/v2.20-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.20-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-rc2-ChangeLog

util-linux 2.20-rc1: Jul 29 2011
* see Documentation/releases/v2.20-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.20-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-rc1-ChangeLog

util-linux 2.19: Feb 10 2011
* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.19-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-ChangeLog

util-linux 2.19-rc3: Jan 25 2011
* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.19-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc3-ChangeLog

util-linux 2.19-rc2: Jan 25 2011
* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.19-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc2-ChangeLog

util-linux 2.19-rc1: Jan 05 2011
* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.19-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc1-ChangeLog

util-linux-ng 2.18: Jun 30 2010
* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.18-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.18/v2.18-ChangeLog

util-linux-ng 2.18-rc2: Jun 18 2010
* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.18-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.18/v2.18-rc2-ChangeLog

util-linux-ng 2.18-rc1: Jun 7 2010
* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.18-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.18/v2.18-rc1-ChangeLog

util-linux-ng 2.17: Jan 8 2010
* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.17-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17-ChangeLog

util-linux-ng 2.17-rc3: Dec 10 2009
* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.17-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17-rc3-ChangeLog

util-linux-ng 2.17-rc2: Dec 9 2009
* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.17-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17-rc2-ChangeLog

util-linux-ng 2.17-rc1: Nov 20 2009
* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.17-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17-rc1-ChangeLog

util-linux-ng 2.16: Jul 2009
* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.16-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/v2.16-ChangeLog

util-linux-ng 2.16-rc2: Jul 2 2009
* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.16-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/v2.16-rc2-ChangeLog

util-linux-ng 2.16-rc1: Jun 28 2009
* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.16-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/v2.16-rc1-ChangeLog

util-linux-ng 2.15: May 5 2009
* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.15-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.15/v2.15-ChangeLog

util-linux-ng 2.15-rc2: Apr 17 2009
* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.15-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.15/v2.15-rc2-ChangeLog

util-linux-ng 2.15-rc1: Mar 18 2009
* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.15-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.15/v2.15-rc1-ChangeLog

util-linux-ng 2.14: Jun 9 2008
* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at
* see Documentation/releases/v2.14-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14-ChangeLog

util-linux-ng 2.14-rc3
* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at
util-linux-ng 2.14-rc3: May 19 2008
* see Documentation/releases/v2.14-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14-rc3-ChangeLog

util-linux-ng 2.14-rc2
* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at
util-linux-ng 2.14-rc2: Apr 28 2008
* see Documentation/releases/v2.14-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14-rc2-ChangeLog

util-linux-ng 2.14-rc1
* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at
util-linux-ng 2.14-rc1: Apr 16 2008
* see Documentation/releases/v2.14-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14-rc1-ChangeLog

util-linux-ng 2.13

* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at
util-linux-ng 2.13: Aug 28 2007
* see Documentation/releases/v2.13-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13-ChangeLog

util-linux-ng 2.13-rc3

* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at
util-linux-ng 2.13-rc3: Aug 8 2007
* see Documentation/releases/v2.13-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13-rc3-ChangeLog

util-linux-ng 2.13-rc2

* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at
util-linux-ng 2.13-rc2: Jul 17 2007
* see Documentation/releases/v2.13-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13-rc2-ChangeLog

util-linux-ng 2.13-rc1

* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at
util-linux-ng 2.13-rc1: Jul 4 2007
* see Documentation/releases/v2.13-ReleaseNotes or the complete changelog at
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13-rc1-ChangeLog

util-linux 2.13-pre7


+ 99
- 38
aclocal.m4 View File

@@ -1,4 +1,4 @@
# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
# generated automatically by aclocal 1.14.1 -*- Autoconf -*-

# Copyright (C) 1996-2013 Free Software Foundation, Inc.

@@ -247,10 +247,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.13'
[am__api_version='1.14'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.13.4], [],
m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])

@@ -266,7 +266,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.13.4])dnl
[AM_AUTOMAKE_VERSION([1.14.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -633,6 +633,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.

dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
m4_define([AC_PROG_CC],
m4_defn([AC_PROG_CC])
[_AM_PROG_CC_C_O
])

# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
# AM_INIT_AUTOMAKE([OPTIONS])
# -----------------------------------------------
@@ -741,7 +747,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])

# POSIX will say in a future version that running "rm -f" with no argument
# is OK; and we want to be able to make that assumption in our Makefile
# recipes. So use an aggressive probe to check that the usage we want is
# actually supported "in the wild" to an acceptable degree.
# See automake bug#10828.
# To make any issue more visible, cause the running configure to be aborted
# by default if the 'rm' program in use doesn't match our expectations; the
# user can still override this though.
if rm -f && rm -fr && rm -rf; then : OK; else
cat >&2 <<'END'
Oops!

Your 'rm' program seems unable to run without file operands specified
on the command line, even when the '-f' option is present. This is contrary
to the behaviour of most rm programs out there, and not conforming with
the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>

Please tell bug-automake@gnu.org about your system, including the value
of your $PATH and any error possibly output before this message. This
can help us improve future automake versions.

END
if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
echo 'Configuration will proceed anyway, since you have set the' >&2
echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
echo >&2
else
cat >&2 <<'END'
Aborting the configuration process, to ensure you take notice of the issue.

You can download and install GNU coreutils to get an 'rm' implementation
that behaves properly: <http://www.gnu.org/software/coreutils/>.

If you want to complete the configuration process using your problematic
'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
to "yes", and re-run configure.

END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
fi])

dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -749,7 +796,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])


# When config.status generates a header, we must update the stamp-h file.
# This file resides in the same directory as the config header
# that is generated. The stamp files are numbered to have different names.
@@ -861,38 +907,6 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])

# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
AC_DEFUN([AM_PROG_CC_C_O],
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([compile])dnl
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
if test "$am_t" != yes; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
dnl Make sure AC_PROG_CC is never called again, or it will override our
dnl setting of CC.
m4_define([AC_PROG_CC],
[m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
])

# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

# Copyright (C) 1997-2013 Free Software Foundation, Inc.
@@ -969,6 +983,53 @@ AC_DEFUN([_AM_IF_OPTION],
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.

# _AM_PROG_CC_C_O
# ---------------
# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
# to automatically call this.
AC_DEFUN([_AM_PROG_CC_C_O],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([compile])dnl
AC_LANG_PUSH([C])dnl
AC_CACHE_CHECK(
[whether $CC understands -c and -o together],
[am_cv_prog_cc_c_o],
[AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
# Make sure it works both with $CC and with simple cc.
# Following AC_PROG_CC_C_O, we do the test twice because some
# compilers refuse to overwrite an existing .o file with -o,
# though they will create one.
am_cv_prog_cc_c_o=yes
for am_i in 1 2; do
if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
&& test -f conftest2.$ac_objext; then
: OK
else
am_cv_prog_cc_c_o=no
break
fi
done
rm -f core conftest*
unset am_i])
if test "$am_cv_prog_cc_c_o" != yes; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
AC_LANG_POP([C])])

# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])

# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.


# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# ---------------------------------------------------------------------------


+ 9
- 9
autogen.sh View File

@@ -24,7 +24,7 @@ autopoint_fun ()
sed -n -e 's/.* \(0\.18\|0\.18\.[1-2]\)$/\1/p'`

if [ -n "$gt_ver" ]; then
echo "warning, force autopoint to use old gettext $gt_ver"
echo "warning: forcing autopoint to use old gettext $gt_ver"
rm -f configure.ac.autogenbak
sed -i.autogenbak configure.ac \
-e "s/\(AM_GNU_GETTEXT_VERSION\).*/\1([$gt_ver])/"
@@ -41,41 +41,41 @@ autopoint_fun ()

test -f sys-utils/mount.c || {
echo
echo "You must run this script in the top-level util-linux directory"
echo "You must run this script in the top-level util-linux directory."
echo
DIE=1
}

(autopoint --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autopoint installed to generate util-linux build system."
echo "You must have autopoint installed to generate the util-linux build system."
echo "The autopoint command is part of the GNU gettext package."
echo
DIE=1
}
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to generate util-linux build system."
echo "You must have autoconf installed to generate the util-linux build system."
echo
DIE=1
}
(autoheader --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoheader installed to generate util-linux build system."
echo "You must have autoheader installed to generate the util-linux build system."
echo "The autoheader command is part of the GNU autoconf package."
echo
DIE=1
}
(libtoolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have libtool-2 installed to generate util-linux build system."
echo "You must have libtool-2 installed to generate the util-linux build system."
echo
DIE=1
}
(automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake installed to generate util-linux build system."
echo
echo "You must have automake installed to generate the util-linux build system."
echo
DIE=1
}

@@ -91,7 +91,7 @@ if test "$DIE" -eq 1; then
fi

echo
echo "Generate build-system by:"
echo "Generating build-system with:"
echo " autopoint: $(autopoint --version | head -1)"
echo " aclocal: $(aclocal --version | head -1)"
echo " autoconf: $(autoconf --version | head -1)"


+ 7
- 0
bash-completion/Makemodule.am View File

@@ -154,7 +154,11 @@ endif

if BUILD_RUNUSER
install-data-hook-bashcomp-runuser::
if BUILD_SU
ln -sf su $(DESTDIR)$(bashcompletiondir)/runuser
else
cp $(top_srcdir)/bash-completion/su $(DESTDIR)$(bashcompletiondir)/runuser
endif
INSTALL_DATA_HOOKS += install-data-hook-bashcomp-runuser
endif

@@ -252,6 +256,9 @@ endif
if BUILD_SETARCH
dist_bashcompletion_DATA += bash-completion/setarch
endif
if BUILD_ZRAMCTL
dist_bashcompletion_DATA += bash-completion/zramctl
endif

if BUILD_MESG
dist_bashcompletion_DATA += bash-completion/mesg


+ 1
- 3
bash-completion/addpart View File

@@ -5,9 +5,7 @@ _addpart_module()
cur="${COMP_WORDS[COMP_CWORD]}"
case $COMP_CWORD in
1)
local DEVS=''
while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
OPTS="--help --version $DEVS"
OPTS="--help --version $(lsblk -pnro name)"
COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
;;
2)


+ 1
- 3
bash-completion/blkdiscard View File

@@ -20,9 +20,7 @@ _blkdiscard_module()
return 0
;;
esac
local DEVS
DEVS=''; while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
COMPREPLY=( $(compgen -W "$DEVS" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
return 0
}
complete -F _blkdiscard_module blkdiscard

+ 1
- 5
bash-completion/blkid View File

@@ -58,11 +58,7 @@ _blkid_module()
return 0
;;
esac
local DEV TYPE DEVICES=''
while read DEV TYPE; do
[ $TYPE = 'part' ] && DEVICES+="$DEV "
done < <(lsblk -pnro name,type)
COMPREPLY=( $(compgen -W "$DEVICES" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
return 0
}
complete -F _blkid_module blkid

+ 1
- 1
bash-completion/blockdev View File

@@ -4,7 +4,7 @@ _blockdev_module()
COMPREPLY=()
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
DEVS="$(lsblk -pnro name)"
OPTS="-h -V -q
--report
--getsz


+ 1
- 5
bash-completion/cfdisk View File

@@ -23,11 +23,7 @@ _cfdisk_module()
return 0
;;
esac
local DEV TYPE DEVICES=''
while read DEV TYPE; do
[ $TYPE = 'disk' ] && DEVICES+="$DEV "
done < <(lsblk -pnro "name,type")
COMPREPLY=( $(compgen -W "$DEVICES" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
return 0
}
complete -F _cfdisk_module cfdisk

+ 1
- 1
bash-completion/chsh View File

@@ -6,7 +6,7 @@ _chsh_module()
prev="${COMP_WORDS[COMP_CWORD-1]}"
case $prev in
'-s'|'--shell')
COMPREPLY=( $(compgen -W "$(chsh -l)" -- $cur) )
COMPREPLY=( $(compgen -W "$($1 -l)" -- $cur) )
return 0
;;
'-u'|'--help'|'-v'|'--version')


+ 1
- 5
bash-completion/delpart View File

@@ -11,11 +11,7 @@ _delpart_module()
esac
case $COMP_CWORD in
1)
local DEV TYPE DEVICES=''
while read DEV TYPE; do
[ $TYPE = 'disk' ] && DEVICES+="$DEV "
done < <(lsblk -pnro name,type)
OPTS="--help --version $DEVICES"
OPTS="--help --version $(lsblk -pnro name)"
COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
;;
2)


+ 1
- 1
bash-completion/eject View File

@@ -15,7 +15,7 @@ _eject_module()
return 0
;;
'-x'|'--cdspeed')
COMPREPLY=( $(compgen -W "$(eject -X)" -- $cur) )
COMPREPLY=( $(compgen -W "$($1 -X)" -- $cur) )
return 0
;;
'-h'|'--help'|'-V'|'--version')


+ 2
- 10
bash-completion/fdisk View File

@@ -6,11 +6,7 @@ _fdisk_module()
prev="${COMP_WORDS[COMP_CWORD-1]}"
case $prev in
'-s'|'--getsz')
local DEV TYPE DEVICES=''
while read DEV TYPE; do
[ $TYPE = 'part' ] && DEVICES+="$DEV "
done < <(lsblk -pnro name,type)
COMPREPLY=( $(compgen -W "$DEVICES" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
return 0
;;
'-b'|'--sector-size')
@@ -55,11 +51,7 @@ _fdisk_module()
return 0
;;
esac
local DEV TYPE DEVICES=''
while read DEV TYPE; do
[ $TYPE = 'disk' ] && DEVICES+="$DEV "
done < <(lsblk -pnro name,type)
COMPREPLY=( $(compgen -W "$DEVICES" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
return 0
}
complete -F _fdisk_module fdisk

+ 5
- 5
bash-completion/findmnt View File

@@ -38,7 +38,7 @@ _findmnt_module()
for I in ${TMP_ARR[@]}; do
MNT_OPTS[$I]='1'
done
done < <(findmnt -rno OPTIONS)
done < <($1 -rno OPTIONS)
COMPREPLY=( $(compgen -W "${!MNT_OPTS[@]}" -- $cur) )
return 0
;;
@@ -57,7 +57,7 @@ _findmnt_module()
'-t'|'--types')
local TYPES
TYPES="adfs affs autofs cifs coda coherent cramfs
debugfs devpts efs ext ext2 ext3 ext4 hfs
debugfs devpts efs ext2 ext3 ext4 hfs
hfsplus hpfs iso9660 jfs minix msdos
ncpfs nfs nfs4 ntfs proc qnx4 ramfs
reiserfs romfs squashfs smbfs sysv tmpfs
@@ -67,13 +67,13 @@ _findmnt_module()
;;
'-S'|'--source')
local DEV_MPOINT
DEV_MPOINT=$(findmnt -rno SOURCE | grep ^/dev)
DEV_MPOINT=$($1 -rno SOURCE | grep ^/dev)
COMPREPLY=( $(compgen -W "$DEV_MPOINT" -- $cur) )
return 0
;;
'-T'|'--target')
local DEV_MPOINT
DEV_MPOINT=$(findmnt -rno TARGET)
DEV_MPOINT=$($1 -rno TARGET)
COMPREPLY=( $(compgen -W "$DEV_MPOINT" -- $cur) )
return 0
;;
@@ -117,7 +117,7 @@ _findmnt_module()
;;
esac
local DEV_MPOINT
DEV_MPOINT=$(findmnt -rno TARGET,SOURCE)
DEV_MPOINT=$($1 -rno TARGET,SOURCE)
COMPREPLY=( $(compgen -W "$DEV_MPOINT" -- $cur) )
return 0
}


+ 1
- 2
bash-completion/fsck View File

@@ -32,8 +32,7 @@ _fsck_module()
return 0
;;
esac
while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
COMPREPLY=( $(compgen -W "$DEVS" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )
return 0
}
complete -F _fsck_module fsck

+ 1
- 2
bash-completion/fsck.minix View File

@@ -9,9 +9,8 @@ _fsck.minix_module()
return 0
;;
esac
while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
OPTS="-l -a -r -v -s -m -f --version"
COMPREPLY=( $(compgen -W "${OPTS[*]} $DEVS" -- $cur) )
COMPREPLY=( $(compgen -W "${OPTS[*]} $(lsblk -pnro name)" -- $cur) )
return 0
}
complete -F _fsck.minix_module fsck.minix

+ 1
- 1
bash-completion/logger View File

@@ -37,7 +37,7 @@ _logger_module()
esac
case $cur in
-*)
OPTS="--journald --udp --id --file --help --server --port --priority --stderr --tag --socket --version"
OPTS="--journald --udp --id --file --help --server --skip-empty --port --priority --rfc3164 --rfc5424 --stderr --tag --size --socket --version"
COMPREPLY=( $(compgen -W "${OPTS[*]}" -- $cur) )
return 0
;;


+ 2
- 2
bash-completion/losetup View File

@@ -6,12 +6,12 @@ _losetup_module()
prev="${COMP_WORDS[COMP_CWORD-1]}"
case $prev in
'-d'|'--detach')
ARG="$(losetup --output NAME | awk '{if (1 < NR) {print}}')"
ARG="$($1 --output NAME | awk '{if (1 < NR) {print}}')"
COMPREPLY=( $(compgen -W "$ARG" -- $cur) )
return 0
;;
'-j'|'--associated')
ARG="$(losetup --output BACK-FILE | awk '{if (1 < NR) {print}}')"
ARG="$($1 --output BACK-FILE | awk '{if (1 < NR) {print}}')"
COMPREPLY=( $(compgen -W "$ARG" -- $cur) )
return 0
;;


+ 1
- 2
bash-completion/lsblk View File

@@ -70,8 +70,7 @@ _lsblk_module()
;;
esac
local DEVS
DEVS=''; while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
COMPREPLY=( $(compgen -W "$DEVS" -- $cur) )
COMPREPLY=( $(compgen -W "$($1 -pnro name)" -- $cur) )
return 0
}
complete -F _lsblk_module lsblk

+ 1
- 2
bash-completion/mkfs View File

@@ -21,8 +21,7 @@ _mkfs_module()
return 0
;;
esac
while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
COMPREPLY=( $(compgen -W "$DEVS /path/to/file" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name) /path/to/file" -- $cur) )
return 0
}
complete -F _mkfs_module mkfs

+ 1
- 2
bash-completion/mkfs.bfs View File

@@ -24,8 +24,7 @@ _mkfs.bfs_module()
return 0
;;
esac
while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
COMPREPLY=( $(compgen -W "$DEVS /path/to/file" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name) /path/to/file" -- $cur) )
return 0
}
complete -F _mkfs.bfs_module mkfs.bfs

+ 1
- 2
bash-completion/mkfs.minix View File

@@ -29,8 +29,7 @@ _mkfs.minix_module()
;;
esac
local DEVS
while read dev; do DEVS+="$dev " ; done < <(lsblk -pnro name)
COMPREPLY=( $(compgen -W "$DEVS" -- $cur) )
COMPREPLY=( $(compgen -W "$(lsblk -pnro name)" -- $cur) )