diff --git a/0001-libfdisk-fix-last-free-sector-detection-if-partition.patch b/0001-libfdisk-fix-last-free-sector-detection-if-partition.patch deleted file mode 100644 index eca67e6b7087efaa333170fd434a8f9f0e3cf9e2..0000000000000000000000000000000000000000 --- a/0001-libfdisk-fix-last-free-sector-detection-if-partition.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 430952f254cddf1ccb47a5f8caf5b5cd64193c3a Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Mon, 10 Aug 2020 11:37:32 +0200 -Subject: [PATCH] libfdisk: fix last free sector detection if partition size - specified - -We need to skip useless gaps between partition if the gap is no large -enough for a new partition. Unfortunately, the current code checks -size of the gap, but does not care for location of the gap -- this is -good enough for dialog driven partitioning, but it's pretty bad if -start of the partition is explicitly specified (e.g. sfdisk). - -Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1860461 -Signed-off-by: Karel Zak ---- - libfdisk/src/dos.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c -index 176969883..890e33a26 100644 ---- a/libfdisk/src/dos.c -+++ b/libfdisk/src/dos.c -@@ -1274,14 +1274,14 @@ static int add_partition(struct fdisk_context *cxt, size_t n, - fdisk_sector_t last; - - rc = find_last_free(cxt, is_logical, start, limit, &last); -- - if (rc == 0 && last - start + 1 < fdisk_partition_get_size(pa)) { - DBG(LABEL, ul_debug("DOS: area <%ju,%ju> too small [wanted=%ju aval=%ju]", - (uintmax_t) start, (uintmax_t) last, - fdisk_partition_get_size(pa), - last - start)); - -- if (fdisk_partition_has_start(pa)) -+ if (fdisk_partition_has_start(pa) -+ && fdisk_partition_get_start(pa) <= last) - rc = -ENOSPC; - else { - start = last + 1; --- -2.25.4 - diff --git a/util-linux-2.36.tar.xz b/util-linux-2.36.1.tar.xz similarity index 41% rename from util-linux-2.36.tar.xz rename to util-linux-2.36.1.tar.xz index 8ce04d19a08e6adb274d393d2d6ac40b7775ac46..8d9ace96a01380b4dd9e487ab3cbca2a656c8fe8 100644 Binary files a/util-linux-2.36.tar.xz and b/util-linux-2.36.1.tar.xz differ diff --git a/util-linux.spec b/util-linux.spec index c6e77622061e63b708aff2ca2eb2c002f2f68d7b..d3f686e6709e6c380b10236fb3f803f9a9d71cee 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,8 +2,8 @@ %global upstream_major 2.36 Name: util-linux -Version: 2.36 -Release: 4 +Version: 2.36.1 +Release: 1 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -36,8 +36,7 @@ Provides: /sbin/blockdev /sbin/findfs /sbin/fsck /sbin/nologin Obsoletes: eject <= 2.1.5 rfkill <= 0.5 util-linux-ng < 2.19 hardlink <= 1:1.3-9 Patch0: 2.36-login-lastlog-create.patch -Patch1: 0001-libfdisk-fix-last-free-sector-detection-if-partition.patch -Patch2: Do-not-excute-Utmp-testcases.patch +Patch1: Do-not-excute-Utmp-testcases.patch Patch9000: Add-check-to-resolve-uname26-version-test-failed.patch @@ -387,6 +386,12 @@ fi %{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*} %changelog +* Tue Jan 26 2021 yangzhuangzhuang - 2.36.1-1 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:update version to 2.36.1 + * Mon Jan 18 2021 Liquor - 2.36-4 - Type:bugfix - ID:NA