commit: d92bc2d3a1d5cbcab0b9ec47fadea2e835092c2f
parent af1e59d3411f55dceba0990594c2ca4d883c97c8
Author: Michael Forney <mforney@mforney.org>
Date: Thu, 3 Dec 2020 21:08:10 -0800
util-linux: Update to 2.36.1
Diffstat:
5 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/pkg/util-linux/config.h b/pkg/util-linux/config.h
@@ -140,8 +140,6 @@
/* #undef HAVE_RPMATCH */
/* #undef HAVE_SA_LEN */
/* #undef HAVE_SCANDIRAT */
-/* #undef HAVE_SCANF_AS_MODIFIER */
-#define HAVE_SCANF_MS_MODIFIER 1
/* #undef HAVE_SCHED_SETATTR */
#define HAVE_SCHED_SETSCHEDULER 1
#define HAVE_SECURE_GETENV 1
@@ -232,11 +230,11 @@
#define HAVE___FPURGE 1
#define HAVE___PROGNAME 1
/* #undef HAVE___SECURE_GETENV */
-#define LIBBLKID_DATE "23-Jul-2020"
-#define LIBBLKID_VERSION "2.36.0"
-#define LIBFDISK_VERSION "2.36.0"
-#define LIBMOUNT_VERSION "2.36.0"
-#define LIBSMARTCOLS_VERSION "2.36.0"
+#define LIBBLKID_DATE "16-Nov-2020"
+#define LIBBLKID_VERSION "2.36.1"
+#define LIBFDISK_VERSION "2.36.1"
+#define LIBMOUNT_VERSION "2.36.1"
+#define LIBSMARTCOLS_VERSION "2.36.1"
/* #undef LOGIN_CHOWN_VCS */
/* #undef LOGIN_STAT_MAIL */
#define LT_OBJDIR ".libs/"
@@ -246,10 +244,10 @@
#define PACKAGE "util-linux"
#define PACKAGE_BUGREPORT "kzak@redhat.com"
#define PACKAGE_NAME "util-linux"
-#define PACKAGE_STRING "util-linux 2.36"
+#define PACKAGE_STRING "util-linux 2.36.1"
#define PACKAGE_TARNAME "util-linux"
#define PACKAGE_URL "http://www.kernel.org/pub/linux/utils/util-linux/"
-#define PACKAGE_VERSION "2.36"
+#define PACKAGE_VERSION "2.36.1"
#define PG_BELL 1
#define STDC_HEADERS 1
/* #undef SYS_fallocate */
@@ -291,7 +289,7 @@
#define USE_TTY_GROUP 1
/* #undef USE_USRDIR_PATHS_ONLY */
/* #undef USE_VENDORDIR */
-#define VERSION "2.36"
+#define VERSION "2.36.1"
#if defined AC_APPLE_UNIVERSAL_BUILD
# if defined __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
diff --git a/pkg/util-linux/gen.lua b/pkg/util-linux/gen.lua
@@ -1,4 +1,4 @@
-set('version', '2.36.0')
+set('version', '2.36.1')
cflags{
'-include $dir/config.h',
'-I $outdir',
@@ -42,31 +42,28 @@ lib('libcommon.a', [[
idcache.c
encode.c
fileutils.c
- ismounted.c
mangle.c
match.c
mbsalign.c
md5.c
pager.c
+ procutils.c
pwdutils.c
randutils.c
setproctitle.c
strutils.c
timeutils.c
ttyutils.c
- exec_shell.c
strv.c
sha1.c
signames.c
- caputils.c
linux_version.c
loopdev.c
cpuset.c
path.c
- procutils.c
sysfs.c
)
]])
diff --git a/pkg/util-linux/patch/0002-Avoid-a-few-unnecessary-statement-expressions.patch b/pkg/util-linux/patch/0002-Avoid-a-few-unnecessary-statement-expressions.patch
@@ -1,4 +1,4 @@
-From 4dc325cb325a2640f429c5107ac9bc0fe85ea79b Mon Sep 17 00:00:00 2001
+From 015737758924b64b67df0a1d1e2385e3398f0cd1 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 18 Jun 2019 02:29:07 -0700
Subject: [PATCH] Avoid a few unnecessary statement expressions
@@ -8,7 +8,7 @@ Subject: [PATCH] Avoid a few unnecessary statement expressions
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/include/c.h b/include/c.h
-index 64cf5c3fb..62fcfe2d0 100644
+index ae0813109..66fefe2a2 100644
--- a/include/c.h
+++ b/include/c.h
@@ -161,9 +161,8 @@
@@ -49,7 +49,7 @@ index 64cf5c3fb..62fcfe2d0 100644
+} while (0)
/*
- * scanf modifiers for "strings allocation"
+ * seek stuff
--
-2.28.0
+2.29.2
diff --git a/pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch b/pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch
@@ -1,4 +1,4 @@
-From 6bd00097ea010f4ead414f740e0b180dacdfc7bf Mon Sep 17 00:00:00 2001
+From 922e927710ecc196aa6f60eab1690a113c2a96ee Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 12 Mar 2019 17:13:45 -0700
Subject: [PATCH] Avoid statement expressions min/max
@@ -7,14 +7,14 @@ Subject: [PATCH] Avoid statement expressions min/max
include/c.h | 24 ++++++++++--------------
lib/mbsalign.c | 2 +-
libfdisk/src/alignment.c | 8 ++++----
- libfdisk/src/context.c | 2 +-
+ libfdisk/src/context.c | 4 ++--
libfdisk/src/gpt.c | 4 ++--
libsmartcols/src/calculate.c | 8 ++++----
libsmartcols/src/column.c | 2 +-
- 7 files changed, 23 insertions(+), 27 deletions(-)
+ 7 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/include/c.h b/include/c.h
-index 62fcfe2d0..3c54d57f4 100644
+index 66fefe2a2..d7eeb699e 100644
--- a/include/c.h
+++ b/include/c.h
@@ -126,21 +126,17 @@
@@ -103,10 +103,10 @@ index 3d0254634..91f6d1f7d 100644
cxt->grain = cxt->user_grain < granularity ? granularity : cxt->user_grain;
DBG(CXT, ul_debugobj(cxt, "new grain: %lu", cxt->grain));
diff --git a/libfdisk/src/context.c b/libfdisk/src/context.c
-index 363db30f4..85f68d816 100644
+index 206627849..6c3a17b98 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
-@@ -893,7 +893,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
+@@ -894,7 +894,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
/* the current layout */
fdisk_get_partitions(cxt, &tb);
/* maximal number of partitions */
@@ -115,11 +115,20 @@ index 363db30f4..85f68d816 100644
while (fdisk_diff_tables(org, tb, &itr, &pa, &change) == 0) {
if (change == FDISK_DIFF_UNCHANGED)
+@@ -951,7 +951,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
+ /* Let's follow the Linux kernel and reduce
+ * DOS extended partition to 1 or 2 sectors.
+ */
+- sz = min(sz, (uint64_t) 2);
++ sz = umin(sz, (uint64_t) 2);
+
+ if (partx_add_partition(cxt->dev_fd, pa->partno + 1,
+ pa->start * ssf, sz) != 0) {
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
-index dbd240617..ac7515630 100644
+index 29fcffa59..5e95b205d 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
-@@ -496,7 +496,7 @@ static int gpt_mknew_pmbr(struct fdisk_context *cxt)
+@@ -504,7 +504,7 @@ static int gpt_mknew_pmbr(struct fdisk_context *cxt)
pmbr->partition_record[0].end_track = 0xFF;
pmbr->partition_record[0].starting_lba = cpu_to_le32(1);
pmbr->partition_record[0].size_in_lba =
@@ -128,7 +137,7 @@ index dbd240617..ac7515630 100644
return 0;
}
-@@ -923,7 +923,7 @@ static int valid_pmbr(struct fdisk_context *cxt)
+@@ -931,7 +931,7 @@ static int valid_pmbr(struct fdisk_context *cxt)
/* Note that gpt_write_pmbr() overwrites PMBR, but we want to keep it valid already
* in memory too to disable warnings when valid_pmbr() called next time */
pmbr->partition_record[part].size_in_lba =
@@ -186,5 +195,5 @@ index c11df69f5..1285d42e6 100644
}
--
-2.28.0
+2.29.2
diff --git a/pkg/util-linux/ver b/pkg/util-linux/ver
@@ -1 +1 @@
-2.36 r1
+2.36.1 r0
