[PATCH 0/5] pull: release preparations, umount.8 and vipw fix

[PATCH 0/5] pull: release preparations, umount.8 and vipw fix

[Sami Kerola]

Hello,

The most of the following patches are preparations to final release.

Third patch will add sys-utils/umount.8 manual, which is almost
identical copy in comparison to old manual.  The big difference is that
new manual has long options.

The vipw change is a bug fix to a corner case bug that was discussed in
the mail list.  Preliminary tests on my computer gave feeling the fix
works, but it would be good to get more vipw testing with various
editors and configration combinations.

The following changes since commit 91f98496f3901ea68853745edac67e3288a3886d:

  docs: update tests docs (2012-08-03 21:33:32 +0200)

are available in the git repository at:

  git://github.com/kerolasa/lelux-utiliteetit.git 2012wk31

for you to fetch changes up to 67efed9623ce27f2ee582c32eda09946eb4eb1a8:

  vipw: make vim writebackup mode work (2012-08-04 09:05:47 +0200)

----------------------------------------------------------------
Sami Kerola (5):
      docs: ftp server does no longer support util-linux-ng
      docs: update TODO
      docs: add sys-utils/umount.8 manual page
      build-sys: add files make check generates in gitignore
      vipw: make vim writebackup mode work

 .gitignore                                |   4 +
 Documentation/TODO                        |   9 --
 Documentation/releases/v2.13-ReleaseNotes |   2 +-
 Documentation/releases/v2.14-ReleaseNotes |  10 +-
 Documentation/releases/v2.15-ReleaseNotes |  10 +-
 Documentation/releases/v2.16-ReleaseNotes |   6 +-
 Documentation/releases/v2.17-ReleaseNotes |  12 +-
 Documentation/releases/v2.18-ReleaseNotes |  12 +-
 NEWS                                      |  42 +++----
 login-utils/vipw.c                        |  12 ++
 sys-utils/Makemodule.am                   |   2 +-
 sys-utils/umount.8                        | 175 ++++++++++++++++++++++++++++++
 12 files changed, 239 insertions(+), 57 deletions(-)
 create mode 100644 sys-utils/umount.8

[PATCH 1/5] docs: ftp server does no longer support util-linux-ng

[Sami Kerola]

A symlink was probably removed from
  ftp://ftp.kernel.org/pub/linux/utils/

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 Documentation/releases/v2.13-ReleaseNotes |  2 +-
 Documentation/releases/v2.14-ReleaseNotes | 10 ++++----
 Documentation/releases/v2.15-ReleaseNotes | 10 ++++----
 Documentation/releases/v2.16-ReleaseNotes |  6 ++---
 Documentation/releases/v2.17-ReleaseNotes | 12 ++++-----
 Documentation/releases/v2.18-ReleaseNotes | 12 ++++-----
 NEWS                                      | 42 +++++++++++++++----------------
 7 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/Documentation/releases/v2.13-ReleaseNotes b/Documentation/releases/v2.13-ReleaseNotes
index e3dc9f7..327894d 100644
--- a/Documentation/releases/v2.13-ReleaseNotes
+++ b/Documentation/releases/v2.13-ReleaseNotes
@@ -61,7 +61,7 @@ Changelog:
 ---------
 
  For more details see ChangeLog files at:
- ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/
 
 
 agetty:
diff --git a/Documentation/releases/v2.14-ReleaseNotes b/Documentation/releases/v2.14-ReleaseNotes
index 1c92a82..4b7c5af 100644
--- a/Documentation/releases/v2.14-ReleaseNotes
+++ b/Documentation/releases/v2.14-ReleaseNotes
@@ -69,20 +69,20 @@ Stable maintenance releases between v2.13 and v2.14
 
 util-linux-ng 2.13.1.1 [22-Apr-2008]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1.1-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1.1-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13.1.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13.1.1-ChangeLog
 
 util-linux-ng 2.13.1 [16-Jan-2008]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13.1-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13.1-ChangeLog
 
 
 ChangeLog between v2.13 and v2.14
 ---------------------------------
 
  For more details see ChangeLog files at:
- ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/
 
 agetty:
    - cleanup MAXHOSTNAMELEN  [Karel Zak]
diff --git a/Documentation/releases/v2.15-ReleaseNotes b/Documentation/releases/v2.15-ReleaseNotes
index 56b10b6..98d9741 100644
--- a/Documentation/releases/v2.15-ReleaseNotes
+++ b/Documentation/releases/v2.15-ReleaseNotes
@@ -111,20 +111,20 @@ Stable maintenance releases between v2.14 and v2.15
 
 util-linux-ng 2.14.1 [10-Aug-2008]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14.1-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14.1-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14.1-ChangeLog
 
 util-linux-ng 2.14.2 [09-Feb-2009]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14.2-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14.2-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14.2-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.14/v2.14.2-ChangeLog
 
 
 ChangeLog between v2.14 and v2.15
 ---------------------------------
 
  For more details see ChangeLog files at:
- ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.15/
 
 addpart:
    - 512-byte sectors in code, bytes in man-page  [Karel Zak]
diff --git a/Documentation/releases/v2.16-ReleaseNotes b/Documentation/releases/v2.16-ReleaseNotes
index b204c64..b7337e8 100644
--- a/Documentation/releases/v2.16-ReleaseNotes
+++ b/Documentation/releases/v2.16-ReleaseNotes
@@ -24,15 +24,15 @@ Stable maintenance releases between v2.15 and v2.16
 
 util-linux-ng 2.15.1 [10-Jun-2009]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15.1-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.15/v2.15.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.15/v2.15.1-ChangeLog
 
 
 ChangeLog between v2.15 and v2.16
 ---------------------------------
 
  For more details see ChangeLog files at:
- ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/
 
 
 build-sys:
diff --git a/Documentation/releases/v2.17-ReleaseNotes b/Documentation/releases/v2.17-ReleaseNotes
index 874622b..d4221b1 100644
--- a/Documentation/releases/v2.17-ReleaseNotes
+++ b/Documentation/releases/v2.17-ReleaseNotes
@@ -33,7 +33,7 @@ libblkid:
     functionality is designed for mkfs programs, DeviceKits, [k]partx or so.
 
   - libblkid API documentation is available at
-    http://ftp.kernel.org/pub/linux/utils/util-linux-ng/libblkid-docs/
+    http://ftp.kernel.org/pub/linux/utils/util-linux/libblkid-docs/
 
 blockdev:
    - supports all new topology ioctls
@@ -51,20 +51,20 @@ Stable maintenance releases between v2.16 and v2.17
 
 util-linux-ng 2.16.1 [07-Sep-2009]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.1-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.1-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/v2.16.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/v2.16.1-ChangeLog
 
 util-linux-ng 2.16.2 [30-Nov-2009]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16.2-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/v2.16.2-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.16/v2.16.2-ChangeLog
 
 
 ChangeLog between v2.16 and v2.17
 ---------------------------------
 
  For more details see ChangeLog files at:
- ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/
 
 addpart:
    - addpart.8 formatting  [Peter Breitenlohner]
diff --git a/Documentation/releases/v2.18-ReleaseNotes b/Documentation/releases/v2.18-ReleaseNotes
index b027804..36e0b2c 100644
--- a/Documentation/releases/v2.18-ReleaseNotes
+++ b/Documentation/releases/v2.18-ReleaseNotes
@@ -20,7 +20,7 @@ libmount:
     fstab, mtab and mountinfo parser, routines for work with parsed 
     data and mount options, mtab locking, etc. The high-level API for 
     mount(2) is planned for the next major release. For more details see:
-    http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/3239
+    http://thread.gmane.org/gmane.linux.utilities.util-linux/3239
 
   - the utils like mount(8) or umount(8) are not linked with the library
     yet. This change is planned for util-linux-ng-2.19.
