diff --git a/adjtimex-1.20-nosyscall.diff b/adjtimex-1.20-nosyscall.diff
deleted file mode 100644
index 3a288c9..0000000
--- a/adjtimex-1.20-nosyscall.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- adjtimex-1.20/adjtimex.c
-+++ adjtimex-1.20/adjtimex.c
-@@ -35,15 +35,6 @@
- #include <sys/ioctl.h>
- #include <linux/rtc.h>
- 
--#ifdef __alpha__
--extern int adjtimex(struct timex *);
--#else
--#ifdef __ia64__
--extern int adjtimex(struct timex *);
--#else
--_syscall1(int, adjtimex, struct timex *, txcp)
--#endif
--#endif
- int F_print = 0;
- 
- #ifndef LOG_PATH
diff --git a/adjtimex-1.20.tar.bz2 b/adjtimex-1.20.tar.bz2
deleted file mode 100644
index 72479ce..0000000
--- a/adjtimex-1.20.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad3619a6f4f04d278ac3d3e0261649465a9748dc84220aa5f4060aadaea839ba
-size 50096
diff --git a/adjtimex-1.28.tar.bz2 b/adjtimex-1.28.tar.bz2
new file mode 100644
index 0000000..6347052
--- /dev/null
+++ b/adjtimex-1.28.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:527a20975cbcffb39ab122867c4a9438cf09e7d1e01a06eaa2f340de282a4c95
+size 75184
diff --git a/baselibs.conf b/baselibs.conf
index 5d89a17..46b935b 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -2,12 +2,11 @@ libuuid1
 libuuid-devel
 	requires -libuuid-<targettype>
 	requires "libuuid1-<targettype> = <version>"
-	requires -libblkid-<targettype>
-	requires "libblkid1-<targettype> = <version>"
 libblkid1
-	obsoletes "e2fsprogs-<targettype> <= <version>"
 libblkid-devel
 	requires -libblkid-<targettype>
 	requires "libblkid1-<targettype> = <version>"
-	requires -libuuid-<targettype>
-	requires "libuuid1-<targettype> = <version>"
+libmount1
+libmount-devel
+	requires -libmount-<targettype>
+	requires "libmount1-<targettype> = <version>"
diff --git a/util-linux-2.12r-fdisk_remove_bogus_warnings.patch b/util-linux-2.12r-fdisk_remove_bogus_warnings.patch
index 6d8694d..ca5a94c 100644
--- a/util-linux-2.12r-fdisk_remove_bogus_warnings.patch
+++ b/util-linux-2.12r-fdisk_remove_bogus_warnings.patch
@@ -1,8 +1,8 @@
-Index: util-linux-ng-2.16/fdisk/fdisk.c
+Index: util-linux-ng-2.18/fdisk/fdisk.c
 ===================================================================
