$ git diff --patch-with-stat --summary f64431c7d5a4c9cc13dd7d02d0b2dd7cad8f6c73..c998aa586f6312cb4e90ac0abee6cd2159faba3a

 .abf.yml                                           |   2 +-
 agetty.patch                                       |  38 ++++++
 rfkill.consoleapp                                  |   3 +
 rfkill.pam                                         |   4 +
 ...12-lower-LOOP_PASSWORD_MIN_LENGTH-for-AES.patch |  11 --
 util-linux-2.12a-cryptoapi-load-module.patch       |  57 ---------
 util-linux-2.12q-autodav.patch                     |  24 ----
 util-linux-2.12q-swapon-skip-encrypted.patch       |  11 --
 util-linux-2.20-chfn-lsb-usergroups.patch          |  24 ----
 util-linux-2.23.1-mount-managed.patch              |  11 --
 util-linux-2.24-mkstemp.patch                      |  36 ------
 util-linux-ng-2.14.1-set-as-encrypted.patch        |  25 ----
 ...try-LOOP_CHANGE_FD-when-loop-already-busy.patch |  24 ----
 util-linux.spec                                    | 139 +++++++++++----------
 14 files changed, 122 insertions(+), 287 deletions(-)
 create mode 100644 agetty.patch
 create mode 100644 rfkill.consoleapp
 create mode 100644 rfkill.pam
 delete mode 100644 util-linux-2.12-lower-LOOP_PASSWORD_MIN_LENGTH-for-AES.patch
 delete mode 100644 util-linux-2.12a-cryptoapi-load-module.patch
 delete mode 100644 util-linux-2.12q-autodav.patch
 delete mode 100644 util-linux-2.12q-swapon-skip-encrypted.patch
 delete mode 100644 util-linux-2.20-chfn-lsb-usergroups.patch
 delete mode 100644 util-linux-2.23.1-mount-managed.patch
 delete mode 100644 util-linux-2.24-mkstemp.patch
 delete mode 100644 util-linux-ng-2.14.1-set-as-encrypted.patch
 delete mode 100644 util-linux-ng-2.18-losetup-try-LOOP_CHANGE_FD-when-loop-already-busy.patch

