util-linux: Update to 2.37

5 files changed, 52 insertions, 37 deletions

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
index 0b2fdbe9..9fce16f9 100644
--- 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,4 +1,4 @@
-From 7af1a37609261fe88626d8f7e7a4b45d972ec8e0 Mon Sep 17 00:00:00 2001
+From 8dc30022b3a899eae7e323b99b5e4fb79518e216 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
@@ -13,7 +13,7 @@ Subject: [PATCH] Don't omit second operand to `?` operator
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/libfdisk/src/bsd.c b/libfdisk/src/bsd.c
-index a7e2791a7..c31a29156 100644
+index 313ae5ae0..0883915f6 100644
 --- a/libfdisk/src/bsd.c
 +++ b/libfdisk/src/bsd.c
 @@ -116,7 +116,7 @@ static struct fdisk_parttype *bsd_partition_parttype(
@@ -26,7 +26,7 @@ index a7e2791a7..c31a29156 100644
  
  
 diff --git a/libfdisk/src/dos.c b/libfdisk/src/dos.c
-index 176969883..7a1f6ea34 100644
+index 4368e5266..a8103ac72 100644
 --- a/libfdisk/src/dos.c
 +++ b/libfdisk/src/dos.c
 @@ -148,7 +148,7 @@ static struct fdisk_parttype *dos_partition_parttype(
@@ -39,7 +39,7 @@ index 176969883..7a1f6ea34 100644
  
  /*
 diff --git a/libfdisk/src/gpt.c b/libfdisk/src/gpt.c
-index 66520c51d..dbd240617 100644
+index 97b161312..5fd9b4d73 100644
 --- a/libfdisk/src/gpt.c
 +++ b/libfdisk/src/gpt.c
 @@ -262,7 +262,7 @@ static struct fdisk_parttype *gpt_partition_parttype(
@@ -52,10 +52,10 @@ index 66520c51d..dbd240617 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 e3eb0cffa..c8f494971 100644
+index 3a5db9c28..b8d017a1d 100644
 --- a/libfdisk/src/parttype.c
 +++ b/libfdisk/src/parttype.c
-@@ -470,7 +470,7 @@ struct fdisk_parttype *fdisk_label_advparse_parttype(
+@@ -491,7 +491,7 @@ struct fdisk_parttype *fdisk_label_advparse_parttype(
  
  	if (res)
  		DBG(PARTTYPE, ul_debugobj(res, "returns parsed '%s' [%s] partition type",
@@ -65,7 +65,7 @@ index e3eb0cffa..c8f494971 100644
  }
  
 diff --git a/libfdisk/src/sgi.c b/libfdisk/src/sgi.c
-index 6b4b5d116..14c7ea9b7 100644
+index 64adf3454..02fd59650 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
@@ -78,7 +78,7 @@ index 6b4b5d116..14c7ea9b7 100644
  
  /* fdisk_get_partition() backend */
 diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c
-index 833f421a8..708e4554f 100644
+index 4c3b1d8cb..7a5c63b5b 100644
 --- a/libfdisk/src/sun.c
 +++ b/libfdisk/src/sun.c
 @@ -827,7 +827,7 @@ static struct fdisk_parttype *sun_get_parttype(
@@ -91,5 +91,5 @@ index 833f421a8..708e4554f 100644
  
  
 -- 
-2.28.0
+2.31.1
 
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
index 7da1fb8f..e9999a1e 100644
--- 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 015737758924b64b67df0a1d1e2385e3398f0cd1 Mon Sep 17 00:00:00 2001
+From edb05302e2c747253afd4698bc445e36c8726306 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,10 +8,10 @@ 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 ae0813109..66fefe2a2 100644
+index b891ad480..b420b5187 100644
 --- a/include/c.h
 +++ b/include/c.h
-@@ -161,9 +161,8 @@
+@@ -176,9 +176,8 @@
   * @member:	the name of the member within the struct.
   */
  #ifndef container_of
@@ -23,7 +23,7 @@ index ae0813109..66fefe2a2 100644
  #endif
  
  #ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
-@@ -241,11 +240,11 @@ errmsg(char doexit, int excode, char adderr, const char *fmt, ...)
+@@ -256,11 +255,11 @@ errmsg(char doexit, int excode, char adderr, const char *fmt, ...)
  
  /* Don't use inline function to avoid '#include "nls.h"' in c.h
   */
@@ -37,7 +37,7 @@ index ae0813109..66fefe2a2 100644
  
  /* After failed execvp() */
  #define EX_EXEC_FAILED		126	/* Program located, but not usable. */
-@@ -372,10 +371,10 @@ static inline int xusleep(useconds_t usec)
+@@ -387,10 +386,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 ae0813109..66fefe2a2 100644
  /*
   * seek stuff
 -- 
-2.29.2
+2.31.1
 
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
index dd5a5a59..d67e5145 100644
--- 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 29065cab257849cec348bf72afcc64885032130c Mon Sep 17 00:00:00 2001
+From 1c563b2cc82ee2f7ec5daeba5747346250fcc2e2 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,7 +10,7 @@ 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 8cc116281..62cc3471b 100644
+index 62aa2b3f5..dafab3ca4 100644
 --- a/disk-utils/fdisk-list.c
 +++ b/disk-utils/fdisk-list.c
 @@ -469,19 +469,15 @@ void list_available_columns(FILE *out)
@@ -37,7 +37,7 @@ index 8cc116281..62cc3471b 100644
  	}
  	return fdisk_field_get_id(fl);
 diff --git a/libfdisk/src/label.c b/libfdisk/src/label.c
-index 98ab475bf..381a3f83b 100644
+index 524a2bfb4..e0ec7da43 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 98ab475bf..381a3f83b 100644
  	}
  
 diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in
-index 374661982..2c0d9c285 100644
+index 6f2e77d04..a0e7aa4b2 100644
 --- a/libfdisk/src/libfdisk.h.in
 +++ b/libfdisk/src/libfdisk.h.in
-@@ -463,7 +463,7 @@ extern int fdisk_label_get_fields_ids_all(
+@@ -466,7 +466,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 374661982..2c0d9c285 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.28.0
+2.31.1
 
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
index 1f13553f..6674de25 100644
--- 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,23 +1,24 @@
-From 922e927710ecc196aa6f60eab1690a113c2a96ee Mon Sep 17 00:00:00 2001
+From 2cfdfe606f814c7672baede286c904c051b00e99 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
 
 ---
  include/c.h                  | 24 ++++++++++--------------
+ include/strutils.h           |  3 ++-
  lib/mbsalign.c               |  2 +-
  libfdisk/src/alignment.c     |  8 ++++----
  libfdisk/src/context.c       |  4 ++--
  libfdisk/src/gpt.c           |  4 ++--
  libsmartcols/src/calculate.c |  8 ++++----
  libsmartcols/src/column.c    |  2 +-
- 7 files changed, 24 insertions(+), 28 deletions(-)
+ 8 files changed, 26 insertions(+), 29 deletions(-)
 
 diff --git a/include/c.h b/include/c.h
-index 66fefe2a2..d7eeb699e 100644
+index b420b5187..fe82a8847 100644
 --- a/include/c.h
 +++ b/include/c.h
-@@ -126,21 +126,17 @@
+@@ -141,21 +141,17 @@
  # define FALSE 0
  #endif
  
@@ -49,6 +50,20 @@ index 66fefe2a2..d7eeb699e 100644
  
  #ifndef cmp_numbers
  # define cmp_numbers(x, y) __extension__ ({	\
+diff --git a/include/strutils.h b/include/strutils.h
+index 7969a84d0..45c1768f0 100644
+--- a/include/strutils.h
++++ b/include/strutils.h
+@@ -70,7 +70,8 @@ static inline void xstrncpy(char *dest, const char *src, size_t n)
+ 
+ 	if (!len)
+ 		return;
+-	len = min(len, n - 1);
++	if (n - 1 < len)
++		len = n - 1;
+ 	memcpy(dest, src, len);
+ 	dest[len] = 0;
+ }
 diff --git a/lib/mbsalign.c b/lib/mbsalign.c
 index e251202af..f3ea1a2df 100644
 --- a/lib/mbsalign.c
@@ -63,7 +78,7 @@ index e251202af..f3ea1a2df 100644
      }
  #ifdef HAVE_WIDECHAR
 diff --git a/libfdisk/src/alignment.c b/libfdisk/src/alignment.c
-index 3d0254634..91f6d1f7d 100644
+index 3ae721913..a1a05f48a 100644
 --- a/libfdisk/src/alignment.c
 +++ b/libfdisk/src/alignment.c
 @@ -38,7 +38,7 @@
@@ -103,10 +118,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 206627849..6c3a17b98 100644
+index 083b255d3..a3bfff993 100644
 --- a/libfdisk/src/context.c
 +++ b/libfdisk/src/context.c
-@@ -894,7 +894,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
+@@ -919,7 +919,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,7 +130,7 @@ index 206627849..6c3a17b98 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)
+@@ -976,7 +976,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.
  			 */
@@ -125,7 +140,7 @@ index 206627849..6c3a17b98 100644
  		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 29fcffa59..5e95b205d 100644
+index 5fd9b4d73..97e23767d 100644
 --- a/libfdisk/src/gpt.c
 +++ b/libfdisk/src/gpt.c
 @@ -504,7 +504,7 @@ static int gpt_mknew_pmbr(struct fdisk_context *cxt)
@@ -137,7 +152,7 @@ index 29fcffa59..5e95b205d 100644
  
  	return 0;
  }
-@@ -931,7 +931,7 @@ static int valid_pmbr(struct fdisk_context *cxt)
+@@ -956,7 +956,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  =
@@ -147,7 +162,7 @@ index 29fcffa59..5e95b205d 100644
  		}
  	}
 diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c
