From a0c4f6127afb1efc3ca6d21c36971a9de46ffa7a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Mon, 2 May 2011 16:40:57 +0000
Subject: [PATCH] - up to 2.19.1

Changed files:
    util-linux-diet.patch -> 1.3
    util-linux.spec -> 1.306
---
 util-linux-diet.patch | 39 +++++++++------------------------------
 util-linux.spec       |  4 ++--
 2 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/util-linux-diet.patch b/util-linux-diet.patch
index 9592674..3118a25 100644
--- a/util-linux-diet.patch
+++ b/util-linux-diet.patch
@@ -73,23 +73,20 @@
  	if (!groupname || !gid)
 --- util-linux-2.19/shlibs/mount/src/tab_update.c~	2011-02-09 14:23:48.000000000 +0100
 +++ util-linux-2.19/shlibs/mount/src/tab_update.c	2011-02-10 20:26:15.846797059 +0100
-@@ -610,8 +610,14 @@
+@@ -653,7 +653,12 @@
+ 	sigfillset(&sigs);
+ 	sigprocmask(SIG_BLOCK, &sigs, &upd->oldsigmask);
  
- 	DBG(UPDATE, mnt_debug("%s: locking", lfile));
- 
--	fd = open(lfile, O_RDONLY|O_CREAT|O_CLOEXEC, S_IWUSR|
--			                             S_IRUSR|S_IRGRP|S_IROTH);
-+	fd = open(lfile,
+-	upd->utab_lock = open(lfile, O_RDONLY|O_CREAT|O_CLOEXEC, S_IWUSR|
++	upd->utab_lock = open(lfile, O_RDONLY|
 +#ifdef O_CLOEXEC
-+		O_RDONLY|O_CREAT|O_CLOEXEC,
-+#else
-+		O_RDONLY|O_CREAT,
++			O_CLOEXEC|
 +#endif
-+		S_IWUSR|S_IRUSR|S_IRGRP|S_IROTH);
-+
++			O_CREAT,
++			S_IWUSR|
+ 			             S_IRUSR|S_IRGRP|S_IROTH);
  	free(lfile);
  
- 	if (fd < 0)
 --- util-linux-2.19/lib/at.c~	2011-01-31 16:43:47.000000000 +0100
 +++ util-linux-2.19/lib/at.c	2011-02-10 20:30:37.336797058 +0100
 @@ -7,6 +7,7 @@
@@ -100,24 +97,6 @@
  
  #include "at.h"
  
---- util-linux-2.19/shlibs/mount/src/utils.c~	2011-02-10 20:32:07.906797058 +0100
-+++ util-linux-2.19/shlibs/mount/src/utils.c	2011-02-10 20:49:24.336797058 +0100
-@@ -664,7 +664,15 @@
- 	if (rc <= 0)
- 		return -errno;
- 
-+#ifdef HAVE_MKOSTEMP
- 	fd = mkostemp(n, flags | O_EXCL);
-+#else
-+	if ( mktemp(n) == NULL || n[0] == '\0' ) {
-+		free(n);
-+		return -errno;
-+	}
-+	fd = open(n, flags | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
-+#endif
- 	if (fd >= 0 && name)
- 		*name = n;
- 	else
 --- util-linux-2.19/misc-utils/findmnt.c~	2011-01-31 16:43:47.000000000 +0100
 +++ util-linux-2.19/misc-utils/findmnt.c	2011-02-10 20:54:23.100130391 +0100
 @@ -30,6 +30,9 @@
diff --git a/util-linux.spec b/util-linux.spec
index 3159a17..e37da46 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -27,12 +27,12 @@ Summary(ru.UTF-8):	Набор базовых системных утилит д
 Summary(tr.UTF-8):	Temel sistem araçları
 Summary(uk.UTF-8):	Набір базових системних утиліт для Linux
 Name:		util-linux
-Version:	2.19
+Version:	2.19.1
 Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/%{name}-%{version}.tar.bz2
-# Source0-md5:	590ca71aad0b254e2631d84401f28255
+# Source0-md5:	3eab06f05163dfa65479c44e5231932c
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:	login.pamd
-- 
2.44.0