commit: 1a79b14516c6f7f194c9cf49a5cfc38dd2b042f1
parent a13d805c07b20aef9929e1419dddce60b91249b7
Author: Michael Forney <mforney@mforney.org>
Date: Mon, 23 Oct 2017 01:20:53 -0700
util-linux: Update to 2.31
Diffstat:
4 files changed, 82 insertions(+), 14 deletions(-)
diff --git a/pkg/util-linux/README.md b/pkg/util-linux/README.md
@@ -0,0 +1,18 @@
+# util-linux
+
+## config.h
+Generated with
+
+ ./configure \
+ --disable-all-programs \
+ --enable-fs-paths-default=/bin \
+ --enable-fsck \
+ --enable-libblkid \
+ --enable-libmount \
+ --enable-libuuid
+
+`HAVE_LIBBLKID` and `HAVE_LIBMOUNT` were undefined because although configure
+requires that we enable them, they aren't actually needed to build fdisk.
+
+`_PATH_RUNSTATEDIR` and `LOCALEDIR` are defined in a separate top section. They
+are normally defined with flags in `Makefile.am`.
diff --git a/pkg/util-linux/config.h b/pkg/util-linux/config.h
@@ -1,9 +1,6 @@
-#include <config-posix.h>
-
-#define _PATH_LOCALSTATEDIR "/run"
+#define _PATH_RUNSTATEDIR "/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
@@ -15,6 +12,7 @@
#define HAVE_BYTESWAP_H 1
/* #undef HAVE_CFLOCALECOPYCURRENT */
/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
+#define HAVE_CLOCK_GETTIME 1
#define HAVE_CPU_SET_T 1
#define HAVE_CRYPT_H 1
/* #undef HAVE_DCGETTEXT */
@@ -22,27 +20,43 @@
/* #undef HAVE_DECL_DIRFD */
/* #undef HAVE_DECL_TZNAME */
#define HAVE_DECL__NL_TIME_WEEK_1STDAY 0
+#define HAVE_DIRFD 1
/* #undef HAVE_DIR_DD_FD */
+#define HAVE_DLFCN_H 1
#define HAVE_ENDIAN_H 1
#define HAVE_ENVIRON_DECL 1
#define HAVE_ERR 1
+#define HAVE_ERRNO_H 1
#define HAVE_ERRX 1
#define HAVE_ERR_H 1
/* #undef HAVE_EXPLICIT_BZERO */
/* #undef HAVE_FALLOCATE */
+#define HAVE_FCNTL_H 1
+#define HAVE_FSEEKO 1
+#define HAVE_FSTATAT 1
+#define HAVE_FSYNC 1
+#define HAVE_FUTIMENS 1
#define HAVE_GETDOMAINNAME 1
#define HAVE_GETDTABLESIZE 1
/* #undef HAVE_GETEXECNAME */
/* #undef HAVE_GETMNTINFO */
#define HAVE_GETOPT_H 1
/* #undef HAVE_GETRANDOM */
+#define HAVE_GETRLIMIT 1
/* #undef HAVE_GETSGNAM */
/* #undef HAVE_GETTEXT */
+#define HAVE_GETUSERSHELL 1
+#define HAVE_ICONV 1
#define HAVE_INOTIFY_INIT 1
#define HAVE_INOTIFY_INIT1 1
+#define HAVE_INTTYPES_H 1
#define HAVE_IOPERM 1
#define HAVE_IOPL 1
+/* #undef HAVE_ISNAN */
+#define HAVE_JRAND48 1
+#define HAVE_LANGINFO_H 1
#define HAVE_LASTLOG_H 1
+#define HAVE_LCHOWN 1
/* #undef HAVE_LIBAUDIT */
/* #undef HAVE_LIBBLKID */
/* #undef HAVE_LIBCAP_NG */
@@ -77,6 +91,7 @@
#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
@@ -84,15 +99,22 @@
#define HAVE_MEMPCPY 1
#define HAVE_MKOSTEMP 1
#define HAVE_MNTENT_H 1
+#define HAVE_NANOSLEEP 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 */
+#define HAVE_NETINET_IN_H 1
/* #undef HAVE_NET_IF_DL_H */
+#define HAVE_NET_IF_H 1
/* #undef HAVE_NTP_GETTIME */
+#define HAVE_OPENAT 1
+#define HAVE_OPEN_MEMSTREAM 1
#define HAVE_PATHS_H 1
#define HAVE_PERSONALITY 1
+#define HAVE_POSIX_FADVISE 1
+/* #undef HAVE_POSIX_FALLOCATE */
#define HAVE_PRCTL 1
/* #undef HAVE_PRLIMIT */
#define HAVE_PROGRAM_INVOCATION_SHORT_NAME 1
@@ -106,6 +128,7 @@
/* #undef HAVE_SCANF_AS_MODIFIER */
#define HAVE_SCANF_MS_MODIFIER 1
/* #undef HAVE_SCHED_SETATTR */
+#define HAVE_SCHED_SETSCHEDULER 1
/* #undef HAVE_SECURE_GETENV */
/* #undef HAVE_SECURITY_GET_INITIAL_CONTEXT */
/* #undef HAVE_SECURITY_OPENPAM_H */
@@ -117,17 +140,26 @@
#define HAVE_SETRESUID 1
#define HAVE_SHADOW_H 1
#define HAVE_SIGHANDLER_T 1
+#define HAVE_SIGQUEUE 1
/* #undef HAVE_SLANG_H */
/* #undef HAVE_SLANG_SLANG_H */
/* #undef HAVE_SLANG_SLCURSES_H */
/* #undef HAVE_SLCURSES_H */
/* #undef HAVE_SMACK */
+#define HAVE_SRANDOM 1
+#define HAVE_STDINT_H 1
#define HAVE_STDIO_EXT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_STRING_H 1
/* #undef HAVE_STRNCHR */
+#define HAVE_STRNDUP 1
+#define HAVE_STRNLEN 1
#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_SYSCONF 1
#define HAVE_SYSINFO 1
/* #undef HAVE_SYS_DISKLABEL_H */
/* #undef HAVE_SYS_DISK_H */
@@ -140,50 +172,65 @@
#define HAVE_SYS_MOUNT_H 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_PRCTL_H 1
+#define HAVE_SYS_RESOURCE_H 1
#define HAVE_SYS_SIGNALFD_H 1
+#define HAVE_SYS_SOCKET_H 1
/* #undef HAVE_SYS_SOCKIO_H */
+#define HAVE_SYS_STAT_H 1
#define HAVE_SYS_SWAP_H 1
#define HAVE_SYS_SYSCALL_H 1
#define HAVE_SYS_SYSMACROS_H 1
#define HAVE_SYS_TIMEX_H 1
+#define HAVE_SYS_TIME_H 1
#define HAVE_SYS_TTYDEFAULTS_H 1
+#define HAVE_SYS_TYPES_H 1
/* #undef HAVE_SYS_UCRED_H */
+#define HAVE_SYS_UN_H 1
#define HAVE_TERM_H 1
#define HAVE_TIMEGM 1
+#define HAVE_TIMER_CREATE 1
#define HAVE_TLS 1
#define HAVE_TM_GMTOFF 1
#define HAVE_TM_ZONE 1
+/* #undef HAVE_TZNAME */
/* #undef HAVE_UNION_SEMUN */
+#define HAVE_UNISTD_H 1
+#define HAVE_UNLINKAT 1
#define HAVE_UNSHARE 1
#define HAVE_UPDWTMPX 1
/* #undef HAVE_USE_DEFAULT_COLORS */
#define HAVE_USLEEP 1
+#define HAVE_UTIMENSAT 1
+#define HAVE_UTMPX_H 1
#define HAVE_UTMP_H 1
/* #undef HAVE_UUIDD */
+#define HAVE_VWARNX 1
#define HAVE_WARN 1
#define HAVE_WARNX 1
#define HAVE_WIDECHAR 1
#define HAVE___FPENDING 1
#define HAVE___PROGNAME 1
/* #undef HAVE___SECURE_GETENV */
-#define LIBBLKID_DATE "02-Jun-2017"
-#define LIBBLKID_VERSION "2.30.2"
-#define LIBFDISK_VERSION "2.30.2"
-#define LIBMOUNT_VERSION "2.30.2"
-#define LIBSMARTCOLS_VERSION "2.30.2"
+#define LIBBLKID_DATE "19-Oct-2017"
+#define LIBBLKID_VERSION "2.31.0"
+#define LIBFDISK_VERSION "2.31.0"
+#define LIBMOUNT_VERSION "2.31.0"
+#define LIBSMARTCOLS_VERSION "2.31.0"
/* #undef LOGIN_CHOWN_VCS */
/* #undef LOGIN_STAT_MAIL */
#define LT_OBJDIR ".libs/"
+/* #undef MULTIARCHTRIPLET */
/* #undef NDEBUG */
#define ONLY_LISTED_SHELLS 1
#define PACKAGE "util-linux"
#define PACKAGE_BUGREPORT "kzak@redhat.com"
#define PACKAGE_NAME "util-linux"
-#define PACKAGE_STRING "util-linux 2.30.2"
+#define PACKAGE_STRING "util-linux 2.31"
#define PACKAGE_TARNAME "util-linux"
#define PACKAGE_URL "http://www.kernel.org/pub/linux/utils/util-linux/"
-#define PACKAGE_VERSION "2.30.2"
+#define PACKAGE_VERSION "2.31"
#define PG_BELL 1
+#define STDC_HEADERS 1
#define SWAPON_HAS_TWO_ARGS 1
/* #undef SYS_fallocate */
/* #undef SYS_ioprio_get */
@@ -216,7 +263,7 @@
#endif
#define USE_TTY_GROUP 1
/* #undef USE_USRDIR_PATHS_ONLY */
-#define VERSION "2.30.2"
+#define VERSION "2.31"
#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.30.2')
+set('version', '2.31.0')
cflags{
'-include $dir/config.h',
'-I include',
@@ -40,6 +40,7 @@ lib('libcommon.a', [[
md5.c
pager.c
path.c
+ pwdutils.c
randutils.c
setproctitle.c
strutils.c
@@ -47,6 +48,7 @@ lib('libcommon.a', [[
ttyutils.c
exec_shell.c
strv.c
+ sha1.c
linux_version.c
loopdev.c
@@ -112,6 +114,7 @@ lib('libuuid.a', [[
unpack.c
unparse.c
uuid_time.c
+ predefined.c
)
]])
diff --git a/pkg/util-linux/rev b/pkg/util-linux/rev
@@ -1 +1 @@
-5
+6
