util-linux: Update from 2.29.2 to 2.30.1

diff --git a/packages/util-linux/build.sh b/packages/util-linux/build.sh
index c400a38..4f54f8b 100644 (file)
--- a/packages/util-linux/build.sh
+++ b/packages/util-linux/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://en.wikipedia.org/wiki/Util-linux
 TERMUX_PKG_DESCRIPTION="Miscellaneous system utilities"
-TERMUX_PKG_VERSION=2.29.2
-TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v2.29/util-linux-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3
+TERMUX_PKG_VERSION=2.30.1
+TERMUX_PKG_SHA256=1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841
+TERMUX_PKG_SRCURL=https://www.kernel.org/pub/linux/utils/util-linux/v${TERMUX_PKG_VERSION:0:4}/util-linux-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_DEPENDS="ncurses, libutil, libcrypt"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_func_setns=yes
@@ -19,6 +19,8 @@ ac_cv_func_unshare=yes
 --disable-switch_root
 --disable-wall
 --disable-libmount
+--disable-lsmem
+--disable-chmem
 "
 # bin/column is currently bundled in the fish package:
 TERMUX_PKG_RM_AFTER_INSTALL="bin/column share/man/man1/column.1"

diff --git a/packages/util-linux/include-c.h.patch b/packages/util-linux/include-c.h.patch
deleted file mode 100644 (file)
index 46b5203..0000000
--- a/packages/util-linux/include-c.h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -u -r ../util-linux-2.28/include/c.h ./include/c.h
---- ../util-linux-2.28/include/c.h     2016-03-08 08:25:50.553182767 -0500
-+++ ./include/c.h      2016-06-22 06:24:22.916322177 -0400
-@@ -257,10 +257,12 @@
-  */
- static inline size_t get_hostname_max(void)
- {
-+#ifndef __ANDROID__
-       long len = sysconf(_SC_HOST_NAME_MAX);
- 
-       if (0 < len)
-               return len;
-+#endif
- 
- #ifdef MAXHOSTNAMELEN
-       return MAXHOSTNAMELEN;

diff --git a/packages/util-linux/lib-monotonic.c.patch b/packages/util-linux/lib-monotonic.c.patch
deleted file mode 100644 (file)
index 8ebd3c2..0000000
--- a/packages/util-linux/lib-monotonic.c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -u -r ../util-linux-2.28/lib/monotonic.c ./lib/monotonic.c
---- ../util-linux-2.28/lib/monotonic.c 2016-02-19 05:30:53.576131474 -0500
-+++ ./lib/monotonic.c  2016-06-23 06:09:05.035726383 -0400
-@@ -26,6 +26,12 @@
-       if (gettimeofday(&now, NULL) != 0)
-               return -errno;
- #ifdef CLOCK_BOOTTIME
-+#ifdef __ANDROID__
-+#define TIMESPEC_TO_TIMEVAL(tv, ts) {                                   \
-+      (tv)->tv_sec = (ts)->tv_sec;                                    \
-+      (tv)->tv_usec = (ts)->tv_nsec / 1000;                           \
-+}
-+#endif
-       if (clock_gettime(CLOCK_BOOTTIME, &hires_uptime) == 0) {
-               TIMESPEC_TO_TIMEVAL(&lores_uptime, &hires_uptime);
-               timersub(&now, &lores_uptime, boot_time);

diff --git a/packages/util-linux/sys-utils-dmesg.c.patch b/packages/util-linux/sys-utils-dmesg.c.patch
deleted file mode 100644 (file)
index dbe7fd8..0000000
--- a/packages/util-linux/sys-utils-dmesg.c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r ../util-linux-2.28/sys-utils/dmesg.c ./sys-utils/dmesg.c
---- ../util-linux-2.28/sys-utils/dmesg.c       2016-03-16 05:39:39.246181199 -0400
-+++ ./sys-utils/dmesg.c        2016-06-23 06:15:22.841546295 -0400
-@@ -11,7 +11,7 @@
- #include <getopt.h>
- #include <stdlib.h>
- #include <sys/klog.h>
--#include <sys/syslog.h>
-+#include <syslog.h>
- #include <sys/time.h>
- #include <sys/sysinfo.h>
- #include <ctype.h>
-@@ -894,6 +894,9 @@
-        * backward compatibility with syslog(2) buffers only
-        */
-       if (ctl->raw) {
-+#ifdef __ANDROID__
-+#define       LOG_MAKEPRI(fac, pri)   ((fac) | (pri))
-+#endif
-               ctl->indent = printf("<%d>[%5ld.%06ld] ",
-                                    LOG_MAKEPRI(rec->facility, rec->level),
-                                    (long) rec->tv.tv_sec,

diff --git a/packages/util-linux/text-utils-column.c.patch b/packages/util-linux/text-utils-column.c.patch
deleted file mode 100644 (file)
index 8551616..0000000
--- a/packages/util-linux/text-utils-column.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../util-linux-2.28/text-utils/column.c ./text-utils/column.c
---- ../util-linux-2.28/text-utils/column.c     2016-01-13 04:06:20.659478041 -0500
-+++ ./text-utils/column.c      2016-06-22 06:32:49.528395388 -0400
-@@ -68,7 +68,7 @@
- #define DEFCOLS     25
- #define TAB         8
- #define DEFNUM      1000
--#define MAXLINELEN  (LINE_MAX + 1)
-+#define MAXLINELEN  (_POSIX2_LINE_MAX + 1)
- 
- static int input(FILE *fp, int *maxlength, wchar_t ***list, int *entries);
- static void c_columnate(int maxlength, long termwidth, wchar_t **list, int entries);