@@ -73,20 +73,20 @@ Stable maintenance releases between v2.17 and v2.18
 
 util-linux-ng 2.17.1 [22-Feb-2010]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.1-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.1-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17.1-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17.1-ChangeLog
 
 util-linux-ng 2.17.2 [22-Mar-2010]
 
- * ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.2-ReleaseNotes
-   ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17.2-ChangeLog
+ * ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17.2-ReleaseNotes
+   ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.17/v2.17.2-ChangeLog
 
 
 Changes between v2.17 and v2.18
 -------------------------------
 
  For more details see ChangeLog files at:
- ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/
+ ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.18/
 
 addpart:
    - use atoll() for parsing command line arguments  [Thomas Fehr]
diff --git a/NEWS b/NEWS
index 5114ffc..dace8d6 100644
--- a/NEWS
+++ b/NEWS
@@ -44,91 +44,91 @@ util-linux 2.19-rc1: Jan 05 2011
 
 util-linux-ng 2.18: Jun 30 2010
 * see Documentation/releases/v2.18-ReleaseNotes or complete changelog at
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc2-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc1-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc3-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc2-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc1-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc2-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc1-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-rc2-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-rc1-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc3-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc2-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc1-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc3-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc2-ChangeLog
+  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
-  ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc1-ChangeLog
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.13/v2.13-rc1-ChangeLog
 
 util-linux 2.13-pre7
 
-- 
1.7.11.4

[PATCH 2/5] docs: update TODO

[Sami Kerola]

Remove tasks that are done.

dmesg: --follow option
Reference: 0fd12a9697c2e01e3c2e1e558ff027cd2947ee94

build-sys: recursive build
Reference: 8772f8d7eeeb922bccee3376552c59d7148df7b4

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 Documentation/TODO | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Documentation/TODO b/Documentation/TODO
index 38a3c30..a646127 100644
--- a/Documentation/TODO
+++ b/Documentation/TODO
@@ -15,9 +15,6 @@ losetup
 dmesg
 -----
 
- - add --follow option
-   http://www.spinics.net/lists/util-linux-ng/msg04453.html
-
  - add --color to colorize err and panic messages
 
 hwclock
@@ -117,12 +114,6 @@ docs
  - (!) add API documentation to libuuid
 
 
-build-sys
---------
-
- - use non-recursive build-sys, see
-   http://thread.gmane.org/gmane.linux.utilities.util-linux-ng/3297
-
 lib/tt.c
 --------
 
-- 
1.7.11.4

[PATCH 3/5] docs: add sys-utils/umount.8 manual page

[Sami Kerola]

The man page is almost exact copy of mount-deprecated/umount.8.  This
version mentions long options, and has the options in same order as
they are mentioned in usage() output.  Rest of the minor changes make
groff slightly nicer e.g. use .PP instead of empty line for paragraph
marker.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 sys-utils/Makemodule.am |   2 +-
 sys-utils/umount.8      | 175 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+), 1 deletion(-)
 create mode 100644 sys-utils/umount.8

diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 4f8dbc1..d376f04 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -168,7 +168,7 @@ bin_PROGRAMS += mount umount
 dist_man_MANS += \
 	sys-utils/mount.8 \
 	sys-utils/fstab.5 \
-	mount-deprecated/umount.8
+	sys-utils/umount.8
 mount_SOURCES = sys-utils/mount.c
 mount_LDADD = $(LDADD) libcommon.la libmount.la $(SELINUX_LIBS)
 mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir)
