2.20.1-2.3: fix #813315

Signed-off-by: Karel Zak <kzak@redhat.com>

.gitignore

@@ -10,3 +10,7 @@
 /floppy-0.18.tar.bz2
 /util-linux-2.19.1-rc1.tar.bz2
 /util-linux-2.19.1.tar.bz2
+/util-linux-2.20-rc1.tar.bz2
+/util-linux-2.20-rc2.tar.bz2
+/util-linux-2.20.tar.bz2
+/util-linux-2.20.1.tar.bz2

sources

@@ -1,2 +1,2 @@
-3eab06f05163dfa65479c44e5231932c  util-linux-2.19.1.tar.bz2
+079b37517fd4e002a2e6e992e8b4e361  util-linux-2.20.1.tar.bz2
 a02aac97c74259ca1b24972c89147ca4  floppy-0.18.tar.bz2

util-linux-2.20-blkid-cachefile.patch

@@ -0,0 +1,64 @@
+diff -up util-linux-2.20-rc1/libblkid/libblkid.3.kzak util-linux-2.20-rc1/libblkid/libblkid.3
+--- util-linux-2.20-rc1/libblkid/libblkid.3.kzak	2011-07-26 16:43:07.000000000 +0200
++++ util-linux-2.20-rc1/libblkid/libblkid.3	2011-07-29 21:17:20.883777687 +0200
+@@ -28,7 +28,7 @@ partitions and block device topology.
+ .P
+ The high-level part of the library keeps information about block devices
+ in a cache file
+-.I /etc/blkid.tab
++.I /etc/blkid/blkid.tab
+ and is verified to still be valid before being returned to the user
+ (if the user has read permission on the raw block device, otherwise not).
+ The cache file also allows unprivileged users (normally anyone other
+@@ -69,7 +69,7 @@ symlink does not match with LABEL or UUI
+ .I CACHE_FILE=<path>
+ Overrides the standard location of the cache file. This setting can be
+ overridden by the environment variable BLKID_FILE. Default is
+-.I /etc/blkid.tab.
++.I /etc/blkid/blkid.tab.
+ .TP
+ .I EVALUATE=<methods>
+ Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
+@@ -87,7 +87,7 @@ from Ted Ts'o.  The library was subseque
+ The low-level probing code was rewritten by Karel Zak.
+ .SH FILES
+ .TP 18
+-.I /etc/blkid.tab
++.I /etc/blkid/blkid.tab
+ caches data extracted from each recognized block device
+ .TP
+ .I /etc/blkid.conf
+diff -up util-linux-2.20-rc1/libblkid/src/blkidP.h.kzak util-linux-2.20-rc1/libblkid/src/blkidP.h
+--- util-linux-2.20-rc1/libblkid/src/blkidP.h.kzak	2011-07-20 21:55:23.000000000 +0200
++++ util-linux-2.20-rc1/libblkid/src/blkidP.h	2011-07-29 21:17:52.852169993 +0200
+@@ -286,7 +286,7 @@ extern char *blkid_strdup(const char *s)
+ extern char *blkid_strndup(const char *s, const int length);
+ extern char *blkid_strconcat(const char *a, const char *b, const char *c);
+ 
+-#define BLKID_CACHE_FILE	"/etc/blkid.tab"
++#define BLKID_CACHE_FILE	"/etc/blkid/blkid.tab"
+ #define BLKID_CONFIG_FILE	"/etc/blkid.conf"
+ 
+ #define BLKID_ERR_IO	 5
+diff -up util-linux-2.20-rc1/misc-utils/blkid.8.kzak util-linux-2.20-rc1/misc-utils/blkid.8
+--- util-linux-2.20-rc1/misc-utils/blkid.8.kzak	2011-07-20 21:55:23.000000000 +0200
++++ util-linux-2.20-rc1/misc-utils/blkid.8	2011-07-29 21:15:37.312506693 +0200
+@@ -79,7 +79,7 @@ same meaning as "KiB") or decimal (10^N)
+ Read from
+ .I cachefile
+ instead of reading from the default cache file
+-.IR /etc/blkid.tab .
++.IR /etc/blkid/blkid.tab .
+ If you want to start with a clean cache (i.e. don't report devices previously
+ scanned but not necessarily available at this time), specify
+ .IR /dev/null .
+@@ -242,7 +242,7 @@ Display version number and exit.
+ Write the device cache to
+ .I writecachefile
+ instead of writing it to the default cache file
+-.IR /etc/blkid.tab .
++.IR /etc/blkid/blkid.tab .
+ If you don't want to save the cache at all, specify
+ .IR /dev/null.
+ If not specified, it will be the same file as that given with the
+diff -up util-linux-2.20-rc1/misc-utils/blkid.c.kzak util-linux-2.20-rc1/misc-utils/blkid.c

