util-linux: Update to 2.30

4 files changed, 27 insertions, 8 deletions

diff --git a/pkg/util-linux/config.h b/pkg/util-linux/config.h
index bb482686..d8e14918 100644
--- a/pkg/util-linux/config.h
+++ b/pkg/util-linux/config.h
@@ -3,6 +3,7 @@
 #define _PATH_LOCALSTATEDIR "/run"
 #define LOCALEDIR "/share/locale"
 
+/* ./configure --disable-all-programs --enable-fsck --enable-libuuid --enable-fs-paths-default=/bin */
 /* #undef AC_APPLE_UNIVERSAL_BUILD */
 #define AGETTY_RELOAD 1
 #define CHFN_CHSH_PASSWORD 1
@@ -19,6 +20,7 @@
 /* #undef HAVE_DCGETTEXT */
 #define HAVE_DECL_CPU_ALLOC 1
 /* #undef HAVE_DECL_DIRFD */
+/* #undef HAVE_DECL_TZNAME */
 #define HAVE_DECL__NL_TIME_WEEK_1STDAY 0
 /* #undef HAVE_DIR_DD_FD */
 #define HAVE_ENDIAN_H 1
@@ -26,18 +28,21 @@
 #define HAVE_ERR 1
 #define HAVE_ERRX 1
 #define HAVE_ERR_H 1
+/* #undef HAVE_EXPLICIT_BZERO */
 /* #undef HAVE_FALLOCATE */
 #define HAVE_GETDOMAINNAME 1
 #define HAVE_GETDTABLESIZE 1
 /* #undef HAVE_GETEXECNAME */
 /* #undef HAVE_GETMNTINFO */
 #define HAVE_GETOPT_H 1
+/* #undef HAVE_GETRANDOM */
 /* #undef HAVE_GETSGNAM */
 /* #undef HAVE_GETTEXT */
 #define HAVE_INOTIFY_INIT 1
 #define HAVE_INOTIFY_INIT1 1
 #define HAVE_IOPERM 1
 #define HAVE_IOPL 1
+#define HAVE_LASTLOG_H 1
 /* #undef HAVE_LIBAUDIT */
 /* #undef HAVE_LIBBLKID */
 /* #undef HAVE_LIBCAP_NG */
@@ -54,8 +59,10 @@
 /* #undef HAVE_LIBUSER */
 /* #undef HAVE_LIBUTEMPTER */
 #define HAVE_LIBUTIL 1
+/* #undef HAVE_LIBUTIL_H */
 #define HAVE_LIBUUID 1
 #define HAVE_LINUX_BLKPG_H 1
+/* #undef HAVE_LINUX_BLKZONED_H */
 #define HAVE_LINUX_BTRFS_H 1
 #define HAVE_LINUX_CDROM_H 1
 /* #undef HAVE_LINUX_COMPILER_H */
@@ -78,8 +85,10 @@
 #define HAVE_MKOSTEMP 1
 #define HAVE_MNTENT_H 1
 /* #undef HAVE_NCURSESW_NCURSES_H */
+/* #undef HAVE_NCURSESW_TERM_H */
 /* #undef HAVE_NCURSES_H */
 /* #undef HAVE_NCURSES_NCURSES_H */
+/* #undef HAVE_NCURSES_TERM_H */
 /* #undef HAVE_NET_IF_DL_H */
 /* #undef HAVE_NTP_GETTIME */
 #define HAVE_PATHS_H 1
@@ -118,6 +127,7 @@
 #define HAVE_STRSIGNAL_DECL 1
 #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
 #define HAVE_STRUCT_TERMIOS_C_LINE 1
+#define HAVE_STRUCT_TM_TM_ZONE 1
 #define HAVE_SYSINFO 1
 /* #undef HAVE_SYS_DISKLABEL_H */
 /* #undef HAVE_SYS_DISK_H */
@@ -138,11 +148,14 @@
 #define HAVE_SYS_TIMEX_H 1
 #define HAVE_SYS_TTYDEFAULTS_H 1
 /* #undef HAVE_SYS_UCRED_H */
+#define HAVE_TERM_H 1
+#define HAVE_TIMEGM 1
 #define HAVE_TLS 1
 #define HAVE_TM_GMTOFF 1
+#define HAVE_TM_ZONE 1
 /* #undef HAVE_UNION_SEMUN */
 #define HAVE_UNSHARE 1