-index b6137fd23..ed6e8dd25 100644
+index 974fc340c..0c11627a7 100644
 --- a/libsmartcols/src/calculate.c
 +++ b/libsmartcols/src/calculate.c
 @@ -57,7 +57,7 @@ static int count_cell_width(struct libscols_table *tb,
@@ -195,5 +210,5 @@ index c11df69f5..1285d42e6 100644
  	}
  
 -- 
-2.29.2
+2.31.1
 
diff --git a/pkg/util-linux/patch/0009-Use-static-inline-function-for-cmp_numbers.patch b/pkg/util-linux/patch/0009-Use-static-inline-function-for-cmp_numbers.patch
index ac10211b..5e4bed9c 100644
--- a/pkg/util-linux/patch/0009-Use-static-inline-function-for-cmp_numbers.patch
+++ b/pkg/util-linux/patch/0009-Use-static-inline-function-for-cmp_numbers.patch
@@ -1,4 +1,4 @@
-From 57af96ed8831118d42647b5dafcdf4f296877074 Mon Sep 17 00:00:00 2001
+From f9e192ecdbfd369fe42da4c9b8a3ab90cfa6f10f Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Tue, 25 Jun 2019 00:13:43 -0700
 Subject: [PATCH] Use static inline function for cmp_numbers
@@ -10,10 +10,10 @@ uintmax_t.
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/include/c.h b/include/c.h
-index 7201b18af..549f1fa24 100644
+index fe82a8847..eb48e7f77 100644
 --- a/include/c.h
 +++ b/include/c.h
-@@ -138,13 +138,11 @@ umin(uintmax_t x, uintmax_t y)
+@@ -153,13 +153,11 @@ umin(uintmax_t x, uintmax_t y)
  	return x < y ? x : y;
  }
  
@@ -33,5 +33,5 @@ index 7201b18af..549f1fa24 100644
  #ifndef offsetof
  #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 -- 
-2.25.0
+2.31.1