diff --git a/sys-utils/umount.8 b/sys-utils/umount.8
new file mode 100644
index 0000000..d073c55
--- /dev/null
+++ b/sys-utils/umount.8
@@ -0,0 +1,175 @@
+.\" Copyright (c) 1996 Andries Brouwer
+.\" This page is somewhat derived from a page that was
+.\" (c) 1980, 1989, 1991 The Regents of the University of California
+.\" and had been heavily modified by Rik Faith and myself.
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" The GNU General Public License's references to "object code"
+.\" and "executables" are to be interpreted as the output of any
+.\" document formatting or typesetting system, including
+.\" intermediate and printed output.
+.\"
+.\" This manual is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with this program; if not, write to the Free Software Foundation, Inc.,
+.\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+.\"
+.TH UMOUNT 8 "August 2012" "util-linux" "System Administration"
+.SH NAME
+umount \- unmount file systems
+.SH SYNOPSIS
+.B umount
+.RB [ \-hV ]
+.LP
+.B umount \-a
+.RB [ \-dflnrv ]
+.RB [ \-t
+.IR vfstype ]
+.RB [ \-O
+.IR options ]
+.br
+.B umount
+.RB [ \-dflnrv ]
+.RI { dir | device }...
+.SH DESCRIPTION
+The
+.B umount
+command detaches the file system(s) mentioned from the file hierarchy.  A
+file system is specified by giving the directory where it has been
+mounted.  Giving the special device on which the file system lives may
+also work, but is obsolete, mainly because it will fail in case this
+device was mounted on more than one directory.
+.PP
+Note that a file system cannot be unmounted when it is 'busy' - for
+example, when there are open files on it, or when some process has its
+working directory there, or when a swap file on it is in use.  The
+offending process could even be
+.B umount
+itself - it opens libc, and libc in its turn may open for example locale
+files.  A lazy unmount avoids this problem.
+.SH OPTIONS
+.TP
+\fB\-a\fR, \fB\-\-all\fR
+All of the file systems described in
+.I /etc/mtab
+are unmounted.  (With
+.B umount
+version 2.7 and later: the
+.I proc
+filesystem is not unmounted.)
+.TP
+\fB\-c\fR, \fB\-\-no\-canonicalize\fR
+Do not canonicalize paths.  For more details about this option see the
+.B mount(8)
+man page.
+.TP
+\fB\-d\fR, \fB\-\-detach\-loop\fR
+In case the unmounted device was a loop device, also free this loop
+device.
+.TP
+\fB\-\-fake\fP
+Causes everything to be done except for the actual system call; this
+'fakes' unmounting the filesystem.  It can be used to remove entries from
+.I /etc/mtab
+that were unmounted earlier with the
+.B \-n
+option.
+.TP
+\fB\-f\fR, \fB\-\-force\fR
+Force unmount (in case of an unreachable NFS system).  (Requires kernel
+2.1.116 or later.)
+.TP
+\fB\-i\fR, \fB\-\-internal\-only\fR
+Do not call the /sbin/umount.<filesystem> helper even if it exists.  By
+default /sbin/umount.<filesystem> helper is called if one exists.
+.TP
+\fB\-n\fR, \fB\-\-no\-mtab\fR
+Unmount without writing in
+.IR /etc/mtab .
+.TP
+\fB\-l\fR, \fB\-\-lazy\fR
+Lazy unmount.  Detach the filesystem from the filesystem hierarchy now,
+and cleanup all references to the filesystem as soon as it is not busy
+anymore.  (Requires kernel 2.4.11 or later.)
+.TP
+\fB\-O\fR, \fB\-\-test\-opts\fR \fIoptions,list\fR
+Indicate that the actions should only be taken on file systems with the
+specified options in
+.IR /etc/fstab .
+More than one option type may be specified in a comma separated list.
+Each option can be prefixed with
+.B no
+to specify options for which no action should be taken.
+.TP
+\fB\-r\fR, \fB\-\-read\-only\fR
+In case unmounting fails, try to remount read-only.
+.TP
+\fB\-t\fR, \fB\-\-types\fR \fIvfstype,ext2,ext3\fR
+Indicate that the actions should only be taken on file systems of the
+specified
+.IR type .
+More than one type may be specified in a comma separated list.  The list
+of file system types can be prefixed with
+.B no
+to specify the file system types on which no action should be taken.
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Verbose mode.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print help message and exit.
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print version and exit.
+.SH "THE LOOP DEVICE"
+The
+.B umount
+command will free the loop device (if any) associated with the mount, in
+case it finds the option 'loop=...' in
+.IR /etc/mtab ,
+or when the \-d option was given.  Any pending loop devices can be freed
+using 'losetup -d', see
+.BR losetup (8).
+.SH NOTES
+The syntax of external umount helpers is:
+.PP
+.BI /sbin/umount. <suffix>
+.RI { dir | device }
+.RB [ \-nlfvr ]
+.RB [ \-t
+.IR type.subtype ]
+.PP
+where the <suffix> is filesystem type or a value from "uhelper=" or
+"helper=" mtab option.  The \-t option is used for filesystems with
+subtypes support (for example /sbin/mount.fuse -t fuse.sshfs).
+.PP
+The uhelper= (unprivileged umount helper) is possible to use when
+non-root user wants to umount a mountpoint which is not defined in the
+/etc/fstab file (e.g. devices mounted by udisk).
+.PP
+The helper= mount option redirects all umount requests to the
+/sbin/umount.<helper> independently on UID.
+.SH FILES
+.I /etc/mtab
+table of mounted file systems
+.SH "SEE ALSO"
+.BR umount (2),
+.BR mount (8),
+.BR losetup (8)
+.SH HISTORY
+A
+.B umount
+command appeared in Version 6 AT&T UNIX.
+.SH AVAILABILITY
+The umount command is part of the util-linux package and is available from
+.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
+Linux Kernel Archive
+.UE .
-- 
1.7.11.4

