Skip to contentSkip to conversation

package/util-linux: upgrade to version 2.35.1

PATCH New unixmania at gmail.com 2 participants 3 messages Feb 7, 2020 – Mar 7, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/util-linux: upgrade to version 2.35.1

From: Carlos Santos <[email protected]>

Drop patches already applied upstream and, consequently, AUTORECONF.

util-linux 2.35.1 Release Notes
===============================

build-sys:
- add --disable-hwclock-gplv3 [Karel Zak]
chrt:
- Use sched_setscheduler system call directly [jonnyh64]
lib/randutils:
- use explicit data types for bit ops [Karel Zak]
libfdisk:
- fix __copy_partition() [Karel Zak]
- make sure we use NULL after free [Karel Zak]
libmount:
- fix x- options use for non-root users [Karel Zak]
po:
- update uk.po (from translationproject.org) [Yuri Chornoivan]
sfdisk:
- make sure we do not overlap on --move [Karel Zak]
- remove broken step alignment for --move [Karel Zak]

---
 ...-make-sure-we-do-not-overlap-on-move.patch |  71 ---------
 ...emove-broken-step-alignment-for-move.patch |  62 --------
 ...-build-sys-add-disable-hwclock-gplv3.patch | 105 --------------
 ...fix-x-options-use-for-non-root-users.patch | 137 ------------------
 package/util-linux/util-linux.hash            |   2 +-
 package/util-linux/util-linux.mk              |   6 +-
 6 files changed, 3 insertions(+), 380 deletions(-)
 delete mode 100644 package/util-linux/0001-sfdisk-make-sure-we-do-not-overlap-on-move.patch
 delete mode 100644 package/util-linux/0002-sfdisk-remove-broken-step-alignment-for-move.patch
 delete mode 100644 package/util-linux/0006-build-sys-add-disable-hwclock-gplv3.patch
 delete mode 100644 package/util-linux/0007-libmount-fix-x-options-use-for-non-root-users.patch