---- util-linux-ng-2.16.orig/fdisk/fdisk.c
-+++ util-linux-ng-2.16/fdisk/fdisk.c
-@@ -1586,6 +1586,7 @@ static void check_consistency(struct par
+--- util-linux-ng-2.18.orig/fdisk/fdisk.c	2010-06-30 14:44:25.000000000 +0200
++++ util-linux-ng-2.18/fdisk/fdisk.c	2010-07-08 14:35:07.000000000 +0200
+@@ -1838,6 +1838,7 @@ static void check_consistency(struct par
  /* compute logical ending (c, h, s) */
  	long2chs(get_start_sect(p) + get_nr_sects(p) - 1, &lec, &leh, &les);
  
@@ -10,7 +10,7 @@ Index: util-linux-ng-2.16/fdisk/fdisk.c
  /* Same physical / logical beginning? */
  	if (cylinders <= 1024 && (pbc != lbc || pbh != lbh || pbs != lbs)) {
  		printf(_("Partition %d has different physical/logical "
-@@ -1602,7 +1603,6 @@ static void check_consistency(struct par
+@@ -1854,7 +1855,6 @@ static void check_consistency(struct par
  		printf(_("logical=(%d, %d, %d)\n"),lec, leh, les);
  	}
  
diff --git a/util-linux-2.14.1-mount_skip_sync.patch b/util-linux-2.14.1-mount_skip_sync.patch
deleted file mode 100644
index bc5bdf1..0000000
--- a/util-linux-2.14.1-mount_skip_sync.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nurw util-linux-ng-2.16.orig/mount/umount.c util-linux-ng-2.16/mount/umount.c
---- util-linux-ng-2.16.orig/mount/umount.c	2009-07-04 01:20:06.000000000 +0200
-+++ util-linux-ng-2.16/mount/umount.c	2009-09-29 14:50:44.000000000 +0200
-@@ -361,6 +361,7 @@
- umount_all (char *types, char *test_opts) {
-      struct mntentchn *mc, *hd;
-      int errors = 0;
-+     int do_sync = 0;
- 
-      hd = mtab_head();
-      if (!hd->prev)
-@@ -370,9 +371,11 @@
- 	      && matching_opts (mc->m.mnt_opts, test_opts)) {
- 	       errors |= umount_one (mc->m.mnt_fsname, mc->m.mnt_dir,
- 				     mc->m.mnt_type, mc->m.mnt_opts, mc);
-+	       do_sync = 1;		     
- 	  }
-      }
- 
-+     if (do_sync)
-      sync ();
-      return errors;
- }
diff --git a/util-linux-2.17.1-mount_losetup_crypto.patch b/util-linux-2.17.1-mount_losetup_crypto.patch
index 24cd77c..93475eb 100644
--- a/util-linux-2.17.1-mount_losetup_crypto.patch
+++ b/util-linux-2.17.1-mount_losetup_crypto.patch
@@ -38,24 +38,23 @@ Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
  create mode 100644 mount/sha512.c
  create mode 100644 mount/sha512.h
 
-diff --git a/mount/Makefile.am b/mount/Makefile.am
-index c5f58aa..43ff01a 100644
---- a/mount/Makefile.am
-+++ b/mount/Makefile.am
-@@ -7,7 +7,8 @@ sbin_PROGRAMS = losetup swapon
+Index: util-linux-ng-2.18/mount/Makefile.am
+===================================================================
+--- util-linux-ng-2.18.orig/mount/Makefile.am	2010-05-24 12:35:47.000000000 +0200
++++ util-linux-ng-2.18/mount/Makefile.am	2010-07-08 14:39:01.000000000 +0200
+@@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon
  dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
  
  # generic sources for all programs (mount, umount, losetup)
--srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h
-+srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h \
-+	      rmd160.c sha512.c
+-srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h
++srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c sha512.c
  
  # generic header for mount and umount
  hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
-diff --git a/mount/lomount.c b/mount/lomount.c
-index 67712c6..a0b951c 100644
---- a/mount/lomount.c
-+++ b/mount/lomount.c
+Index: util-linux-ng-2.18/mount/lomount.c
+===================================================================
+--- util-linux-ng-2.18.orig/mount/lomount.c	2010-05-19 23:36:23.000000000 +0200
++++ util-linux-ng-2.18/mount/lomount.c	2010-07-08 14:39:29.000000000 +0200
 @@ -23,6 +23,12 @@
  #include "sundries.h"
  #include "xmalloc.h"
@@ -143,7 +142,7 @@ index 67712c6..a0b951c 100644
  	char *filename;
  
  	if (verbose) {
-@@ -707,13 +742,37 @@ set_loop(const char *device, const char *file, unsigned long long offset,
+@@ -707,13 +742,37 @@ set_loop(const char *device, const char
  		filename = (char *) file;
  	xstrncpy((char *)loopinfo64.lo_file_name, filename, LO_NAME_SIZE);
  
@@ -183,7 +182,7 @@ index 67712c6..a0b951c 100644
  		}
  	}
  
-@@ -734,20 +793,70 @@ set_loop(const char *device, const char *file, unsigned long long offset,
+@@ -734,20 +793,70 @@ set_loop(const char *device, const char
  	}
  #endif
  
@@ -266,7 +265,7 @@ index 67712c6..a0b951c 100644
  	}
  
  	if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-@@ -895,7 +1004,13 @@ usage(void) {
+@@ -897,7 +1006,13 @@ usage(void) {
  
  	fprintf(stderr, _("\nOptions:\n"
    " -e | --encryption <type> enable data encryption with specified <name/num>\n"
@@ -280,7 +279,7 @@ index 67712c6..a0b951c 100644
    " -o | --offset <num>      start at offset <num> into file\n"
    "      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
    " -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-@@ -908,11 +1023,14 @@ usage(void) {
+@@ -910,11 +1025,14 @@ usage(void) {
  int
  main(int argc, char **argv) {
  	char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
@@ -292,10 +291,10 @@ index 67712c6..a0b951c 100644
  	int ro = 0;
  	int pfd = -1;
 +	int keysz = 0;
- 	unsigned long long off, slimit;
+ 	uintmax_t off = 0, slimit = 0;
  	struct option longopts[] = {
  		{ "all", 0, 0, 'a' },
-@@ -921,6 +1039,8 @@ main(int argc, char **argv) {
+@@ -923,6 +1041,8 @@ main(int argc, char **argv) {
  		{ "encryption", 1, 0, 'e' },
  		{ "find", 0, 0, 'f' },
  		{ "help", 0, 0, 'h' },
@@ -305,8 +304,8 @@ index 67712c6..a0b951c 100644
  		{ "offset", 1, 0, 'o' },
  		{ "sizelimit", 1, 0, 128 },
 @@ -939,12 +1059,13 @@ main(int argc, char **argv) {
- 	off = 0;
-         slimit = 0;
+ 
+ 	capacity = delete = find = all = 0;
  	assoc = offset = sizelimit = encryption = passfd = NULL;
 +	keysize = NULL;
  
@@ -332,7 +331,7 @@ index 67712c6..a0b951c 100644
  		case 'o':
  			offset = optarg;
  			break;
-@@ -1054,8 +1181,11 @@ main(int argc, char **argv) {
+@@ -1058,8 +1185,11 @@ main(int argc, char **argv) {
  	else {
  		if (passfd && sscanf(passfd, "%d", &pfd) != 1)
  			usage();
@@ -345,10 +344,10 @@ index 67712c6..a0b951c 100644
  			if (res == 2 && find) {
  				if (verbose)
  					printf(_("stolen loop=%s...trying again\n"),
-diff --git a/mount/lomount.h b/mount/lomount.h
-index 59108d4..07ab875 100644
---- a/mount/lomount.h
-+++ b/mount/lomount.h
+Index: util-linux-ng-2.18/mount/lomount.h
+===================================================================
+--- util-linux-ng-2.18.orig/mount/lomount.h	2010-02-04 12:53:56.000000000 +0100
++++ util-linux-ng-2.18/mount/lomount.h	2010-07-08 14:38:38.000000000 +0200
 @@ -1,5 +1,6 @@
 -extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
 -		    const char *, int, int *);
@@ -358,11 +357,11 @@ index 59108d4..07ab875 100644
  extern int del_loop(const char *);
  extern int is_loop_device(const char *);
  extern int is_loop_autoclear(const char *device);
-diff --git a/mount/losetup.8 b/mount/losetup.8
-index 8ccab6c..8566898 100644
---- a/mount/losetup.8
-+++ b/mount/losetup.8
-@@ -92,9 +92,18 @@ find the first unused loop device. If a
+Index: util-linux-ng-2.18/mount/losetup.8
+===================================================================
+--- util-linux-ng-2.18.orig/mount/losetup.8	2010-05-19 23:36:23.000000000 +0200
++++ util-linux-ng-2.18/mount/losetup.8	2010-07-08 14:38:38.000000000 +0200
+@@ -96,9 +96,18 @@ find the first unused loop device. If a
  argument is present, use this device. Otherwise, print its name
  .IP "\fB\-h, \-\-help\fP"
  print help
@@ -381,7 +380,7 @@ index 8ccab6c..8566898 100644
  .IP "\fB\-o, \-\-offset \fIoffset\fP"
  the data start is moved \fIoffset\fP bytes into the specified file or
  device
-@@ -165,6 +174,8 @@ the command
+@@ -169,6 +178,8 @@ the command
  .fi
  .SH RESTRICTION
  DES encryption is painfully slow. On the other hand, XOR is terribly weak.
@@ -390,11 +389,11 @@ index 8ccab6c..8566898 100644
  
  Cryptoloop is deprecated in favor of dm-crypt. For more details see
  .BR cryptsetup (8).
-diff --git a/mount/mount.8 b/mount/mount.8
-index 2888b46..582898a 100644
---- a/mount/mount.8
-+++ b/mount/mount.8
-@@ -826,6 +826,15 @@ Every time the inode is modified, the i_version field will be incremented.
+Index: util-linux-ng-2.18/mount/mount.8
+===================================================================
+--- util-linux-ng-2.18.orig/mount/mount.8	2010-06-30 10:41:35.000000000 +0200
++++ util-linux-ng-2.18/mount/mount.8	2010-07-08 14:38:38.000000000 +0200
+@@ -869,6 +869,15 @@ Every time the inode is modified, the i_
  .B noiversion
  Do not increment the i_version inode field.
  .TP
@@ -410,7 +409,7 @@ index 2888b46..582898a 100644
  .B mand
  Allow mandatory locks on this filesystem. See
  .BR fcntl (2).
-@@ -2525,6 +2534,10 @@ that are really options to
+@@ -2582,6 +2591,10 @@ that are really options to
  .BR \%losetup (8).
  (These options can be used in addition to those specific
  to the filesystem type.)
@@ -419,13 +418,13 @@ index 2888b46..582898a 100644
 +.BR \-\-pass-fd
 +option.
  
- If no explicit loop device is mentioned
- (but just an option `\fB\-o loop\fP' is given), then
-diff --git a/mount/mount.c b/mount/mount.c
-index efe1165..09006f7 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
-@@ -95,6 +95,9 @@ struct mountargs {
+ Since Linux 2.6.25 is supported auto-destruction of loop devices and
+ then any loop device allocated by
+Index: util-linux-ng-2.18/mount/mount.c
+===================================================================
+--- util-linux-ng-2.18.orig/mount/mount.c	2010-06-30 12:51:09.000000000 +0200
++++ util-linux-ng-2.18/mount/mount.c	2010-07-08 14:38:38.000000000 +0200
+@@ -96,6 +96,9 @@ struct mountargs {
         void *data;
  };
  
@@ -435,7 +434,7 @@ index efe1165..09006f7 100644
  /* Map from -o and fstab option strings to the flag argument to mount(2).  */
  struct opt_map {
    const char *opt;		/* option name */
-@@ -200,6 +203,7 @@ static int opt_nofail = 0;
+@@ -201,6 +204,7 @@ static int opt_nofail = 0;
  
  static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit,
          *opt_encryption, *opt_speed, *opt_comment, *opt_uhelper;
@@ -443,7 +442,7 @@ index efe1165..09006f7 100644
  
  static int is_readonly(const char *node);
  static int mounted (const char *spec0, const char *node0);
-@@ -216,6 +220,8 @@ static struct string_opt_map {
+@@ -217,6 +221,8 @@ static struct string_opt_map {
    { "offset=",	0, &opt_offset },
    { "sizelimit=",  0, &opt_sizelimit },
    { "encryption=", 0, &opt_encryption },
@@ -452,7 +451,7 @@ index efe1165..09006f7 100644
    { "speed=", 0, &opt_speed },
    { "comment=", 1, &opt_comment },
    { "uhelper=", 0, &opt_uhelper },
-@@ -1081,7 +1087,8 @@ loop_check(const char **spec, const char **type, int *flags,
+@@ -1116,7 +1122,8 @@ loop_check(const char **spec, const char
        *type = opt_vfstype;
    }
  
@@ -461,8 +460,8 @@ index efe1165..09006f7 100644
 +	    opt_encryption || opt_phash || opt_keybits);
    *loopfile = *spec;
  
-   if (*loop) {
-@@ -1113,7 +1120,7 @@ loop_check(const char **spec, const char **type, int *flags,
+   /* Automatically create a loop device from a regular file if a filesystem
+@@ -1170,7 +1177,7 @@ loop_check(const char **spec, const char
  	  printf(_("mount: going to use the loop device %s\n"), *loopdev);
  
  	if ((res = set_loop(*loopdev, *loopfile, offset, sizelimit,
@@ -471,7 +470,7 @@ index efe1165..09006f7 100644
  	  if (res == 2) {
  	     /* loop dev has been grabbed by some other process,
  	        try again, if not given explicitly */
-@@ -1920,6 +1927,7 @@ static struct option longopts[] = {
+@@ -1981,6 +1988,7 @@ static struct option longopts[] = {
  	{ "options", 1, 0, 'o' },
  	{ "test-opts", 1, 0, 'O' },
  	{ "pass-fd", 1, 0, 'p' },
@@ -479,7 +478,7 @@ index efe1165..09006f7 100644
  	{ "types", 1, 0, 't' },
  	{ "bind", 0, 0, 'B' },
  	{ "move", 0, 0, 'M' },
-@@ -2082,6 +2090,7 @@ main(int argc, char *argv[]) {
+@@ -2143,6 +2151,7 @@ main(int argc, char *argv[]) {
  	char *options = NULL, *test_opts = NULL, *node;
  	const char *spec = NULL;
  	char *label = NULL;
@@ -487,7 +486,7 @@ index efe1165..09006f7 100644
  	char *uuid = NULL;
  	char *types = NULL;
  	char *p;
-@@ -2112,7 +2121,7 @@ main(int argc, char *argv[]) {
+@@ -2173,7 +2182,7 @@ main(int argc, char *argv[]) {
  	initproctitle(argc, argv);
  #endif
  
@@ -496,7 +495,7 @@ index efe1165..09006f7 100644
  				 longopts, NULL)) != -1) {
  		switch (c) {
  		case 'a':	       /* mount everything in fstab */
-@@ -2133,6 +2142,9 @@ main(int argc, char *argv[]) {
+@@ -2194,6 +2203,9 @@ main(int argc, char *argv[]) {
  		case 'i':
  			external_allowed = 0;
  			break;
@@ -506,7 +505,7 @@ index efe1165..09006f7 100644
  		case 'l':
  			list_with_volumelabel = 1;
  			break;
-@@ -2280,6 +2292,9 @@ main(int argc, char *argv[]) {
+@@ -2341,6 +2353,9 @@ main(int argc, char *argv[]) {
  
  	atexit(unlock_mtab);
  
@@ -516,11 +515,10 @@ index efe1165..09006f7 100644
  	switch (argc+specseen) {
  	case 0:
  		/* mount -a */
-diff --git a/mount/rmd160.c b/mount/rmd160.c
-new file mode 100644
-index 0000000..3430954
---- /dev/null
-+++ b/mount/rmd160.c
+Index: util-linux-ng-2.18/mount/rmd160.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/rmd160.c	2010-07-08 14:38:38.000000000 +0200
 @@ -0,0 +1,532 @@
 +/* rmd160.c  -	RIPE-MD160
 + *	Copyright (C) 1998 Free Software Foundation, Inc.
@@ -1054,11 +1052,10 @@ index 0000000..3430954
 +    rmd160_final( &hd );
 +    memcpy( outbuf, hd.buf, 20 );
 +}
-diff --git a/mount/rmd160.h b/mount/rmd160.h
-new file mode 100644
-index 0000000..4b2c61d
---- /dev/null
-+++ b/mount/rmd160.h
+Index: util-linux-ng-2.18/mount/rmd160.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/rmd160.h	2010-07-08 14:38:38.000000000 +0200
 @@ -0,0 +1,11 @@
 +#ifndef RMD160_H
 +#define RMD160_H
@@ -1071,11 +1068,10 @@ index 0000000..4b2c61d
 +#endif /*RMD160_H*/
 +
 +
-diff --git a/mount/sha512.c b/mount/sha512.c
-new file mode 100644
-index 0000000..f717c8b
---- /dev/null
-+++ b/mount/sha512.c
+Index: util-linux-ng-2.18/mount/sha512.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/sha512.c	2010-07-08 14:38:38.000000000 +0200
 @@ -0,0 +1,432 @@
 +/*
 + *  sha512.c
@@ -1509,11 +1505,10 @@ index 0000000..f717c8b
 +    memset(&ctx, 0, sizeof(ctx));
 +}
 +#endif
-diff --git a/mount/sha512.h b/mount/sha512.h
-new file mode 100644
-index 0000000..4b57c01
---- /dev/null
-+++ b/mount/sha512.h
+Index: util-linux-ng-2.18/mount/sha512.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/sha512.h	2010-07-08 14:38:38.000000000 +0200
 @@ -0,0 +1,45 @@
 +/*
 + *  sha512.h
@@ -1560,6 +1555,3 @@ index 0000000..4b57c01
 +/* no sha384_write(), use sha512_write() */
 +/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47]  */
 +extern void sha384_hash_buffer(const unsigned char *, size_t, unsigned char *, size_t);
--- 
-1.6.4.2
-
diff --git a/util-linux-addpart-use-atoll.patch b/util-linux-addpart-use-atoll.patch
deleted file mode 100644
index 35310a9..0000000
--- a/util-linux-addpart-use-atoll.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: util-linux-ng-2.17.2/partx/addpart.c
-===================================================================
---- util-linux-ng-2.17.2.orig/partx/addpart.c	2010-01-28 15:57:59.000000000 +0100
-+++ util-linux-ng-2.17.2/partx/addpart.c	2010-05-11 15:51:26.000000000 +0200
-@@ -25,8 +25,8 @@ main(int argc, char **argv){
- 		exit(1);
- 	}
- 	p.pno = atoi(argv[2]);
--	p.start = 512 * ((long long) atol(argv[3]));
--	p.length = 512 * ((long long) atol(argv[4]));
-+	p.start = 512 * atoll(argv[3]);
-+	p.length = 512 * atoll(argv[4]);
- 	p.devname[0] = 0;
- 	p.volname[0] = 0;
- 	a.op = BLKPG_ADD_PARTITION;
diff --git a/util-linux-mount-detect-ro-mount.patch b/util-linux-mount-detect-ro-mount.patch
deleted file mode 100644
index 313b2b3..0000000
--- a/util-linux-mount-detect-ro-mount.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 81694f8c60dffb7851f941e69a1b79bc573ace53 Mon Sep 17 00:00:00 2001
-From: Petr Uzel <petr.uzel@suse.cz>
-Date: Fri, 21 May 2010 15:19:31 +0200
-Subject: [PATCH] mount: detect when kernel silently adds MS_RDONLY flag
-
-Linux kernel can silently add MS_RDONLY flag when mounting file system that
-does not have write support. Check this to avoid 'ro' in /proc/mounts and 'rw'
-in mtab.
-
-[kzak@redhat.com: - don't check for 'ro' for MS_MOVE and MS_PROPAGATION]
-
-Reported-by: James Foris <jim.foris@med.ge.com>
-Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- mount/mount.c |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-Index: util-linux-ng-2.17.2/mount/mount.c
-===================================================================
---- util-linux-ng-2.17.2.orig/mount/mount.c	2010-05-28 15:22:47.000000000 +0200
-+++ util-linux-ng-2.17.2/mount/mount.c	2010-05-28 15:23:03.000000000 +0200
-@@ -1388,6 +1388,18 @@ mount_retry:
-       flags &= ~MS_RDONLY;
-   }
- 
-+  /* Kernel can silently add MS_RDONLY flag when mounting file system that
-+   * does not have write support. Check this to avoid 'ro' in /proc/mounts
-+   * and 'rw' in mtab.
-+   */
-+  if (!fake && mnt5_res == 0 &&
-+      !(flags & MS_RDONLY) && !(flags & MS_PROPAGATION) && !(flags & MS_MOVE) &&
-+      is_readonly(node)) {
-+
-+      printf(_("mount: warning: %s seems to be mounted read-only.\n"), node);
-+      flags |= MS_RDONLY;
-+  }
-+
-   if (fake || mnt5_res == 0) {
-       /* Mount succeeded, report this (if verbose) and write mtab entry.  */
- 
diff --git a/util-linux-ng-2.17.2.tar.bz2 b/util-linux-ng-2.17.2.tar.bz2
deleted file mode 100644
index 9eb499a..0000000
--- a/util-linux-ng-2.17.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c9ae801b6a5ab20b7749a278a8bf6830ef53adc5e8b7eb0ac1a9f410c774118f
-size 3815657
diff --git a/util-linux-ng-2.18.tar.bz2 b/util-linux-ng-2.18.tar.bz2
new file mode 100644
index 0000000..4afa426
--- /dev/null
+++ b/util-linux-ng-2.18.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8c5c07c763888aa712b4585393346667a00793127c54cef0470cfa456b031cc
+size 7669676
diff --git a/util-linux-rpmlintrc b/util-linux-rpmlintrc
index 1741f88..52ce686 100644
--- a/util-linux-rpmlintrc
+++ b/util-linux-rpmlintrc
@@ -1,5 +1,4 @@
 addFilter("init-script-without-%stop_on_removal-preun /etc/init.d/raw")
 addFilter("incoherent-init-script-name raw")
 addFilter("no-reload-entry /etc/init.d/raw")
-addFilter("files-duplicate .*(rootflags|ramsize|vidmode)")
  
diff --git a/util-linux.changes b/util-linux.changes
index 24f134a..6901a66 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Jul  9 06:23:27 UTC 2010 - puzel@novell.com
+
+- update to util-linux-ng-2.18
+  - do not provide rdev, ramsize, vidmode and rootflags commands
+    anymore
+  - fdisk does not use cylinders as display units by default
+  - libmount: new library; its API is still officially unstable
+  - new commands: findmnt, fsfreeze, swaplabel
+  - blkid: new option "-i" to print I/O limits
+  - full release notes:
+    ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes
+- update to adjtimex-1.28
+- update to which-2.20 
+- drop util-linux-2.14.1-mount_skip_sync.patch (fixed upstream)
+- drop util-linux-addpart-use-atoll.patch (fixed upstream)
+- drop util-linux-mount-detect-ro-mount.patch (fixed upstream)
+- drop adjtimex-1.20-nosyscall.diff (fixed upstream)
+- cleanup specfile a bit
+
 -------------------------------------------------------------------
 Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de
 
diff --git a/util-linux.spec b/util-linux.spec
index 6678082..4582e88 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package util-linux (Version 2.17.2)
+# spec file for package util-linux (Version 2.18)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,30 +17,40 @@
 
 
 
+%define time_ver 1.7
+%define which_ver 2.20
+%define adjtimex_ver 1.28
+
 Name:           util-linux
-BuildRequires:  audit-devel gettext-devel pkg-config
-BuildRequires:  libselinux-devel libsepol-devel ncurses-devel pam-devel readline-devel zlib-devel
+BuildRequires:  audit-devel 
+BuildRequires:  gettext-devel 
+BuildRequires:  libselinux-devel 
+BuildRequires:  libsepol-devel 
+BuildRequires:  ncurses-devel
+BuildRequires:  pam-devel 
+BuildRequires:  pkg-config
+BuildRequires:  readline-devel 
+BuildRequires:  zlib-devel
 Url:            http://userweb.kernel.org/~kzak/util-linux-ng/
 Supplements:    filesystem(minix)
 PreReq:         %install_info_prereq permissions
 License:        GPLv2+
 Group:          System/Base
 AutoReqProv:    on
-Version:        2.17.2
+Version:        2.18
 Release:        5
 Recommends:     %name-lang = %{version}
 Summary:        A collection of basic system utilities
 Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
 Source1:        util-linux-rpmlintrc
+# XXX: make nologin part of login package
 Source2:        nologin.c
 Source3:        nologin.8
 Source4:        raw.init
 Source5:        etc.raw
 Source6:        etc_filesystems
+# XXX: add libmnt
 Source7:        baselibs.conf
-%define time_ver 1.7
-%define which_ver 2.19
-%define adjtimex_ver 1.20
 # XXX: post upstream?
 Source9:        adjtimex-%{adjtimex_ver}.tar.bz2
 # XXX: post upstream?
@@ -66,20 +76,13 @@ Source51:       blkid.conf
 ##
 # 241372 - remove legacy warnings from fdisk
 Patch1:         util-linux-2.12r-fdisk_remove_bogus_warnings.patch
-# bnc#447036
-Patch2:         util-linux-2.14.1-mount_skip_sync.patch
 # crypto patch
 Patch3:         util-linux-2.17.1-mount_losetup_crypto.patch
 Patch4:         util-linux-2.17.1-losetup-honor-documented-c-option
-# 603328
-Patch5:         util-linux-addpart-use-atoll.patch
-# bnc#481123
-Patch6:         util-linux-mount-detect-ro-mount.patch
 Patch7:         util-linux-swapon-btrfs-limitations
 ##
 ## adjtimex
 ##
-Patch50:        adjtimex-1.20-nosyscall.diff
 ##
 ## klogconsole
 ##
@@ -96,8 +99,8 @@ Patch70:        which-lib64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %insserv_prereq %fillup_prereq /bin/sed
 #
-Provides:       util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} schedutils = %{version}-%{release} uuid-runtime = %{version}-%{release}
-Obsoletes:      util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} schedutils < %{version}-%{release} uuid-runtime < %{version}-%{release}
+Provides:       util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} uuid-runtime = %{version}-%{release}
+Obsoletes:      util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} uuid-runtime < %{version}-%{release}
 
 %description
 This package contains a large variety of low-level system utilities
@@ -118,7 +121,7 @@ License:        GPLv2+
 Summary:        Development files for the filesystem detection library
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
-Requires:       libblkid1 = %version libuuid-devel
+Requires:       libblkid1 = %version
 
 %description -n libblkid-devel
 Files needed to develop applications using the library for filesystem
@@ -156,27 +159,44 @@ Requires:       libuuid1 = %version
 Files to develop applications using the library to generate universally
 unique IDs (UUIDs).
 
+%package -n libmount1
+License:        GPLv2+
+Summary:        Mount library
+Group:          System/Filesystems
+AutoReqProv:    on
+
+%description -n libmount1
+Library designed to be used in low-level utils like
+mount(8) and /sbin/mount.<type> helpers.
+
+%package -n libmount-devel
+License:        GPLv2+
+Summary:        Development files for libmount1
+Group:          Development/Libraries/C and C++
+AutoReqProv:    on
+Requires:       libmount1 = %version
+
+%description -n libmount-devel
+Files to develop applications using the libmount library.
+
 %lang_package
 %prep
 %setup -q -a 9 -b 11 -b 12 -b 13 -n %name-ng-%version
-#patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 %patch7 -p1
 #
 cd adjtimex-*
-%patch50 -p1
+# adjtimex patches belongs here
 cd -
 # setctsid
 cp %{S:22} %{S:23} .
 # nologin
 cp %{S:2} %{S:3} %{S:26} %{S:30} .
 cd ../klogconsole
-%patch55 -p1 -b .quiet
+#%#patch55 -p1 -b .quiet
+%patch55 -p1
 %patch56 -p1 
 cd ../time-*
 %patch60
@@ -192,7 +212,6 @@ cd ..
 pushd ../
 # which build
 cd which-%{which_ver}
-#autoreconf -fi
 aclocal --force
 autoconf --force
 automake --force-missing --add-missing --foreign
@@ -243,9 +262,6 @@ CFLAGS="$RPM_OPT_FLAGS" \
   --enable-write \
   --disable-use-tty-group \
   --disable-static \
-%ifarch %ix86 x86_64
-  --enable-rdev \
-%endif
 #
 make %{?_smp_mflags}
 #
@@ -300,6 +316,7 @@ install -m 644 %{SOURCE6} $RPM_BUILD_ROOT/etc/filesystems
 install -m 755 nologin $RPM_BUILD_ROOT/sbin
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libblkid.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libuuid.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libmount.la
 %ifnarch ppc ppc64
 install -m 755 mkzimage_cmdline $RPM_BUILD_ROOT/usr/bin
 install -m 644 %{S:28} $RPM_BUILD_ROOT%{_mandir}/man8
@@ -385,6 +402,12 @@ fi
 %postun -n libblkid1
 /sbin/ldconfig
 
+%post -n libmount1
+/sbin/ldconfig
+
+%postun -n libmount1
+/sbin/ldconfig
+
 %pre -n uuidd
 /usr/sbin/groupadd -r uuidd 2>/dev/null || :
 /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
@@ -432,6 +455,7 @@ fi
 /bin/more
 /bin/mount
 /bin/umount
+/bin/findmnt
 /sbin/adjtimex
 /sbin/agetty
 /sbin/blockdev
@@ -455,6 +479,8 @@ fi
 /sbin/fsck
 /sbin/switch_root
 /sbin/wipefs
+/sbin/fsfreeze
+/sbin/swaplabel
 /usr/bin/ipcmk
 /bin/logger
 /usr/bin/cal
@@ -473,8 +499,6 @@ fi
 /usr/bin/ipcs
 /usr/bin/isosize
 /usr/bin/line
-#/usr/bin/linux32
-#/usr/bin/linux64
 /usr/bin/look
 /usr/bin/lscpu
 /usr/bin/mcookie
@@ -573,13 +597,14 @@ fi
 %{_mandir}/man8/fsck.minix.8.gz
 %{_mandir}/man8/isosize.8.gz
 %{_mandir}/man8/ldattach.8.gz
-#%{_mandir}/man8/linux32.8.gz
-#%{_mandir}/man8/linux64.8.gz
 %{_mandir}/man8/losetup.8.gz
 %{_mandir}/man8/mkfs.8.gz
 %{_mandir}/man8/mkswap.8.gz
 %{_mandir}/man8/mount.8.gz
 %{_mandir}/man8/nologin.8.gz
+%{_mandir}/man8/findmnt.8.gz
+%{_mandir}/man8/fsfreeze.8.gz
+%{_mandir}/man8/swaplabel.8.gz
 %ifnarch ppc ppc64
 %{_mandir}/man8/mkzimage_cmdline.8.gz
 %endif
@@ -600,7 +625,6 @@ fi
 %attr (755,root,root) /usr/share/getopt/getopt-parse.tcsh
 %attr (755,root,root) /usr/share/getopt/getopt-test.bash
 %attr (755,root,root) /usr/share/getopt/getopt-test.tcsh
-#/usr/share/locale/*/LC_MESSAGES/util-linux-ng.mo
 %ifnarch ia64
 %doc fdisk/README.fdisk
 /sbin/fdisk
@@ -613,18 +637,7 @@ fi
 /sbin/cfdisk
 /sbin/sfdisk
 %endif
-%ifarch %ix86 x86_64
-/usr/sbin/ramsize
-/usr/sbin/rdev
-/usr/sbin/rootflags
-/usr/sbin/vidmode
-%{_mandir}/man8/ramsize.8.gz
-%{_mandir}/man8/rdev.8.gz
-%{_mandir}/man8/rootflags.8.gz
-%{_mandir}/man8/vidmode.8.gz
-%endif
 %ifnarch s390 s390x
-#%config(noreplace) /etc/fdprm
 /usr/bin/cytune
 /usr/sbin/fdformat
 /sbin/hwclock
@@ -637,35 +650,6 @@ fi
 %{_mandir}/man8/klogconsole.8.gz
 %{_mandir}/man8/tunelp.8.gz
 %endif
-# setarch links
-#%ifarch %ix86 x86_64
-#/usr/bin/i386
-#%{_mandir}/man8/i386.8.gz
-#%endif
-#%ifarch x86_64
-#/usr/bin/x86_64
-#%{_mandir}/man8/x86_64.8.gz
-#%endif 
-#%ifarch s390 s390x
-#/usr/bin/s390
-#/usr/bin/s390x
-#%{_mandir}/man8/s390.8.gz
-#%{_mandir}/man8/s390x.8.gz
-#%endif
-#%ifarch ppc ppc64
-#/usr/bin/ppc
-#/usr/bin/ppc32
-#/usr/bin/ppc64
-#%{_mandir}/man8/ppc.8.gz
-#%{_mandir}/man8/ppc32.8.gz
-#%{_mandir}/man8/ppc64.8.gz
-#%endif
-#%ifarch ia64
-#/usr/bin/i386
-#/usr/bin/ia64
-#%{_mandir}/man8/i386.8.gz
-#%{_mandir}/man8/ia64.8.gz
-#%endif
 
 %files -n libblkid1
 %defattr(-, root, root)
@@ -680,6 +664,18 @@ fi
 %_libdir/pkgconfig/blkid.pc
 %{_mandir}/man3/libblkid.3.gz
 
+%files -n libmount1
+%defattr(-, root, root)
+/%{_lib}/libmount.so.1
+/%{_lib}/libmount.so.1.*
+
+%files -n libmount-devel
+%defattr(-, root, root)
+%{_libdir}/libmount.so
+%dir %{_includedir}/mount
+%{_includedir}/mount/mount.h
+%_libdir/pkgconfig/mount.pc
+
 %files -n uuidd
 %defattr(-, root, root)
 %verify(not mode) %attr(0755,root,root) /usr/sbin/uuidd
diff --git a/which-2.19.tar.bz2 b/which-2.19.tar.bz2
deleted file mode 100644
index 3de4dde..0000000
--- a/which-2.19.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fb382412c553f05f1336a43591e7de106e9ca3c675113973160e72196001df6
-size 105483
diff --git a/which-2.20.tar.bz2 b/which-2.20.tar.bz2
new file mode 100644
index 0000000..f10b8ce
--- /dev/null
+++ b/which-2.20.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33ca01bb3d801338e4a464367d74eaab24f87041c44c9b5e1150393f1744a3a0
+size 107758