[PATCH 4/5] build-sys: add files make check generates in gitignore

[Sami Kerola]

The config/test-driver appears at automake stage, rest after running
'make check'.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8a740e3..7628dda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,10 @@ tags
 .version
 .dirstamp
 config/ltmain.sh
+config/test-driver
+test-suite.log
+tests/run-nonroot.sh.log
+tests/run-nonroot.sh.trs
 
 # libuuid depends on AX_TLS macro
 !m4/tls.m4
-- 
1.7.11.4

[PATCH 5/5] vipw: make vim writebackup mode work

[Sami Kerola]

Some editors, such as Vim with 'writebackup' mode enabled, use "atomic
save" in which the old file is deleted and a new one with the same name
created in its place.  The vipw tries to detect if such happen by
looking hard temporary file link count, when it is zero reopen
temporary file by using it's path.

Reported-by: Mantas Mikulėnas <grawity@gmail.com>
References: http://www.spinics.net/lists/util-linux-ng/msg06666.html
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
 login-utils/vipw.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/login-utils/vipw.c b/login-utils/vipw.c
index ed3f43b..1eeeb0d 100644
--- a/login-utils/vipw.c
+++ b/login-utils/vipw.c
@@ -275,6 +275,18 @@ static void edit_file(int is_shadow)
 
 	if (fstat(fileno(tmp_fd), &end))
 		pw_error(tmp_file, 1, 1);
