From 8a9666da9b321efae41da18c81ada6407ac715ce Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 23 Jul 2020 20:08:16 +0000 Subject: Thu Jul 23 20:08:16 UTC 2020 a/util-linux-2.36-x86_64-1.txz: Upgraded. d/check-0.15.1-x86_64-1.txz: Upgraded. d/parallel-20200722-noarch-1.txz: Upgraded. x/mesa-20.1.4-x86_64-1.txz: Upgraded. extra/sendmail/sendmail-8.16.1-x86_64-2.txz: Rebuilt. Updated site.config.m4 and included -DDANE. Thanks to HQuest. extra/sendmail/sendmail-cf-8.16.1-noarch-2.txz: Rebuilt. testing/packages/gcc10/gcc-10.2.0-x86_64-1.txz: Upgraded. testing/packages/gcc10/gcc-brig-10.2.0-x86_64-1.txz: Upgraded. testing/packages/gcc10/gcc-g++-10.2.0-x86_64-1.txz: Upgraded. testing/packages/gcc10/gcc-gdc-10.2.0-x86_64-1.txz: Upgraded. testing/packages/gcc10/gcc-gfortran-10.2.0-x86_64-1.txz: Upgraded. testing/packages/gcc10/gcc-gnat-10.2.0-x86_64-1.txz: Upgraded. testing/packages/gcc10/gcc-go-10.2.0-x86_64-1.txz: Upgraded. testing/packages/gcc10/gcc-objc-10.2.0-x86_64-1.txz: Upgraded. --- ...eadline-prompt-for-each-field-on-a-separa.patch | 79 ---------------------- source/a/util-linux/util-linux.SlackBuild | 5 +- source/d/scons/scons.SlackBuild | 2 +- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 source/a/util-linux/0001-chfn-Make-readline-prompt-for-each-field-on-a-separa.patch (limited to 'source') diff --git a/source/a/util-linux/0001-chfn-Make-readline-prompt-for-each-field-on-a-separa.patch b/source/a/util-linux/0001-chfn-Make-readline-prompt-for-each-field-on-a-separa.patch deleted file mode 100644 index 2c2f3903d..000000000 --- a/source/a/util-linux/0001-chfn-Make-readline-prompt-for-each-field-on-a-separa.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 49848aa53ae3a599277e8ceb50feda565f140b45 Mon Sep 17 00:00:00 2001 -From: Damien Goutte-Gattat -Date: Sat, 27 Jun 2020 19:58:13 +0100 -Subject: [PATCH] chfn: Make readline prompt for each field on a separate line - -When readline is called to get user input, it is called without -a prompt argument. As a result, if the user does not enter anything -for a given field, then the next field is displayed on the same -line, yielding the following output: - - $ chfn - Changing finger information for user. - Password: - Name []: Office []: Office Phone []: Home Phone []: - -instead of the expected: - - $ chfn - Changing finger information for user. - Password: - Full Name []: - Room Number []: - Work Phone []: - Home Phone []: - -This patch restores the expected behavior by feeding readline with -a character to display as "prompt". - -[kzak@redhat.com: - do the same change in chsh - - use ' ' rather than '\n' for non-readline code] - -Signed-off-by: Damien Goutte-Gattat -Signed-off-by: Karel Zak ---- - login-utils/chfn.c | 5 +++-- - login-utils/chsh.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/login-utils/chfn.c b/login-utils/chfn.c -index 1b203a83e..4b2b42912 100644 ---- a/login-utils/chfn.c -+++ b/login-utils/chfn.c -@@ -235,12 +235,13 @@ static char *ask_new_field(struct chfn_control *ctl, const char *question, - 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 -+ putchar(' '); - if (getline(&buf, &dummy, stdin) < 0) - #endif - errx(EXIT_FAILURE, _("Aborted.")); -diff --git a/login-utils/chsh.c b/login-utils/chsh.c -index a9ebec86f..17cc9f1e0 100644 ---- a/login-utils/chsh.c -+++ b/login-utils/chsh.c -@@ -205,10 +205,11 @@ static char *ask_new_shell(char *question, char *oldshell) - #endif - if (!oldshell) - oldshell = ""; -- printf("%s [%s]\n", question, oldshell); -+ printf("%s [%s]:", question, oldshell); - #ifdef HAVE_LIBREADLINE -- if ((ans = readline("> ")) == NULL) -+ if ((ans = readline(" ")) == NULL) - #else -+ putchar(' '); - if (getline(&ans, &dummy, stdin) < 0) - #endif - return NULL; --- -2.27.0 - diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 05e1ad4c9..1467bc42e 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:-5} +BUILD=${BUILD:-1} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -123,9 +123,6 @@ 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 chfn and chsh when using readline: -zcat $CWD/0001-chfn-Make-readline-prompt-for-each-field-on-a-separa.patch.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/d/scons/scons.SlackBuild b/source/d/scons/scons.SlackBuild index f27faebe3..875e91070 100755 --- a/source/d/scons/scons.SlackBuild +++ b/source/d/scons/scons.SlackBuild @@ -68,7 +68,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf SCons-$VERSION scons-$VERSION tar xvf $CWD/scons-$VERSION.tar.*z* || exit 1 -cd SCons-$VERSION || scons-$VERSION || exit 1 +cd SCons-$VERSION || cd scons-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -- cgit v1.2.3