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

Revert upstream commit 7ef86a0 to fix RHBZ #1783066

Browse Source
This commit is contained in:
Adam Williamson 2019-12-12 18:07:54 -08:00
parent 42ab31a080
commit 2cde2b2546
3 changed files with 258 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0001-Revert-tests-add-missing-ts_check_prog-xz.patch Normal file
View File

@ -0,0 +1,39 @@
From 908a490fa475c643f275ed1f4e3060ae17f51794 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 12 Dec 2019 17:19:56 -0800
Subject: [PATCH 1/2] Revert "tests: add missing 'ts_check_prog xz'"
This reverts commit a72a19865d72481c2dd40110919863121cc644bd.
---
tests/ts/blkid/iso-partitions | 1 -
tests/ts/hardlink/options | 2 --
2 files changed, 3 deletions(-)
diff --git a/tests/ts/blkid/iso-partitions b/tests/ts/blkid/iso-partitions
index 4aaa164f7..02fdd4e50 100755
--- a/tests/ts/blkid/iso-partitions
+++ b/tests/ts/blkid/iso-partitions
@@ -25,7 +25,6 @@ ts_init "$*"
ts_check_test_command "$TS_CMD_BLKID"
ts_check_test_command "$TS_CMD_PARTX"
-ts_check_prog xz
ts_skip_nonroot
diff --git a/tests/ts/hardlink/options b/tests/ts/hardlink/options
index bb445caf4..16d26c4ac 100755
--- a/tests/ts/hardlink/options
+++ b/tests/ts/hardlink/options
@@ -23,8 +23,6 @@ TS_DESC="options"
ts_init "$*"
ts_check_test_command "$TS_CMD_HARDLINK"
-ts_check_prog xz
-ts_check_prog tar
SRCDIR="$TS_OUTDIR/testdir1"
--
2.24.0

208
0002-Revert-libblkid-improve-handling-of-ISO-files-with-p.patch Normal file
View File

