From 84730d7abad295f83f3a923170248e19b2afb375 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 24 Jul 2023 19:26:18 +0000 Subject: [PATCH] Mon Jul 24 19:26:18 UTC 2023 ap/tmux-3.3a-x86_64-2.txz: Rebuilt. Patched to fix a crash when copying text. Thanks to nullptr, gnw, and Daedra. d/parallel-20230722-noarch-1.txz: Upgraded. l/libarchive-3.7.0-x86_64-1.txz: Upgraded. l/pipewire-0.3.75-x86_64-2.txz: Rebuilt. [PATCH] pipewire: add missing stdbool.h include to version.h.in. Thanks to marav. n/network-scripts-15.1-noarch-1.txz: Upgraded. Added netconfig.8 manpage. Thanks to metaed. extra/brltty/brltty-6.6-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 24 +- ChangeLog.txt | 12 + FILELIST.TXT | 126 +-- extra/source/brltty/brltty.SlackBuild | 2 +- source/ap/tmux/0002-ncurses.patch | 759 ++++++++++++++++++ source/ap/tmux/tmux.SlackBuild | 5 +- source/l/libarchive/libarchive.SlackBuild | 12 +- ...84b26aba3917d086ac3f009aa2cab9d197d2.patch | 26 + source/l/pipewire/pipewire.SlackBuild | 4 +- source/n/network-scripts/manpages/netconfig.8 | 104 +++ .../network-scripts.SlackBuild | 7 +- 11 files changed, 1009 insertions(+), 72 deletions(-) create mode 100644 source/ap/tmux/0002-ncurses.patch create mode 100644 source/l/pipewire/193384b26aba3917d086ac3f009aa2cab9d197d2.patch create mode 100644 source/n/network-scripts/manpages/netconfig.8 diff --git a/ChangeLog.rss b/ChangeLog.rss index bfafdede7..e9c68c23d 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,29 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Mon, 24 Jul 2023 00:17:18 GMT - Mon, 24 Jul 2023 02:33:48 GMT + Mon, 24 Jul 2023 19:26:18 GMT + Mon, 24 Jul 2023 19:58:53 GMT maintain_current_git.sh v 1.17 + + Mon, 24 Jul 2023 19:26:18 GMT + Mon, 24 Jul 2023 19:26:18 GMT + https://git.slackware.nl/current/tag/?h=20230724192618 + 20230724192618 + + +ap/tmux-3.3a-x86_64-2.txz: Rebuilt. + Patched to fix a crash when copying text. Thanks to nullptr, gnw, and Daedra. +d/parallel-20230722-noarch-1.txz: Upgraded. +l/libarchive-3.7.0-x86_64-1.txz: Upgraded. +l/pipewire-0.3.75-x86_64-2.txz: Rebuilt. + [PATCH] pipewire: add missing stdbool.h include to version.h.in. + Thanks to marav. +n/network-scripts-15.1-noarch-1.txz: Upgraded. + Added netconfig.8 manpage. Thanks to metaed. +extra/brltty/brltty-6.6-x86_64-1.txz: Upgraded. + ]]> + + Mon, 24 Jul 2023 00:17:18 GMT Mon, 24 Jul 2023 00:17:18 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index b6f7bb94a..4f2605146 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,15 @@ +Mon Jul 24 19:26:18 UTC 2023 +ap/tmux-3.3a-x86_64-2.txz: Rebuilt. + Patched to fix a crash when copying text. Thanks to nullptr, gnw, and Daedra. +d/parallel-20230722-noarch-1.txz: Upgraded. +l/libarchive-3.7.0-x86_64-1.txz: Upgraded. +l/pipewire-0.3.75-x86_64-2.txz: Rebuilt. + [PATCH] pipewire: add missing stdbool.h include to version.h.in. + Thanks to marav. +n/network-scripts-15.1-noarch-1.txz: Upgraded. + Added netconfig.8 manpage. Thanks to metaed. +extra/brltty/brltty-6.6-x86_64-1.txz: Upgraded. ++--------------------------+ Mon Jul 24 00:17:18 UTC 2023 a/kernel-generic-6.1.40-x86_64-1.txz: Upgraded. a/kernel-huge-6.1.40-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index ea713f958..040748ce6 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Jul 24 00:24:59 UTC 2023 +Mon Jul 24 19:29:37 UTC 2023 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2023-07-24 00:17 . +drwxr-xr-x 12 root root 4096 2023-07-24 19:26 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1114863 2023-07-21 19:43 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-07-21 19:43 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1114863 2023-07-24 00:25 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-07-24 00:25 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 711901 2023-07-24 00:17 ./ChangeLog.txt +-rw-r--r-- 1 root root 712437 2023-07-24 19:26 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2023-07-24 00:16 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2023-07-24 00:16 ./EFI/BOOT -rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1454274 2023-07-21 19:43 ./FILELIST.TXT +-rw-r--r-- 1 root root 1454274 2023-07-24 00:24 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 874501 2023-07-24 00:24 ./PACKAGES.TXT +-rw-r--r-- 1 root root 874500 2023-07-24 19:29 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3629 2023-07-23 23:55 ./README.initrd -rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT @@ -39,12 +39,12 @@ drwxr-xr-x 2 root root 4096 2023-07-24 00:16 ./EFI/BOOT -rw-r--r-- 1 root root 17294 2008-12-08 18:13 ./SPEAK_INSTALL.TXT -rw-r--r-- 1 root root 57187 2022-02-01 19:37 ./Slackware-HOWTO -rw-r--r-- 1 root root 8700 2022-01-26 05:44 ./UPGRADE.TXT -drwxr-xr-x 16 root root 4096 2023-07-17 19:22 ./extra --rw-r--r-- 1 root root 46139 2023-07-17 19:22 ./extra/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-07-17 19:22 ./extra/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 56649 2023-07-17 19:22 ./extra/FILE_LIST --rw-r--r-- 1 root root 120401 2023-07-17 19:22 ./extra/MANIFEST.bz2 --rw-r--r-- 1 root root 34856 2023-07-17 19:22 ./extra/PACKAGES.TXT +drwxr-xr-x 16 root root 4096 2023-07-24 19:28 ./extra +-rw-r--r-- 1 root root 46139 2023-07-24 19:28 ./extra/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-07-24 19:28 ./extra/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 56649 2023-07-24 19:28 ./extra/FILE_LIST +-rw-r--r-- 1 root root 121063 2023-07-24 19:28 ./extra/MANIFEST.bz2 +-rw-r--r-- 1 root root 34856 2023-07-24 19:28 ./extra/PACKAGES.TXT -rw-r--r-- 1 root root 149 2002-02-09 00:18 ./extra/README.TXT drwxr-xr-x 2 root root 20480 2020-05-26 20:38 ./extra/aspell-word-lists -rw-r--r-- 1 root root 171 2016-06-06 20:10 ./extra/aspell-word-lists/aspell-af-0.50_0-x86_64-5.txt @@ -331,10 +331,10 @@ drwxr-xr-x 2 root root 4096 2012-06-25 02:53 ./extra/bittornado -rw-r--r-- 1 root root 444 2012-06-23 18:20 ./extra/bittornado/bittornado-0.3.18-noarch-3.txt -rw-r--r-- 1 root root 236800 2012-06-23 18:20 ./extra/bittornado/bittornado-0.3.18-noarch-3.txz -rw-r--r-- 1 root root 198 2012-06-23 18:20 ./extra/bittornado/bittornado-0.3.18-noarch-3.txz.asc -drwxr-xr-x 2 root root 4096 2022-10-27 02:37 ./extra/brltty --rw-r--r-- 1 root root 360 2022-10-26 22:52 ./extra/brltty/brltty-6.5-x86_64-2.txt --rw-r--r-- 1 root root 2126048 2022-10-26 22:52 ./extra/brltty/brltty-6.5-x86_64-2.txz --rw-r--r-- 1 root root 163 2022-10-26 22:52 ./extra/brltty/brltty-6.5-x86_64-2.txz.asc +drwxr-xr-x 2 root root 4096 2023-07-24 19:28 ./extra/brltty +-rw-r--r-- 1 root root 360 2023-07-24 18:56 ./extra/brltty/brltty-6.6-x86_64-1.txt +-rw-r--r-- 1 root root 2198840 2023-07-24 18:56 ./extra/brltty/brltty-6.6-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-07-24 18:56 ./extra/brltty/brltty-6.6-x86_64-1.txz.asc drwxr-xr-x 2 root root 4096 2021-11-21 20:19 ./extra/fltk -rw-r--r-- 1 root root 490 2021-11-21 19:57 ./extra/fltk/fltk-1.3.8-x86_64-1.txt -rw-r--r-- 1 root root 951704 2021-11-21 19:57 ./extra/fltk/fltk-1.3.8-x86_64-1.txz @@ -526,9 +526,9 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./extra/source/bittornado -rw-r--r-- 1 root root 913 2005-07-14 22:53 ./extra/source/bittornado/btdownloadxterm.sh.gz -rw-r--r-- 1 root root 283 2006-02-08 01:28 ./extra/source/bittornado/doinst.sh.gz -rw-r--r-- 1 root root 902 2018-02-27 06:13 ./extra/source/bittornado/slack-desc -drwxr-xr-x 2 root root 4096 2022-10-26 22:52 ./extra/source/brltty --rw-r--r-- 1 root root 2493377 2022-06-09 15:30 ./extra/source/brltty/brltty-6.5.tar.lz --rwxr-xr-x 1 root root 4826 2022-10-26 22:52 ./extra/source/brltty/brltty.SlackBuild +drwxr-xr-x 2 root root 4096 2023-07-24 18:55 ./extra/source/brltty +-rw-r--r-- 1 root root 2548004 2023-07-22 15:40 ./extra/source/brltty/brltty-6.6.tar.lz +-rwxr-xr-x 1 root root 4826 2023-07-24 18:55 ./extra/source/brltty/brltty.SlackBuild -rwxr-xr-x 1 root root 720 2021-10-02 19:06 ./extra/source/brltty/dump.dos.windows.android.stuff.sh -rw-r--r-- 1 root root 814 2018-02-27 06:13 ./extra/source/brltty/slack-desc drwxr-xr-x 2 root root 4096 2022-09-06 18:32 ./extra/source/fltk @@ -665,11 +665,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2023-07-24 00:24 ./slackware64 --rw-r--r-- 1 root root 341223 2023-07-24 00:24 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-07-24 00:24 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 423009 2023-07-24 00:23 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4312900 2023-07-24 00:23 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2023-07-24 19:29 ./slackware64 +-rw-r--r-- 1 root root 341220 2023-07-24 19:29 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-07-24 19:29 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 423006 2023-07-24 19:28 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4306045 2023-07-24 19:28 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 32768 2023-07-24 00:23 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt @@ -1061,7 +1061,7 @@ drwxr-xr-x 2 root root 32768 2023-07-24 00:23 ./slackware64/a -rw-r--r-- 1 root root 540 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txt -rw-r--r-- 1 root root 56160 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz.asc -drwxr-xr-x 2 root root 20480 2023-07-17 19:23 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2023-07-24 19:28 ./slackware64/ap -rw-r--r-- 1 root root 291 2023-06-23 18:07 ./slackware64/ap/a2ps-4.15.5-x86_64-1.txt -rw-r--r-- 1 root root 653716 2023-06-23 18:07 ./slackware64/ap/a2ps-4.15.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-06-23 18:07 ./slackware64/ap/a2ps-4.15.5-x86_64-1.txz.asc @@ -1289,9 +1289,9 @@ drwxr-xr-x 2 root root 20480 2023-07-17 19:23 ./slackware64/ap -rw-r--r-- 1 root root 614 2023-07-04 20:21 ./slackware64/ap/texinfo-7.0.3-x86_64-2.txt -rw-r--r-- 1 root root 1625160 2023-07-04 20:21 ./slackware64/ap/texinfo-7.0.3-x86_64-2.txz -rw-r--r-- 1 root root 163 2023-07-04 20:21 ./slackware64/ap/texinfo-7.0.3-x86_64-2.txz.asc --rw-r--r-- 1 root root 368 2022-06-15 17:56 ./slackware64/ap/tmux-3.3a-x86_64-1.txt --rw-r--r-- 1 root root 388528 2022-06-15 17:56 ./slackware64/ap/tmux-3.3a-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-06-15 17:56 ./slackware64/ap/tmux-3.3a-x86_64-1.txz.asc +-rw-r--r-- 1 root root 368 2023-07-24 18:53 ./slackware64/ap/tmux-3.3a-x86_64-2.txt +-rw-r--r-- 1 root root 389700 2023-07-24 18:53 ./slackware64/ap/tmux-3.3a-x86_64-2.txz +-rw-r--r-- 1 root root 163 2023-07-24 18:53 ./slackware64/ap/tmux-3.3a-x86_64-2.txz.asc -rw-r--r-- 1 root root 543 2021-11-03 01:08 ./slackware64/ap/undervolt-20210815_e39aea1-x86_64-2.txt -rw-r--r-- 1 root root 14560 2021-11-03 01:08 ./slackware64/ap/undervolt-20210815_e39aea1-x86_64-2.txz -rw-r--r-- 1 root root 163 2021-11-03 01:08 ./slackware64/ap/undervolt-20210815_e39aea1-x86_64-2.txz.asc @@ -1316,7 +1316,7 @@ drwxr-xr-x 2 root root 20480 2023-07-17 19:23 ./slackware64/ap -rw-r--r-- 1 root root 506 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txt -rw-r--r-- 1 root root 3156392 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz.asc -drwxr-xr-x 2 root root 20480 2023-07-24 00:23 ./slackware64/d +drwxr-xr-x 2 root root 20480 2023-07-24 19:28 ./slackware64/d -rw-r--r-- 1 root root 360 2022-03-09 03:58 ./slackware64/d/Cython-0.29.28-x86_64-1.txt -rw-r--r-- 1 root root 2393012 2022-03-09 03:58 ./slackware64/d/Cython-0.29.28-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-03-09 03:58 ./slackware64/d/Cython-0.29.28-x86_64-1.txz.asc @@ -1471,9 +1471,9 @@ drwxr-xr-x 2 root root 20480 2023-07-24 00:23 ./slackware64/d -rw-r--r-- 1 root root 529 2023-04-15 18:36 ./slackware64/d/pahole-1.25-x86_64-1.txt -rw-r--r-- 1 root root 327656 2023-04-15 18:36 ./slackware64/d/pahole-1.25-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-04-15 18:36 ./slackware64/d/pahole-1.25-x86_64-1.txz.asc --rw-r--r-- 1 root root 398 2023-06-19 16:57 ./slackware64/d/parallel-20230622-noarch-1.txt --rw-r--r-- 1 root root 510176 2023-06-19 16:57 ./slackware64/d/parallel-20230622-noarch-1.txz --rw-r--r-- 1 root root 163 2023-06-19 16:57 ./slackware64/d/parallel-20230622-noarch-1.txz.asc +-rw-r--r-- 1 root root 398 2023-07-24 18:52 ./slackware64/d/parallel-20230722-noarch-1.txt +-rw-r--r-- 1 root root 511764 2023-07-24 18:52 ./slackware64/d/parallel-20230722-noarch-1.txz +-rw-r--r-- 1 root root 163 2023-07-24 18:52 ./slackware64/d/parallel-20230722-noarch-1.txz.asc -rw-r--r-- 1 root root 469 2023-04-24 19:58 ./slackware64/d/patchelf-0.18.0-x86_64-1.txt -rw-r--r-- 1 root root 94892 2023-04-24 19:58 ./slackware64/d/patchelf-0.18.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-04-24 19:58 ./slackware64/d/patchelf-0.18.0-x86_64-1.txz.asc @@ -2732,7 +2732,7 @@ drwxr-xr-x 2 root root 86016 2023-07-16 20:37 ./slackware64/kde -rw-r--r-- 1 root root 403 2023-07-06 17:30 ./slackware64/kde/zxing-cpp-2.1.0-x86_64-1.txt -rw-r--r-- 1 root root 754048 2023-07-06 17:30 ./slackware64/kde/zxing-cpp-2.1.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-07-06 17:30 ./slackware64/kde/zxing-cpp-2.1.0-x86_64-1.txz.asc -drwxr-xr-x 2 root root 86016 2023-07-24 00:23 ./slackware64/l +drwxr-xr-x 2 root root 86016 2023-07-24 19:28 ./slackware64/l -rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt -rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz -rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc @@ -3161,9 +3161,9 @@ drwxr-xr-x 2 root root 86016 2023-07-24 00:23 ./slackware64/l -rw-r--r-- 1 root root 484 2021-02-13 06:56 ./slackware64/l/libappindicator-12.10.0-x86_64-3.txt -rw-r--r-- 1 root root 61584 2021-02-13 06:56 ./slackware64/l/libappindicator-12.10.0-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 06:56 ./slackware64/l/libappindicator-12.10.0-x86_64-3.txz.asc --rw-r--r-- 1 root root 402 2023-03-08 02:14 ./slackware64/l/libarchive-3.6.2-x86_64-3.txt --rw-r--r-- 1 root root 515296 2023-03-08 02:14 ./slackware64/l/libarchive-3.6.2-x86_64-3.txz --rw-r--r-- 1 root root 163 2023-03-08 02:14 ./slackware64/l/libarchive-3.6.2-x86_64-3.txz.asc +-rw-r--r-- 1 root root 402 2023-07-24 19:04 ./slackware64/l/libarchive-3.7.0-x86_64-1.txt +-rw-r--r-- 1 root root 525072 2023-07-24 19:04 ./slackware64/l/libarchive-3.7.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-07-24 19:04 ./slackware64/l/libarchive-3.7.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 369 2023-03-05 21:01 ./slackware64/l/libasyncns-0.8-x86_64-6.txt -rw-r--r-- 1 root root 22292 2023-03-05 21:01 ./slackware64/l/libasyncns-0.8-x86_64-6.txz -rw-r--r-- 1 root root 163 2023-03-05 21:01 ./slackware64/l/libasyncns-0.8-x86_64-6.txz.asc @@ -3613,9 +3613,9 @@ drwxr-xr-x 2 root root 86016 2023-07-24 00:23 ./slackware64/l -rw-r--r-- 1 root root 415 2021-02-13 07:37 ./slackware64/l/pilot-link-0.12.5-x86_64-16.txt -rw-r--r-- 1 root root 554276 2021-02-13 07:37 ./slackware64/l/pilot-link-0.12.5-x86_64-16.txz -rw-r--r-- 1 root root 163 2021-02-13 07:37 ./slackware64/l/pilot-link-0.12.5-x86_64-16.txz.asc --rw-r--r-- 1 root root 552 2023-07-21 18:59 ./slackware64/l/pipewire-0.3.75-x86_64-1.txt --rw-r--r-- 1 root root 2444576 2023-07-21 18:59 ./slackware64/l/pipewire-0.3.75-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-07-21 18:59 ./slackware64/l/pipewire-0.3.75-x86_64-1.txz.asc +-rw-r--r-- 1 root root 552 2023-07-24 18:59 ./slackware64/l/pipewire-0.3.75-x86_64-2.txt +-rw-r--r-- 1 root root 2446316 2023-07-24 18:59 ./slackware64/l/pipewire-0.3.75-x86_64-2.txz +-rw-r--r-- 1 root root 163 2023-07-24 18:59 ./slackware64/l/pipewire-0.3.75-x86_64-2.txz.asc -rw-r--r-- 1 root root 450 2023-02-01 05:13 ./slackware64/l/polkit-122-x86_64-1.txt -rw-r--r-- 1 root root 187320 2023-02-01 05:13 ./slackware64/l/polkit-122-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-02-01 05:13 ./slackware64/l/polkit-122-x86_64-1.txz.asc @@ -3920,7 +3920,7 @@ drwxr-xr-x 2 root root 86016 2023-07-24 00:23 ./slackware64/l -rw-r--r-- 1 root root 463 2023-04-05 18:12 ./slackware64/l/zstd-1.5.5-x86_64-1.txt -rw-r--r-- 1 root root 465608 2023-04-05 18:12 ./slackware64/l/zstd-1.5.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-04-05 18:12 ./slackware64/l/zstd-1.5.5-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2023-07-24 00:23 ./slackware64/n +drwxr-xr-x 2 root root 36864 2023-07-24 19:28 ./slackware64/n -rw-r--r-- 1 root root 357 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txt -rw-r--r-- 1 root root 1517848 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz.asc @@ -4207,9 +4207,9 @@ drwxr-xr-x 2 root root 36864 2023-07-24 00:23 ./slackware64/n -rw-r--r-- 1 root root 306 2021-02-13 12:15 ./slackware64/n/netwatch-1.3.1_2-x86_64-5.txt -rw-r--r-- 1 root root 86984 2021-02-13 12:15 ./slackware64/n/netwatch-1.3.1_2-x86_64-5.txz -rw-r--r-- 1 root root 163 2021-02-13 12:15 ./slackware64/n/netwatch-1.3.1_2-x86_64-5.txz.asc --rw-r--r-- 1 root root 582 2023-06-26 18:53 ./slackware64/n/network-scripts-15.0-noarch-19.txt --rw-r--r-- 1 root root 40036 2023-06-26 18:53 ./slackware64/n/network-scripts-15.0-noarch-19.txz --rw-r--r-- 1 root root 163 2023-06-26 18:53 ./slackware64/n/network-scripts-15.0-noarch-19.txz.asc +-rw-r--r-- 1 root root 582 2023-07-24 19:25 ./slackware64/n/network-scripts-15.1-noarch-1.txt +-rw-r--r-- 1 root root 40940 2023-07-24 19:25 ./slackware64/n/network-scripts-15.1-noarch-1.txz +-rw-r--r-- 1 root root 163 2023-07-24 19:25 ./slackware64/n/network-scripts-15.1-noarch-1.txz.asc -rw-r--r-- 1 root root 557 2021-02-13 12:16 ./slackware64/n/netwrite-0.17-x86_64-4.txt -rw-r--r-- 1 root root 6912 2021-02-13 12:16 ./slackware64/n/netwrite-0.17-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 12:16 ./slackware64/n/netwrite-0.17-x86_64-4.txz.asc @@ -5582,11 +5582,11 @@ drwxr-xr-x 2 root root 4096 2023-03-08 20:34 ./slackware64/y -rw-r--r-- 1 root root 1491108 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2023-07-24 00:24 ./source --rw-r--r-- 1 root root 599738 2023-07-24 00:24 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-07-24 00:24 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 833992 2023-07-24 00:24 ./source/FILE_LIST --rw-r--r-- 1 root root 24715509 2023-07-24 00:24 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2023-07-24 19:29 ./source +-rw-r--r-- 1 root root 599893 2023-07-24 19:29 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-07-24 19:29 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 834177 2023-07-24 19:29 ./source/FILE_LIST +-rw-r--r-- 1 root root 24721144 2023-07-24 19:29 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT drwxr-xr-x 124 root root 4096 2023-06-29 19:08 ./source/a -rw-r--r-- 1 root root 234 2022-10-16 18:39 ./source/a/FTBFSlog @@ -7241,11 +7241,12 @@ drwxr-xr-x 2 root root 4096 2023-03-26 20:12 ./source/ap/texinfo -rwxr-xr-x 1 root root 5039 2023-07-04 20:06 ./source/ap/texinfo/texinfo.SlackBuild -rw-r--r-- 1 root root 571 2019-09-24 20:23 ./source/ap/texinfo/update-info-dir.8.gz -rw-r--r-- 1 root root 859 2019-09-24 20:26 ./source/ap/texinfo/update-info-dir.gz -drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/ap/tmux +drwxr-xr-x 2 root root 4096 2023-07-24 18:50 ./source/ap/tmux +-rw-r--r-- 1 root root 25016 2023-07-24 18:50 ./source/ap/tmux/0002-ncurses.patch -rw-r--r-- 1 root root 270 2017-05-24 03:36 ./source/ap/tmux/doinst.sh.gz -rw-r--r-- 1 root root 820 2019-11-27 18:16 ./source/ap/tmux/slack-desc -rw-r--r-- 1 root root 701785 2022-06-09 11:30 ./source/ap/tmux/tmux-3.3a.tar.lz --rwxr-xr-x 1 root root 5165 2022-09-06 18:27 ./source/ap/tmux/tmux.SlackBuild +-rwxr-xr-x 1 root root 5257 2023-07-24 18:52 ./source/ap/tmux/tmux.SlackBuild -rw-r--r-- 1 root root 203 2017-05-24 03:38 ./source/ap/tmux/tmux.conf.gz -rw-r--r-- 1 root root 29 2020-10-30 19:31 ./source/ap/tmux/tmux.url drwxr-xr-x 2 root root 4096 2021-11-02 19:02 ./source/ap/undervolt @@ -7590,8 +7591,8 @@ drwxr-xr-x 2 root root 4096 2023-04-15 18:36 ./source/d/pahole -rwxr-xr-x 1 root root 3820 2022-05-23 18:28 ./source/d/pahole/pahole.SlackBuild -rw-r--r-- 1 root root 52 2022-05-23 18:20 ./source/d/pahole/pahole.url -rw-r--r-- 1 root root 1015 2022-05-23 18:32 ./source/d/pahole/slack-desc -drwxr-xr-x 2 root root 4096 2023-06-19 16:57 ./source/d/parallel --rw-r--r-- 1 root root 2000466 2023-06-18 20:04 ./source/d/parallel/parallel-20230622.tar.lz +drwxr-xr-x 2 root root 4096 2023-07-24 18:52 ./source/d/parallel +-rw-r--r-- 1 root root 1990729 2023-07-23 11:50 ./source/d/parallel/parallel-20230722.tar.lz -rwxr-xr-x 1 root root 4535 2022-09-06 18:27 ./source/d/parallel/parallel.SlackBuild -rw-r--r-- 1 root root 857 2018-04-21 03:27 ./source/d/parallel/slack-desc drwxr-xr-x 2 root root 4096 2023-04-24 19:57 ./source/d/patchelf @@ -10585,10 +10586,9 @@ drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/libappindicator -rw-r--r-- 1 root root 337592 2015-01-24 21:11 ./source/l/libappindicator/libappindicator-12.10.0.tar.xz -rwxr-xr-x 1 root root 4870 2022-09-06 18:27 ./source/l/libappindicator/libappindicator.SlackBuild -rw-r--r-- 1 root root 979 2020-11-01 20:04 ./source/l/libappindicator/slack-desc -drwxr-xr-x 2 root root 4096 2023-03-07 21:39 ./source/l/libarchive --rw-r--r-- 1 root root 5213196 2022-12-09 15:06 ./source/l/libarchive/libarchive-3.6.2.tar.xz --rw-r--r-- 1 root root 659 2022-12-09 15:06 ./source/l/libarchive/libarchive-3.6.2.tar.xz.asc --rwxr-xr-x 1 root root 3776 2023-03-07 21:39 ./source/l/libarchive/libarchive.SlackBuild +drwxr-xr-x 2 root root 4096 2023-07-24 19:02 ./source/l/libarchive +-rw-r--r-- 1 root root 3767660 2023-07-18 06:30 ./source/l/libarchive/libarchive-3.7.0.tar.lz +-rwxr-xr-x 1 root root 3908 2023-07-24 19:03 ./source/l/libarchive/libarchive.SlackBuild -rw-r--r-- 1 root root 41 2019-06-17 02:47 ./source/l/libarchive/libarchive.url -rw-r--r-- 1 root root 856 2018-02-27 06:12 ./source/l/libarchive/slack-desc drwxr-xr-x 2 root root 4096 2023-03-05 20:50 ./source/l/libasyncns @@ -11387,7 +11387,8 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/pilot-link -rwxr-xr-x 1 root root 4918 2021-02-13 05:32 ./source/l/pilot-link/pilot-link.SlackBuild -rw-r--r-- 1 root root 645 2010-02-19 18:53 ./source/l/pilot-link/pilot-link.png14.diff.gz -rw-r--r-- 1 root root 873 2018-02-27 06:12 ./source/l/pilot-link/slack-desc -drwxr-xr-x 2 root root 4096 2023-07-21 18:58 ./source/l/pipewire +drwxr-xr-x 2 root root 4096 2023-07-24 18:58 ./source/l/pipewire +-rw-r--r-- 1 root root 799 2023-07-24 18:58 ./source/l/pipewire/193384b26aba3917d086ac3f009aa2cab9d197d2.patch -rw-r--r-- 1 root root 159 2023-04-13 18:07 ./source/l/pipewire/doinst.sh.gz -rwxr-xr-x 1 root root 1661 2023-04-13 18:59 ./source/l/pipewire/fetch-lua.sh -rwxr-xr-x 1 root root 1511 2023-04-13 18:26 ./source/l/pipewire/fetch-wireplumber.sh @@ -11396,7 +11397,7 @@ drwxr-xr-x 2 root root 4096 2023-07-21 18:58 ./source/l/pipewire -rw-r--r-- 1 root root 2639 2023-04-13 18:07 ./source/l/pipewire/pipewire-disable.sh -rw-r--r-- 1 root root 2156 2023-04-13 18:07 ./source/l/pipewire/pipewire-enable.sh -rw-r--r-- 1 root root 266 2022-01-05 06:27 ./source/l/pipewire/pipewire-pulse.desktop.sample --rwxr-xr-x 1 root root 5365 2023-04-13 18:42 ./source/l/pipewire/pipewire.SlackBuild +-rwxr-xr-x 1 root root 5454 2023-07-24 18:59 ./source/l/pipewire/pipewire.SlackBuild -rw-r--r-- 1 root root 268 2022-01-03 20:11 ./source/l/pipewire/pipewire.desktop.sample -rw-r--r-- 1 root root 49 2020-09-29 01:53 ./source/l/pipewire/pipewire.url -rw-r--r-- 1 root root 1038 2020-11-01 20:04 ./source/l/pipewire/slack-desc @@ -12642,13 +12643,14 @@ drwxr-xr-x 5 root root 4096 2023-06-26 18:37 ./source/n/network-scripts -rw-r--r-- 1 root root 6258 2021-02-28 05:34 ./source/n/network-scripts/README.bonding -rw-r--r-- 1 root root 28190 2021-02-28 05:36 ./source/n/network-scripts/README.networking -rw-r--r-- 1 root root 485 2007-04-26 01:50 ./source/n/network-scripts/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2020-08-14 03:30 ./source/n/network-scripts/manpages +drwxr-xr-x 2 root root 4096 2023-07-24 19:18 ./source/n/network-scripts/manpages +-rw-r--r-- 1 root root 1791 2023-07-24 19:17 ./source/n/network-scripts/manpages/netconfig.8 -rw-r--r-- 1 root root 3482 2021-02-28 05:34 ./source/n/network-scripts/manpages/rc.inet1.8 -rw-r--r-- 1 root root 12258 2021-02-28 05:34 ./source/n/network-scripts/manpages/rc.inet1.conf.5 drwxr-xr-x 2 root root 4096 2021-03-13 05:06 ./source/n/network-scripts/modprobe.d -rw-r--r-- 1 root root 442 2021-02-28 02:09 ./source/n/network-scripts/modprobe.d/bonding.conf -rw-r--r-- 1 root root 344 2021-02-28 02:09 ./source/n/network-scripts/modprobe.d/ipv6.conf --rwxr-xr-x 1 root root 4998 2023-06-26 18:50 ./source/n/network-scripts/network-scripts.SlackBuild +-rwxr-xr-x 1 root root 5079 2023-07-24 19:19 ./source/n/network-scripts/network-scripts.SlackBuild drwxr-xr-x 2 root root 4096 2021-04-01 20:21 ./source/n/network-scripts/scripts -rw-r--r-- 1 root root 21 1999-01-28 01:15 ./source/n/network-scripts/scripts/HOSTNAME -rw-r--r-- 1 root root 27 1994-07-07 15:39 ./source/n/network-scripts/scripts/host.conf @@ -15248,7 +15250,7 @@ drwxr-xr-x 2 root root 4096 2023-05-23 18:11 ./source/xfce/xfce4-panel drwxr-xr-x 2 root root 4096 2023-06-05 18:35 ./source/xfce/xfce4-panel-profiles -rw-r--r-- 1 root root 121 2019-08-02 07:05 ./source/xfce/xfce4-panel-profiles/doinst.sh.gz -rw-r--r-- 1 root root 1141 2023-06-05 18:33 ./source/xfce/xfce4-panel-profiles/slack-desc --rw-r--r-- 1 root root 71610 2023-06-05 07:03 ./source/xfce/xfce4-panel-profiles/xfce4-panel-profiles-1.0.14.tar.lz +-rw-r--r-- 1 root root 71610 2023-06-05 07:03 ./source/xfce/xfce4-panel-profiles/xfce4-panel-profiles-1.0.14.tar.lz -rwxr-xr-x 1 root root 3834 2021-02-22 01:27 ./source/xfce/xfce4-panel-profiles/xfce4-panel-profiles.SlackBuild -rw-r--r-- 1 root root 896 2018-02-27 06:13 ./source/xfce/xfce4-panel/slack-desc -rw-r--r-- 1 root root 1344602 2023-05-22 17:42 ./source/xfce/xfce4-panel/xfce4-panel-4.18.4.tar.lz diff --git a/extra/source/brltty/brltty.SlackBuild b/extra/source/brltty/brltty.SlackBuild index 90580a459..5b026dad8 100755 --- a/extra/source/brltty/brltty.SlackBuild +++ b/extra/source/brltty/brltty.SlackBuild @@ -32,7 +32,7 @@ PKG=/tmp/package-brltty PKGNAM=brltty 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 diff --git a/source/ap/tmux/0002-ncurses.patch b/source/ap/tmux/0002-ncurses.patch new file mode 100644 index 000000000..9eb101434 --- /dev/null +++ b/source/ap/tmux/0002-ncurses.patch @@ -0,0 +1,759 @@ +From 33b5788ef7534cf9b3492dda5fd15056042f3e1b Mon Sep 17 00:00:00 2001 +From: nicm +Date: Tue, 25 Apr 2023 09:31:50 +0000 +Subject: [PATCH 1/3] Tidy tparm wrapper functions to have more obvious names + and check tparm return value. + +(cherry picked from commit 8f34504736cf3547992c4ba948c1e65f3813715c) +--- + tmux.h | 26 ++++++------ + tty-term.c | 47 ++++++++++++++++----- + tty.c | 118 ++++++++++++++++++++++++++--------------------------- + 3 files changed, 108 insertions(+), 83 deletions(-) + +diff --git a/tmux.h b/tmux.h +index 53084b8b..5a90352e 100644 +--- a/tmux.h ++++ b/tmux.h +@@ -2250,12 +2250,12 @@ void tty_margin_off(struct tty *); + void tty_cursor(struct tty *, u_int, u_int); + void tty_clipboard_query(struct tty *); + void tty_putcode(struct tty *, enum tty_code_code); +-void tty_putcode1(struct tty *, enum tty_code_code, int); +-void tty_putcode2(struct tty *, enum tty_code_code, int, int); +-void tty_putcode3(struct tty *, enum tty_code_code, int, int, int); +-void tty_putcode_ptr1(struct tty *, enum tty_code_code, const void *); +-void tty_putcode_ptr2(struct tty *, enum tty_code_code, const void *, +- const void *); ++void tty_putcode_i(struct tty *, enum tty_code_code, int); ++void tty_putcode_ii(struct tty *, enum tty_code_code, int, int); ++void tty_putcode_iii(struct tty *, enum tty_code_code, int, int, int); ++void tty_putcode_s(struct tty *, enum tty_code_code, const char *); ++void tty_putcode_ss(struct tty *, enum tty_code_code, const char *, ++ const char *); + void tty_puts(struct tty *, const char *); + void tty_putc(struct tty *, u_char); + void tty_putn(struct tty *, const void *, size_t, u_int); +@@ -2318,15 +2318,15 @@ int tty_term_read_list(const char *, int, char ***, u_int *, + void tty_term_free_list(char **, u_int); + int tty_term_has(struct tty_term *, enum tty_code_code); + const char *tty_term_string(struct tty_term *, enum tty_code_code); +-const char *tty_term_string1(struct tty_term *, enum tty_code_code, int); +-const char *tty_term_string2(struct tty_term *, enum tty_code_code, int, ++const char *tty_term_string_i(struct tty_term *, enum tty_code_code, int); ++const char *tty_term_string_ii(struct tty_term *, enum tty_code_code, int, + int); +-const char *tty_term_string3(struct tty_term *, enum tty_code_code, int, ++const char *tty_term_string_iii(struct tty_term *, enum tty_code_code, int, + int, int); +-const char *tty_term_ptr1(struct tty_term *, enum tty_code_code, +- const void *); +-const char *tty_term_ptr2(struct tty_term *, enum tty_code_code, +- const void *, const void *); ++const char *tty_term_string_s(struct tty_term *, enum tty_code_code, ++ const char *); ++const char *tty_term_string_ss(struct tty_term *, enum tty_code_code, ++ const char *, const char *); + int tty_term_number(struct tty_term *, enum tty_code_code); + int tty_term_flag(struct tty_term *, enum tty_code_code); + const char *tty_term_describe(struct tty_term *, enum tty_code_code); +diff --git a/tty-term.c b/tty-term.c +index fdf0c4fa..32dd849a 100644 +--- a/tty-term.c ++++ b/tty-term.c +@@ -760,35 +760,60 @@ tty_term_string(struct tty_term *term, enum tty_code_code code) + } + + const char * +-tty_term_string1(struct tty_term *term, enum tty_code_code code, int a) ++tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a) + { +- return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0)); ++ const char *x = tty_term_string(term, code), *s; ++ ++ s = tparm((char *)x, a); ++ if (s == NULL) ++ fatalx("could not expand %s", tty_term_codes[code].name); ++ return (s); + } + + const char * +-tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b) ++tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b) + { +- return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0)); ++ const char *x = tty_term_string(term, code), *s; ++ ++ s = tparm((char *)x, a, b); ++ if (s == NULL) ++ fatalx("could not expand %s", tty_term_codes[code].name); ++ return (s); + } + + const char * +-tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b, ++tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, int b, + int c) + { +- return (tparm((char *) tty_term_string(term, code), a, b, c, 0, 0, 0, 0, 0, 0)); ++ const char *x = tty_term_string(term, code), *s; ++ ++ s = tparm((char *)x, a, b, c); ++ if (s == NULL) ++ fatalx("could not expand %s", tty_term_codes[code].name); ++ return (s); + } + + const char * +-tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a) ++tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a) + { +- return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0)); ++ const char *x = tty_term_string(term, code), *s; ++ ++ s = tparm((char *)x, (long)a); ++ if (s == NULL) ++ fatalx("could not expand %s", tty_term_codes[code].name); ++ return (s); + } + + const char * +-tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a, +- const void *b) ++tty_term_string_ss(struct tty_term *term, enum tty_code_code code, const char *a, ++ const char *b) + { +- return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0)); ++ const char *x = tty_term_string(term, code), *s; ++ ++ s = tparm((char *)x, (long)a, (long)b); ++ if (s == NULL) ++ fatalx("could not expand %s", tty_term_codes[code].name); ++ return (s); + } + + int +diff --git a/tty.c b/tty.c +index 49cf9795..a4d744d0 100644 +--- a/tty.c ++++ b/tty.c +@@ -399,7 +399,7 @@ tty_stop_tty(struct tty *tty) + if (tcsetattr(c->fd, TCSANOW, &tty->tio) == -1) + return; + +- tty_raw(tty, tty_term_string2(tty->term, TTYC_CSR, 0, ws.ws_row - 1)); ++ tty_raw(tty, tty_term_string_ii(tty->term, TTYC_CSR, 0, ws.ws_row - 1)); + if (tty_acs_needed(tty)) + tty_raw(tty, tty_term_string(tty->term, TTYC_RMACS)); + tty_raw(tty, tty_term_string(tty->term, TTYC_SGR0)); +@@ -409,7 +409,7 @@ tty_stop_tty(struct tty *tty) + if (tty_term_has(tty->term, TTYC_SE)) + tty_raw(tty, tty_term_string(tty->term, TTYC_SE)); + else if (tty_term_has(tty->term, TTYC_SS)) +- tty_raw(tty, tty_term_string1(tty->term, TTYC_SS, 0)); ++ tty_raw(tty, tty_term_string_i(tty->term, TTYC_SS, 0)); + } + if (tty->mode & MODE_BRACKETPASTE) + tty_raw(tty, tty_term_string(tty->term, TTYC_DSBP)); +@@ -506,42 +506,42 @@ tty_putcode(struct tty *tty, enum tty_code_code code) + } + + void +-tty_putcode1(struct tty *tty, enum tty_code_code code, int a) ++tty_putcode_i(struct tty *tty, enum tty_code_code code, int a) + { + if (a < 0) + return; +- tty_puts(tty, tty_term_string1(tty->term, code, a)); ++ tty_puts(tty, tty_term_string_i(tty->term, code, a)); + } + + void +-tty_putcode2(struct tty *tty, enum tty_code_code code, int a, int b) ++tty_putcode_ii(struct tty *tty, enum tty_code_code code, int a, int b) + { + if (a < 0 || b < 0) + return; +- tty_puts(tty, tty_term_string2(tty->term, code, a, b)); ++ tty_puts(tty, tty_term_string_ii(tty->term, code, a, b)); + } + + void +-tty_putcode3(struct tty *tty, enum tty_code_code code, int a, int b, int c) ++tty_putcode_iii(struct tty *tty, enum tty_code_code code, int a, int b, int c) + { + if (a < 0 || b < 0 || c < 0) + return; +- tty_puts(tty, tty_term_string3(tty->term, code, a, b, c)); ++ tty_puts(tty, tty_term_string_iii(tty->term, code, a, b, c)); + } + + void +-tty_putcode_ptr1(struct tty *tty, enum tty_code_code code, const void *a) ++tty_putcode_s(struct tty *tty, enum tty_code_code code, const char *a) + { + if (a != NULL) +- tty_puts(tty, tty_term_ptr1(tty->term, code, a)); ++ tty_puts(tty, tty_term_string_s(tty->term, code, a)); + } + + void +-tty_putcode_ptr2(struct tty *tty, enum tty_code_code code, const void *a, +- const void *b) ++tty_putcode_ss(struct tty *tty, enum tty_code_code code, const char *a, ++ const char *b) + { + if (a != NULL && b != NULL) +- tty_puts(tty, tty_term_ptr2(tty->term, code, a, b)); ++ tty_puts(tty, tty_term_string_ss(tty->term, code, a, b)); + } + + static void +@@ -603,7 +603,7 @@ tty_putc(struct tty *tty, u_char ch) + * it works on sensible terminals as well. + */ + if (tty->term->flags & TERM_NOAM) +- tty_putcode2(tty, TTYC_CUP, tty->cy, tty->cx); ++ tty_putcode_ii(tty, TTYC_CUP, tty->cy, tty->cx); + } else + tty->cx++; + } +@@ -682,7 +682,7 @@ tty_force_cursor_colour(struct tty *tty, int c) + else { + colour_split_rgb(c, &r, &g, &b); + xsnprintf(s, sizeof s, "rgb:%02hhx/%02hhx/%02hhx", r, g, b); +- tty_putcode_ptr1(tty, TTYC_CS, s); ++ tty_putcode_s(tty, TTYC_CS, s); + } + tty->ccolour = c; + } +@@ -743,7 +743,7 @@ tty_update_cursor(struct tty *tty, int mode, struct screen *s) + if (tty_term_has(tty->term, TTYC_SE)) + tty_putcode(tty, TTYC_SE); + else +- tty_putcode1(tty, TTYC_SS, 0); ++ tty_putcode_i(tty, TTYC_SS, 0); + } + if (cmode & (MODE_CURSOR_BLINKING|MODE_CURSOR_VERY_VISIBLE)) + tty_putcode(tty, TTYC_CVVIS); +@@ -751,27 +751,27 @@ tty_update_cursor(struct tty *tty, int mode, struct screen *s) + case SCREEN_CURSOR_BLOCK: + if (tty_term_has(tty->term, TTYC_SS)) { + if (cmode & MODE_CURSOR_BLINKING) +- tty_putcode1(tty, TTYC_SS, 1); ++ tty_putcode_i(tty, TTYC_SS, 1); + else +- tty_putcode1(tty, TTYC_SS, 2); ++ tty_putcode_i(tty, TTYC_SS, 2); + } else if (cmode & MODE_CURSOR_BLINKING) + tty_putcode(tty, TTYC_CVVIS); + break; + case SCREEN_CURSOR_UNDERLINE: + if (tty_term_has(tty->term, TTYC_SS)) { + if (cmode & MODE_CURSOR_BLINKING) +- tty_putcode1(tty, TTYC_SS, 3); ++ tty_putcode_i(tty, TTYC_SS, 3); + else +- tty_putcode1(tty, TTYC_SS, 4); ++ tty_putcode_i(tty, TTYC_SS, 4); + } else if (cmode & MODE_CURSOR_BLINKING) + tty_putcode(tty, TTYC_CVVIS); + break; + case SCREEN_CURSOR_BAR: + if (tty_term_has(tty->term, TTYC_SS)) { + if (cmode & MODE_CURSOR_BLINKING) +- tty_putcode1(tty, TTYC_SS, 5); ++ tty_putcode_i(tty, TTYC_SS, 5); + else +- tty_putcode1(tty, TTYC_SS, 6); ++ tty_putcode_i(tty, TTYC_SS, 6); + } else if (cmode & MODE_CURSOR_BLINKING) + tty_putcode(tty, TTYC_CVVIS); + break; +@@ -833,7 +833,7 @@ tty_emulate_repeat(struct tty *tty, enum tty_code_code code, + enum tty_code_code code1, u_int n) + { + if (tty_term_has(tty->term, code)) +- tty_putcode1(tty, code, n); ++ tty_putcode_i(tty, code, n); + else { + while (n-- > 0) + tty_putcode(tty, code1); +@@ -1122,7 +1122,7 @@ tty_clear_line(struct tty *tty, const struct grid_cell *defaults, u_int py, + /* Section of line. Use ECH if possible. */ + if (tty_term_has(tty->term, TTYC_ECH)) { + tty_cursor(tty, px, py); +- tty_putcode1(tty, TTYC_ECH, nx); ++ tty_putcode_i(tty, TTYC_ECH, nx); + return; + } + } +@@ -1263,7 +1263,7 @@ tty_clear_area(struct tty *tty, const struct grid_cell *defaults, u_int py, + tty_term_has(tty->term, TTYC_INDN)) { + tty_region(tty, py, py + ny - 1); + tty_margin_off(tty); +- tty_putcode1(tty, TTYC_INDN, ny); ++ tty_putcode_i(tty, TTYC_INDN, ny); + return; + } + +@@ -1278,7 +1278,7 @@ tty_clear_area(struct tty *tty, const struct grid_cell *defaults, u_int py, + tty_term_has(tty->term, TTYC_INDN)) { + tty_region(tty, py, py + ny - 1); + tty_margin(tty, px, px + nx - 1); +- tty_putcode1(tty, TTYC_INDN, ny); ++ tty_putcode_i(tty, TTYC_INDN, ny); + return; + } + } +@@ -1579,7 +1579,7 @@ tty_sync_start(struct tty *tty) + + if (tty_term_has(tty->term, TTYC_SYNC)) { + log_debug("%s sync start", tty->client->name); +- tty_putcode1(tty, TTYC_SYNC, 1); ++ tty_putcode_i(tty, TTYC_SYNC, 1); + } + } + +@@ -1594,7 +1594,7 @@ tty_sync_end(struct tty *tty) + + if (tty_term_has(tty->term, TTYC_SYNC)) { + log_debug("%s sync end", tty->client->name); +- tty_putcode1(tty, TTYC_SYNC, 2); ++ tty_putcode_i(tty, TTYC_SYNC, 2); + } + } + +@@ -1793,7 +1793,7 @@ tty_cmd_reverseindex(struct tty *tty, const struct tty_ctx *ctx) + if (tty_term_has(tty->term, TTYC_RI)) + tty_putcode(tty, TTYC_RI); + else +- tty_putcode1(tty, TTYC_RIN, 1); ++ tty_putcode_i(tty, TTYC_RIN, 1); + } + + void +@@ -1872,7 +1872,7 @@ tty_cmd_scrollup(struct tty *tty, const struct tty_ctx *ctx) + tty_cursor(tty, 0, 0); + else + tty_cursor(tty, 0, tty->cy); +- tty_putcode1(tty, TTYC_INDN, ctx->num); ++ tty_putcode_i(tty, TTYC_INDN, ctx->num); + } + } + +@@ -1902,7 +1902,7 @@ tty_cmd_scrolldown(struct tty *tty, const struct tty_ctx *ctx) + tty_cursor_pane(tty, ctx, ctx->ocx, ctx->orupper); + + if (tty_term_has(tty->term, TTYC_RIN)) +- tty_putcode1(tty, TTYC_RIN, ctx->num); ++ tty_putcode_i(tty, TTYC_RIN, ctx->num); + else { + for (i = 0; i < ctx->num; i++) + tty_putcode(tty, TTYC_RI); +@@ -2101,7 +2101,7 @@ tty_set_selection(struct tty *tty, const char *buf, size_t len) + + b64_ntop(buf, len, encoded, size); + tty->flags |= TTY_NOBLOCK; +- tty_putcode_ptr2(tty, TTYC_MS, "", encoded); ++ tty_putcode_ss(tty, TTYC_MS, "", encoded); + + free(encoded); + } +@@ -2246,7 +2246,7 @@ tty_region(struct tty *tty, u_int rupper, u_int rlower) + tty_cursor(tty, 0, tty->cy); + } + +- tty_putcode2(tty, TTYC_CSR, tty->rupper, tty->rlower); ++ tty_putcode_ii(tty, TTYC_CSR, tty->rupper, tty->rlower); + tty->cx = tty->cy = UINT_MAX; + } + +@@ -2274,7 +2274,7 @@ tty_margin(struct tty *tty, u_int rleft, u_int rright) + if (tty->rleft == rleft && tty->rright == rright) + return; + +- tty_putcode2(tty, TTYC_CSR, tty->rupper, tty->rlower); ++ tty_putcode_ii(tty, TTYC_CSR, tty->rupper, tty->rlower); + + tty->rleft = rleft; + tty->rright = rright; +@@ -2282,7 +2282,7 @@ tty_margin(struct tty *tty, u_int rleft, u_int rright) + if (rleft == 0 && rright == tty->sx - 1) + tty_putcode(tty, TTYC_CLMG); + else +- tty_putcode2(tty, TTYC_CMG, rleft, rright); ++ tty_putcode_ii(tty, TTYC_CMG, rleft, rright); + tty->cx = tty->cy = UINT_MAX; + } + +@@ -2392,7 +2392,7 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy) + * the cursor with CUB/CUF. + */ + if ((u_int) abs(change) > cx && tty_term_has(term, TTYC_HPA)) { +- tty_putcode1(tty, TTYC_HPA, cx); ++ tty_putcode_i(tty, TTYC_HPA, cx); + goto out; + } else if (change > 0 && + tty_term_has(term, TTYC_CUB) && +@@ -2402,12 +2402,12 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy) + tty_putcode(tty, TTYC_CUB1); + goto out; + } +- tty_putcode1(tty, TTYC_CUB, change); ++ tty_putcode_i(tty, TTYC_CUB, change); + goto out; + } else if (change < 0 && + tty_term_has(term, TTYC_CUF) && + !tty_use_margin(tty)) { +- tty_putcode1(tty, TTYC_CUF, -change); ++ tty_putcode_i(tty, TTYC_CUF, -change); + goto out; + } + } else if (cx == thisx) { +@@ -2440,21 +2440,21 @@ tty_cursor(struct tty *tty, u_int cx, u_int cy) + (change < 0 && cy - change > tty->rlower) || + (change > 0 && cy - change < tty->rupper)) { + if (tty_term_has(term, TTYC_VPA)) { +- tty_putcode1(tty, TTYC_VPA, cy); ++ tty_putcode_i(tty, TTYC_VPA, cy); + goto out; + } + } else if (change > 0 && tty_term_has(term, TTYC_CUU)) { +- tty_putcode1(tty, TTYC_CUU, change); ++ tty_putcode_i(tty, TTYC_CUU, change); + goto out; + } else if (change < 0 && tty_term_has(term, TTYC_CUD)) { +- tty_putcode1(tty, TTYC_CUD, -change); ++ tty_putcode_i(tty, TTYC_CUD, -change); + goto out; + } + } + + absolute: + /* Absolute movement. */ +- tty_putcode2(tty, TTYC_CUP, cy, cx); ++ tty_putcode_ii(tty, TTYC_CUP, cy, cx); + + out: + tty->cx = cx; +@@ -2533,13 +2533,13 @@ tty_attributes(struct tty *tty, const struct grid_cell *gc, + !tty_term_has(tty->term, TTYC_SMULX)) + tty_putcode(tty, TTYC_SMUL); + else if (changed & GRID_ATTR_UNDERSCORE_2) +- tty_putcode1(tty, TTYC_SMULX, 2); ++ tty_putcode_i(tty, TTYC_SMULX, 2); + else if (changed & GRID_ATTR_UNDERSCORE_3) +- tty_putcode1(tty, TTYC_SMULX, 3); ++ tty_putcode_i(tty, TTYC_SMULX, 3); + else if (changed & GRID_ATTR_UNDERSCORE_4) +- tty_putcode1(tty, TTYC_SMULX, 4); ++ tty_putcode_i(tty, TTYC_SMULX, 4); + else if (changed & GRID_ATTR_UNDERSCORE_5) +- tty_putcode1(tty, TTYC_SMULX, 5); ++ tty_putcode_i(tty, TTYC_SMULX, 5); + } + if (changed & GRID_ATTR_BLINK) + tty_putcode(tty, TTYC_BLINK); +@@ -2593,14 +2593,14 @@ tty_colours(struct tty *tty, const struct grid_cell *gc) + if (have_ax) + tty_puts(tty, "\033[39m"); + else if (tc->fg != 7) +- tty_putcode1(tty, TTYC_SETAF, 7); ++ tty_putcode_i(tty, TTYC_SETAF, 7); + tc->fg = gc->fg; + } + if (COLOUR_DEFAULT(gc->bg) && !COLOUR_DEFAULT(tc->bg)) { + if (have_ax) + tty_puts(tty, "\033[49m"); + else if (tc->bg != 0) +- tty_putcode1(tty, TTYC_SETAB, 0); ++ tty_putcode_i(tty, TTYC_SETAB, 0); + tc->bg = gc->bg; + } + } +@@ -2768,12 +2768,12 @@ tty_colours_fg(struct tty *tty, const struct grid_cell *gc) + xsnprintf(s, sizeof s, "\033[%dm", gc->fg); + tty_puts(tty, s); + } else +- tty_putcode1(tty, TTYC_SETAF, gc->fg - 90 + 8); ++ tty_putcode_i(tty, TTYC_SETAF, gc->fg - 90 + 8); + goto save; + } + + /* Otherwise set the foreground colour. */ +- tty_putcode1(tty, TTYC_SETAF, gc->fg); ++ tty_putcode_i(tty, TTYC_SETAF, gc->fg); + + save: + /* Save the new values in the terminal current cell. */ +@@ -2800,12 +2800,12 @@ tty_colours_bg(struct tty *tty, const struct grid_cell *gc) + xsnprintf(s, sizeof s, "\033[%dm", gc->bg + 10); + tty_puts(tty, s); + } else +- tty_putcode1(tty, TTYC_SETAB, gc->bg - 90 + 8); ++ tty_putcode_i(tty, TTYC_SETAB, gc->bg - 90 + 8); + goto save; + } + + /* Otherwise set the background colour. */ +- tty_putcode1(tty, TTYC_SETAB, gc->bg); ++ tty_putcode_i(tty, TTYC_SETAB, gc->bg); + + save: + /* Save the new values in the terminal current cell. */ +@@ -2841,10 +2841,10 @@ tty_colours_us(struct tty *tty, const struct grid_cell *gc) + * non-RGB version may be wrong. + */ + if (tty_term_has(tty->term, TTYC_SETULC)) +- tty_putcode1(tty, TTYC_SETULC, c); ++ tty_putcode_i(tty, TTYC_SETULC, c); + else if (tty_term_has(tty->term, TTYC_SETAL) && + tty_term_has(tty->term, TTYC_RGB)) +- tty_putcode1(tty, TTYC_SETAL, c); ++ tty_putcode_i(tty, TTYC_SETAL, c); + + save: + /* Save the new values in the terminal current cell. */ +@@ -2858,18 +2858,18 @@ tty_try_colour(struct tty *tty, int colour, const char *type) + + if (colour & COLOUR_FLAG_256) { + if (*type == '3' && tty_term_has(tty->term, TTYC_SETAF)) +- tty_putcode1(tty, TTYC_SETAF, colour & 0xff); ++ tty_putcode_i(tty, TTYC_SETAF, colour & 0xff); + else if (tty_term_has(tty->term, TTYC_SETAB)) +- tty_putcode1(tty, TTYC_SETAB, colour & 0xff); ++ tty_putcode_i(tty, TTYC_SETAB, colour & 0xff); + return (0); + } + + if (colour & COLOUR_FLAG_RGB) { + colour_split_rgb(colour & 0xffffff, &r, &g, &b); + if (*type == '3' && tty_term_has(tty->term, TTYC_SETRGBF)) +- tty_putcode3(tty, TTYC_SETRGBF, r, g, b); ++ tty_putcode_iii(tty, TTYC_SETRGBF, r, g, b); + else if (tty_term_has(tty->term, TTYC_SETRGBB)) +- tty_putcode3(tty, TTYC_SETRGBB, r, g, b); ++ tty_putcode_iii(tty, TTYC_SETRGBB, r, g, b); + return (0); + } + +@@ -2953,7 +2953,7 @@ tty_clipboard_query(struct tty *tty) + + if ((~tty->flags & TTY_STARTED) || (tty->flags & TTY_OSC52QUERY)) + return; +- tty_putcode_ptr2(tty, TTYC_MS, "", "?"); ++ tty_putcode_ss(tty, TTYC_MS, "", "?"); + + tty->flags |= TTY_OSC52QUERY; + evtimer_set(&tty->clipboard_timer, tty_clipboard_query_callback, tty); +-- +2.40.1 + + +From de51c8eb81b9db49fa34a8ea7886c9fe4164f46d Mon Sep 17 00:00:00 2001 +From: Nicholas Marriott +Date: Fri, 28 Apr 2023 06:44:40 +0100 +Subject: [PATCH 2/3] Use ncurses' new tparm_s function (added in 6.4-20230424) + instead of tparm so it does not object to string arguments in capabilities it + doesn't already know. + +(cherry picked from commit 39d41d0810d4e8ae6ce8d27776dfbb96722d9319) +--- + configure.ac | 4 ++++ + tty-term.c | 48 +++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 43 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2b8b3b11..3c3c1873 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -344,6 +344,10 @@ else + AC_MSG_ERROR("curses not found") + fi + fi ++AC_CHECK_FUNCS([ \ ++ tiparm \ ++ tiparm_s \ ++]) + + # Look for utempter. + AC_ARG_ENABLE( +diff --git a/tty-term.c b/tty-term.c +index 32dd849a..18b17420 100644 +--- a/tty-term.c ++++ b/tty-term.c +@@ -764,7 +764,13 @@ tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a) + { + const char *x = tty_term_string(term, code), *s; + +- s = tparm((char *)x, a); ++#if defined(HAVE_TIPARM_S) ++ s = tiparm_s(1, 0, x, a); ++#elif defined(HAVE_TIPARM) ++ s = tiparm(x, a); ++#else ++ s = tparm((char *)x, a, 0, 0, 0, 0, 0, 0, 0, 0); ++#endif + if (s == NULL) + fatalx("could not expand %s", tty_term_codes[code].name); + return (s); +@@ -775,19 +781,31 @@ tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b) + { + const char *x = tty_term_string(term, code), *s; + +- s = tparm((char *)x, a, b); ++#if defined(HAVE_TIPARM_S) ++ s = tiparm_s(2, 0, x, a, b); ++#elif defined(HAVE_TIPARM) ++ s = tiparm(x, a, b); ++#else ++ s = tparm((char *)x, a, b, 0, 0, 0, 0, 0, 0, 0); ++#endif + if (s == NULL) + fatalx("could not expand %s", tty_term_codes[code].name); + return (s); + } + + const char * +-tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, int b, +- int c) ++tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, ++ int b, int c) + { + const char *x = tty_term_string(term, code), *s; + +- s = tparm((char *)x, a, b, c); ++#if defined(HAVE_TIPARM_S) ++ s = tiparm_s(3, 0, x, a, b, c); ++#elif defined(HAVE_TIPARM) ++ s = tiparm(x, a, b, c); ++#else ++ s = tparm((char *)x, a, b, c, 0, 0, 0, 0, 0, 0); ++#endif + if (s == NULL) + fatalx("could not expand %s", tty_term_codes[code].name); + return (s); +@@ -798,19 +816,31 @@ tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a) + { + const char *x = tty_term_string(term, code), *s; + +- s = tparm((char *)x, (long)a); ++#if defined(HAVE_TIPARM_S) ++ s = tiparm_s(1, 1, x, a); ++#elif defined(HAVE_TIPARM) ++ s = tiparm(x, a); ++#else ++ s = tparm((char *)x, (long)a, 0, 0, 0, 0, 0, 0, 0, 0); ++#endif + if (s == NULL) + fatalx("could not expand %s", tty_term_codes[code].name); + return (s); + } + + const char * +-tty_term_string_ss(struct tty_term *term, enum tty_code_code code, const char *a, +- const char *b) ++tty_term_string_ss(struct tty_term *term, enum tty_code_code code, ++ const char *a, const char *b) + { + const char *x = tty_term_string(term, code), *s; + +- s = tparm((char *)x, (long)a, (long)b); ++#if defined(HAVE_TIPARM_S) ++ s = tiparm_s(2, 3, x, a, b); ++#elif defined(HAVE_TIPARM) ++ s = tiparm(x, a, b); ++#else ++ s = tparm((char *)x, (long)a, b, 0, 0, 0, 0, 0, 0, 0); ++#endif + if (s == NULL) + fatalx("could not expand %s", tty_term_codes[code].name); + return (s); +-- +2.40.1 + + +From 732135ed357566d65749fde1967f5639026d9418 Mon Sep 17 00:00:00 2001 +From: nicm +Date: Fri, 28 Apr 2023 05:59:35 +0000 +Subject: [PATCH 3/3] Do not fatal if tparm fails, instead just log it (not + working sequences are better than exiting). + +(cherry picked from commit bf636d9575806134ca7efd917ee0d54e9330ae86) +--- + tty-term.c | 30 ++++++++++++++++++++---------- + 1 file changed, 20 insertions(+), 10 deletions(-) + +diff --git a/tty-term.c b/tty-term.c +index 18b17420..e489f610 100644 +--- a/tty-term.c ++++ b/tty-term.c +@@ -771,8 +771,10 @@ tty_term_string_i(struct tty_term *term, enum tty_code_code code, int a) + #else + s = tparm((char *)x, a, 0, 0, 0, 0, 0, 0, 0, 0); + #endif +- if (s == NULL) +- fatalx("could not expand %s", tty_term_codes[code].name); ++ if (s == NULL) { ++ log_debug("could not expand %s", tty_term_codes[code].name); ++ return (""); ++ } + return (s); + } + +@@ -788,8 +790,10 @@ tty_term_string_ii(struct tty_term *term, enum tty_code_code code, int a, int b) + #else + s = tparm((char *)x, a, b, 0, 0, 0, 0, 0, 0, 0); + #endif +- if (s == NULL) +- fatalx("could not expand %s", tty_term_codes[code].name); ++ if (s == NULL) { ++ log_debug("could not expand %s", tty_term_codes[code].name); ++ return (""); ++ } + return (s); + } + +@@ -806,8 +810,10 @@ tty_term_string_iii(struct tty_term *term, enum tty_code_code code, int a, + #else + s = tparm((char *)x, a, b, c, 0, 0, 0, 0, 0, 0); + #endif +- if (s == NULL) +- fatalx("could not expand %s", tty_term_codes[code].name); ++ if (s == NULL) { ++ log_debug("could not expand %s", tty_term_codes[code].name); ++ return (""); ++ } + return (s); + } + +@@ -823,8 +829,10 @@ tty_term_string_s(struct tty_term *term, enum tty_code_code code, const char *a) + #else + s = tparm((char *)x, (long)a, 0, 0, 0, 0, 0, 0, 0, 0); + #endif +- if (s == NULL) +- fatalx("could not expand %s", tty_term_codes[code].name); ++ if (s == NULL) { ++ log_debug("could not expand %s", tty_term_codes[code].name); ++ return (""); ++ } + return (s); + } + +@@ -841,8 +849,10 @@ tty_term_string_ss(struct tty_term *term, enum tty_code_code code, + #else + s = tparm((char *)x, (long)a, b, 0, 0, 0, 0, 0, 0, 0); + #endif +- if (s == NULL) +- fatalx("could not expand %s", tty_term_codes[code].name); ++ if (s == NULL) { ++ log_debug("could not expand %s", tty_term_codes[code].name); ++ return (""); ++ } + return (s); + } + +-- +2.40.1 + diff --git a/source/ap/tmux/tmux.SlackBuild b/source/ap/tmux/tmux.SlackBuild index a0d5a4767..0ea690da1 100755 --- a/source/ap/tmux/tmux.SlackBuild +++ b/source/ap/tmux/tmux.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tmux VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -88,6 +88,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix crash when copying text: +cat $CWD/0002-ncurses.patch | patch -p1 --verbose || exit 1 + if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh fi diff --git a/source/l/libarchive/libarchive.SlackBuild b/source/l/libarchive/libarchive.SlackBuild index d4bb66258..341389530 100755 --- a/source/l/libarchive/libarchive.SlackBuild +++ b/source/l/libarchive/libarchive.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2008 Heinz Wiesinger -# Copyright 2008, 2009, 2010, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2016, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libarchive VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -79,6 +79,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +if [ ! -r configure ]; then + if [ -x ./autogen.sh ]; then + NOCONFIGURE=1 ./autogen.sh + else + autoreconf -vif + fi +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/pipewire/193384b26aba3917d086ac3f009aa2cab9d197d2.patch b/source/l/pipewire/193384b26aba3917d086ac3f009aa2cab9d197d2.patch new file mode 100644 index 000000000..cff767889 --- /dev/null +++ b/source/l/pipewire/193384b26aba3917d086ac3f009aa2cab9d197d2.patch @@ -0,0 +1,26 @@ +From 193384b26aba3917d086ac3f009aa2cab9d197d2 Mon Sep 17 00:00:00 2001 +From: "Tom A. Wagner" +Date: Mon, 24 Jul 2023 12:48:33 +0200 +Subject: [PATCH] pipewire: add missing stdbool.h include to version.h.in + +The header file only works when included in a file where stdbool.h was already included otherwise. +--- + src/pipewire/version.h.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pipewire/version.h.in b/src/pipewire/version.h.in +index 87fc0cfad..94c645b3a 100644 +--- a/src/pipewire/version.h.in ++++ b/src/pipewire/version.h.in +@@ -11,6 +11,8 @@ + extern "C" { + #endif + ++#include ++ + /** Return the version of the header files. Keep in mind that this is + a macro and not a function, so it is impossible to get the pointer of + it. */ +-- +GitLab + diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild index 08762cdb5..5f60da985 100755 --- a/source/l/pipewire/pipewire.SlackBuild +++ b/source/l/pipewire/pipewire.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pipewire VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -92,6 +92,8 @@ find . \ # Add lua (with pipewire patches): ( cd subprojects ; tar xf $CWD/lua-5.4.4.tar.lz ) +cat $CWD/193384b26aba3917d086ac3f009aa2cab9d197d2.patch | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/n/network-scripts/manpages/netconfig.8 b/source/n/network-scripts/manpages/netconfig.8 new file mode 100644 index 000000000..70c10b806 --- /dev/null +++ b/source/n/network-scripts/manpages/netconfig.8 @@ -0,0 +1,104 @@ +'\" t +.\" Manual page created with latex2man on Fri Jul 21 22:36:08 2023 +.\" NOTE: This file is generated, DO NOT EDIT. +.de Vb +.ft CW +.nf +.. +.de Ve +.ft R + +.fi +.. +.TH "NETCONFIG" "8" "21 July 2023" "System Manager\&'s Manual " "System Manager\&'s Manual " +.SH NAME + +.PP +netconfig +presents dialog boxes that ask the system operator for facts +about this node\&'s network configuration, such as host name, domain, IP address +(or how to get it), router, and name server. It can optionally probe the node +for its network card. +.PP +.SH SYNOPSIS + +.PP +/sbin/netconfig +.PP +.SH DESCRIPTION + +.PP +The information requested from the operator includes: +.TP +.B * +hostname, +.TP +.B * +domain name, +.TP +.B * +VLAN, +.TP +.B * +configuration type (static, dynamic, etc.), +.TP +.B * +IPv4 and IPv6 addresses and router addresses, +.TP +.B * +name server, and +.TP +.B * +probe for network card (yes/no). +.PP +It summarizes the responses given and confirms with the operator before +configuring the node. +.PP +The files modified or overwritten, when applicable, are: +.TP +.B * +/etc/HOSTNAME +.TP +.B * +/etc/NetworkManager/NetworkManager.conf +.TP +.B * +/etc/rc.d/rc.inet1.conf +.TP +.B * +/etc/hosts +.TP +.B * +/etc/networks +.TP +.B * +/etc/resolv.conf +.TP +.B * +/etc/rc.netdevice +.PP +Plus, it enables /etc/rc.d/rc.networkmanager +to run during multiuser +startup, again when applicable. +.PP +The Slackware boot disk runs netconfig +as part of operating system setup, +and the system operator can re\-run netconfig +any time later. +.PP +Note that many of the changes made by netconfig +take effect only when +the system is next rebooted. +.PP +.SH OPTIONS + +.PP +netconfig +does not take arguments. +.PP +.SH AUTHOR + +.PP +Mostly written by Patrick Volkerding . +.PP +.\" NOTE: This file is generated, DO NOT EDIT. diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild index 71c0b7000..80927a11a 100755 --- a/source/n/network-scripts/network-scripts.SlackBuild +++ b/source/n/network-scripts/network-scripts.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2017, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2015, 2017, 2018, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=network-scripts -VERSION=${VERSION:-15.0} +VERSION=${VERSION:-15.1} ARCH=noarch -BUILD=${BUILD:-19} +BUILD=${BUILD:-1} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -68,6 +68,7 @@ chmod 755 $PKG/var/log/setup/setup.netconfig mkdir -p $PKG/usr/man/man{5,8} cat $CWD/manpages/rc.inet1.conf.5 | gzip -9c > $PKG/usr/man/man5/rc.inet1.conf.5.gz cat $CWD/manpages/rc.inet1.8 | gzip -9c > $PKG/usr/man/man8/rc.inet1.8.gz +cat $CWD/manpages/netconfig.8 | gzip -9c > $PKG/usr/man/man8/netconfig.8.gz # Add default module configs for bonding and ipv6 mkdir -p $PKG/lib/modprobe.d/