rpms/util-linux
7
0
Fork 0
Code Issues Pull Requests Releases Activity

2.25-0.3: upgrade to -rc2

Browse Source
This commit is contained in:
Karel Zak 2014-07-02 12:31:03 +02:00
parent 9016a84fba
commit 4be87e9faa
4 changed files with 7 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -32,3 +32,4 @@
/util-linux-2.24.1.tar.xz
/util-linux-2.24.2.tar.xz
/util-linux-2.25-rc1.tar.xz
/util-linux-2.25-rc2.tar.xz

2
sources
View File

@ -1 +1 @@
fd0c219f2c2cc765a9c6a29cd96fb091 util-linux-2.25-rc1.tar.xz
9df5663b5b302a5219c2b7ba38868071 util-linux-2.25-rc2.tar.xz

46
util-linux-squashfs-probe.patch
View File

@ -1,46 +0,0 @@
From cbccd7a4f8ffcded136e83fb7c3aeedc393d312d Mon Sep 17 00:00:00 2001
From: David Shea <dshea@redhat.com>
Date: Mon, 23 Jun 2014 13:41:48 -0400
Subject: [PATCH] libblkid: correct the return values in squashfs probe
Returning -1 can cause squashfs v3 detection to make v4 detection fail.
Signed-off-by: Karel Zak <kzak@redhat.com>
---
libblkid/src/superblocks/squashfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c
index a35d60f..8ed2838 100644
--- a/libblkid/src/superblocks/squashfs.c
+++ b/libblkid/src/superblocks/squashfs.c
@@ -41,7 +41,7 @@ static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
major = le16_to_cpu(sq->s_major);
minor = le16_to_cpu(sq->s_minor);
if (major < 4)
- return -1;
+ return 1;
blkid_probe_sprintf_version(pr, "%u.%u", major, minor);
@@ -56,7 +56,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag)
sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block);
if (!sq)
- return -1;
+ return errno ? -errno : 1;
if (strcmp(mag->magic, "sqsh") == 0) {
major = be16_to_cpu(sq->s_major);
@@ -67,7 +67,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag)
}
if (major > 3)
- return -1;
+ return 1;
blkid_probe_sprintf_version(pr, "%u.%u", major, minor);
--
1.9.3

10
util-linux.spec
View File

@ -2,12 +2,12 @@
Summary: A collection of basic system utilities
Name: util-linux
Version: 2.25
Release: 0.2%{?dist}
Release: 0.3%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base
URL: http://en.wikipedia.org/wiki/Util-linux
%define upstream_version %{version}-rc1
%define upstream_version %{version}-rc2
### Macros
%define compldir %{_datadir}/bash-completion/completions/
@ -77,9 +77,6 @@ Requires: libsmartcols = %{version}-%{release}
# 151635 - makeing /var/log/lastlog
Patch0: 2.23-login-lastlog-create.patch
# 1112315 - libblkid: correct the return values in squashfs probe
Patch1: util-linux-squashfs-probe.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
@ -833,6 +830,9 @@ exit 0
%{_libdir}/python*/site-packages/libmount/*
%changelog
* Thu Jul 02 2014 Karel Zak <kzak@redhat.com> 2.25-0.3
- upgrade to release 2.25-rc2
* Wed Jun 25 2014 Peter Jones <pjones@redhat.com> - 2.25-0.2
- Fix libblkid's squashfs probe return checking.
Related: rhbz#1112315