diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-02-27 20:41:05 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-02-27 22:41:55 +0100 |
| commit | 750befe72ff6633b0448d104634f085e8a0dbcef (patch) | |
| tree | 42b931369aa4824adf5df9fef654a388e54502b5 /source/d | |
| parent | 610d6ea496dca00f1d0ce8baaff2202b5025bca9 (diff) | |
| download | current-750befe72ff6633b0448d104634f085e8a0dbcef.tar.gz current-750befe72ff6633b0448d104634f085e8a0dbcef.tar.xz | |
Mon Feb 27 20:41:05 UTC 202320230227204105
ap/sudo-1.9.13p2-x86_64-1.txz: Upgraded.
d/make-4.4.1-x86_64-1.txz: Upgraded.
d/strace-6.2-x86_64-1.txz: Upgraded.
x/ibus-libpinyin-1.15.1-x86_64-2.txz: Rebuilt.
[PATCH] fix awk scripts to work properly when used against sqlite 3.41.0.
Thanks to lucabon.
Diffstat (limited to 'source/d')
| -rw-r--r-- | source/d/make/0370a7a40fe9523ea334dcb8a2a60f1418595b49.patch | 48 | ||||
| -rwxr-xr-x | source/d/make/make.SlackBuild | 8 |
2 files changed, 3 insertions, 53 deletions
diff --git a/source/d/make/0370a7a40fe9523ea334dcb8a2a60f1418595b49.patch b/source/d/make/0370a7a40fe9523ea334dcb8a2a60f1418595b49.patch deleted file mode 100644 index 9b6a35447..000000000 --- a/source/d/make/0370a7a40fe9523ea334dcb8a2a60f1418595b49.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 0370a7a40fe9523ea334dcb8a2a60f1418595b49 -Author: Dmitry Goncharov <dgoncharov@users.sf.net> -Date: Sun Nov 6 07:36:26 2022 -0500 - - [SV 63307] Spawn children with the default disposition of sigpipe. - - * src/main.c (main): Set sigpipe disposition to a handler, rather than - SIG_IGN, in order for children to have the default sigpipe disposition. - * tests/scripts/misc/sigpipe: Add sigpipe tests. - -diff --git a/src/main.c b/src/main.c -index eec93656..d8857696 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1152,6 +1152,15 @@ temp_stdin_unlink () - } - } - -+#ifdef SIGPIPE -+static void -+handle_sigpipe (int sig) -+{ -+ /* Suppress unused variable warning. */ -+ sig = sig; -+} -+#endif -+ - #ifdef _AMIGA - int - main (int argc, char **argv) -@@ -1182,9 +1191,15 @@ main (int argc, char **argv, char **envp) - /* Useful for attaching debuggers, etc. */ - SPIN ("main-entry"); - -- /* Don't die if our stdout sends us SIGPIPE. */ -+ /* Don't die if our stdout sends us SIGPIPE to get temporary files removed. -+ * If make has inherited SIG_IGN, keep running with SIG_IGN to let make's -+ * children inherit SIG_IGN. -+ * Othwerwise, set sigpipe disposition to a handler, in order for children to -+ * have the default sigpipe disposition. */ -+ - #ifdef SIGPIPE -- bsd_signal (SIGPIPE, SIG_IGN); -+ if (bsd_signal (SIGPIPE, handle_sigpipe) == SIG_IGN) -+ bsd_signal (SIGPIPE, SIG_IGN); - #endif - - #ifdef HAVE_ATEXIT diff --git a/source/d/make/make.SlackBuild b/source/d/make/make.SlackBuild index e879bcff1..1c77a5002 100755 --- a/source/d/make/make.SlackBuild +++ b/source/d/make/make.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=make VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,8 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -cat $CWD/0370a7a40fe9523ea334dcb8a2a60f1418595b49.patch | patch -p1 --verbose || exit 1 - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -129,7 +127,7 @@ fi mkdir -p $PKG/usr/doc/make-$VERSION cp -a \ - AUTHORS COPYING* ChangeLog NEWS README* \ + AUTHORS* COPYING* ChangeLog NEWS* README* \ $PKG/usr/doc/make-$VERSION/ # If there's a ChangeLog, installing at least part of the recent history |