3
0
forked from pool/util-linux
Petr Uzel 2011-02-10 11:31:55 +00:00 committed by Git OBS Bridge
parent 7d8a75db87
commit 087c220d1a
5 changed files with 15 additions and 53 deletions

View File

@ -1,42 +0,0 @@
From e31694761ca0165bda8a4b8f4b3bdbac548ba464 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Fri, 21 Jan 2011 11:56:52 +0100
Subject: [PATCH] fix parsing offset= followed by more options
Signed-off-by: Ludwig Nussel <ludwig.nussel@suse.de>
---
mount/mount.c | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
Index: util-linux-2.19-rc1/mount/mount.c
===================================================================
--- util-linux-2.19-rc1.orig/mount/mount.c
+++ util-linux-2.19-rc1/mount/mount.c
@@ -2044,12 +2044,21 @@ is_fstab_entry_mounted(struct mntentchn
char *p = strstr(mc->m.mnt_opts, "offset=");
uintmax_t offset = 0;
- if (p && strtosize(p + 7, &offset) != 0) {
- if (verbose)
- printf(_("mount: ignore %s "
- "(unparsable offset= option)\n"),
- mc->m.mnt_fsname);
- return -1;
+ if (p) {
+ char buf[128];
+ buf[0] = 0;
+ strncat(buf, p+7, sizeof(buf)-1);
+
+ if (p = strchr(buf, ','))
+ *p = '\0';
+
+ if (strtosize(buf, &offset) != 0) {
+ if (verbose)
+ printf(_("mount: ignore %s "
+ "(unparsable offset= option)\n"),
+ mc->m.mnt_fsname);
+ return -1;
+ }
}
if (is_mounted_same_loopfile(mc->m.mnt_dir, mc->m.mnt_fsname, offset))
goto yes;

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c1977f63cd06e7fba741f55ef8e95d366ed6fde83c50ca00171694bd3d3833b
size 4298703

3
util-linux-2.19.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d8189ba6dfb508d5c36f50103a7b84943d893e51e6d7a314155a82f68efb33b6
size 4376791

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Feb 10 11:01:40 UTC 2011 - puzel@novell.com
- update to util-linux-2.19
- uuid fixes
- cleanups, documentation and translation updates
- drop util-linux-2.19-rc1-loop-offset.diff (fixed in upstream, by
different patch)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 26 11:47:55 UTC 2011 - puzel@novell.com Wed Jan 26 11:47:55 UTC 2011 - puzel@novell.com

View File

@ -20,8 +20,6 @@
%define which_ver 2.20 %define which_ver 2.20
%define adjtimex_ver 1.28 %define adjtimex_ver 1.28
%define ul_tar_version 2.19-rc3
Name: util-linux Name: util-linux
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
@ -32,7 +30,7 @@ BuildRequires: pam-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
Version: 2.18.93 Version: 2.19
Release: 1 Release: 1
Url: http://kernel.org/~kzak/util-linux/ Url: http://kernel.org/~kzak/util-linux/
Supplements: filesystem(minix) Supplements: filesystem(minix)
@ -45,7 +43,7 @@ Group: System/Base
AutoReqProv: on AutoReqProv: on
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Summary: A collection of basic system utilities Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v19/%{name}-%{ul_tar_version}.tar.bz2 Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v19/%{name}-%{version}.tar.bz2
Source1: util-linux-rpmlintrc Source1: util-linux-rpmlintrc
# XXX: make nologin part of login package # XXX: make nologin part of login package
Source2: nologin.c Source2: nologin.c
@ -83,8 +81,6 @@ Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
# crypto patch # crypto patch
Patch3: util-linux-2.17.1-mount_losetup_crypto.patch Patch3: util-linux-2.17.1-mount_losetup_crypto.patch
Patch4: util-linux-2.17.1-losetup-honor-documented-c-option Patch4: util-linux-2.17.1-losetup-honor-documented-c-option
#
Patch5: util-linux-2.19-rc1-loop-offset.diff
## ##
## adjtimex ## adjtimex
## ##
@ -182,11 +178,10 @@ Files to develop applications using the libmount library.
%lang_package %lang_package
%prep %prep
%setup -q -a 9 -b 11 -b 12 -b 13 -n %{name}-%ul_tar_version %setup -q -a 9 -b 11 -b 12 -b 13 -n %{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1
# #
cd adjtimex-* cd adjtimex-*