commit: 97fe1fc955cfc5945f3c4143d26443c6c7bc57a0
parent 9e2c69dc5544625487950116da263422d120f7bc
Author: Michael Forney <mforney@mforney.org>
Date: Fri, 14 Aug 2020 00:01:19 -0700
util-linux: Update to 2.36
Diffstat:
9 files changed, 73 insertions(+), 84 deletions(-)
diff --git a/pkg/util-linux/config.h b/pkg/util-linux/config.h
@@ -5,6 +5,7 @@
#define AGETTY_RELOAD 1
#define CHFN_CHSH_PASSWORD 1
#define CONFIG_ADJTIME_PATH "/etc/adjtime"
+/* #undef CRYPTSETUP_VIA_DLOPEN */
/* #undef ENABLE_NLS */
#define FS_SEARCH_PATH "/bin"
/* #undef HAVE_ASM_IO_H */
@@ -16,6 +17,7 @@
#define HAVE_CLOCK_GETTIME 1
#define HAVE_CPU_SET_T 1
/* #undef HAVE_CRYPTSETUP */
+/* #undef HAVE_CRYPT_ACTIVATE_BY_SIGNED_KEY */
#define HAVE_CRYPT_H 1
/* #undef HAVE_DCGETTEXT */
#define HAVE_DECL_CPU_ALLOC 1
@@ -68,6 +70,7 @@
/* #undef HAVE_LIBBLKID */
/* #undef HAVE_LIBCAP_NG */
/* #undef HAVE_LIBCRYPT */
+/* #undef HAVE_LIBECONF */
/* #undef HAVE_LIBMOUNT */
/* #undef HAVE_LIBNCURSES */
/* #undef HAVE_LIBNCURSESW */
@@ -100,11 +103,9 @@
#define HAVE_LINUX_VERSION_H 1
#define HAVE_LINUX_WATCHDOG_H 1
/* #undef HAVE_LLSEEK */
-/* #undef HAVE_LLSEEK_PROTOTYPE */
#define HAVE_LOCALE_H 1
/* #undef HAVE_LOFF_T */
-#define HAVE_LSEEK64 1
-#define HAVE_LSEEK64_PROTOTYPE 1
+/* #undef HAVE_MAGIC */
#define HAVE_MEMORY_H 1
#define HAVE_MEMPCPY 1
#define HAVE_MKOSTEMP 1
@@ -231,11 +232,11 @@
#define HAVE___FPURGE 1
#define HAVE___PROGNAME 1
/* #undef HAVE___SECURE_GETENV */
-#define LIBBLKID_DATE "20-May-2020"
-#define LIBBLKID_VERSION "2.35.2"
-#define LIBFDISK_VERSION "2.35.2"
-#define LIBMOUNT_VERSION "2.35.2"
-#define LIBSMARTCOLS_VERSION "2.35.2"
+#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"
/* #undef LOGIN_CHOWN_VCS */
/* #undef LOGIN_STAT_MAIL */
#define LT_OBJDIR ".libs/"
@@ -245,10 +246,10 @@
#define PACKAGE "util-linux"
#define PACKAGE_BUGREPORT "kzak@redhat.com"
#define PACKAGE_NAME "util-linux"
-#define PACKAGE_STRING "util-linux 2.35.2"
+#define PACKAGE_STRING "util-linux 2.36"
#define PACKAGE_TARNAME "util-linux"
#define PACKAGE_URL "http://www.kernel.org/pub/linux/utils/util-linux/"
-#define PACKAGE_VERSION "2.35.2"
+#define PACKAGE_VERSION "2.36"
#define PG_BELL 1
#define STDC_HEADERS 1
/* #undef SYS_fallocate */
@@ -289,7 +290,8 @@
#endif
#define USE_TTY_GROUP 1
/* #undef USE_USRDIR_PATHS_ONLY */
-#define VERSION "2.35.2"
+/* #undef USE_VENDORDIR */
+#define VERSION "2.36"
#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.35.2')
+set('version', '2.36.0')
cflags{
'-include $dir/config.h',
'-I $outdir',
@@ -40,6 +40,7 @@ lib('libcommon.a', [[
crc32c.c
env.c
idcache.c
+ encode.c
fileutils.c
ismounted.c
mangle.c
diff --git a/pkg/util-linux/patch/0001-Don-t-omit-second-operand-to-operator.patch b/pkg/util-linux/patch/0001-Don-t-omit-second-operand-to-operator.patch
@@ -1,16 +1,15 @@
-From ee722c6acbea8bd467ce7a8100d185d72e6573b4 Mon Sep 17 00:00:00 2001
+From 2087e89a262f9655f13878f175ad019ed3578d01 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 18 Jun 2019 01:38:53 -0700
Subject: [PATCH] Don't omit second operand to `?` operator
---
- libfdisk/src/bsd.c | 2 +-
- libfdisk/src/dos.c | 2 +-
- libfdisk/src/gpt.c | 2 +-
- libfdisk/src/parttype.c | 2 +-
- libfdisk/src/sgi.c | 2 +-
- libfdisk/src/sun.c | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
+ libfdisk/src/bsd.c | 2 +-
+ libfdisk/src/dos.c | 2 +-
+ libfdisk/src/gpt.c | 2 +-
+ libfdisk/src/sgi.c | 2 +-
+ libfdisk/src/sun.c | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
index a7e2791a7..c31a29156 100644
@@ -26,10 +25,10 @@ index a7e2791a7..c31a29156 100644
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
-index 53713ec5f..4a2cd946b 100644
+index 176969883..7a1f6ea34 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
-@@ -136,7 +136,7 @@ static struct fdisk_parttype *dos_partition_parttype(
+@@ -148,7 +148,7 @@ static struct fdisk_parttype *dos_partition_parttype(
{
struct fdisk_parttype *t
= fdisk_label_get_parttype_from_code(cxt->label, p->sys_ind);
@@ -39,10 +38,10 @@ index 53713ec5f..4a2cd946b 100644
/*
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
-index f50bb4441..a2a346faa 100644
+index 66520c51d..dbd240617 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
-@@ -248,7 +248,7 @@ static struct fdisk_parttype *gpt_partition_parttype(
+@@ -262,7 +262,7 @@ static struct fdisk_parttype *gpt_partition_parttype(
guid_to_string(&guid, str);
t = fdisk_label_get_parttype_from_string(cxt->label, str);
@@ -51,21 +50,8 @@ index f50bb4441..a2a346faa 100644
}
static void gpt_entry_set_type(struct gpt_entry *e, struct gpt_guid *uuid)
-diff --git a/libfdisk/src/parttype.c b/libfdisk/src/parttype.c
-index d5ad434f0..ba4e994cf 100644
---- a/libfdisk/src/parttype.c
-+++ b/libfdisk/src/parttype.c
-@@ -335,7 +335,7 @@ struct fdisk_parttype *fdisk_label_parse_parttype(
-
- done:
- DBG(PARTTYPE, ul_debugobj(ret, "returns parsed '%s' [%s] partition type",
-- ret->name, ret->typestr ? : ""));
-+ ret->name, ret->typestr ? ret->typestr : ""));
- return ret;
- }
-
diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
-index 884e385ac..4bdc5729c 100644
+index 6b4b5d116..14c7ea9b7 100644
--- a/libfdisk/src/sgi.c
+++ b/libfdisk/src/sgi.c
@@ -351,7 +351,7 @@ static struct fdisk_parttype *sgi_get_parttype(struct fdisk_context *cxt, size_t
@@ -91,5 +77,5 @@ index 833f421a8..708e4554f 100644
--
-2.25.0
+2.28.0
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 71672deb5a3eb13f2a641f55c5a62e954b3b2252 Mon Sep 17 00:00:00 2001
+From 4dc325cb325a2640f429c5107ac9bc0fe85ea79b 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 812692885..7f3a8b173 100644
+index 64cf5c3fb..62fcfe2d0 100644
--- a/include/c.h
+++ b/include/c.h
@@ -161,9 +161,8 @@
@@ -37,7 +37,7 @@ index 812692885..7f3a8b173 100644
/* After failed execvp() */
#define EX_EXEC_FAILED 126 /* Program located, but not usable. */
-@@ -366,10 +365,10 @@ static inline int xusleep(useconds_t usec)
+@@ -372,10 +371,10 @@ static inline int xusleep(useconds_t usec)
#define UTIL_LINUX_VERSION _("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING
@@ -51,5 +51,5 @@ index 812692885..7f3a8b173 100644
/*
* scanf modifiers for "strings allocation"
--
-2.25.0
+2.28.0
diff --git a/pkg/util-linux/patch/0004-Remove-need-for-VLA-for-label-name.patch b/pkg/util-linux/patch/0004-Remove-need-for-VLA-for-label-name.patch
@@ -1,4 +1,4 @@
-From 40ca588931ea2ef57ce2c44a3b92bf036fae827a Mon Sep 17 00:00:00 2001
+From 29065cab257849cec348bf72afcc64885032130c Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Tue, 18 Jun 2019 11:54:57 -0700
Subject: [PATCH] Remove need for VLA for label name
@@ -10,10 +10,10 @@ Subject: [PATCH] Remove need for VLA for label name
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c
-index 6bc52d704..66c04fb6a 100644
+index 8cc116281..62cc3471b 100644
--- a/disk-utils/fdisk-list.c
+++ b/disk-utils/fdisk-list.c
-@@ -464,19 +464,15 @@ void list_available_columns(FILE *out)
+@@ -469,19 +469,15 @@ void list_available_columns(FILE *out)
static int fieldname_to_id(const char *name, size_t namesz)
{
const struct fdisk_field *fl;
@@ -37,7 +37,7 @@ index 6bc52d704..66c04fb6a 100644
}
return fdisk_field_get_id(fl);
diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c
-index a18cdeaff..a976d3650 100644
+index 98ab475bf..381a3f83b 100644
--- a/libfdisk/src/label.c
+++ b/libfdisk/src/label.c
@@ -223,12 +223,14 @@ const struct fdisk_field *fdisk_label_get_field(const struct fdisk_label *lb, in
@@ -66,10 +66,10 @@ index a18cdeaff..a976d3650 100644
}
diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in
-index 0669c0a7c..c7bc5b6d4 100644
+index 374661982..2c0d9c285 100644
--- a/libfdisk/src/libfdisk.h.in
+++ b/libfdisk/src/libfdisk.h.in
-@@ -425,7 +425,7 @@ extern int fdisk_label_get_fields_ids_all(
+@@ -463,7 +463,7 @@ extern int fdisk_label_get_fields_ids_all(
extern const struct fdisk_field *fdisk_label_get_field(const struct fdisk_label *lb, int id);
extern const struct fdisk_field *fdisk_label_get_field_by_name(
const struct fdisk_label *lb,
@@ -79,5 +79,5 @@ index 0669c0a7c..c7bc5b6d4 100644
extern void fdisk_label_set_changed(struct fdisk_label *lb, int changed);
extern int fdisk_label_is_changed(const struct fdisk_label *lb);
--
-2.25.0
+2.28.0
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 3e9baf3101f85cd288d6bbcbfc75c2e8d6a49e7e Mon Sep 17 00:00:00 2001
+From 6bd00097ea010f4ead414f740e0b180dacdfc7bf 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
@@ -14,7 +14,7 @@ Subject: [PATCH] Avoid statement expressions min/max
7 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/include/c.h b/include/c.h
-index 7f3a8b173..7201b18af 100644
+index 62fcfe2d0..3c54d57f4 100644
--- a/include/c.h
+++ b/include/c.h
@@ -126,21 +126,17 @@
@@ -50,10 +50,10 @@ index 7f3a8b173..7201b18af 100644
#ifndef cmp_numbers
# define cmp_numbers(x, y) __extension__ ({ \
diff --git a/lib/mbsalign.c b/lib/mbsalign.c
-index 8fdab9ee9..bb31e7583 100644
+index e251202af..f3ea1a2df 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
-@@ -563,7 +563,7 @@ mbsalign_unibyte:
+@@ -614,7 +614,7 @@ mbsalign_unibyte:
dest = mbs_align_pad (dest, dest_end, start_spaces, padchar);
space_left = dest_end - dest;
@@ -63,7 +63,7 @@ index 8fdab9ee9..bb31e7583 100644
}
#ifdef HAVE_WIDECHAR
diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
-index 4ae5ff08f..931ec8b9a 100644
+index 3d0254634..91f6d1f7d 100644
--- a/libfdisk/src/alignment.c
+++ b/libfdisk/src/alignment.c
@@ -38,7 +38,7 @@
@@ -93,7 +93,7 @@ index 4ae5ff08f..931ec8b9a 100644
cxt->alignment_offset) / cxt->sector_size;
if (direction == FDISK_ALIGN_UP && res < lba)
-@@ -396,7 +396,7 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt)
+@@ -398,7 +398,7 @@ int fdisk_apply_user_device_properties(struct fdisk_context *cxt)
fdisk_reset_alignment(cxt);
if (cxt->user_grain) {
@@ -103,10 +103,10 @@ index 4ae5ff08f..931ec8b9a 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 5c9d8aabc..88d83530f 100644
+index 363db30f4..85f68d816 100644
--- a/libfdisk/src/context.c
+++ b/libfdisk/src/context.c
-@@ -891,7 +891,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
+@@ -893,7 +893,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 */
@@ -116,10 +116,10 @@ index 5c9d8aabc..88d83530f 100644
while (fdisk_diff_tables(org, tb, &itr, &pa, &change) == 0) {
if (change == FDISK_DIFF_UNCHANGED)
diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
-index a2a346faa..54984bf32 100644
+index dbd240617..ac7515630 100644
--- a/libfdisk/src/gpt.c
+++ b/libfdisk/src/gpt.c
-@@ -421,7 +421,7 @@ static int gpt_mknew_pmbr(struct fdisk_context *cxt)
+@@ -496,7 +496,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 +128,7 @@ index a2a346faa..54984bf32 100644
return 0;
}
-@@ -770,7 +770,7 @@ static int valid_pmbr(struct fdisk_context *cxt)
+@@ -923,7 +923,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 =
@@ -138,10 +138,10 @@ index a2a346faa..54984bf32 100644
}
}
diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c
-index a0c0dc4b9..ad48f619c 100644
+index b6137fd23..ed6e8dd25 100644
--- a/libsmartcols/src/calculate.c
+++ b/libsmartcols/src/calculate.c
-@@ -55,7 +55,7 @@ static int count_cell_width(struct libscols_table *tb,
+@@ -57,7 +57,7 @@ static int count_cell_width(struct libscols_table *tb,
if (len == (size_t) -1) /* ignore broken multibyte strings */
len = 0;
@@ -150,7 +150,7 @@ index a0c0dc4b9..ad48f619c 100644
if (cl->is_extreme && cl->width_avg && len > cl->width_avg * 2)
return 0;
-@@ -64,10 +64,10 @@ static int count_cell_width(struct libscols_table *tb,
+@@ -66,10 +66,10 @@ static int count_cell_width(struct libscols_table *tb,
cl->extreme_sum += len;
cl->extreme_count++;
}
@@ -163,28 +163,28 @@ index a0c0dc4b9..ad48f619c 100644
}
return 0;
}
-@@ -108,7 +108,7 @@ static int count_column_width(struct libscols_table *tb,
- }
- if (scols_cell_get_data(&cl->header)) {
- size_t len = mbs_safe_width(scols_cell_get_data(&cl->header));
+@@ -115,7 +115,7 @@ static int count_column_width(struct libscols_table *tb,
+ if (data) {
+ size_t len = scols_table_is_noencoding(tb) ?
+ mbs_width(data) : mbs_safe_width(data);
- cl->width_min = max(cl->width_min, len);
+ cl->width_min = umax(cl->width_min, len);
} else
no_header = 1;
diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c
-index 4b42938f6..81fe76000 100644
+index c11df69f5..1285d42e6 100644
--- a/libsmartcols/src/column.c
+++ b/libsmartcols/src/column.c
-@@ -343,7 +343,7 @@ size_t scols_wrapnl_chunksize(const struct libscols_column *cl __attribute__((un
- } else
- sz = mbs_safe_width(data);
-
+@@ -347,7 +347,7 @@ size_t scols_wrapnl_chunksize(const struct libscols_column *cl __attribute__((un
+ mbs_width(data) :
+ mbs_safe_width(data);
+ }
- sum = max(sum, sz);
+ sum = umax(sum, sz);
data = p;
}
--
-2.26.2
+2.28.0
diff --git a/pkg/util-linux/patch/0007-Use-MAXIMUM_PARTS-instead-of-VLA.patch b/pkg/util-linux/patch/0007-Use-MAXIMUM_PARTS-instead-of-VLA.patch
@@ -1,4 +1,4 @@
-From eed6c30243fef046d6079c5c84266885268d2fcd Mon Sep 17 00:00:00 2001
+From abcdd92972cc92840e8db22d7018c44dbb9ec2f4 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 24 Jun 2019 23:41:53 -0700
Subject: [PATCH] Use MAXIMUM_PARTS instead of VLA
@@ -10,10 +10,10 @@ static array length.
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
-index 4a2cd946b..badc7ef28 100644
+index 7a1f6ea34..967b7bd19 100644
--- a/libfdisk/src/dos.c
+++ b/libfdisk/src/dos.c
-@@ -1530,8 +1530,7 @@ static int dos_verify_disklabel(struct fdisk_context *cxt)
+@@ -1624,8 +1624,7 @@ static int dos_verify_disklabel(struct fdisk_context *cxt)
{
size_t i, j;
fdisk_sector_t total = 1, n_sectors = cxt->total_sectors;
@@ -22,7 +22,7 @@ index 4a2cd946b..badc7ef28 100644
+ fdisk_sector_t first[MAXIMUM_PARTS], last[MAXIMUM_PARTS];
struct dos_partition *p;
struct fdisk_dos_label *l = self_label(cxt);
-
+ int nerrors = 0;
--
-2.25.0
+2.28.0
diff --git a/pkg/util-linux/patch/0008-Use-alloca-if-VLAs-aren-t-supported.patch b/pkg/util-linux/patch/0008-Use-alloca-if-VLAs-aren-t-supported.patch
@@ -1,4 +1,4 @@
-From ab9ac99af70f341362ca9afa7d2fad22b6b02ca2 Mon Sep 17 00:00:00 2001
+From 7943a7c1c795a1ffe79b2898eb4860cec60dec23 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 24 Jun 2019 23:54:21 -0700
Subject: [PATCH] Use alloca if VLAs aren't supported
@@ -8,10 +8,10 @@ Subject: [PATCH] Use alloca if VLAs aren't supported
1 file changed, 4 insertions(+)
diff --git a/lib/path.c b/lib/path.c
-index 64bf7c6f0..786b709ae 100644
+index 75fa85305..af90261a6 100644
--- a/lib/path.c
+++ b/lib/path.c
-@@ -968,7 +968,11 @@ static int ul_path_cpuparse(struct path_cxt *pc, cpu_set_t **set, int maxcpus, i
+@@ -982,7 +982,11 @@ static int ul_path_cpuparse(struct path_cxt *pc, cpu_set_t **set, int maxcpus, i
{
FILE *f;
size_t setsize, len = maxcpus * 7;
@@ -24,5 +24,5 @@ index 64bf7c6f0..786b709ae 100644
*set = NULL;
--
-2.25.0
+2.28.0
diff --git a/pkg/util-linux/ver b/pkg/util-linux/ver
@@ -1 +1 @@
-2.35.2 r0
+2.36 r0