@ -0,0 +1,208 @@
From f0e3bafa74b36f63e30ceb533b0f4e0844238f5b Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 12 Dec 2019 17:20:04 -0800
Subject: [PATCH 2/2] Revert "libblkid: improve handling of ISO files with
partition tables"
This reverts commit 7ef86a08914427d6486734614d7d3bbed1f108fe.
---
libblkid/src/superblocks/iso9660.c | 37 ---------
.../blkid/iso-partitions-no_partitions | 9 ---
.../expected/blkid/iso-partitions-partitions | 25 ------
tests/ts/blkid/iso-partitions | 71 ------------------
tests/ts/blkid/iso-partitions.img.xz | Bin 1188 -> 0 bytes
5 files changed, 142 deletions(-)
delete mode 100644 tests/expected/blkid/iso-partitions-no_partitions
delete mode 100644 tests/expected/blkid/iso-partitions-partitions
delete mode 100755 tests/ts/blkid/iso-partitions
delete mode 100644 tests/ts/blkid/iso-partitions.img.xz
diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c
index 730939f70..8dc2e5394 100644
--- a/libblkid/src/superblocks/iso9660.c
+++ b/libblkid/src/superblocks/iso9660.c
@@ -13,7 +13,6 @@
*/
#include <stdio.h>
#include <stdlib.h>
-#include <stdbool.h>
#include <unistd.h>
#include <string.h>
#include <stdint.h>
@@ -166,37 +165,6 @@ static int is_str_empty(const unsigned char *str, size_t len)
return 1;
}
-/*
- * The ISO format specifically avoids the first 32kb to allow for a
- * partition table to be added, if desired.
- * When an ISO contains a partition table, the usual thing to do is to
- * have a partition that points at the iso filesystem. In such case,
- * we want to only probe the iso metadata for the corresponding partition
- * device, avoiding returning the metadata for the parent block device.
- */
-static bool isofs_belongs_to_device(blkid_probe pr)
-{
- dev_t devno;
- blkid_partlist ls;
-
- /* Get device number, but if that fails, assume we aren't dealing
- * with partitions, and continue probing. */
- devno = blkid_probe_get_devno(pr);
- if (!devno)
- return true;
-
- /* Get partition table, but if that fails, assume we aren't dealing
- * with partitions, and continue probing. */
- ls = blkid_probe_get_partitions(pr);
- if (!ls)
- return true;
-
- /* Check that the device we're working with corresponds to an
- * entry in the partition table. If so, this is the correct
- * device to return the iso metadata on. */
- return blkid_partlist_devno_to_partition(ls, devno) != NULL;
-}
-
/* iso9660 [+ Microsoft Joliet Extension] */
static int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
{
@@ -212,11 +180,6 @@ static int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag)
if (!iso)
return errno ? -errno : 1;
- /* Check if the iso metadata should be returned on a different device
- * instead of this one. */
- if (!isofs_belongs_to_device(pr))
- return 1;
-
memcpy(label, iso->volume_id, sizeof(label));
blkid_probe_set_block_size(pr, 2048);
diff --git a/tests/expected/blkid/iso-partitions-no_partitions b/tests/expected/blkid/iso-partitions-no_partitions
deleted file mode 100644
index dbfd57a34..000000000
--- a/tests/expected/blkid/iso-partitions-no_partitions
+++ /dev/null
@@ -1,9 +0,0 @@
-ID_FS_BLOCK_SIZE=2048
-ID_FS_PUBLISHER_ID=UTIL-LINUX
-ID_FS_UUID=2019-09-24-09-31-05-00
-ID_FS_UUID_ENC=2019-09-24-09-31-05-00
-ID_FS_VERSION=Joliet\x20Extension
-ID_FS_LABEL=ISOIMAGE
-ID_FS_LABEL_ENC=ISOIMAGE
-ID_FS_TYPE=iso9660
-ID_FS_USAGE=filesystem
diff --git a/tests/expected/blkid/iso-partitions-partitions b/tests/expected/blkid/iso-partitions-partitions
deleted file mode 100644
index e34ca39fc..000000000
--- a/tests/expected/blkid/iso-partitions-partitions
+++ /dev/null
@@ -1,25 +0,0 @@
-ID_PART_TABLE_TYPE=dos
---
-ID_FS_BLOCK_SIZE=2048
-ID_FS_PUBLISHER_ID=UTIL-LINUX
-ID_FS_UUID=2019-09-24-09-31-05-00
-ID_FS_UUID_ENC=2019-09-24-09-31-05-00
-ID_FS_VERSION=Joliet\x20Extension
-ID_FS_LABEL=ISOIMAGE
-ID_FS_LABEL_ENC=ISOIMAGE
-ID_FS_TYPE=iso9660
-ID_FS_USAGE=filesystem
-ID_PART_TABLE_TYPE=dos
-ID_PART_ENTRY_SCHEME=dos
-ID_PART_ENTRY_TYPE=0x83
-ID_PART_ENTRY_NUMBER=1
-ID_PART_ENTRY_OFFSET=0
-ID_PART_ENTRY_SIZE=136
-ID_PART_ENTRY_DISK=__ts_majorminor__
---
-ID_PART_ENTRY_SCHEME=dos
-ID_PART_ENTRY_TYPE=0xef
-ID_PART_ENTRY_NUMBER=2
-ID_PART_ENTRY_OFFSET=136
-ID_PART_ENTRY_SIZE=4096
-ID_PART_ENTRY_DISK=__ts_majorminor__
diff --git a/tests/ts/blkid/iso-partitions b/tests/ts/blkid/iso-partitions
deleted file mode 100755
index 02fdd4e50..000000000
--- a/tests/ts/blkid/iso-partitions
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright (C) 2019 Endless Mobile, Inc.
-#
-# This file is part of util-linux.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-
-TS_TOPDIR="${0%/*}/../.."
-TS_DESC="iso-partitions"
-
-. $TS_TOPDIR/functions.sh
-
-ts_init "$*"
-
-ts_check_test_command "$TS_CMD_BLKID"
-ts_check_test_command "$TS_CMD_PARTX"
-
-ts_skip_nonroot
-
-# set global variable TS_DEVICE
-ts_scsi_debug_init dev_size_mb=50
-
-# This image (created by xorriso) has partition 1 pointing to the ISO
-# area, followed by an unformatted second partition.
-xz -dc ${TS_SELF}/iso-partitions.img.xz > ${TS_DEVICE}
-udevadm settle
-
-ts_init_subtest "partitions"
-$TS_CMD_PARTX -a ${TS_DEVICE} &>/dev/null
-udevadm settle
-
-# Check that the ISO metadata is not shown on the main disk device
-$TS_CMD_BLKID -p -o udev ${TS_DEVICE} >> $TS_OUTPUT
-echo -- >> $TS_OUTPUT
-
-# Check that the ISO metadata is shown on the "ISO partition"
-$TS_CMD_BLKID -p -o udev ${TS_DEVICE}1 >> $TS_OUTPUT
-echo -- >> $TS_OUTPUT
-
-# Check that the ISO metadata is not shown on the other partition
-$TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 >> $TS_OUTPUT
-
-# substitute major/minor number before comparison
-sed -i \
- -e 's/^\(ID_PART_ENTRY_DISK\)=.*/\1=__ts_majorminor__/' \
- $TS_OUTPUT
-
-ts_finalize_subtest
-
-# Remove the partition table and check that the ISO metadata is shown on the
-# main disk device.
-ts_init_subtest "no_partitions"
-dd if=/dev/zero of=${TS_DEVICE} bs=512 count=1 &>/dev/null
-udevadm settle
-$TS_CMD_PARTX -d ${TS_DEVICE} &>/dev/null
-udevadm settle
-$TS_CMD_BLKID -p -o udev ${TS_DEVICE} >> $TS_OUTPUT
-ts_finalize_subtest
-
-ts_finalize
--
2.24.0