-#define HAVE_UPDWTMP 1
+#define HAVE_UPDWTMPX 1
 /* #undef HAVE_USE_DEFAULT_COLORS */
 #define HAVE_USLEEP 1
 #define HAVE_UTMP_H 1
@@ -153,7 +166,11 @@
 #define HAVE___FPENDING 1
 #define HAVE___PROGNAME 1
 /* #undef HAVE___SECURE_GETENV */
-#define LIBBLKID_DATE "22-Feb-2017"
+#define LIBBLKID_DATE "02-Jun-2017"
+#define LIBBLKID_VERSION "2.30.0"
+#define LIBFDISK_VERSION "2.30.0"
+#define LIBMOUNT_VERSION "2.30.0"
+#define LIBSMARTCOLS_VERSION "2.30.0"
 /* #undef LOGIN_CHOWN_VCS */
 /* #undef LOGIN_STAT_MAIL */
 #define LT_OBJDIR ".libs/"
@@ -162,10 +179,10 @@
 #define PACKAGE "util-linux"
 #define PACKAGE_BUGREPORT "kzak@redhat.com"
 #define PACKAGE_NAME "util-linux"
-#define PACKAGE_STRING "util-linux 2.29.2"
+#define PACKAGE_STRING "util-linux 2.30"
 #define PACKAGE_TARNAME "util-linux"
 #define PACKAGE_URL "http://www.kernel.org/pub/linux/utils/util-linux/"
-#define PACKAGE_VERSION "2.29.2"
+#define PACKAGE_VERSION "2.30"
 #define PG_BELL 1
 #define SWAPON_HAS_TWO_ARGS 1
 /* #undef SYS_fallocate */
@@ -177,6 +194,7 @@
 /* #undef SYS_sched_setattr */
 /* #undef SYS_setns */
 /* #undef SYS_unshare */
+/* #undef TM_IN_SYS_TIME */
 #define USE_COLORS_BY_DEFAULT 1
 /* #undef USE_LIBMOUNT_SUPPORT_MTAB */
 #define USE_PLYMOUTH_SUPPORT 1
@@ -198,7 +216,7 @@
 #endif
 #define USE_TTY_GROUP 1
 /* #undef USE_USRDIR_PATHS_ONLY */
-#define VERSION "2.29.2"
+#define VERSION "2.30"
 #if defined AC_APPLE_UNIVERSAL_BUILD
 # if defined __BIG_ENDIAN__
 #  define WORDS_BIGENDIAN 1
diff --git a/pkg/util-linux/gen.rc b/pkg/util-linux/gen.rc
index 0c729967..cfd5a435 100644
--- a/pkg/util-linux/gen.rc
+++ b/pkg/util-linux/gen.rc
@@ -1,3 +1,4 @@
+version=2.30.0
 cflags\
 	-include '$dir'/config.h\
 	-I include\
@@ -7,9 +8,9 @@ cflags\
 	-I '$srcdir'/libuuid/src
 
 build '$outdir'/libsmartcols.h sed '$srcdir'/libsmartcols/src/libsmartcols.h.in ; with\
-	expr '''s,"@LIBSMARTCOLS_VERSION@",PACKAGE_VERSION,'''
+	expr s,@LIBSMARTCOLS_VERSION@,$version,
 build '$outdir'/libfdisk.h sed '$srcdir'/libfdisk/src/libfdisk.h.in ; expr=(\
-	-e '''s,"@LIBFDISK_VERSION@",PACKAGE_VERSION,''' \
+	-e s,@LIBFDISK_VERSION@,$version,\
 	-e /@LIBFDISK_MAJOR_VERSION@/d\
 	-e /@LIBFDISK_MINOR_VERSION@/d\
 	-e /@LIBFDISK_PATCH_VERSION@/d\
diff --git a/pkg/util-linux/rev b/pkg/util-linux/rev
index 0cfbf088..00750edc 100644
--- a/pkg/util-linux/rev
+++ b/pkg/util-linux/rev
@@ -1 +1 @@
-2
+3
diff --git a/pkg/util-linux/src b/pkg/util-linux/src
-Subproject 79851652f1ee508bab0f35cc2ec6933998c2f2b
+Subproject dd9bae58ae4bc3bded2acf743981bbc8c06f468