package/util-linux/0001-sfdisk-make-sure-we-do-not-overlap-on-move.patch deleted +0 -71
deleted file mode 100644
index 115e9425fd..0000000000
@@ -1,71 +0,0 @@
-From 2b26438c4bf90b7836111cc49d847ee89e49bfa8 Mon Sep 17 00:00:00 2001
-From: Karel Zak <[email protected]>
-Date: Thu, 23 Jan 2020 12:44:58 +0100
-Subject: [PATCH] sfdisk: make sure we do not overlap on --move
-
-The area we need to move does not have to be aligned to optimal I/O
-size (step size) -- we need to be sure we do not move data
-after/before the area.
-
-Addresses: https://github.com/karelzak/util-linux/issues/938
-Signed-off-by: Karel Zak <[email protected]>
----
- disk-utils/sfdisk.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
-index 0601c3bcf..8f2edb87f 100644
---- a/disk-utils/sfdisk.c
-+++ b/disk-utils/sfdisk.c
-@@ -374,7 +374,7 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
- 	int ok = 0, fd, backward = 0;
- 	fdisk_sector_t nsectors, from, to, step, i, prev;
- 	size_t io, ss, step_bytes, cc;
--	uintmax_t src, dst;
-+	uintmax_t src, dst, nbytes;
- 	int errsv, progress = 0;
- 	struct timeval prev_time;
- 	uint64_t bytes_per_sec = 0;
-@@ -409,6 +409,7 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
- 	from = fdisk_partition_get_start(orig_pa);
- 	to = fdisk_partition_get_start(pa);
- 
-+
- 	if ((to >= from && from + nsectors >= to) ||
- 	    (from >= to && to + nsectors >= from)) {
- 		/* source and target overlay, check if we need to copy
-@@ -434,6 +435,8 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
- 	while (nsectors % step)
- 		step--;
- 
-+	nbytes = nsectors * ss;
-+
- 	DBG(MISC, ul_debug(" step: %ju (%zu bytes)", (uintmax_t)step, step_bytes));
- 
- #if defined(POSIX_FADV_SEQUENTIAL) && defined(HAVE_POSIX_FADVISE)
-@@ -504,7 +507,7 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
- 	gettimeofday(&prev_time, NULL);
- 	prev = 0;
- 
--	for (cc = 1, i = 0; i < nsectors; i += step, cc++) {
-+	for (cc = 1, i = 0; i < nsectors && nbytes > 0; i += step, cc++) {
- 		ssize_t rc;
- 
- 		if (backward)
-@@ -512,6 +515,13 @@ static int move_partition_data(struct sfdisk *sf, size_t partno, struct fdisk_pa
- 
- 		DBG(MISC, ul_debug("#%05zu: src=%ju dst=%ju", cc, src, dst));
- 
-+		if (nbytes < step_bytes) {
-+			DBG(MISC, ul_debug(" aligning step from %ju to %ju",
-+						step_bytes, nbytes));
-+			step_bytes = nbytes;
-+		}
-+		nbytes -= step_bytes;
-+
- 		if (!sf->noact) {
- 			/* read source */
- 			if (lseek(fd, src, SEEK_SET) == (off_t) -1)
--- 
-2.18.2
-
package/util-linux/0002-sfdisk-remove-broken-step-alignment-for-move.patch deleted +0 -62

62 lines not on this page · raw message

package/util-linux/0006-build-sys-add-disable-hwclock-gplv3.patch deleted +0 -105

105 lines not on this page · raw message

package/util-linux/0007-libmount-fix-x-options-use-for-non-root-users.patch deleted +0 -137

137 lines not on this page · raw message

package/util-linux/util-linux.hash +1 -1
index a5a9099125..f9a3d1e867 100644
@@ -1,5 +1,5 @@
 # From https://www.kernel.org/pub/linux/utils/util-linux/v2.35/sha256sums.asc
-sha256 b3081b560268c1ec3367e035234e91616fa7923a0afc2b1c80a2a6d8b9dfe2c9  util-linux-2.35.tar.xz
+sha256 d9de3edd287366cd908e77677514b9387b22bc7b88f45b83e1922c3597f1d7f9  util-linux-2.35.1.tar.xz
 # License files, locally calculated
 sha256 869660b5269f4f40a8a679da7f403ea3a6e71d46087aab5e14871b09bcb55955  README.licensing
 sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3-Clause
package/util-linux/util-linux.mk +2 -4
index b867a670a4..549442232e 100644
@@ -5,13 +5,11 @@
 ################################################################################
 
 UTIL_LINUX_VERSION_MAJOR = 2.35
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR)
+UTIL_LINUX_VERSION_MINOR = 1
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR)
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
-# 0006-build-sys-add-disable-hwclock-gplv3.patch
-UTIL_LINUX_AUTORECONF = YES
-
 # README.licensing claims that some files are GPL-2.0 only, but this is not
 # true. Some files are GPL-3.0+ but only in tests and optionally in hwclock
 # (but we disable that option). rfkill uses an ISC-style license.
Signature · 1 line
2.18.2
#1 lore raw

PATCH 1/1 package/util-linux: upgrade to version 2.35.1

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"unixmania" == unixmania <[email protected]> writes:

From: Carlos Santos <[email protected]>
Drop patches already applied upstream and, consequently, AUTORECONF.

Great, I noticed the release with yesterdays' LWN and was going to do the bump this weekend - Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/util-linux: upgrade to version 2.35.1

In reply to unixmania at gmail.com
Quoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"unixmania" == unixmania <[email protected]> writes:

From: Carlos Santos <[email protected]>
Drop patches already applied upstream and, consequently, AUTORECONF.

util-linux 2.35.1 Release Notes
===============================

build-sys:
- add --disable-hwclock-gplv3 [Karel Zak]
chrt:
- Use sched_setscheduler system call directly [jonnyh64]
lib/randutils:
- use explicit data types for bit ops [Karel Zak]
libfdisk:
- fix __copy_partition() [Karel Zak]
- make sure we use NULL after free [Karel Zak]
libmount:
- fix x- options use for non-root users [Karel Zak]
po:
- update uk.po (from translationproject.org) [Yuri Chornoivan]
sfdisk:
- make sure we do not overlap on --move [Karel Zak]
- remove broken step alignment for --move [Karel Zak]

Quoted 1 line

Committed to 2019.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard