summaryrefslogtreecommitdiffstats
path: root/source/a/util-linux
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/util-linux')
-rwxr-xr-xsource/a/util-linux/util-linux.SlackBuild5
-rw-r--r--source/a/util-linux/util-linux.chfn.diff18
2 files changed, 22 insertions, 1 deletions
diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild
index a7eaff24a..7d149b4ff 100755
--- a/source/a/util-linux/util-linux.SlackBuild
+++ b/source/a/util-linux/util-linux.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=util-linux
VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
ADJTIMEXVERS=1.29
SETSERIALVERS=2.17
@@ -123,6 +123,9 @@ zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 --verbose || exit 1
# /dev/ram* devices in 'fdisk -l' output:
zcat $CWD/util-linux.do.not.list.ram.devices.diff.gz | patch -p1 --verbose || exit 1
+# Fix a chfn bug when using readline:
+zcat $CWD/util-linux.chfn.diff.gz | patch -p1 --verbose || exit 1
+
# This just call the configure script with $1 either being 2 for python2
# or 3 for python3.
#
diff --git a/source/a/util-linux/util-linux.chfn.diff b/source/a/util-linux/util-linux.chfn.diff
new file mode 100644
index 000000000..7947f72d1
--- /dev/null
+++ b/source/a/util-linux/util-linux.chfn.diff
@@ -0,0 +1,18 @@
+--- ./login-utils/chfn.c.orig 2020-05-20 07:27:43.465013472 -0500
++++ ./login-utils/chfn.c 2020-06-27 14:11:54.733895362 -0500
+@@ -236,12 +236,13 @@
+ if (!def_val)
+ def_val = "";
+ while (true) {
+- printf("%s [%s]: ", question, def_val);
++ printf("%s [%s]:", question, def_val);
+ __fpurge(stdin);
+ #ifdef HAVE_LIBREADLINE
+ rl_bind_key('\t', rl_insert);
+- if ((buf = readline(NULL)) == NULL)
++ if ((buf = readline(" ")) == NULL)
+ #else
++ printf(" ");
+ if (getline(&buf, &dummy, stdin) < 0)
+ #endif
+ errx(EXIT_FAILURE, _("Aborted."));