From 750befe72ff6633b0448d104634f085e8a0dbcef Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 27 Feb 2023 20:41:05 +0000 Subject: Mon Feb 27 20:41:05 UTC 2023 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. --- .../0370a7a40fe9523ea334dcb8a2a60f1418595b49.patch | 48 ------------------ source/d/make/make.SlackBuild | 8 ++- .../96042887815b4700c7cafa64cf88942af438ea98.patch | 57 ++++++++++++++++++++++ source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild | 8 +-- 4 files changed, 64 insertions(+), 57 deletions(-) delete mode 100644 source/d/make/0370a7a40fe9523ea334dcb8a2a60f1418595b49.patch create mode 100644 source/x/ibus-libpinyin/96042887815b4700c7cafa64cf88942af438ea98.patch (limited to 'source') 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 -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 diff --git a/source/x/ibus-libpinyin/96042887815b4700c7cafa64cf88942af438ea98.patch b/source/x/ibus-libpinyin/96042887815b4700c7cafa64cf88942af438ea98.patch new file mode 100644 index 000000000..ee3f8b220 --- /dev/null +++ b/source/x/ibus-libpinyin/96042887815b4700c7cafa64cf88942af438ea98.patch @@ -0,0 +1,57 @@ +From 96042887815b4700c7cafa64cf88942af438ea98 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Fri, 24 Feb 2023 13:38:56 +0100 +Subject: [PATCH] build: fix awk scripts to work properly when used againts + sqlite 3.41.0 + +The SQL standard requires double-quotes around identifiers and +single-quotes around string literals. For example: + + "this is a legal SQL column name" + 'this is an SQL string literal' + +With sqlite 3.41.0, this is being enforced on the CLI +--- + data/english.awk | 8 ++++---- + data/table.awk | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/data/english.awk b/data/english.awk +index c5dc0aa2..8b32f3f2 100644 +--- a/data/english.awk ++++ b/data/english.awk +@@ -5,9 +5,9 @@ BEGIN { + print "BEGIN TRANSACTION;" + + # Create english table +- print "CREATE TABLE IF NOT EXISTS \"english\" ( " \ +- "\"word\" TEXT NOT NULL PRIMARY KEY," \ +- "\"freq\" FLOAT NOT NULL DEFAULT(0)" \ ++ print "CREATE TABLE IF NOT EXISTS 'english' ( " \ ++ "'word' TEXT NOT NULL PRIMARY KEY," \ ++ "'freq' FLOAT NOT NULL DEFAULT(0)" \ + ");"; + + # Create desc table +@@ -16,7 +16,7 @@ BEGIN { + } + + # Insert data into english table +- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2} ++ { printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2} + + #quit sqlite3 + END { +diff --git a/data/table.awk b/data/table.awk +index 700529cf..c097ec26 100644 +--- a/data/table.awk ++++ b/data/table.awk +@@ -21,7 +21,7 @@ BEGIN { + + # Insert data into phrases table + NF == 4 { +- printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1; ++ printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1; + id++; + } + diff --git a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild index 2e9446ba2..bd0f8e45d 100755 --- a/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild +++ b/source/x/ibus-libpinyin/ibus-libpinyin.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for ibus-libpinyin - # Copyright 2017 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2017, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2020, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ibus-libpinyin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -96,6 +94,8 @@ if [ ! -r configure ]; then fi fi +cat $CWD/96042887815b4700c7cafa64cf88942af438ea98.patch | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ -- cgit v1.2.3-65-gdbad