sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 9386 from home:vuntz:branches:GNOME:Factory

Browse Source 
Copy from IBS home:mszeredi:branches:SUSE:Factory:Head/util-linux based on submit request 9386 from user mszeredi

OBS-URL: https://build.opensuse.org/request/show/9386
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=104
This commit is contained in:
Lars Vogdt 2010-12-05 22:09:36 +00:00 committed by Git OBS Bridge
parent 48ae891e72
commit dbc9b8a0bd
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util-linux-2.18-no-canonicalize-fix.patch Normal file
View File

@ -0,0 +1,24 @@
commit 1cf4c20b198c0c6566198fd00b983d9aaf8321bc
Author: Miklos Szeredi <miklos@szeredi.hu>
Date: Thu Oct 7 16:05:12 2010 +0200
mount: don't canonicalize "spec" with --no-canonicalize option
"Spec" was still canonicalized despite --no-canonicalize. This
resulted in a hang during login with pam_encfs (Debian Bug#593336).
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
diff --git a/mount/devname.c b/mount/devname.c
index 585d259..05da092 100644
--- a/mount/devname.c
+++ b/mount/devname.c
@@ -8,7 +8,7 @@ spec_to_devname(const char *spec)
{
if (!spec)
return NULL;
- if (is_pseudo_fs(spec))
+ if (nocanonicalize || is_pseudo_fs(spec))
return xstrdup(spec);
return fsprobe_get_devname_by_spec(spec);
}

11
util-linux.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Dec 2 17:09:08 CET 2010 - mszeredi@suse.cz
- mount: don't canonicalize "spec" with --no-canonicalize option
[bnc#651598]
-------------------------------------------------------------------
Thu Dec 2 15:23:36 CET 2010 - mszeredi@suse.cz
- add Provides: util-linux(fake+no-canonicalize) [bnc#651598]
-------------------------------------------------------------------
Tue Nov 30 12:19:53 UTC 2010 - puzel@novell.com

6
util-linux.spec
View File

@ -33,12 +33,14 @@ BuildRequires: zlib-devel
Url: http://userweb.kernel.org/~kzak/util-linux-ng/
Supplements: filesystem(minix)
Provides: fsck-with-dev-lock = %{version}
# bnc#651598:
Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions
License: GPLv2+
Group: System/Base
AutoReqProv: on
Version: 2.18
Release: 5
Release: 6
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
@ -82,6 +84,7 @@ Patch4: util-linux-2.17.1-losetup-honor-documented-c-option
Patch7: util-linux-swapon-btrfs-limitations
Patch8: util-linux-agetty-s-option.patch
Patch9: util-linux-fsck-l-option.patch
Patch10: util-linux-2.18-no-canonicalize-fix.patch
##
## adjtimex
##
@ -190,6 +193,7 @@ Files to develop applications using the libmount library.
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
#
cd adjtimex-*
# adjtimex patches belongs here