diff --git a/.abf.yml b/.abf.yml
index 098a018..bacd828 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  util-linux-2.30.2.tar.xz: a90e1e7e30e342862d062a885d2dfb8eb8a1f596
+  util-linux-2.31.tar.xz: 4ebb8a2c1da21a6da08b553abd0f4dd3dbc55b4e
diff --git a/agetty.patch b/agetty.patch
new file mode 100644
index 0000000..b6536bc
--- /dev/null
+++ b/agetty.patch
@@ -0,0 +1,38 @@
+--- util-linux-2.26/term-utils/agetty.c.org	2015-02-27 09:44:28.005955842 -0500
++++ util-linux-2.26/term-utils/agetty.c	2015-02-27 09:45:28.454200135 -0500
+@@ -1379,7 +1379,7 @@
+ 	 * Wait for a while, then read everything the modem has said so far and
+ 	 * try to extract the speed of the dial-in call.
+ 	 */
+-	sleep(1);
++	usleep(1000);
+ 	if ((nread = read(STDIN_FILENO, buf, sizeof(buf) - 1)) > 0) {
+ 		buf[nread] = '\0';
+ 		for (bp = buf; bp < buf + nread; bp++)
+@@ -1728,7 +1728,7 @@
+ 	 * the baud rate).
+ 	 */
+ 	if ((op->flags & F_VCONSOLE) == 0)
+-		sleep(1);
++		usleep(1000);
+ 	tcflush(STDIN_FILENO, TCIFLUSH);
+ 
+ 	eightbit = (op->flags & F_EIGHTBITS);
+--- util-linux-2.28/term-utils/agetty.c~	2016-04-04 08:29:50.000000000 +0000
++++ util-linux-2.28/term-utils/agetty.c	2016-10-29 13:44:35.655558375 +0000
+@@ -36,6 +36,7 @@
+ #include <netdb.h>
+ #include <ifaddrs.h>
+ #include <net/if.h>
++#include <malloc.h>
+ 
+ #include "strutils.h"
+ #include "all-io.h"
+@@ -1804,6 +1805,7 @@
+ 		/* Always show login prompt. */
+ 		write_all(STDOUT_FILENO, LOGIN, sizeof(LOGIN) - 1);
+ 	}
++	malloc_trim(0);
+ }
+ 
+ /* Select next baud rate. */
diff --git a/rfkill.consoleapp b/rfkill.consoleapp
new file mode 100644
index 0000000..fbb185f
--- /dev/null
+++ b/rfkill.consoleapp
@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=/sbin/rfkill
+GUI=no
diff --git a/rfkill.pam b/rfkill.pam
new file mode 100644
index 0000000..268cc92
--- /dev/null
+++ b/rfkill.pam
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth       sufficient   pam_rootok.so
+auth       required     pam_localuser.so
+account    required     pam_permit.so
diff --git a/util-linux-2.12-lower-LOOP_PASSWORD_MIN_LENGTH-for-AES.patch b/util-linux-2.12-lower-LOOP_PASSWORD_MIN_LENGTH-for-AES.patch
deleted file mode 100644
index cf2c621..0000000
--- a/util-linux-2.12-lower-LOOP_PASSWORD_MIN_LENGTH-for-AES.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mount/lomount.c	2009-01-13 18:11:05.000000000 +0100
-+++ mount/lomount.c.oden	2009-01-13 18:11:15.000000000 +0100
-@@ -59,7 +59,7 @@ extern int read_options_from_fstab(char 
- extern int recompute_loop_dev_size(char *);
- 
- #if !defined(LOOP_PASSWORD_MIN_LENGTH)
--# define  LOOP_PASSWORD_MIN_LENGTH   20
-+# define  LOOP_PASSWORD_MIN_LENGTH   3
- #endif
- 
- char    *passFDnumber = (char *)0;
diff --git a/util-linux-2.12a-cryptoapi-load-module.patch b/util-linux-2.12a-cryptoapi-load-module.patch
deleted file mode 100644
index e100f5f..0000000
--- a/util-linux-2.12a-cryptoapi-load-module.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- mount/loop.c	2009-01-13 18:12:03.000000000 +0100
-+++ mount/loop.c.oden	2009-01-13 18:12:09.000000000 +0100
-@@ -12,7 +12,12 @@
- #include <ctype.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/wait.h>
-+#include <fcntl.h>
-+#include <unistd.h>
- #include <errno.h>
-+#include "nls.h"
- #include "loop.h"
- 
- static void convert_info_to_info64(struct loop_info *info, struct loop_info64 *info64)
-@@ -193,6 +198,32 @@ static char *getApiName(char *e, int *le
- 	return((char *)s);
- }
- 
-+void load_module(char * module) {
-+	pid_t x;
-+	int y;
-+	char * a[3];
-+
-+	if(!(x = fork())) {
-+		if((x = open("/dev/null", O_WRONLY)) >= 0) {
-+			dup2(x, 2);
-+			close(x);
-+		}
-+		a[0] = "modprobe";
-+		a[1] = module;
-+		a[2] = NULL;
-+		execvp(a[0], &a[0]);
-+		execv("/sbin/modprobe", &a[0]);
-+		/* error to stdout, stderr is directed to /dev/null */
-+		printf(_("loop: unable to execute modprobe\n"));
-+		exit(1);
-+	}
-+	if(x == -1) {
-+		fprintf(stderr, _("loop: fork failed\n"));
-+		return;
-+	}
-+	waitpid(x, &y, 0);
-+}
-+
- int loop_crypt_type(const char *name, u_int32_t *kbyp, char **apiName)
- {
- 	int i, k;
-@@ -209,6 +240,8 @@ int loop_crypt_type(const char *name, u_
- 		}
- 	}
- 	*kbyp = 16; /* 128 bits */
-+	load_module("cryptoloop");
-+	load_module(*apiName);
- 	return 18; /* LO_CRYPT_CRYPTOAPI */
- }
- 
diff --git a/util-linux-2.12q-autodav.patch b/util-linux-2.12q-autodav.patch
deleted file mode 100644
index 1ed9c71..0000000
--- a/util-linux-2.12q-autodav.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- mount/mount.c	2009-01-13 18:08:47.000000000 +0100
-+++ mount/mount.c.oden	2009-01-13 18:08:56.000000000 +0100
-@@ -1129,6 +1129,7 @@ try_mount_one (const char *spec0, const 
-   /*
-    * Call mount.TYPE for types that require a separate mount program.
-    * For the moment these types are ncpfs and smbfs. Maybe also vxfs.
-+   * For the moment these types are ncpfs and smbfs and davfs. Maybe also vxfs.
-    * All such special things must occur isolated in the types string.
-    */
-   if (check_special_mountprog(spec, node, types, flags, extra_opts, &status)) {
-@@ -1457,7 +1458,12 @@ mount_one (const char *spec, const char 
- 	opts = append_opt(opts, cmdlineopts, NULL);
- 
- 	if (types == NULL && !mounttype && !is_existing_file(spec)) {
--		if (strchr (spec, ':') != NULL) {
-+		if((!strncmp(spec, "http://", 7))||(!strncmp(spec, "https://", 8))) {
-+			types = "davfs";
-+			if (verbose)
-+				printf(_("mount: no type was given - "
-+					"I'll assume dav because of the http[s]:// prefix\n"));
-+		} else if (strchr (spec, ':') != NULL) {
- 			types = "nfs";
- 			if (verbose)
- 				printf(_("mount: no type was given - "
diff --git a/util-linux-2.12q-swapon-skip-encrypted.patch b/util-linux-2.12q-swapon-skip-encrypted.patch
deleted file mode 100644
index 67db608..0000000
--- a/util-linux-2.12q-swapon-skip-encrypted.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mount/swapon.c	2009-01-13 18:10:01.000000000 +0100
-+++ mount/swapon.c.oden	2009-01-13 18:10:07.000000000 +0100
-@@ -906,6 +906,8 @@ main_swapoff(int argc, char *argv[]) {
- 					loop = opt + 5;
- 				if (strncmp(opt, "encryption=", 11) == 0)
- 					encryption = opt + 11;
-+				if (strncmp(opt, "encrypted", 9) == 0)
-+					skip=1;
- 			}
- 			if (loop && encryption) {
- 				if (!is_in_proc_swaps(loop)) {  
diff --git a/util-linux-2.20-chfn-lsb-usergroups.patch b/util-linux-2.20-chfn-lsb-usergroups.patch
deleted file mode 100644
index af03c69..0000000
--- a/util-linux-2.20-chfn-lsb-usergroups.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- util-linux-2.21/login-utils/chfn.c.chfnlsb	2012-01-09 15:53:10.000000000 +0100
-+++ util-linux-2.21/login-utils/chfn.c	2012-02-26 03:04:50.450786636 +0100
-@@ -221,7 +221,7 @@ static int parse_argv(int argc, char *ar
- 	optind = 0;
- 	info_given = false;
- 	while (true) {
--		c = getopt_long(argc, argv, "f:r:p:h:o:uv", long_options,
-+		c = getopt_long(argc, argv, "f:r:w:p:h:o:uv", long_options,
- 				&index);
- 		if (c == -1)
- 			break;
-@@ -245,10 +245,12 @@ static int parse_argv(int argc, char *ar
- 			pinfo->full_name = optarg;
- 			status = check_gecos_string(_("Name"), optarg);
- 			break;
-+		case 'r':
- 		case 'o':
- 			pinfo->office = optarg;
- 			status = check_gecos_string(_("Office"), optarg);
- 			break;
-+		case 'w':
- 		case 'p':
- 			pinfo->office_phone = optarg;
- 			status = check_gecos_string(_("Office Phone"), optarg);
diff --git a/util-linux-2.23.1-mount-managed.patch b/util-linux-2.23.1-mount-managed.patch
deleted file mode 100644
index d7fc451..0000000
--- a/util-linux-2.23.1-mount-managed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- util-linux-2.23.1/libmount/src/optmap.c.bero	2012-08-20 14:00:10.630018001 +0200
-+++ util-linux-2.23.1/libmount/src/optmap.c	2012-08-20 14:01:38.329015387 +0200
-@@ -112,6 +112,8 @@ static const struct libmnt_optmap linux_
-    { "shared",      MS_SHARED,              MNT_NOHLPS | MNT_NOMTAB }, /* Shared */
-    { "rshared",     MS_SHARED | MS_REC,     MNT_NOHLPS | MNT_NOMTAB },
- #endif
-+   { "kudzu", MNT_MS_COMMENT },
-+   { "managed", MNT_MS_COMMENT },
-    { NULL, 0, 0 }
- };
- 
diff --git a/util-linux-2.24-mkstemp.patch b/util-linux-2.24-mkstemp.patch
deleted file mode 100644
index 5dbdf02..0000000
--- a/util-linux-2.24-mkstemp.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur util-linux-2.25.2/lib/fileutils.c util-linux-2.25.2.tpg/lib/fileutils.c
---- util-linux-2.25.2/lib/fileutils.c	2014-09-16 12:37:06.000000000 +0000
-+++ util-linux-2.25.2.tpg/lib/fileutils.c	2014-11-02 20:17:32.132751334 +0000
-@@ -40,7 +40,7 @@
- 		return -1;
- 
- 	old_mode = umask(077);
--	fd = mkostemp(localtmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+	fd = mkstemp(localtmp);
- 	umask(old_mode);
- 	if (fd == -1) {
- 		free(localtmp);
-diff -Naur util-linux-2.25.2/libblkid/src/save.c util-linux-2.25.2.tpg/libblkid/src/save.c
---- util-linux-2.25.2/libblkid/src/save.c	2014-09-16 12:37:06.000000000 +0000
-+++ util-linux-2.25.2.tpg/libblkid/src/save.c	2014-11-02 20:17:50.357246753 +0000
-@@ -113,7 +113,7 @@
- 		tmp = malloc(strlen(filename) + 8);
- 		if (tmp) {
- 			sprintf(tmp, "%s-XXXXXX", filename);
--			fd = mkostemp(tmp, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+			fd = mkstemp(tmp);
- 			if (fd >= 0) {
- 				if (fchmod(fd, 0644) != 0)
- 					DBG(SAVE, ul_debug("%s: fchmod failed", filename));
-diff -Naur util-linux-2.25.2/libmount/src/utils.c util-linux-2.25.2.tpg/libmount/src/utils.c
---- util-linux-2.25.2/libmount/src/utils.c	2014-10-24 09:10:06.000000000 +0000
-+++ util-linux-2.25.2.tpg/libmount/src/utils.c	2014-11-02 20:18:19.988052255 +0000
-@@ -942,7 +942,7 @@
- 	 */
- 	oldmode = umask(S_IRGRP|S_IWGRP|S_IXGRP|
- 			S_IROTH|S_IWOTH|S_IXOTH);
--	fd = mkostemp(n, O_RDWR|O_CREAT|O_EXCL|O_CLOEXEC);
-+	fd = mkstemp(n);
- 	if (fd < 0)
- 		fd = -errno;
- 	umask(oldmode);
diff --git a/util-linux-ng-2.14.1-set-as-encrypted.patch b/util-linux-ng-2.14.1-set-as-encrypted.patch
deleted file mode 100644
index 0c05010..0000000
--- a/util-linux-ng-2.14.1-set-as-encrypted.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -p -up util-linux-ng-2.14.1/mount/mount.c.set-as-encrypted util-linux-ng-2.14.1/mount/mount.c
---- util-linux-ng-2.14.1/mount/mount.c.set-as-encrypted	2008-09-16 16:03:52.000000000 +0200
-+++ util-linux-ng-2.14.1/mount/mount.c	2008-09-16 16:12:05.000000000 +0200
-@@ -100,11 +100,12 @@ struct opt_map {
- #define MS_USER		0x20000000
- #define MS_OWNER	0x10000000
- #define MS_GROUP	0x08000000
-+#define MS_ENCRYPT	0x00030000
- #define MS_COMMENT	0x02000000
- #define MS_LOOP		0x00010000
- 
- /* Options that we keep the mount system call from seeing.  */
--#define MS_NOSYS	(MS_NOAUTO|MS_USERS|MS_USER|MS_COMMENT|MS_LOOP)
-+#define MS_NOSYS	(MS_NOAUTO|MS_USERS|MS_USER|MS_COMMENT|MS_ENCRYPT|MS_LOOP)
- 
- /* Options that we keep from appearing in the options field in the mtab.  */
- #define MS_NOMTAB	(MS_REMOUNT|MS_NOAUTO|MS_USERS|MS_USER)
-@@ -143,6 +144,7 @@ static const struct opt_map opt_map[] = 
-   { "noowner",	0, 1, MS_OWNER  },	/* Device owner has no special privs */
-   { "group",	0, 0, MS_GROUP  },	/* Let the group of the device mount */
-   { "nogroup",	0, 1, MS_GROUP  },	/* Device group has no special privs */
-+  { "encrypted", 0, 0, MS_ENCRYPT },	/* Device encrypted */
-   { "_netdev",	0, 0, MS_COMMENT},	/* Device requires network */
-   { "comment",	0, 0, MS_COMMENT},	/* fstab comment only (kudzu,_netdev)*/
- 
diff --git a/util-linux-ng-2.18-losetup-try-LOOP_CHANGE_FD-when-loop-already-busy.patch b/util-linux-ng-2.18-losetup-try-LOOP_CHANGE_FD-when-loop-already-busy.patch
deleted file mode 100644
index a75eea1..0000000
--- a/util-linux-ng-2.18-losetup-try-LOOP_CHANGE_FD-when-loop-already-busy.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- util-linux-ng-2.18/mount/lomount.c	2010-09-04 22:16:57.000000000 +0000
-+++ util-linux-ng-2.18/mount/lomount.c.tpg	2010-09-04 22:22:02.000000000 +0000
-@@ -851,6 +851,10 @@
- 	*loopro = (mode == O_RDONLY);
- 
- 	if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-+	    int saved_errno = errno;
-+#define LOOP_CHANGE_FD	0x4C06
-+	    if (ioctl (fd, LOOP_CHANGE_FD, ffd) < 0) {
-+	    	errno = saved_errno;
- 		if(errno == EBUSY)
- 			errRetVal = busyRetVal;
- 		if((errRetVal != 2) || verbose)
-@@ -862,6 +866,10 @@
- close_ffd_return1:
- 		close (ffd);
- 		return errRetVal;
-+ 	    }
-+ 	    close (ffd);
-+ 	    close (fd);
-+ 	    return 0;
- 	}
- 
- 	memset (&loopinfo, 0, sizeof (loopinfo));
diff --git a/util-linux.spec b/util-linux.spec
index ff118e2..4927bfa 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,6 +1,9 @@
 # seems to cause issues with blkid on x86_64
 %define _disable_lto 1
 
+# (tpg) optimize it a bit
+%global optflags %optflags -O3
+
 %define blkid_major 1
 %define libblkid %mklibname blkid %{blkid_major}
 %define devblkid %mklibname blkid -d
@@ -33,13 +36,13 @@
 %define no_hwclock_archs s390 s390x
 
 %if !%{build_bootstrap}
-%bcond_without	python
+%bcond_without python
 %endif
 
 Summary:	A collection of basic system utilities
 Name:		util-linux
-Version:	2.30.2
-Release:	1
+Version:	2.31
+Release:	4
 License:	GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group:		System/Base
 URL:		http://www.kernel.org/pub/linux/utils/util-linux
@@ -55,8 +58,9 @@ Source7:	util-linux-runuser.pamd
 Source8:	util-linux-runuser-l.pamd
 Source9:	%{name}.rpmlintrc
 Source11:	uuidd-tmpfiles.conf
-# RHEL/Fedora specific mount options
-Patch1:		util-linux-2.23.1-mount-managed.patch
+Source12:	rfkill.pam
+Source13:	rfkill.consoleapp
+
 # 151635 - makeing /var/log/lastlog
 Patch5:		util-linux-2.26-login-lastlog-create.patch
 # /etc/blkid.tab --> /etc/blkid/blkid.tab
@@ -68,19 +72,10 @@ Patch11:	util-linux-ng-2.16-blkid-cachefile.patch
 
 # misc documentation fixes for man pages
 Patch111:	util-linux-2.11t-mkfsman.patch
+
+%ifarch alpha %{sparc} ppc
 # sparc build fix
 Patch115:	util-linux-2.22-fix-ioctl.patch
-
-# crypto patches
-# loop-AES patch
-# reworked from http://loop-aes.sourceforge.net/updates/util-linux-ng-2.17-20100120.diff.bz2
-Patch1100:	http://loop-aes.sourceforge.net/updates/util-linux-2.25.1-20140911.diff.bz2
-Patch1101:	util-linux-2.12q-swapon-skip-encrypted.patch
-Patch1102:	util-linux-2.12-lower-LOOP_PASSWORD_MIN_LENGTH-for-AES.patch
-# load cryptoloop and cypher modules when use cryptoapi
-Patch1103:	util-linux-2.12a-cryptoapi-load-module.patch
-Patch1104:	util-linux-ng-2.14.1-set-as-encrypted.patch
-
 # clock program for ppc
 Patch1200:	util-linux-2.10r-clock-1.1-ppc.patch
 # leng options for clock-ppc
@@ -89,11 +84,15 @@ Patch1201:	util-linux-2.10s-clock-syntax-ppc.patch
 Patch1202:	util-linux-2.26-chfn-lsb-usergroups.patch
 # fix build on alpha with newer kernel-headers
 Patch1203:	util-linux-2.11m-cmos-alpha.patch
-# Mandrivamove patches
-Patch1300:	util-linux-ng-2.18-losetup-try-LOOP_CHANGE_FD-when-loop-already-busy.patch
+%endif
+
+# (tpg) ClearLinux patches
+Patch2000:	agetty.patch
 
 BuildRequires:	libtool
 BuildRequires:	sed
+BuildRequires:	bison
+BuildRequires:	byacc
 BuildRequires:	rpm-build >= 1:5.4.10-5
 BuildRequires:	audit-devel
 BuildRequires:	gettext-devel
@@ -136,6 +135,7 @@ Conflicts:	coreutils < 8.19-2
 # (proyvind): handle sulogin, wall, mountpoint being moved
 Conflicts:	sysvinit-tools < 2.87-24
 Conflicts:	bash-completion < 2:2.3-3
+Conflicts:	rfkill < 0.5-10
 Requires:	pam >= 1.3.0-1
 Requires:	shadow >= 4.2.1-24
 Requires:	%{libblkid} = %{EVRD}
@@ -153,7 +153,7 @@ utilities that are necessary for a Linux system to function.  Among
 others, Util-linux-ng contains the fdisk configuration tool and the login
 program.
 
-%package -n	%{libblkid}
+%package -n %{libblkid}
 Summary:	Block device ID library
 Group:		System/Libraries
 License:	LGPLv2+
@@ -162,7 +162,7 @@ Conflicts:	%{libext2fs} < 1.41.6-2mnb2
 %description -n %{libblkid}
 This is block device identification library, part of util-linux.
 
-%package -n	%{devblkid}
+%package -n %{devblkid}
 Summary:	Block device ID library
 Group:		Development/C
 License:	LGPLv2+
@@ -171,11 +171,11 @@ Requires:	%{devuuid} = %{version}-%{release}
 Conflicts:	%{devext2fs} < 1.41.6-2mnb2
 Provides:	libblkid-devel = %{version}-%{release}
 
-%description -n	%{devblkid}
+%description -n %{devblkid}
 This is the block device identification development library and headers,
 part of util-linux.
 
-%package -n	%{libfdisk}
+%package -n %{libfdisk}
 Summary:	Fdisk library
 Group:		System/Libraries
 License:	LGPLv2+
@@ -183,24 +183,24 @@ License:	LGPLv2+
 %description -n %{libfdisk}
 This is fdisk library, part of util-linux.
 
-%package -n	%{devfdisk}
+%package -n %{devfdisk}
 Summary:	Fdisk development library
 Group:		Development/C
 License:	LGPLv2+
 Requires:	%{libfdisk} = %{version}-%{release}
 Provides:	libfdisk-devel = %{version}-%{release}
 
-%description -n	%{devfdisk}
+%description -n %{devfdisk}
 This is the fdisk development library and headers,
 part of util-linux.
 
-%package -n	%{libuuid}
+%package -n %{libuuid}
 Summary:	Universally unique ID library
 Group:		System/Libraries
 License:	BSD
 Conflicts:	%{libext2fs} < 1.41.8-2mnb2
 
-%description -n	%{libuuid}
+%description -n %{libuuid}
 This is the universally unique ID library, part of e2fsprogs.
 
 The libuuid library generates and parses 128-bit universally unique
@@ -210,7 +210,7 @@ be used for multiple purposes, from tagging objects with an extremely
 short lifetime, to reliably identifying very persistent objects
 across a network.
 
-%package -n	%{devuuid}
+%package -n %{devuuid}
 Summary:	Universally unique ID library
 Group:		Development/C
 License:	BSD
@@ -218,7 +218,7 @@ Conflicts:	%{libext2fs} < 1.41.8-2mnb2
 Requires:	%{libuuid} = %{version}
 Provides:	libuuid-devel = %{version}-%{release}
 
-%description -n	%{devuuid}
+%description -n %{devuuid}
 This is the universally unique ID development library and headers,
 part of e2fsprogs.
 
@@ -229,7 +229,7 @@ be used for multiple purposes, from tagging objects with an extremely
 short lifetime, to reliably identifying very persistent objects
 across a network.
 
-%package -n	uuidd
+%package -n uuidd
 Summary:	Helper daemon to guarantee uniqueness of time-based UUIDs
 Group:		System/Servers
 License:	GPLv2
@@ -237,47 +237,47 @@ Requires(post):	systemd
 Requires(pre):	shadow-utils >= 4.2.1-7
 Requires(pre,post,preun,postun):	rpm-helper >= 0.24.12-11
 
-%description -n	uuidd
+%description -n uuidd
 The uuidd package contains a userspace daemon (uuidd) which guarantees
 uniqueness of time-based UUID generation even at very high rates on
 SMP systems.
 
-%package -n	%{libmount}
+%package -n %{libmount}
 Summary:	Universal mount library
 Group:		System/Libraries
 License:	LGPLv2+
 
-%description -n	%{libmount}
+%description -n %{libmount}
 The libmount library is used to parse /etc/fstab,
 /etc/mtab and /proc/self/mountinfo files,
 manage the mtab file, evaluate mount options, etc.
 
-%package -n	%{devmount}
+%package -n %{devmount}
 Summary:	Universally unique ID library
 Group:		Development/C
 License:	LGPLv2+
 Requires:	%{libmount} = %{EVRD}
 Provides:	libmount-devel = %{version}-%{release}
 
-%description -n	%{devmount}
+%description -n %{devmount}
 Development files and headers for libmount library.
 
-%package -n     %{libsmartcols}
-Summary:        Formatting library for ls-like programs
-Group:          System/Libraries
-License:        LGPL2+
+%package -n %{libsmartcols}
+Summary:	Formatting library for ls-like programs
+Group:		System/Libraries
+License:	LGPL2+
 Requires:	filesystem >= 3.0-9
 
 %description -n %{libsmartcols}
 The libsmartcols library is used to format output,
 for ls-like terminal programs.
 
-%package -n     %{devsmartcols}
-Summary:        Formatting library for ls-like programs
-Group:          Development/C
-License:        LGPL2+
-Requires:       %{libsmartcols} = %{EVRD}
-Provides:       libsmartcols-devel = %{version}-%{release}
+%package -n %{devsmartcols}
+Summary:	Formatting library for ls-like programs
+Group:		Development/C
+License:	LGPL2+
+Requires:	%{libsmartcols} = %{EVRD}
+Provides:	libsmartcols-devel = %{version}-%{release}
 
 %description -n %{devsmartcols}
 Development files and headers for libsmartcols library.
@@ -291,7 +291,7 @@ Requires:	%{name} = %{EVRD}
 chfn and chsh utilities with dependence on libuser.
 
 %if %{with python}
-%package -n	python-libmount
+%package -n python-libmount
 Summary:	Python bindings for the libmount library
 Group:		Development/Python
 Requires:	%{libmount} = %{EVRD}
@@ -304,10 +304,21 @@ supplied by the libmount library to work with mount tables (fstab,
 mountinfo, etc) and mount filesystems.
 %endif
 
+%package -n rfkill
+Summary:	Simple /dev/rfkill userspace tool
+Group:		System/Base
+Obsoletes:	rfkill < 1:0.5-10
+Provides:	rfkill = 1:0.5-10
+Conflicts:	rfkill < 0.5-10
+
+%description -n rfkill
+Rfkill is a simple userspace tool to manipulate /dev/rfkill.
+It's needed to enable and disable wireless and bluetooth from 
+userspace beginning with 2.6.31 series kernels.
+
 %prep
 %setup -q
 
-%patch1 -p1 -b .options~
 %patch5 -p1 -b .lastlog~
 
 # Mandriva
@@ -325,18 +336,11 @@ mountinfo, etc) and mount filesystems.
 %endif
 
 %patch111 -p1 -b .mkfsman~
+%ifarch %{sparc}
 %patch115 -p1 -b .fix-ioctl~
+%endif
 
-#%patch1100 -p1 -b .loopAES
-#%patch1101 -p0 -b .swapon-encrypted
-#%patch1102 -p0 -b .loopAES-password
-#%patch1103 -p0 -b .load-module
-#%patch1104 -p1 -b .set-as-encrypted
-
-#%patch1300 -p1 -b .CHANGE-FD
-
-# rebuild build system for loop-AES patch
-#./autogen.sh
+%patch2000 -p1
 
 %build
 %ifarch %{ix86}
@@ -373,14 +377,12 @@ unset LINGUAS || :
 	--enable-nologin \
 	--with-systemd \
 	--with-readline \
-	--enable-libmount-force-mountinfo \
 	--enable-sulogin-emergency-mount \
 	--with-systemdsystemunitdir=%{_systemunitdir} \
 
 # build util-linux
 %make REALTIME_LIBS="-lrt -lpthread"
 
-
 %install
 mkdir -p %{buildroot}/{bin,sbin}
 mkdir -p %{buildroot}%{_bindir}
@@ -440,9 +442,12 @@ chmod 755 %{buildroot}%{_bindir}/sunhostid
   install -m 644 %{SOURCE6} ./su-l
   install -m 644 %{SOURCE7} ./runuser
   install -m 644 %{SOURCE8} ./runuser-l
+  install -m 644 %{SOURCE12} ./rfkill
   popd
 }
 
+install -m 0644 %{SOURCE13} -D %{buildroot}%{_sysconfdir}/security/console.apps/rfkill
+
 # This has dependencies on stuff in /usr
 mv %{buildroot}{/sbin/,/usr/sbin}/cfdisk
 
@@ -711,10 +716,11 @@ end
 %{_bindir}/ul
 %{_bindir}/unshare
 %{_bindir}/uuidgen
+%{_bindir}/uuidparse
 %{_bindir}/whereis
 %{_bindir}/ipcmk
 %{_bindir}/lscpu
-%attr(2755,root,tty)	%{_bindir}/write
+%attr(2755,root,tty) %{_bindir}/write
 %{_sbindir}/readprofile
 %ifnarch s390 s390x
 %{_sbindir}/tunelp
@@ -751,6 +757,7 @@ end
 %{_mandir}/man1/setterm.1*
 %{_mandir}/man1/ul.1*
 %{_mandir}/man1/uuidgen.1*
+%{_mandir}/man1/uuidparse.1*
 %{_mandir}/man1/unshare.1*
 %{_mandir}/man1/utmpdump.1*
 %{_mandir}/man1/whereis.1*
@@ -789,8 +796,8 @@ end
 %{_mandir}/man8/raw.8*
 %{_mandir}/man8/rawdevices.8*
 %endif
-%_mandir/man8/readprofile.8*
-%_mandir/man8/resizepart.8*
+%{_mandir}/man8/readprofile.8*
+%{_mandir}/man8/resizepart.8*
 %ifnarch s390 s390x
 %{_mandir}/man8/tunelp.8*
 %endif
@@ -802,8 +809,8 @@ end
 %{_mandir}/man8/wdctl.8*
 %{_mandir}/man8/fsck.minix.8*
 %{_mandir}/man8/mkfs.minix.8*
-%attr(4755,root,root)	/bin/mount
-%attr(4755,root,root)	/bin/umount
+%attr(4755,root,root) /bin/mount
+%attr(4755,root,root) /bin/umount
 /sbin/swapon
 /sbin/swapoff
 /sbin/switch_root
@@ -838,6 +845,12 @@ end
 %attr(-, uuidd, uuidd) %{_sbindir}/uuidd
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 
+%files -n rfkill
+%config(noreplace) %{_sysconfdir}/pam.d/rfkill
+%config(noreplace) %{_sysconfdir}/security/console.apps/rfkill
+%{_bindir}/rfkill
+%{_mandir}/man8/rfkill.8*
+
 %files -n %{libblkid}
 /%{_lib}/libblkid.so.%{blkid_major}*