oasis

commit: 99da1a5c89bcf793d9759cfb0d53d4f28454745b
parent 733056b32658e775d723cdd85fe17b2ce334b615
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 21 May 2020 17:33:26 -0700

util-linux: Update to 2.35.2

Diffstat:
M
pkg/util-linux/config.h
16
++++++++--------
M
pkg/util-linux/gen.lua
2
+-
M
pkg/util-linux/patch/0005-Avoid-statement-expressions-min-max.patch
8
++++----
M
pkg/util-linux/ver
2
+-

4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/util-linux/config.h b/pkg/util-linux/config.h
@@ -231,11 +231,11 @@
 #define HAVE___FPURGE 1
 #define HAVE___PROGNAME 1
 /* #undef HAVE___SECURE_GETENV */
-#define LIBBLKID_DATE "31-Jan-2020"
-#define LIBBLKID_VERSION "2.35.1"
-#define LIBFDISK_VERSION "2.35.1"
-#define LIBMOUNT_VERSION "2.35.1"
-#define LIBSMARTCOLS_VERSION "2.35.1"
+#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"
 /* #undef LOGIN_CHOWN_VCS */
 /* #undef LOGIN_STAT_MAIL */
 #define LT_OBJDIR ".libs/"
@@ -245,10 +245,10 @@
 #define PACKAGE "util-linux"
 #define PACKAGE_BUGREPORT "kzak@redhat.com"
 #define PACKAGE_NAME "util-linux"
-#define PACKAGE_STRING "util-linux 2.35.1"
+#define PACKAGE_STRING "util-linux 2.35.2"
 #define PACKAGE_TARNAME "util-linux"
 #define PACKAGE_URL "http://www.kernel.org/pub/linux/utils/util-linux/"
-#define PACKAGE_VERSION "2.35.1"
+#define PACKAGE_VERSION "2.35.2"
 #define PG_BELL 1
 #define STDC_HEADERS 1
 /* #undef SYS_fallocate */
@@ -289,7 +289,7 @@
 #endif
 #define USE_TTY_GROUP 1
 /* #undef USE_USRDIR_PATHS_ONLY */
-#define VERSION "2.35.1"
+#define VERSION "2.35.2"
 #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.1')
+set('version', '2.35.2')
 cflags{
 	'-include $dir/config.h',
 	'-I $outdir',
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 2b467498acfe9f1de27503a7ce94307755a997f5 Mon Sep 17 00:00:00 2001
+From 3e9baf3101f85cd288d6bbcbfc75c2e8d6a49e7e 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
@@ -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 743a6bc1d..0434840ab 100644
+index 5c9d8aabc..88d83530f 100644
 --- a/libfdisk/src/context.c
 +++ b/libfdisk/src/context.c
-@@ -890,7 +890,7 @@ int fdisk_reread_changes(struct fdisk_context *cxt, struct fdisk_table *org)
+@@ -891,7 +891,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 */
@@ -186,5 +186,5 @@ index 4b42938f6..81fe76000 100644
  	}
  
 -- 
-2.25.0
+2.26.2
 
diff --git a/pkg/util-linux/ver b/pkg/util-linux/ver
@@ -1 +1 @@
-2.35.1 r0
+2.35.2 r0