rpms/util-linux-ng/devel util-linux-ng-2.16-libblkid-compression.patch, NONE, 1.1 util-linux-ng.spec, 1.56, 1.57
kzak
kzak at fedoraproject.org
Sun Aug 23 19:25:24 UTC 2009
Author: kzak
Update of /cvs/pkgs/rpms/util-linux-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19826
Modified Files:
util-linux-ng.spec
Added Files:
util-linux-ng-2.16-libblkid-compression.patch
Log Message:
* Sun Aug 23 2009 Karel Zak <kzak at redhat.com> 2.16-7
- fix #518572 - blkid requires ext2.ko to be decompressed on installation media
util-linux-ng-2.16-libblkid-compression.patch:
ext.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
--- NEW FILE util-linux-ng-2.16-libblkid-compression.patch ---
>From e94e99523d8a3d0218fe16b0a7a2c5886ccbc652 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak at redhat.com>
Date: Sun, 23 Aug 2009 20:33:10 +0200
Subject: [PATCH] libblkid: add *.ko.gz support to modules.dep parser
Address-Red-Hat-Bug: #518572
Signed-off-by: Karel Zak <kzak at redhat.com>
---
shlibs/blkid/src/probers/ext.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/shlibs/blkid/src/probers/ext.c b/shlibs/blkid/src/probers/ext.c
index a4d35d1..c27411d 100644
--- a/shlibs/blkid/src/probers/ext.c
+++ b/shlibs/blkid/src/probers/ext.c
@@ -224,8 +224,8 @@ static int check_for_modules(const char *fs_name)
#ifdef __linux__
struct utsname uts;
FILE *f;
- char buf[1024], *cp, *t;
- int i;
+ char buf[1024], *cp;
+ int namesz;
if (uname(&uts))
return 0;
@@ -234,6 +234,9 @@ static int check_for_modules(const char *fs_name)
f = fopen(buf, "r");
if (!f)
return 0;
+
+ namesz = strlen(fs_name);
+
while (!feof(f)) {
if (!fgets(buf, sizeof(buf), f))
break;
@@ -244,13 +247,10 @@ static int check_for_modules(const char *fs_name)
if ((cp = strrchr(buf, '/')) == NULL)
continue;
cp++;
- i = strlen(cp);
- if (i > 3) {
- t = cp + i - 3;
- if (!strcmp(t, ".ko"))
- *t = 0;
- }
- if (!strcmp(cp, fs_name)) {
+
+ if (!strncmp(cp, fs_name, namesz) &&
+ (!strcmp(cp + namesz, ".ko") ||
+ !strcmp(cp + namesz, ".ko.gz"))) {
fclose(f);
return 1;
}
--
1.6.2.5
Index: util-linux-ng.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-linux-ng/devel/util-linux-ng.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- util-linux-ng.spec 21 Aug 2009 11:21:10 -0000 1.56
+++ util-linux-ng.spec 23 Aug 2009 19:25:24 -0000 1.57
@@ -2,7 +2,7 @@
Summary: A collection of basic system utilities
Name: util-linux-ng
Version: 2.16
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
@@ -103,8 +103,13 @@ Patch5: util-linux-ng-2.16-blkid-cachefi
Patch7: util-linux-ng-2.13-login-lastlog.patch
# 231192 - ipcs is not printing correct values on pLinux
Patch8: util-linux-ng-2.15-ipcs-32bit.patch
+
+### Upstream patches
+###
# 513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
Patch9: util-linux-ng-2.16-libblkid-ext2.patch
+# 518572 - blkid requires ext2.ko to be decompressed on installation media
+Patch10: util-linux-ng-2.16-libblkid-compression.patch
%description
The util-linux-ng package contains a large variety of low-level system
@@ -200,6 +205,7 @@ cp %{SOURCE8} %{SOURCE9} .
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1
%build
unset LINGUAS || :
@@ -710,6 +716,9 @@ fi
%changelog
+* Sun Aug 23 2009 Karel Zak <kzak at redhat.com> 2.16-7
+- fix #518572 - blkid requires ext2.ko to be decompressed on installation media
+
* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.16-6
- rebuilt with new audit
More information about the scm-commits
mailing list