+	/* Some editors, such as Vim with 'writebackup' mode enabled,
+	 * use "atomic save" in which the old file is deleted and a new
+	 * one with the same name created in its place.  */
+	if (end.st_nlink == 0) {
+		if (close_stream(tmp_fd) != 0)
+			err(EXIT_FAILURE, _("write error"));
+		tmp_fd = fopen(tmp_file, "r");
+		if (!tmp_file)
+			err(EXIT_FAILURE, _("cannot open %s"), tmp_file);
+		if (fstat(fileno(tmp_fd), &end))
+			pw_error(tmp_file, 1, 1);
+	}
 	if (begin.st_mtime == end.st_mtime) {
 		warnx(_("no changes made"));
 		pw_error((char *)NULL, 0, 0);
-- 
1.7.11.4

Re: [PATCH 5/5] vipw: make vim writebackup mode work

[Bernhard Voelker]

On August 4, 2012 at 9:33 AM Sami Kerola <kerolasa@iki.fi> wrote:

> Some editors, such as Vim with 'writebackup' mode enabled, use "atomic
> save" in which the old file is deleted and a new one with the same name
> created in its place.  The vipw tries to detect if such happen by
> looking hard temporary file link count, when it is zero reopen
> temporary file by using it's path.
>
> Reported-by: Mantas Mikulėnas <grawity@gmail.com>
> References: http://www.spinics.net/lists/util-linux-ng/msg06666.html
> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
> ---
>  login-utils/vipw.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
>
> diff --git a/login-utils/vipw.c b/login-utils/vipw.c
> index ed3f43b..1eeeb0d 100644
> --- a/login-utils/vipw.c
> +++ b/login-utils/vipw.c
> @@ -275,6 +275,18 @@ static void edit_file(int is_shadow)
> 
>          if (fstat(fileno(tmp_fd), &end))
>                  pw_error(tmp_file, 1, 1);
> +        /* Some editors, such as Vim with 'writebackup' mode enabled,
> +         * use "atomic save" in which the old file is deleted and a new
> +         * one with the same name created in its place.  */
> +        if (end.st_nlink == 0) {
> +                if (close_stream(tmp_fd) != 0)
> +                        err(EXIT_FAILURE, _("write error"));
> +                tmp_fd = fopen(tmp_file, "r");
> +                if (!tmp_file)
> +                        err(EXIT_FAILURE, _("cannot open %s"), tmp_file);
> +                if (fstat(fileno(tmp_fd), &end))
> +                        pw_error(tmp_file, 1, 1);
> +        }
>          if (begin.st_mtime == end.st_mtime) {
>                  warnx(_("no changes made"));
>                  pw_error((char *)NULL, 0, 0);
> --
> 1.7.11.4

Hi Sami,

wasn't the discussion about additionally prompting the user that
"the file vanished and a a new file with the same name has
been created" for security reasons?

We're talking about the intermediate file (in /tmp), but as it's
name is visible e.g. in ps listings, I'd recommend to be cautious
about it.

Have a nice day,
Berny

Re: [PATCH 5/5] vipw: make vim writebackup mode work

[Sami Kerola]

On Mon, Aug 6, 2012 at 8:14 AM, Bernhard Voelker
<mail@bernhard-voelker.de> wrote:
> On August 4, 2012 at 9:33 AM Sami Kerola <kerolasa@iki.fi> wrote:
>
>> Some editors, such as Vim with 'writebackup' mode enabled, use "atomic
>> save" in which the old file is deleted and a new one with the same name
>> created in its place.  The vipw tries to detect if such happen by
>> looking hard temporary file link count, when it is zero reopen
>> temporary file by using it's path.
>>
>> Reported-by: Mantas Mikulėnas <grawity@gmail.com>
>> References: http://www.spinics.net/lists/util-linux-ng/msg06666.html
>> Signed-off-by: Sami Kerola <kerolasa@iki.fi>
>> ---
>>  login-utils/vipw.c | 12 ++++++++++++
>>  1 file changed, 12 insertions(+)
>>
>> diff --git a/login-utils/vipw.c b/login-utils/vipw.c
>> index ed3f43b..1eeeb0d 100644
>> --- a/login-utils/vipw.c
>> +++ b/login-utils/vipw.c
>> @@ -275,6 +275,18 @@ static void edit_file(int is_shadow)
>>
>>          if (fstat(fileno(tmp_fd), &end))
>>                  pw_error(tmp_file, 1, 1);
>> +        /* Some editors, such as Vim with 'writebackup' mode enabled,
>> +         * use "atomic save" in which the old file is deleted and a new
>> +         * one with the same name created in its place.  */
>> +        if (end.st_nlink == 0) {
>> +                if (close_stream(tmp_fd) != 0)
>> +                        err(EXIT_FAILURE, _("write error"));
>> +                tmp_fd = fopen(tmp_file, "r");
>> +                if (!tmp_file)
>> +                        err(EXIT_FAILURE, _("cannot open %s"), tmp_file);
>> +                if (fstat(fileno(tmp_fd), &end))
>> +                        pw_error(tmp_file, 1, 1);
>> +        }
>>          if (begin.st_mtime == end.st_mtime) {
>>                  warnx(_("no changes made"));
>>                  pw_error((char *)NULL, 0, 0);
>> --
>> 1.7.11.4

Hi Berny,

Yes, I did mention file exchange should probably warn.  When I
added the warning it looked like noise, and I could not get
message right.

> We're talking about the intermediate file (in /tmp), but as it's
> name is visible e.g. in ps listings, I'd recommend to be cautious
> about it.

The temporary file in vipw case is created to /etc/ and moved in
place within directory.  Earlier /tmp/ was used, but it resulted
to non-atomic move and rename(2) complaining about device
boundary.  See following commit for details.

commit 3c4fed097ddb65dbe3d88f60caee78fb60756f3e

I am assuming /etc/ is not normally writable for users, so the
security problem should be mostly theoretical.  That said perhaps
a message such as

vipw: intermediate /etc/vipw.XXXXX file change

might be appropriate, if it is explained in vipw(8).  Or is it
simply noise no-one cares?

-- 
   Sami Kerola
   http://www.iki.fi/kerolasa/

Re: [PATCH 5/5] vipw: make vim writebackup mode work

[Bernhard Voelker]

On August 6, 2012 at 9:30 AM Sami Kerola <kerolasa@iki.fi> wrote:

> On Mon, Aug 6, 2012 at 8:14 AM, Bernhard Voelker
> <mail@bernhard-voelker.de> wrote:

> Hi Berny,
>
> Yes, I did mention file exchange should probably warn.  When I
> added the warning it looked like noise, and I could not get
> message right.
>
> > We're talking about the intermediate file (in /tmp), but as it's
> > name is visible e.g. in ps listings, I'd recommend to be cautious
> > about it.
>
> The temporary file in vipw case is created to /etc/ and moved in
> place within directory.  Earlier /tmp/ was used, but it resulted
> to non-atomic move and rename(2) complaining about device
> boundary.  See following commit for details.

yes, /etc right.

> I am assuming /etc/ is not normally writable for users, so the
> security problem should be mostly theoretical.  That said perhaps
> a message such as
>
> vipw: intermediate /etc/vipw.XXXXX file change
>
> might be appropriate, if it is explained in vipw(8).  Or is it
> simply noise no-one cares?

Right, /etc is quite safe. Therefore, as vipw is deprecated anyway,
I'd say your patch is okay.

Have a nice day,
Berny

Re: [PATCH 0/5] pull: release preparations, umount.8 and vipw fix

[Karel Zak]

On Sat, Aug 04, 2012 at 09:33:35AM +0200, Sami Kerola wrote:
>  .gitignore                                |   4 +

 now we call test/run.sh only, so I have modified the gitignore patch.

>  Documentation/TODO                        |   9 --
>  Documentation/releases/v2.13-ReleaseNotes |   2 +-
>  Documentation/releases/v2.14-ReleaseNotes |  10 +-
>  Documentation/releases/v2.15-ReleaseNotes |  10 +-
>  Documentation/releases/v2.16-ReleaseNotes |   6 +-
>  Documentation/releases/v2.17-ReleaseNotes |  12 +-
>  Documentation/releases/v2.18-ReleaseNotes |  12 +-
>  NEWS                                      |  42 +++----
>  login-utils/vipw.c                        |  12 ++
>  sys-utils/Makemodule.am                   |   2 +-
>  sys-utils/umount.8                        | 175 ++++++++++++++++++++++++++++++
>  12 files changed, 239 insertions(+), 57 deletions(-)
>  create mode 100644 sys-utils/umount.8

 Applied, thanks.

-- 
 Karel Zak  <kzak@redhat.com>
 http://karelzak.blogspot.com