12
util-linux.spec
View File

@ -2,7 +2,7 @@
Summary: A collection of basic system utilities Summary: A collection of basic system utilities
Name: util-linux Name: util-linux
Version: 2.35 Version: 2.35
Release: 0.1%{?dist} Release: 0.2%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
URL: http://en.wikipedia.org/wiki/Util-linux URL: http://en.wikipedia.org/wiki/Util-linux
@ -106,6 +106,13 @@ Requires: libfdisk = %{version}-%{release}
# 151635 - makeing /var/log/lastlog # 151635 - makeing /var/log/lastlog
Patch0: 2.28-login-lastlog-create.patch Patch0: 2.28-login-lastlog-create.patch
# Revert https://github.com/karelzak/util-linux/commit/7ef86a0
# to fix boot of installer and live images as optical media:
# https://bugzilla.redhat.com/show_bug.cgi?id=1783066
# Other reversion is needed for this revert to be clean
Patch1: 0001-Revert-tests-add-missing-ts_check_prog-xz.patch
Patch2: 0002-Revert-libblkid-improve-handling-of-ISO-files-with-p.patch
%description %description
The util-linux package contains a large variety of low-level system The util-linux package contains a large variety of low-level system
utilities that are necessary for a Linux system to function. Among utilities that are necessary for a Linux system to function. Among
@ -932,6 +939,9 @@ fi
%{_libdir}/python*/site-packages/libmount/ %{_libdir}/python*/site-packages/libmount/
%changelog %changelog
* Thu Dec 12 2019 Adam Williamson <awilliam@redhat.com> - 2.35-0.2
- Revert upstream commit 7ef86a0 to fix RHBZ #1783066
* Wed Dec 11 2019 Karel Zak <kzak@redhat.com> - 2.35-0.1 * Wed Dec 11 2019 Karel Zak <kzak@redhat.com> - 2.35-0.1
- upgrade to v2.35-rc1 - upgrade to v2.35-rc1
https://www.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes https://www.kernel.org/pub/linux/utils/util-linux/v2.35/v2.35-ReleaseNotes