[util-linux/f17] 2.21.2-2: fix uuidd start, and mount -s
kzak
kzak at fedoraproject.org
Tue Jun 19 09:46:46 UTC 2012
commit caa3318d49f2fa4036fef2ba588bb961b9406ff0
Author: Karel Zak <kzak at redhat.com>
Date: Tue Jun 19 11:46:21 2012 +0200
2.21.2-2: fix uuidd start, and mount -s
Signed-off-by: Karel Zak <kzak at redhat.com>
util-linux-2.21-mount-sloppy.patch | 27 +++++++++++++++++++++++++++
util-linux-2.21-uuidd-rundir.patch | 26 ++++++++++++++++++++++++++
util-linux.spec | 28 ++++++++++++++++++++--------
uuidd.tmpfiles | 1 +
4 files changed, 74 insertions(+), 8 deletions(-)
---
diff --git a/util-linux-2.21-mount-sloppy.patch b/util-linux-2.21-mount-sloppy.patch
new file mode 100644
index 0000000..7b7f9b9
--- /dev/null
+++ b/util-linux-2.21-mount-sloppy.patch
@@ -0,0 +1,27 @@
+From e26de525e21677c680d87f63e4dafbe4859365bf Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Thu, 14 Jun 2012 14:43:21 +0200
+Subject: [PATCH] mount: (new) allow sloppy for non-root
+
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=825836
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ sys-utils/mount.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/sys-utils/mount.c b/sys-utils/mount.c
+index 2b8843c..9cc2db3 100644
+--- a/sys-utils/mount.c
++++ b/sys-utils/mount.c
+@@ -731,7 +731,7 @@ int main(int argc, char **argv)
+ longopts, NULL)) != -1) {
+
+ /* only few options are allowed for non-root users */
+- if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpri", c))
++ if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpris", c))
+ exit_non_root(option_to_longopt(c, longopts));
+
+ switch(c) {
+--
+1.7.7.6
+
diff --git a/util-linux-2.21-uuidd-rundir.patch b/util-linux-2.21-uuidd-rundir.patch
new file mode 100644
index 0000000..f270b0b
--- /dev/null
+++ b/util-linux-2.21-uuidd-rundir.patch
@@ -0,0 +1,26 @@
+From 1425948c8ceaf128c9cfcf4db680be4144f89314 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak at redhat.com>
+Date: Mon, 18 Jun 2012 15:46:20 +0200
+Subject: [PATCH] uuidd: move from /var/run/uuidd to /run/uuidd
+
+Signed-off-by: Karel Zak <kzak at redhat.com>
+---
+ libuuid/src/uuidd.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libuuid/src/uuidd.h b/libuuid/src/uuidd.h
+index 27b79c2..ff7e6d7 100644
+--- a/libuuid/src/uuidd.h
++++ b/libuuid/src/uuidd.h
+@@ -35,7 +35,7 @@
+ #ifndef _UUID_UUIDD_H
+ #define _UUID_UUIDD_H
+
+-#define UUIDD_DIR "/var/run/uuidd"
++#define UUIDD_DIR "/run/uuidd"
+ #define UUIDD_SOCKET_PATH UUIDD_DIR "/request"
+ #define UUIDD_PIDFILE_PATH UUIDD_DIR "/uuidd.pid"
+ #define UUIDD_PATH "/usr/sbin/uuidd"
+--
+1.7.7.6
+
diff --git a/util-linux.spec b/util-linux.spec
index cee41ce..88c92ea 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
Summary: A collection of basic system utilities
Name: util-linux
Version: 2.21.2
-Release: 1%{?dist}
+Release: 2%{?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/
@@ -34,6 +34,7 @@ Source8: nologin.c
Source9: nologin.8
Source10: uuidd.init
Source11: http://downloads.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
+Source12: uuidd.tmpfiles
### Obsoletes & Conflicts & Provides
# old versions of e2fsprogs contain fsck, uuidgen
@@ -77,6 +78,12 @@ Patch3: util-linux-ng-2.21-login-lastlog.patch
# 231192 - ipcs is not printing correct values on pLinux
Patch4: util-linux-2.21-ipcs-32bit.patch
+### Upstream patches
+### 825836 - Problems with automount map using quota
+Patch5: util-linux-2.21-mount-sloppy.patch
+# 826122 - uuidd fails to start
+Patch6: util-linux-2.21-uuidd-rundir.patch
+
%description
The util-linux package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among
@@ -187,11 +194,9 @@ SMP systems.
%setup -q -a 11 -n %{name}-%{upstream_version}
cp %{SOURCE8} %{SOURCE9} .
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+for p in %{patches}; do
+ %{__patch} -p1 -F%{_default_patch_fuzz} %{_default_patch_flags} -i "$p"
+done
%build
unset LINGUAS || :
@@ -264,8 +269,10 @@ mv ${RPM_BUILD_ROOT}%{_sbindir}/raw ${RPM_BUILD_ROOT}%{_bindir}/raw
# Our own initscript for uuidd
install -D -m 755 %{SOURCE10} ${RPM_BUILD_ROOT}/etc/rc.d/init.d/uuidd
# And a dirs uuidd needs that the makefiles don't create
-install -d ${RPM_BUILD_ROOT}/var/run/uuidd
+install -d ${RPM_BUILD_ROOT}/run/uuidd
install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
+install -d ${RPM_BUILD_ROOT}/etc/tmpfiles.d
+install -m 0644 %{SOURCE12} ${RPM_BUILD_ROOT}/etc/tmpfiles.d/uuidd.conf
# libtool junk
rm -rf ${RPM_BUILD_ROOT}%{_libdir}/*.la
@@ -651,7 +658,8 @@ fi
%{_mandir}/man8/uuidd.8*
%attr(-, uuidd, uuidd) %{_sbindir}/uuidd
%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
-%dir %attr(2775, uuidd, uuidd) /var/run/uuidd
+%dir %attr(0710, uuidd, uuidd) /run/uuidd
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/uuidd.conf
%files -n libmount
@@ -707,6 +715,10 @@ fi
%changelog
+* Mon Jun 18 2012 Karel Zak <kzak at redhat.com> 2.21.2-2
+- fix #825836 - Problems with automount map using quota
+- fix #826122 - uuidd fails to start
+
* Fri May 25 2012 Karel Zak <kzak at redhat.com> 2.21.2-1
- upgrade to bugfix release 2.21.1
- fix #814699 - namei(1) incorrectly resolves relative symlinks
diff --git a/uuidd.tmpfiles b/uuidd.tmpfiles
new file mode 100644
index 0000000..d1721cb
--- /dev/null
+++ b/uuidd.tmpfiles
@@ -0,0 +1 @@
+d /run/uuidd 0710 uuidd uuidd -
More information about the scm-commits
mailing list