util-linux-2.20-fdformat-man-ide.patch

@@ -0,0 +1,25 @@
+diff -up util-linux-2.20-rc1/disk-utils/fdformat.8.orig util-linux-2.20-rc1/disk-utils/fdformat.8
+--- util-linux-2.20-rc1/disk-utils/fdformat.8.orig	2011-07-20 21:55:23.000000000 +0200
++++ util-linux-2.20-rc1/disk-utils/fdformat.8	2011-07-29 21:08:57.558601033 +0200
+@@ -43,6 +43,11 @@ when a non-standard format is being used
+ autodetected earlier.  In this case, use
+ .BR setfdprm (8)
+ to load the disk parameters.
++
++For ATAPI IDE floppy driver (also known as LS-120 drives or "Superdisk"
++drives) you have to use the
++.BR floppy (8).
++
+ .SH OPTIONS
+ .TP
+ \fB\-n\fR, \fB\-\-no\-verify\fR
+@@ -58,7 +63,8 @@ Display help and exit.
+ .BR fd (4),
+ .BR setfdprm (8),
+ .BR mkfs (8),
+-.BR emkfs (8)
++.BR emkfs (8),
++.BR floppy (8)
+ .SH AUTHOR
+ Werner Almesberger (almesber@nessie.cs.id.ethz.ch)
+ .SH AVAILABILITY

util-linux-2.20-ipcs-32bit.patch

@@ -1,10 +1,10 @@
-diff -up util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c
---- util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak	2009-03-25 13:19:08.000000000 +0100
-+++ util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c	2009-06-04 15:22:48.000000000 +0200
-@@ -243,6 +243,26 @@ print_perms (int id, struct ipc_perm *ip
- 		printf(" %-10d\n", ipcp->gid);
+diff -up util-linux-2.20-rc2/sys-utils/ipcs.c.kzak util-linux-2.20-rc2/sys-utils/ipcs.c
+--- util-linux-2.20-rc2/sys-utils/ipcs.c.kzak	2011-08-12 11:13:00.000000000 +0200
++++ util-linux-2.20-rc2/sys-utils/ipcs.c	2011-08-17 01:16:23.629928605 +0200
+@@ -255,6 +255,28 @@ print_perms (int id, struct ipc_perm *ip
  }
  
+ 
 +static unsigned long long
 +shminfo_from_proc(const char *name, unsigned long def)
 +{
@@ -25,10 +25,12 @@ diff -up util-linux-ng-2.15.1-rc1/sys-utils/ipcs.c.kzak util-linux-ng-2.15.1-rc1
 +	fclose(f);
 +	return res;
 +}
- 
++
++
  void do_shm (char format)
  {
-@@ -266,12 +286,12 @@ void do_shm (char format)
+ 	int maxid, shmid, id;
+@@ -277,12 +299,12 @@ void do_shm (char format)
  			return;
  		/* glibc 2.1.3 and all earlier libc's have ints as fields
  		   of struct shminfo; glibc 2.1.91 has unsigned long; ach */

util-linux-2.20-logger.patch

@@ -0,0 +1,46 @@
+From 86248cd28a27bdd9a437e389966b0415e106802e Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Thu, 8 Dec 2011 10:20:22 +0100
+Subject: [PATCH] logger: fix remote logging
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Reported-by: Hervé Quillévéré <herve_quillevere@herveq.tk>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/logger.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/misc-utils/logger.c b/misc-utils/logger.c
+index a331f26..c89fca7 100644
+--- a/misc-utils/logger.c
++++ b/misc-utils/logger.c
+@@ -281,7 +281,7 @@ main(int argc, char **argv) {
+ 			}
+ 		}
+ 		if (p != buf) {
+-		    if (!usock)
++		    if (!usock && !udpserver)
+ 			syslog(pri, "%s", buf);
+ 		    else
+ 			mysyslog(LogSock, logflags, pri, tag, buf);
+@@ -295,13 +295,13 @@ main(int argc, char **argv) {
+ 		    if (len > 0 && buf[len - 1] == '\n')
+ 			    buf[len - 1] = '\0';
+ 
+-		    if (!usock)
++		    if (!usock && !udpserver)
+ 			syslog(pri, "%s", buf);
+ 		    else
+ 			mysyslog(LogSock, logflags, pri, tag, buf);
+ 		}
+ 	}
+-	if (!usock)
++	if (!usock && !udpserver)
+ 		closelog();
+ 	else
+ 		close(LogSock);
+-- 
+1.7.7.5
+

util-linux-2.20-mount-hint.patch

@@ -0,0 +1,51 @@
+From 3142564b244b3163446d59f83390f73cea85097b Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 10 Jan 2012 15:43:56 +0100
+Subject: [PATCH] mount: add hint that context= has to be quoted
+
+Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=747038
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ mount/mount.8 |   17 ++++++++++++++++-
+ 1 files changed, 16 insertions(+), 1 deletions(-)
+
+diff --git a/mount/mount.8 b/mount/mount.8
+index 2c4f636..00b512e 100644
+--- a/mount/mount.8
++++ b/mount/mount.8
+@@ -839,7 +839,7 @@ xattrs are supported, you can save time not having to label every file by
+ assigning the entire disk one security context.
+ 
+ A commonly used option for removable media is
+-.BR context=system_u:object_r:removable_t .
++.BR context="system_u:object_r:removable_t" .
+ 
+ Two other options are
+ .BR fscontext=
+@@ -875,8 +875,23 @@ useful for things like stateless linux.
+ Note that kernel rejects any remount request that includes the context
+ option even if unchanged from the current context.
+ 
++.B Warning that \fIcontext\fP value might contains comma
++and in this case the value has to be properly quoted otherwise
++.BR mount (8)
++will interpret the comma as separator between mount options. Don't forget that
++shell strips off quotes and
++.BR "double quoting is required" ,
++for example:
++.RS
++.RS
++.sp
++mount -t tmpfs none /mnt \-o 'context="system_u:object_r:tmp_t:s0:c127,c456",noexec'
++.sp
++.RE
++
+ For more details, see
+ .BR selinux (8)
++.RE
+ 
+ .TP
+ .B defaults
+-- 
+1.7.7.5
+

util-linux-2.20-mount-rec.patch

@@ -0,0 +1,32 @@
+diff -up util-linux-2.20.1/libmount/src/context_mount.c.kzak util-linux-2.20.1/libmount/src/context_mount.c
+--- util-linux-2.20.1/libmount/src/context_mount.c.kzak	2011-10-18 14:22:27.000000000 +0200
++++ util-linux-2.20.1/libmount/src/context_mount.c	2012-04-17 15:25:14.273287922 +0200
+@@ -46,9 +46,10 @@ static int fix_optstr(struct libmnt_cont
+ 
+ 	fs = cxt->fs;
+ 
+-	/* The propagation flags should not be used together with any other flags */
++	/* The propagation flags should not be used together with any other
++	 * flags (except MS_REC and MS_SILENT) */
+ 	if (cxt->mountflags & MS_PROPAGATION)
+-		cxt->mountflags &= MS_PROPAGATION;
++		cxt->mountflags &= (MS_PROPAGATION | MS_REC | MS_SILENT);
+ 
+ 	if (!mnt_optstr_get_option(fs->user_optstr, "user", &val, &valsz)) {
+ 		if (val) {
+diff -up util-linux-2.20.1/mount/mount.c.kzak util-linux-2.20.1/mount/mount.c
+--- util-linux-2.20.1/mount/mount.c.kzak	2012-04-17 15:24:52.817199995 +0200
++++ util-linux-2.20.1/mount/mount.c	2012-04-17 15:25:14.274287916 +0200
+@@ -586,9 +586,10 @@ parse_opts (const char *options, int *fl
+ 
+ 	*flags |= mounttype;
+ 
+-	/* The propagation flags should not be used together with any other flags */
++	/* The propagation flags should not be used together with any
++	 * other flags (except MS_REC and MS_SILENT) */
+ 	if (*flags & MS_PROPAGATION)
+-		*flags &= MS_PROPAGATION;
++		*flags &= (MS_PROPAGATION | MS_REC | MS_SILENT);
+ }
+ 
+ /* Try to build a canonical options string.  */

util-linux-2.20-mount.patch

@@ -0,0 +1,141 @@
+From a4c0cc75ff9744299f108c259efab1bd30c8007a Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 2 Jan 2012 11:08:17 +0100
+Subject: [PATCH] mount: append inverting options for mount.<type>
+
+ fstab:
+	server://foo   /mnt/foo    nfs    user,exec
+
+The mount(8) does not append the option "exec" to /sbin/mount.<type>
+helper's command line. This is no problem when executed by non-root
+user as it reads the options from fstab only.
+
+.. but when executed by root (UID=0) then the mount.<type> helper
+follows the command where the "exec" option is missing. This is bug.
+
+original version (strace output):
+
+ execve("/sbin/mount.nfs", ["/sbin/mount.nfs",
+        "sr.net.home:/mnt/store", "/mnt/store", "-o",
+        "rw,nosuid,nodev,noauto,user"], [/* 21 vars */]) = 0
+
+fixed version:
+
+ execve("/sbin/mount.nfs", ["/sbin/mount.nfs",
+        "sr.net.home:/mnt/store", "/mnt/store", "-o",
+        "rw,nosuid,nodev,noauto,user,exec"], [/* 21 vars */]) = 0
+                                    ^^^^^
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ mount/mount.c |   31 ++++++++++++++++++++++++-------
+ 1 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/mount/mount.c b/mount/mount.c
+index 9b444c4..a18b2df 100644
+--- a/mount/mount.c
++++ b/mount/mount.c
+@@ -207,6 +207,8 @@ static const struct opt_map opt_map[] = {
+ 
+ static int opt_nofail = 0;
+ 
++static int invuser_flags;
++
+ static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit,
+         *opt_encryption, *opt_speed, *opt_comment, *opt_uhelper, *opt_helper;
+ 
+@@ -473,7 +475,7 @@ static int has_context_option(char *opts)
+  * For the options uid= and gid= replace user or group name by its value.
+  */
+ static inline void
+-parse_opt(char *opt, int *mask, char **extra_opts) {
++parse_opt(char *opt, int *mask, int *inv_user, char **extra_opts) {
+ 	const struct opt_map *om;
+ 
+ 	for (om = opt_map; om->opt != NULL; om++)
+@@ -482,6 +484,9 @@ parse_opt(char *opt, int *mask, char **extra_opts) {
+ 				*mask &= ~om->mask;
+ 			else
+ 				*mask |= om->mask;
++			if (om->inv && ((*mask & MS_USER) || (*mask & MS_USERS))
++			    && (om->mask & MS_SECURE))
++				*inv_user |= om->mask;
+ 			if ((om->mask == MS_USER || om->mask == MS_USERS)
+ 			    && !om->inv)
+ 				*mask |= MS_SECURE;
+@@ -566,7 +571,7 @@ parse_opts (const char *options, int *flags, char **extra_opts) {
+ 			/* end of option item or last item */
+ 			if (*p == '\0' || *(p+1) == '\0') {
+ 				if (!parse_string_opt(opt))
+-					parse_opt(opt, flags, extra_opts);
++					parse_opt(opt, flags, &invuser_flags, extra_opts);
+ 				opt = NULL;
+ 			}
+ 		}
+@@ -587,7 +592,9 @@ parse_opts (const char *options, int *flags, char **extra_opts) {
+ 
+ /* Try to build a canonical options string.  */
+ static char *
+-fix_opts_string (int flags, const char *extra_opts, const char *user) {
++fix_opts_string (int flags, const char *extra_opts,
++		 const char *user, int inv_user)
++{
+ 	const struct opt_map *om;
+ 	const struct string_opt_map *m;
+ 	char *new_opts;
+@@ -611,6 +618,16 @@ fix_opts_string (int flags, const char *extra_opts, const char *user) {
+ 	if (user)
+ 		new_opts = append_opt(new_opts, "user=", user);
+ 
++	if (inv_user) {
++		for (om = opt_map; om->opt != NULL; om++) {
++			if (om->mask && om->inv
++			    && (inv_user & om->mask) == om->mask) {
++				new_opts = append_opt(new_opts, om->opt, NULL);
++				inv_user &= ~om->mask;
++			}
++		}
++	}
++
+ 	return new_opts;
+ }
+ 
+@@ -662,7 +679,7 @@ create_mtab (void) {
+ 		mnt.mnt_dir = "/";
+ 		mnt.mnt_fsname = spec_to_devname(fstab->m.mnt_fsname);
+ 		mnt.mnt_type = fstab->m.mnt_type;
+-		mnt.mnt_opts = fix_opts_string (flags, extra_opts, NULL);
++		mnt.mnt_opts = fix_opts_string (flags, extra_opts, NULL, 0);
+ 		mnt.mnt_freq = mnt.mnt_passno = 0;
+ 		free(extra_opts);
+ 
+@@ -787,7 +804,7 @@ check_special_mountprog(const char *spec, const char *node, const char *type, in
+ 			if (setuid(getuid()) < 0)
+ 				die(EX_FAIL, _("mount: cannot set user id: %s"), strerror(errno));
+ 
+-			oo = fix_opts_string (flags, extra_opts, NULL);
++			oo = fix_opts_string(flags, extra_opts, NULL, invuser_flags);
+ 			mountargs[i++] = mountprog;			/* 1 */
+ 			mountargs[i++] = (char *) spec;			/* 2 */
+ 			mountargs[i++] = (char *) node;			/* 3 */
+@@ -1659,7 +1676,7 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
+   }
+ 
+ #ifdef HAVE_LIBMOUNT_MOUNT
+-  mtab_opts = fix_opts_string(flags & ~MS_NOMTAB, extra_opts, user);
++  mtab_opts = fix_opts_string(flags & ~MS_NOMTAB, extra_opts, user, 0);
+   mtab_flags = flags;
+ 
+   if (fake)
+@@ -1703,7 +1720,7 @@ try_mount_one (const char *spec0, const char *node0, const char *types0,
+   }
+ 
+   if (fake || mnt5_res == 0) {
+-      char *mo = fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user);
++      char *mo = fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user, 0);
+       const char *tp = types ? types : "unknown";
+ 
+       /* Mount succeeded, report this (if verbose) and write mtab entry.  */
+-- 
+1.7.7.5
+

util-linux-2.20-switch_root.patch

@@ -0,0 +1,25 @@
+--- a/sys-utils/switch_root.c
++++ b/sys-utils/switch_root.c
+@@ -40,6 +40,10 @@
+ #define MS_MOVE 8192
+ #endif
+ 
++#ifndef MNT_DETACH
++#define MNT_DETACH       0x00000002	/* Just detach from the tree */
++#endif
++
+ /* remove all files/directories below dirName -- don't cross mountpoints */
+ static int recursiveRemove(int fd)
+ {
+@@ -131,7 +135,7 @@ static int switchroot(const char *newroot)
+ 
+ 		if ((stat(newmount, &sb) != 0) || (sb.st_dev != newroot_stat.st_dev)) {
+ 			/* mount point seems to be mounted already or stat failed */
+-			umount(umounts[i]);
++			umount2(umounts[i], MNT_DETACH);
+ 			continue;
+ 		}
+ 
+-- 
+1.7.7.5
+

util-linux-ng-2.13-fdformat-man-ide.patch

@@ -1,23 +0,0 @@
---- util-linux-ng-2.13-rc3/disk-utils/fdformat.8.xxx	2007-07-03 01:56:04.000000000 +0200
-+++ util-linux-ng-2.13-rc3/disk-utils/fdformat.8	2007-08-13 12:07:58.000000000 +0200
-@@ -45,6 +45,10 @@
- .BR setfdprm (8)
- to load the disk parameters.
- 
-+For ATAPI IDE floppy driver (also known as LS-120 drives or "Superdisk"
-+drives) you have to use the
-+.BR floppy (8).
-+
- .SH OPTIONS
- .TP
- .B \-n
-@@ -54,7 +58,8 @@
- .BR fd (4),
- .BR setfdprm (8),
- .BR mkfs (8),
--.BR emkfs (8)
-+.BR emkfs (8),
-+.BR floppy (8)
- .SH AUTHOR
- Werner Almesberger (almesber@nessie.cs.id.ethz.ch)
- .SH AVAILABILITY

util-linux-ng-2.16-blkid-cachefile.patch

@@ -1,78 +0,0 @@
----
- misc-utils/blkid.8        |    4 ++--
- misc-utils/blkid.c        |    2 +-
- shlibs/blkid/libblkid.3   |    6 +++---
- shlibs/blkid/src/blkidP.h |    2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
---- util-linux-ng-2.18-rc1.orig/misc-utils/blkid.8
-+++ util-linux-ng-2.18-rc1/misc-utils/blkid.8
-@@ -81,7 +81,7 @@ same meaning as "KiB") or decimal (10^N)
- Read from
- .I cachefile
- instead of reading from the default cache file
--.IR /etc/blkid.tab .
-+.IR /etc/blkid/blkid.tab .
- If you want to start with a clean cache (i.e. don't report devices previously
- scanned but not necessarily available at this time), specify
- .IR /dev/null .
-@@ -228,7 +228,7 @@ Display version number and exit.
- Write the device cache to
- .I writecachefile
- instead of writing it to the default cache file
--.IR /etc/blkid.tab .
-+.IR /etc/blkid/blkid.tab .
- If you don't want to save the cache to the default file, specify
- .IR /dev/null.
- If not specified it will be the same file as that given by the
---- util-linux-ng-2.18-rc1.orig/misc-utils/blkid.c
-+++ util-linux-ng-2.18-rc1/misc-utils/blkid.c
-@@ -65,7 +65,7 @@ static void usage(int error)
- 		"        [-o format] <dev> [dev ...]\n\n"
- 		"  %1$s -i [-s <tag>] [-o format] <dev> [dev ...]\n\n"
- 		"Options:\n"
--		"  -c <file>   cache file (default: /etc/blkid.tab, /dev/null = none)\n"
-+		"  -c <file>   cache file (default: /etc/blkid/blkid.tab, /dev/null = none)\n"
- 		"  -h          print this usage message and exit\n"
- 		"  -g          garbage collect the blkid cache\n"
- 		"  -o <format> output format; can be one of:\n"
---- util-linux-ng-2.18-rc1.orig/shlibs/blkid/libblkid.3
-+++ util-linux-ng-2.18-rc1/shlibs/blkid/libblkid.3
-@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
- specific block device names into configuration files.
- .P
- Block device information is normally kept in a cache file
--.I /etc/blkid.tab
-+.I /etc/blkid/blkid.tab
- and is verified to still be valid before being returned to the user
- (if the user has read permission on the raw block device, otherwise not).
- The cache file also allows unprivileged users (normally anyone other
-@@ -59,7 +59,7 @@ symlink does not match with LABEL or UUI
- .I CACHE_FILE=<path>
- Overrides the standard location of the cache file. This setting can be
- overridden by the environment variable BLKID_FILE. Default is
--.I /etc/blkid.tab.
-+.I /etc/blkid/blkid.tab.
- .TP
- .I EVALUATE=<methods>
- Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
-@@ -77,7 +77,7 @@ from Ted Ts'o.  The library was subseque
- The low-level probing code was rewritten by Karel Zak.
- .SH FILES
- .TP 18
--.I /etc/blkid.tab
-+.I /etc/blkid/blkid.tab
- caches data extracted from each recognized block device
- .TP
- .I /etc/blkid.conf
---- util-linux-ng-2.18-rc1.orig/shlibs/blkid/src/blkidP.h
-+++ util-linux-ng-2.18-rc1/shlibs/blkid/src/blkidP.h
-@@ -279,7 +279,7 @@ extern int blkid_fstatat(DIR *dir, const
- extern int blkid_openat(DIR *dir, const char *dirname, const char *filename,
- 			int flags);
- 
--#define BLKID_CACHE_FILE	"/etc/blkid.tab"
-+#define BLKID_CACHE_FILE	"/etc/blkid/blkid.tab"
- #define BLKID_CONFIG_FILE	"/etc/blkid.conf"
- 
- #define BLKID_ERR_IO	 5

util-linux.spec

@@ -1,8 +1,8 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux
-Version: 2.19.1
-Release: 2%{?dist}
+Version: 2.20.1
+Release: 2.3%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://kernel.org/~kzak/util-linux/
@@ -33,7 +33,9 @@ BuildRequires: popt-devel
 BuildRequires: libutempter-devel
 
 ### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-%{upstream_version}.tar.bz2
+#Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-%{upstream_version}.tar.bz2
+#
+Source0: ftp://ftp.infradead.org/pub/util-linux/v2.20/util-linux-%{upstream_version}.tar.bz2
 Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
@@ -51,7 +53,7 @@ Obsoletes: util-linux-ng < 2.19
 Provides: util-linux-ng = %{version}-%{release}
 
 Requires(post): coreutils
-Requires: pam >= 1.0.90, /etc/pam.d/system-auth
+Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth
 Requires: audit-libs >= 1.0.6
 Requires: libuuid = %{version}-%{release}
 Requires: libblkid = %{version}-%{release}
@@ -66,7 +68,7 @@ Requires: udev
 # add a missing header
 Patch0: util-linux-2.19-floppy-locale.patch
 # add note about ATAPI IDE floppy to fdformat.8
-Patch1: util-linux-ng-2.13-fdformat-man-ide.patch
+Patch1: util-linux-2.20-fdformat-man-ide.patch
 # 169628 - /usr/bin/floppy doesn't work with /dev/fd0
 Patch2: util-linux-2.19-floppy-generic.patch
 
@@ -75,26 +77,25 @@ Patch2: util-linux-2.19-floppy-generic.patch
 # 199745 - Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
 Patch4: util-linux-ng-2.13-ctrlaltdel-man.patch
 # /etc/blkid.tab --> /etc/blkid/blkid.tab
-Patch5: util-linux-ng-2.16-blkid-cachefile.patch
+Patch5: util-linux-2.20-blkid-cachefile.patch
 
 ### Ready for upstream?
 ###
 # 151635 - makeing /var/log/lastlog
 Patch7: util-linux-ng-2.13-login-lastlog.patch
 # 231192 - ipcs is not printing correct values on pLinux
-Patch8: util-linux-ng-2.15-ipcs-32bit.patch
+Patch8: util-linux-2.20-ipcs-32bit.patch
 
-### Upstream patches
-###
-# kernel "3.0"
-Patch9: util-linux-2.19-kernel-version.patch
-# 709319 - 'mount -a' mounts already mounted directories
-Patch10: util-linux-2.19-libmount-mounted.patch
-Patch11: util-linux-2.19-mount-a-bind.patch
-# 709681 - failure to mount if a mount point ends with a slash in /etc/fstab
-Patch12: util-linux-2.19-mount-fsname.patch
-# 716483 - /var/tmp --(BIND-mounted)--> /tmp disrupts/hangs bootup
-Patch13: util-linux-2.19-mount-mountpoint.patch
+# 747250 - /run shows up twice in /proc/mounts
+Patch9: util-linux-2.20-switch_root.patch
+# 769636 - systemd NFS Mounts Ignore "exec" Flag
+Patch10: util-linux-2.20-mount.patch
+# 771607 - The logger utility's "-n"/"--server" option doesn't work
+Patch11: util-linux-2.20-logger.patch
+# 747038 - Mount does not handle context mount correctly
+Patch12: util-linux-2.20-mount-hint.patch
+# 813315 - recursive propagation mounts are not recursive
+Patch13: util-linux-2.20-mount-rec.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -215,7 +216,6 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch12 -p1
 %patch13 -p1
 
-
 %build
 unset LINGUAS || :
 
@@ -232,6 +232,7 @@ export SUID_LDFLAGS="-pie"
 	--enable-login-utils \
 	--enable-kill \
 	--enable-write \
+	--enable-ddate \
 %if %{include_raw}
 	--enable-raw \
 %endif
@@ -514,6 +515,7 @@ fi
 /bin/kill
 /bin/lsblk
 /bin/more
+/bin/mountpoint
 /bin/taskset
 
 /sbin/addpart
@@ -606,6 +608,7 @@ fi
 %{_mandir}/man1/lscpu.1*
 %{_mandir}/man1/mcookie.1*
 %{_mandir}/man1/more.1*
+%{_mandir}/man1/mountpoint.1*
 %{_mandir}/man1/namei.1*
 %{_mandir}/man1/readprofile.1*
 %{_mandir}/man1/rename.1*
@@ -622,7 +625,6 @@ fi
 %{_mandir}/man1/uuidgen.1*
 %{_mandir}/man1/whereis.1*
 %{_mandir}/man1/write.1*
-
 %{_mandir}/ru/man1/ddate.1.gz
 
 %{_mandir}/man5/fstab.5*
@@ -709,12 +711,12 @@ fi
 
 %files -n libmount
 %defattr(-,root,root)
-%doc shlibs/mount/COPYING.libmount
+%doc libmount/COPYING.libmount
 /%{_lib}/libmount.so.*
 
 %files -n libmount-devel
 %defattr(-,root,root)
-%doc shlibs/mount/COPYING.libmount
+%doc libmount/COPYING.libmount
 %{_libdir}/libmount.so
 %{_includedir}/libmount
 %{_libdir}/pkgconfig/mount.pc
@@ -722,13 +724,13 @@ fi
 
 %files -n libblkid
 %defattr(-,root,root)
-%doc shlibs/blkid/COPYING.libblkid
+%doc libblkid/COPYING.libblkid
 %dir /etc/blkid
 /%{_lib}/libblkid.so.*
 
 %files -n libblkid-devel
 %defattr(-,root,root)
-%doc shlibs/blkid/COPYING.libblkid
+%doc libblkid/COPYING.libblkid
 %{_libdir}/libblkid.so
 %{_includedir}/blkid
 %{_mandir}/man3/libblkid.3*
@@ -737,12 +739,12 @@ fi
 
 %files -n libuuid
 %defattr(-,root,root)
-%doc shlibs/uuid/COPYING.libuuid
+%doc libuuid/COPYING.libuuid
 /%{_lib}/libuuid.so.*
 
 %files -n libuuid-devel
 %defattr(-,root,root)
-%doc shlibs/uuid/COPYING.libuuid
+%doc libuuid/COPYING.libuuid
 %{_libdir}/libuuid.so
 %{_includedir}/uuid
 %{_mandir}/man3/uuid.3*
@@ -752,6 +754,7 @@ fi
 %{_mandir}/man3/uuid_generate.3*
 %{_mandir}/man3/uuid_generate_random.3*
 %{_mandir}/man3/uuid_generate_time.3*
+%{_mandir}/man3/uuid_generate_time_safe.3*
 %{_mandir}/man3/uuid_is_null.3*
 %{_mandir}/man3/uuid_parse.3*
 %{_mandir}/man3/uuid_time.3*
@@ -760,6 +763,41 @@ fi
 
 
 %changelog
+* Tue Apr 17 2012 Karel Zak <kzak@redhat.com> 2.20.1-2.3
+- fix #813315 - recursive propagation mounts are not recursive
+
+* Thu Jan 19 2012 Michal Luscon <mluscon@redhat.com> 2.20.1-2.2
+- fix #747250 - /run shows up twice in /proc/mounts
+- fix #769636 - systemd NFS Mounts Ignore "exec" Flag
+- fix #771607 - The logger utility's "-n"/"--server" option doesn't work
+- fix #747038 - Mount does not handle context mount correctly
+
+* Tue Nov 22 2011 Karel Zak <kzak@redhat.com> 2.20.1-2.1
+- fix #748216 - util-linux requires pam >= 1.1.3-7
+
+* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.20.1-2
+- Rebuilt for glibc bug#747377
+
+* Thu Oct 20 2011 Karel Zak <kzak@redhat.com> 2.20.1-1
+- upgrade to the release 2.20.1
+  ftp://ftp.infradead.org/pub/util-linux/v2.20/v2.20.1-ReleaseNotes
+- fix #737091 - mount command picks random mount point to operate on during remount
+- fix #739522 - login user input is not shown on serial console
+- fix #745746 - Unable to umount nfs shares using the force option
+- fix #746705 - Remounting tmpfs read-write hangs
+- fix #747250 - /run shows up twice in /proc/mounts
+
+* Mon Aug 29 2011 Karel Zak <kzak@redhat.com> 2.20-1
+- upgrade to the release 2.20
+
+* Wed Aug 17 2011 Karel Zak <kzak@redhat.com> 2.20-0.2
+- upgrade to the release 2.20-rc2
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-rc2-ChangeLog
+
+* Fri Aug  2 2011 Karel Zak <kzak@redhat.com> 2.20-0.1
+- upgrade to the release 2.20-rc1
+  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-ReleaseNotes
+
 * Mon Jul  4 2011 Karel Zak <kzak@redhat.com> 2.19.1-2
 - fix #716483 - /var/tmp --(BIND-mounted)--> /tmp disrupts/hangs bootup
 - fix #709681 - failure to mount if a mount point ends with a slash in /etc/fstab