From 9e2efe650cfe5bf9113679ba90646e15e551b0e1 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 14 Apr 2022 21:14:21 +0000 Subject: Thu Apr 14 21:14:21 UTC 2022 patches/packages/git-2.35.3-x86_64-1_slack15.0.txz: Upgraded. This update fixes a security issue where a Git worktree created by another user might be able to execute arbitrary code. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24765 (* Security fix *) patches/packages/gzip-1.12-x86_64-1_slack15.0.txz: Upgraded. This update fixes a security issue: zgrep applied to a crafted file name with two or more newlines can no longer overwrite an arbitrary, attacker-selected file. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1271 (* Security fix *) patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz: Rebuilt. This update fixes a security issue: xzgrep applied to a crafted file name with two or more newlines can no longer overwrite an arbitrary, attacker-selected file. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1271 (* Security fix *) --- ChangeLog.rss | 34 +++- ChangeLog.txt | 22 +++ FILELIST.TXT | 181 +++++++++++--------- patches/packages/git-2.35.3-x86_64-1_slack15.0.txt | 11 ++ patches/packages/gzip-1.12-x86_64-1_slack15.0.txt | 11 ++ patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt | 11 ++ patches/source/git/git.SlackBuild | 185 +++++++++++++++++++++ patches/source/git/git.url | 1 + patches/source/git/slack-desc | 19 +++ patches/source/gzip/gzip.SlackBuild | 176 ++++++++++++++++++++ patches/source/gzip/slack-desc | 19 +++ patches/source/xz/slack-desc | 19 +++ patches/source/xz/xz.SlackBuild | 169 +++++++++++++++++++ patches/source/xz/xzgrep-ZDI-CAN-16587.patch | 94 +++++++++++ 14 files changed, 873 insertions(+), 79 deletions(-) create mode 100644 patches/packages/git-2.35.3-x86_64-1_slack15.0.txt create mode 100644 patches/packages/gzip-1.12-x86_64-1_slack15.0.txt create mode 100644 patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt create mode 100755 patches/source/git/git.SlackBuild create mode 100644 patches/source/git/git.url create mode 100644 patches/source/git/slack-desc create mode 100755 patches/source/gzip/gzip.SlackBuild create mode 100644 patches/source/gzip/slack-desc create mode 100644 patches/source/xz/slack-desc create mode 100755 patches/source/xz/xz.SlackBuild create mode 100644 patches/source/xz/xzgrep-ZDI-CAN-16587.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 34167ae53..bcf2c49e8 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,39 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 13 Apr 2022 20:51:01 GMT - Thu, 14 Apr 2022 11:29:51 GMT + Thu, 14 Apr 2022 21:14:21 GMT + Fri, 15 Apr 2022 11:29:41 GMT maintain_current_git.sh v 1.17 + + Thu, 14 Apr 2022 21:14:21 GMT + Thu, 14 Apr 2022 21:14:21 GMT + https://git.slackware.nl/current/tag/?h=20220414211421 + 20220414211421 + + +patches/packages/git-2.35.3-x86_64-1_slack15.0.txz: Upgraded. + This update fixes a security issue where a Git worktree created by another + user might be able to execute arbitrary code. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24765 + (* Security fix *) +patches/packages/gzip-1.12-x86_64-1_slack15.0.txz: Upgraded. + This update fixes a security issue: + zgrep applied to a crafted file name with two or more newlines can no + longer overwrite an arbitrary, attacker-selected file. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1271 + (* Security fix *) +patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz: Rebuilt. + This update fixes a security issue: + xzgrep applied to a crafted file name with two or more newlines can no + longer overwrite an arbitrary, attacker-selected file. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1271 + (* Security fix *) + ]]> + + Wed, 13 Apr 2022 20:51:01 GMT Wed, 13 Apr 2022 20:51:01 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 3d1bf656b..8e7e9d88d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,25 @@ +Thu Apr 14 21:14:21 UTC 2022 +patches/packages/git-2.35.3-x86_64-1_slack15.0.txz: Upgraded. + This update fixes a security issue where a Git worktree created by another + user might be able to execute arbitrary code. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24765 + (* Security fix *) +patches/packages/gzip-1.12-x86_64-1_slack15.0.txz: Upgraded. + This update fixes a security issue: + zgrep applied to a crafted file name with two or more newlines can no + longer overwrite an arbitrary, attacker-selected file. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1271 + (* Security fix *) +patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz: Rebuilt. + This update fixes a security issue: + xzgrep applied to a crafted file name with two or more newlines can no + longer overwrite an arbitrary, attacker-selected file. + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1271 + (* Security fix *) ++--------------------------+ Wed Apr 13 20:51:01 UTC 2022 patches/packages/ruby-3.0.4-x86_64-1_slack15.0.txz: Upgraded. This update fixes bugs and security issues: diff --git a/FILELIST.TXT b/FILELIST.TXT index 7e523c1f0..bc3adaf09 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Wed Apr 13 20:53:58 UTC 2022 +Thu Apr 14 21:19:43 UTC 2022 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 2022-04-13 20:51 . +drwxr-xr-x 12 root root 4096 2022-04-14 21:14 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1131566 2022-04-12 22:02 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-04-12 22:02 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1132044 2022-04-13 20:54 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-04-13 20:54 ./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 1887304 2022-04-13 20:51 ./ChangeLog.txt +-rw-r--r-- 1 root root 1888353 2022-04-14 21:14 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./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 1476901 2022-04-12 22:01 ./FILELIST.TXT +-rw-r--r-- 1 root root 1477553 2022-04-13 20:53 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY -rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT @@ -737,13 +737,13 @@ drwxr-xr-x 2 root root 4096 2008-05-07 05:21 ./pasture/source/php/pear -rwxr-xr-x 1 root root 9448 2018-05-16 22:38 ./pasture/source/php/php.SlackBuild -rw-r--r-- 1 root root 775 2017-07-07 19:25 ./pasture/source/php/php.ini-development.diff.gz -rw-r--r-- 1 root root 830 2005-12-09 05:18 ./pasture/source/php/slack-desc -drwxr-xr-x 4 root root 4096 2022-04-13 20:53 ./patches --rw-r--r-- 1 root root 29936 2022-04-13 20:53 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-04-13 20:53 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 40039 2022-04-13 20:53 ./patches/FILE_LIST --rw-r--r-- 1 root root 11152700 2022-04-13 20:53 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 21309 2022-04-13 20:53 ./patches/PACKAGES.TXT -drwxr-xr-x 3 root root 12288 2022-04-13 20:53 ./patches/packages +drwxr-xr-x 4 root root 4096 2022-04-14 21:19 ./patches +-rw-r--r-- 1 root root 31609 2022-04-14 21:19 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-04-14 21:19 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 42312 2022-04-14 21:19 ./patches/FILE_LIST +-rw-r--r-- 1 root root 11225398 2022-04-14 21:19 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 23023 2022-04-14 21:19 ./patches/PACKAGES.TXT +drwxr-xr-x 3 root root 12288 2022-04-14 21:19 ./patches/packages -rw-r--r-- 1 root root 327 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txt -rw-r--r-- 1 root root 10716 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz -rw-r--r-- 1 root root 163 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz.asc @@ -771,9 +771,15 @@ drwxr-xr-x 3 root root 12288 2022-04-13 20:53 ./patches/packages -rw-r--r-- 1 root root 602 2022-02-21 19:29 ./patches/packages/flac-1.3.4-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 389380 2022-02-21 19:29 ./patches/packages/flac-1.3.4-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-02-21 19:29 ./patches/packages/flac-1.3.4-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 397 2022-04-14 21:10 ./patches/packages/git-2.35.3-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 6657864 2022-04-14 21:10 ./patches/packages/git-2.35.3-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2022-04-14 21:10 ./patches/packages/git-2.35.3-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 503 2022-03-19 18:40 ./patches/packages/glibc-zoneinfo-2022a-noarch-1_slack15.0.txt -rw-r--r-- 1 root root 206288 2022-03-19 18:40 ./patches/packages/glibc-zoneinfo-2022a-noarch-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-03-19 18:40 ./patches/packages/glibc-zoneinfo-2022a-noarch-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 314 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 111208 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2022-04-14 21:04 ./patches/packages/gzip-1.12-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 513 2022-03-14 17:42 ./patches/packages/httpd-2.4.53-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 3882140 2022-03-14 17:42 ./patches/packages/httpd-2.4.53-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-03-14 17:42 ./patches/packages/httpd-2.4.53-x86_64-1_slack15.0.txz.asc @@ -847,10 +853,13 @@ drwxr-xr-x 2 root root 4096 2022-03-09 04:17 ./patches/packages/linux-5.15 -rw-r--r-- 1 root root 367 2022-04-12 19:47 ./patches/packages/whois-5.5.13-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 62016 2022-04-12 19:47 ./patches/packages/whois-5.5.13-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-04-12 19:47 ./patches/packages/whois-5.5.13-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 489 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt +-rw-r--r-- 1 root root 322660 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz +-rw-r--r-- 1 root root 163 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz.asc -rw-r--r-- 1 root root 388 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 105204 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txz.asc -drwxr-xr-x 30 root root 4096 2022-04-13 18:55 ./patches/source +drwxr-xr-x 33 root root 4096 2022-04-14 21:13 ./patches/source drwxr-xr-x 2 root root 4096 2022-01-16 05:07 ./patches/source/aaa_base -rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./patches/source/aaa_base/_aaa_base.tar.gz -rwxr-xr-x 1 root root 3894 2022-02-15 05:07 ./patches/source/aaa_base/aaa_base.SlackBuild @@ -929,6 +938,12 @@ drwxr-xr-x 2 root root 4096 2022-02-21 19:14 ./patches/source/flac -rw-r--r-- 1 root root 433 2014-11-29 12:34 ./patches/source/flac/flac.man.diff.gz -rw-r--r-- 1 root root 41 2019-08-05 18:53 ./patches/source/flac/flac.url -rw-r--r-- 1 root root 1054 2018-02-27 06:12 ./patches/source/flac/slack-desc +drwxr-xr-x 2 root root 4096 2022-04-14 19:39 ./patches/source/git +-rw-r--r-- 1 root root 566 2022-04-14 00:16 ./patches/source/git/git-2.35.3.tar.sign +-rw-r--r-- 1 root root 6876328 2022-04-14 00:16 ./patches/source/git/git-2.35.3.tar.xz +-rwxr-xr-x 1 root root 5491 2022-04-14 20:18 ./patches/source/git/git.SlackBuild +-rw-r--r-- 1 root root 45 2015-09-01 20:04 ./patches/source/git/git.url +-rw-r--r-- 1 root root 848 2018-02-27 06:13 ./patches/source/git/slack-desc drwxr-xr-x 3 root root 4096 2022-03-19 18:38 ./patches/source/glibc-zoneinfo -rw-r--r-- 1 root root 1221 2021-04-19 18:23 ./patches/source/glibc-zoneinfo/doinst.sh.gz -rwxr-xr-x 1 root root 5596 2022-03-19 18:39 ./patches/source/glibc-zoneinfo/glibc-zoneinfo.SlackBuild @@ -949,6 +964,11 @@ drwxr-xr-x 2 root root 4096 2006-12-03 23:10 ./patches/source/glibc-zonein -rw-r--r-- 1 root root 425833 2022-03-16 13:36 ./patches/source/glibc-zoneinfo/tzdata2022a.tar.gz -rw-r--r-- 1 root root 833 2022-03-16 13:36 ./patches/source/glibc-zoneinfo/tzdata2022a.tar.gz.asc -rw-r--r-- 1 root root 178 2020-10-12 18:03 ./patches/source/glibc-zoneinfo/zic.default.fat.diff.gz +drwxr-xr-x 2 root root 4096 2022-04-07 21:51 ./patches/source/gzip +-rw-r--r-- 1 root root 825548 2022-04-07 17:00 ./patches/source/gzip/gzip-1.12.tar.xz +-rw-r--r-- 1 root root 833 2022-04-07 17:00 ./patches/source/gzip/gzip-1.12.tar.xz.sig +-rwxr-xr-x 1 root root 5170 2022-04-14 20:41 ./patches/source/gzip/gzip.SlackBuild +-rw-r--r-- 1 root root 766 2018-02-27 06:13 ./patches/source/gzip/slack-desc drwxr-xr-x 2 root root 4096 2022-03-14 17:38 ./patches/source/httpd -rw-r--r-- 1 root root 931 2018-09-24 18:58 ./patches/source/httpd/doinst.sh.gz -rw-r--r-- 1 root root 7431942 2022-03-14 09:45 ./patches/source/httpd/httpd-2.4.53.tar.bz2 @@ -1161,6 +1181,13 @@ drwxr-xr-x 2 root root 4096 2022-04-12 19:47 ./patches/source/whois -rw-r--r-- 1 root root 87312 2022-04-07 23:09 ./patches/source/whois/whois-5.5.13.tar.xz -rwxr-xr-x 1 root root 2917 2022-03-28 19:06 ./patches/source/whois/whois.SlackBuild -rw-r--r-- 1 root root 33 2019-07-24 18:55 ./patches/source/whois/whois.url +drwxr-xr-x 2 root root 4096 2022-04-14 20:33 ./patches/source/xz +-rw-r--r-- 1 root root 939 2020-03-18 18:04 ./patches/source/xz/slack-desc +-rw-r--r-- 1 root root 1148824 2020-03-17 18:46 ./patches/source/xz/xz-5.2.5.tar.xz +-rw-r--r-- 1 root root 566 2020-03-17 18:27 ./patches/source/xz/xz-5.2.5.tar.xz.sig +-rwxr-xr-x 1 root root 5257 2022-04-14 20:38 ./patches/source/xz/xz.SlackBuild +-rw-r--r-- 1 root root 3488 2022-04-07 16:59 ./patches/source/xz/xzgrep-ZDI-CAN-16587.patch +-rw-r--r-- 1 root root 566 2022-04-07 16:59 ./patches/source/xz/xzgrep-ZDI-CAN-16587.patch.sig drwxr-xr-x 2 root root 4096 2022-03-28 19:00 ./patches/source/zlib -rw-r--r-- 1 root root 840 2018-02-27 06:12 ./patches/source/zlib/slack-desc -rw-r--r-- 1 root root 1288864 2022-03-27 23:39 ./patches/source/zlib/zlib-1.2.12.tar.xz @@ -2711,29 +2738,29 @@ drwxr-xr-x 2 root root 69632 2022-02-01 08:29 ./slackware64/kde -rw-r--r-- 1 root root 377 2022-01-06 22:56 ./slackware64/kde/kosmindoormap-21.12.1-x86_64-1.txt -rw-r--r-- 1 root root 387056 2022-01-06 22:56 ./slackware64/kde/kosmindoormap-21.12.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-06 22:56 ./slackware64/kde/kosmindoormap-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 261 2022-01-08 22:34 ./slackware64/kde/kpackage-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 190700 2022-01-08 22:34 ./slackware64/kde/kpackage-5.90.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-08 22:34 ./slackware64/kde/kpackage-5.90.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 276 2022-01-08 22:40 ./slackware64/kde/kparts-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 252140 2022-01-08 22:40 ./slackware64/kde/kparts-5.90.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-08 22:40 ./slackware64/kde/kparts-5.90.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 254 2022-01-06 22:27 ./slackware64/kde/kpat-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 3801704 2022-01-06 22:27 ./slackware64/kde/kpat-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:27 ./slackware64/kde/kpat-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 432 2022-01-08 22:43 ./slackware64/kde/kpeople-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 120296 2022-01-08 22:43 ./slackware64/kde/kpeople-5.90.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-08 22:43 ./slackware64/kde/kpeople-5.90.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 260 2021-09-30 18:57 ./slackware64/kde/kpeoplevcard-0.1-x86_64-4.txt --rw-r--r-- 1 root root 23900 2021-09-30 18:57 ./slackware64/kde/kpeoplevcard-0.1-x86_64-4.txz --rw-r--r-- 1 root root 163 2021-09-30 18:57 ./slackware64/kde/kpeoplevcard-0.1-x86_64-4.txz.asc --rw-r--r-- 1 root root 489 2022-01-06 21:37 ./slackware64/kde/kpimtextedit-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 358852 2022-01-06 21:37 ./slackware64/kde/kpimtextedit-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 21:37 ./slackware64/kde/kpimtextedit-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 193 2022-01-06 21:46 ./slackware64/kde/kpkpass-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 40648 2022-01-06 21:46 ./slackware64/kde/kpkpass-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 21:46 ./slackware64/kde/kpkpass-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 648 2022-01-08 22:25 ./slackware64/kde/kplotting-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 49316 2022-01-08 22:25 ./slackware64/kde/kplotting-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 261 2022-01-08 22:34 ./slackware64/kde/kpackage-5.90.0-x86_64-1.txt +-rw-r--r-- 1 root root 190700 2022-01-08 22:34 ./slackware64/kde/kpackage-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-08 22:34 ./slackware64/kde/kpackage-5.90.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 276 2022-01-08 22:40 ./slackware64/kde/kparts-5.90.0-x86_64-1.txt +-rw-r--r-- 1 root root 252140 2022-01-08 22:40 ./slackware64/kde/kparts-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-08 22:40 ./slackware64/kde/kparts-5.90.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 254 2022-01-06 22:27 ./slackware64/kde/kpat-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 3801704 2022-01-06 22:27 ./slackware64/kde/kpat-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:27 ./slackware64/kde/kpat-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 432 2022-01-08 22:43 ./slackware64/kde/kpeople-5.90.0-x86_64-1.txt +-rw-r--r-- 1 root root 120296 2022-01-08 22:43 ./slackware64/kde/kpeople-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-08 22:43 ./slackware64/kde/kpeople-5.90.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 260 2021-09-30 18:57 ./slackware64/kde/kpeoplevcard-0.1-x86_64-4.txt +-rw-r--r-- 1 root root 23900 2021-09-30 18:57 ./slackware64/kde/kpeoplevcard-0.1-x86_64-4.txz +-rw-r--r-- 1 root root 163 2021-09-30 18:57 ./slackware64/kde/kpeoplevcard-0.1-x86_64-4.txz.asc +-rw-r--r-- 1 root root 489 2022-01-06 21:37 ./slackware64/kde/kpimtextedit-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 358852 2022-01-06 21:37 ./slackware64/kde/kpimtextedit-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 21:37 ./slackware64/kde/kpimtextedit-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 193 2022-01-06 21:46 ./slackware64/kde/kpkpass-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 40648 2022-01-06 21:46 ./slackware64/kde/kpkpass-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 21:46 ./slackware64/kde/kpkpass-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 648 2022-01-08 22:25 ./slackware64/kde/kplotting-5.90.0-x86_64-1.txt +-rw-r--r-- 1 root root 49316 2022-01-08 22:25 ./slackware64/kde/kplotting-5.90.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-08 22:25 ./slackware64/kde/kplotting-5.90.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 328 2022-01-06 23:00 ./slackware64/kde/kpmcore-21.12.1-x86_64-1.txt -rw-r--r-- 1 root root 625348 2022-01-06 23:00 ./slackware64/kde/kpmcore-21.12.1-x86_64-1.txz @@ -5473,26 +5500,26 @@ drwxr-xr-x 2 root root 65536 2022-02-01 04:47 ./slackware64/x -rw-r--r-- 1 root root 163 2021-02-13 13:15 ./slackware64/x/xf86-input-joystick-1.6.3-x86_64-5.txz.asc -rw-r--r-- 1 root root 475 2021-02-13 13:15 ./slackware64/x/xf86-input-keyboard-1.9.0-x86_64-5.txt -rw-r--r-- 1 root root 25888 2021-02-13 13:15 ./slackware64/x/xf86-input-keyboard-1.9.0-x86_64-5.txz --rw-r--r-- 1 root root 163 2021-02-13 13:15 ./slackware64/x/xf86-input-keyboard-1.9.0-x86_64-5.txz.asc --rw-r--r-- 1 root root 468 2022-01-25 05:57 ./slackware64/x/xf86-input-libinput-1.2.1-x86_64-1.txt --rw-r--r-- 1 root root 52092 2022-01-25 05:57 ./slackware64/x/xf86-input-libinput-1.2.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-25 05:57 ./slackware64/x/xf86-input-libinput-1.2.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 428 2021-02-13 13:15 ./slackware64/x/xf86-input-mouse-1.9.3-x86_64-3.txt --rw-r--r-- 1 root root 49536 2021-02-13 13:15 ./slackware64/x/xf86-input-mouse-1.9.3-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:15 ./slackware64/x/xf86-input-mouse-1.9.3-x86_64-3.txz.asc --rw-r--r-- 1 root root 485 2021-02-13 13:16 ./slackware64/x/xf86-input-penmount-1.5.0-x86_64-14.txt --rw-r--r-- 1 root root 18280 2021-02-13 13:16 ./slackware64/x/xf86-input-penmount-1.5.0-x86_64-14.txz --rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-penmount-1.5.0-x86_64-14.txz.asc --rw-r--r-- 1 root root 490 2021-02-13 13:16 ./slackware64/x/xf86-input-synaptics-1.9.1-x86_64-3.txt --rw-r--r-- 1 root root 71216 2021-02-13 13:16 ./slackware64/x/xf86-input-synaptics-1.9.1-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-synaptics-1.9.1-x86_64-3.txz.asc --rw-r--r-- 1 root root 476 2021-02-13 13:16 ./slackware64/x/xf86-input-vmmouse-13.1.0-x86_64-9.txt --rw-r--r-- 1 root root 27400 2021-02-13 13:16 ./slackware64/x/xf86-input-vmmouse-13.1.0-x86_64-9.txz --rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-vmmouse-13.1.0-x86_64-9.txz.asc --rw-r--r-- 1 root root 423 2021-02-13 13:16 ./slackware64/x/xf86-input-void-1.4.1-x86_64-3.txt --rw-r--r-- 1 root root 18200 2021-02-13 13:16 ./slackware64/x/xf86-input-void-1.4.1-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-void-1.4.1-x86_64-3.txz.asc --rw-r--r-- 1 root root 376 2021-02-13 13:16 ./slackware64/x/xf86-input-wacom-0.40.0-x86_64-2.txt +-rw-r--r-- 1 root root 163 2021-02-13 13:15 ./slackware64/x/xf86-input-keyboard-1.9.0-x86_64-5.txz.asc +-rw-r--r-- 1 root root 468 2022-01-25 05:57 ./slackware64/x/xf86-input-libinput-1.2.1-x86_64-1.txt +-rw-r--r-- 1 root root 52092 2022-01-25 05:57 ./slackware64/x/xf86-input-libinput-1.2.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-25 05:57 ./slackware64/x/xf86-input-libinput-1.2.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 428 2021-02-13 13:15 ./slackware64/x/xf86-input-mouse-1.9.3-x86_64-3.txt +-rw-r--r-- 1 root root 49536 2021-02-13 13:15 ./slackware64/x/xf86-input-mouse-1.9.3-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:15 ./slackware64/x/xf86-input-mouse-1.9.3-x86_64-3.txz.asc +-rw-r--r-- 1 root root 485 2021-02-13 13:16 ./slackware64/x/xf86-input-penmount-1.5.0-x86_64-14.txt +-rw-r--r-- 1 root root 18280 2021-02-13 13:16 ./slackware64/x/xf86-input-penmount-1.5.0-x86_64-14.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-penmount-1.5.0-x86_64-14.txz.asc +-rw-r--r-- 1 root root 490 2021-02-13 13:16 ./slackware64/x/xf86-input-synaptics-1.9.1-x86_64-3.txt +-rw-r--r-- 1 root root 71216 2021-02-13 13:16 ./slackware64/x/xf86-input-synaptics-1.9.1-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-synaptics-1.9.1-x86_64-3.txz.asc +-rw-r--r-- 1 root root 476 2021-02-13 13:16 ./slackware64/x/xf86-input-vmmouse-13.1.0-x86_64-9.txt +-rw-r--r-- 1 root root 27400 2021-02-13 13:16 ./slackware64/x/xf86-input-vmmouse-13.1.0-x86_64-9.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-vmmouse-13.1.0-x86_64-9.txz.asc +-rw-r--r-- 1 root root 423 2021-02-13 13:16 ./slackware64/x/xf86-input-void-1.4.1-x86_64-3.txt +-rw-r--r-- 1 root root 18200 2021-02-13 13:16 ./slackware64/x/xf86-input-void-1.4.1-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-void-1.4.1-x86_64-3.txz.asc +-rw-r--r-- 1 root root 376 2021-02-13 13:16 ./slackware64/x/xf86-input-wacom-0.40.0-x86_64-2.txt -rw-r--r-- 1 root root 105080 2021-02-13 13:16 ./slackware64/x/xf86-input-wacom-0.40.0-x86_64-2.txz -rw-r--r-- 1 root root 163 2021-02-13 13:16 ./slackware64/x/xf86-input-wacom-0.40.0-x86_64-2.txz.asc -rw-r--r-- 1 root root 452 2021-07-30 18:12 ./slackware64/x/xf86-video-amdgpu-21.0.0-x86_64-1.txt @@ -15127,26 +15154,26 @@ drwxr-xr-x 2 root root 4096 2021-06-25 03:12 ./source/xap/mozilla-firefox -rwxr-xr-x 1 root root 1926 2021-06-25 03:12 ./source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.build -rw-r--r-- 1 root root 35 2021-06-25 03:11 ./source/xap/mozilla-firefox/build-deps/cbindgen/cbindgen.url drwxr-xr-x 2 root root 4096 2021-10-12 20:15 ./source/xap/mozilla-firefox/build-deps/nodejs --rw-r--r-- 1 root root 33429880 2021-10-12 03:58 ./source/xap/mozilla-firefox/build-deps/nodejs/node-v16.11.1.tar.xz --rwxr-xr-x 1 root root 3005 2021-08-13 18:37 ./source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build --rw-r--r-- 1 root root 86 2019-07-08 21:02 ./source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url --rw-r--r-- 1 root root 609 2021-12-13 19:25 ./source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch.gz --rwxr-xr-x 1 root root 840 2018-03-13 12:55 ./source/xap/mozilla-firefox/fetch-and-repack.sh --rw-r--r-- 1 root root 330 2019-07-08 18:41 ./source/xap/mozilla-firefox/ff.ui.scrollToClick.diff.gz --rw-r--r-- 1 root root 388976720 2022-01-27 00:30 ./source/xap/mozilla-firefox/firefox-91.5.1esr.source.tar.xz --rw-r--r-- 1 root root 833 2022-01-27 00:30 ./source/xap/mozilla-firefox/firefox-91.5.1esr.source.tar.xz.asc --rw-r--r-- 1 root root 327 2008-06-17 17:19 ./source/xap/mozilla-firefox/firefox.moz_plugin_path.diff.gz --rw-r--r-- 1 root root 518 2021-03-15 17:43 ./source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff.gz --rw-r--r-- 1 root root 462 2009-07-01 06:05 ./source/xap/mozilla-firefox/mimeTypes.rdf.gz --rw-r--r-- 1 root root 680 2009-07-01 13:28 ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff.gz --rwxr-xr-x 1 root root 16186 2021-12-13 19:38 ./source/xap/mozilla-firefox/mozilla-firefox.SlackBuild --rw-r--r-- 1 root root 2748 2017-12-04 21:30 ./source/xap/mozilla-firefox/mozilla-firefox.desktop --rw-r--r-- 1 root root 1033 2020-07-07 18:08 ./source/xap/mozilla-firefox/slack-desc -drwxr-xr-x 4 root root 4096 2022-01-24 23:29 ./source/xap/mozilla-thunderbird -drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./source/xap/mozilla-thunderbird/autoconf --rw-r--r-- 1 root root 5869 2016-07-03 18:04 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz --rw-r--r-- 1 root root 300116 1999-01-15 21:03 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13.tar.xz --rwxr-xr-x 1 root root 2632 2016-07-03 18:50 ./source/xap/mozilla-thunderbird/autoconf/autoconf.build +-rw-r--r-- 1 root root 33429880 2021-10-12 03:58 ./source/xap/mozilla-firefox/build-deps/nodejs/node-v16.11.1.tar.xz +-rwxr-xr-x 1 root root 3005 2021-08-13 18:37 ./source/xap/mozilla-firefox/build-deps/nodejs/nodejs.build +-rw-r--r-- 1 root root 86 2019-07-08 21:02 ./source/xap/mozilla-firefox/build-deps/nodejs/nodejs.url +-rw-r--r-- 1 root root 609 2021-12-13 19:25 ./source/xap/mozilla-firefox/d30c921928a12fccd5085888011f899ff1c788cd.patch.gz +-rwxr-xr-x 1 root root 840 2018-03-13 12:55 ./source/xap/mozilla-firefox/fetch-and-repack.sh +-rw-r--r-- 1 root root 330 2019-07-08 18:41 ./source/xap/mozilla-firefox/ff.ui.scrollToClick.diff.gz +-rw-r--r-- 1 root root 388976720 2022-01-27 00:30 ./source/xap/mozilla-firefox/firefox-91.5.1esr.source.tar.xz +-rw-r--r-- 1 root root 833 2022-01-27 00:30 ./source/xap/mozilla-firefox/firefox-91.5.1esr.source.tar.xz.asc +-rw-r--r-- 1 root root 327 2008-06-17 17:19 ./source/xap/mozilla-firefox/firefox.moz_plugin_path.diff.gz +-rw-r--r-- 1 root root 518 2021-03-15 17:43 ./source/xap/mozilla-firefox/gkrust.a.no.networking.check.diff.gz +-rw-r--r-- 1 root root 462 2009-07-01 06:05 ./source/xap/mozilla-firefox/mimeTypes.rdf.gz +-rw-r--r-- 1 root root 680 2009-07-01 13:28 ./source/xap/mozilla-firefox/mozilla-firefox-mimeTypes-fix.diff.gz +-rwxr-xr-x 1 root root 16186 2021-12-13 19:38 ./source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +-rw-r--r-- 1 root root 2748 2017-12-04 21:30 ./source/xap/mozilla-firefox/mozilla-firefox.desktop +-rw-r--r-- 1 root root 1033 2020-07-07 18:08 ./source/xap/mozilla-firefox/slack-desc +drwxr-xr-x 4 root root 4096 2022-01-24 23:29 ./source/xap/mozilla-thunderbird +drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./source/xap/mozilla-thunderbird/autoconf +-rw-r--r-- 1 root root 5869 2016-07-03 18:04 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz +-rw-r--r-- 1 root root 300116 1999-01-15 21:03 ./source/xap/mozilla-thunderbird/autoconf/autoconf-2.13.tar.xz +-rwxr-xr-x 1 root root 2632 2016-07-03 18:50 ./source/xap/mozilla-thunderbird/autoconf/autoconf.build drwxr-xr-x 5 root root 4096 2021-08-13 18:35 ./source/xap/mozilla-thunderbird/build-deps -rwxr-xr-x 1 root root 1939 2019-08-27 19:18 ./source/xap/mozilla-thunderbird/build-deps.sh drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./source/xap/mozilla-thunderbird/build-deps/autoconf diff --git a/patches/packages/git-2.35.3-x86_64-1_slack15.0.txt b/patches/packages/git-2.35.3-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..059a95baf --- /dev/null +++ b/patches/packages/git-2.35.3-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +git: git (the stupid content tracker) +git: +git: Git is a fast, scalable, distributed revision control system with an +git: unusually rich command set that provides both high-level operations +git: and full access to internals. +git: +git: "git" can mean anything, depending on your mood. +git: +git: Git was originally written by Linus Torvalds and is currently +git: maintained by Junio C. Hamano. +git: diff --git a/patches/packages/gzip-1.12-x86_64-1_slack15.0.txt b/patches/packages/gzip-1.12-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..39d94caf0 --- /dev/null +++ b/patches/packages/gzip-1.12-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +gzip: gzip (file compression utility) +gzip: +gzip: Gzip reduces the size of the named files using Lempel-Ziv coding +gzip: (LZ77). Whenever possible, each file is replaced by one with the +gzip: extension .gz, while keeping the same ownership modes, access and +gzip: modification times. +gzip: +gzip: +gzip: +gzip: +gzip: diff --git a/patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt b/patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt new file mode 100644 index 000000000..e99c0a2fa --- /dev/null +++ b/patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt @@ -0,0 +1,11 @@ +xz: xz (compression utility based on the LZMA algorithm) +xz: +xz: LZMA is a general purpose compression algorithm designed by Igor +xz: Pavlov as part of 7-Zip. It provides high compression ratio while +xz: keeping the decompression speed fast. XZ Utils are an attempt to make +xz: LZMA compression easy to use on free (as in freedom) operating +xz: systems. +xz: +xz: The people most responsible for xz are Igor Pavlov, Ville Koskinen, +xz: and Lasse Collin. Homepage: http://tukaani.org/xz/ +xz: diff --git a/patches/source/git/git.SlackBuild b/patches/source/git/git.SlackBuild new file mode 100755 index 000000000..5ed4b0c6c --- /dev/null +++ b/patches/source/git/git.SlackBuild @@ -0,0 +1,185 @@ +#!/bin/bash + +# Copyright 2008, 2009, 2010, 2011, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=git +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1_slack15.0} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# 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 +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +eval $(perl '-V:installvendorlib') +PERLDIR=$installvendorlib/$ARCH-linux-thread-multi/auto + +if ls /var/log/packages/git-* 1> /dev/null 2> /dev/null ; then + echo "The git package needs to be removed before building to ensure that" + echo "the perl modules are included in the new package." + echo + echo "Removing the git package in 15 seconds, and then continuing with the build." + sleep 15 + removepkg git +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-git + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf git-$VERSION +tar xvf $CWD/git-$VERSION.tar.?z* || exit 1 +cd git-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +mkdir -p $PKG/usr/doc/git-$VERSION +cp -a \ + COPYING* INSTALL README \ + Documentation \ + contrib \ + $PKG/usr/doc/git-$VERSION +( cd $PKG/usr/doc/git-$VERSION/Documentation ; rm *.1 *.3 *.7 ) +( cd $PKG/usr/doc/git-$VERSION && find . -name ".git*" -exec rm -r "{}" \+ ) + +mkdir -p $PKG/usr/share/bash-completion/completions +ln -s /usr/doc/git-$VERSION/contrib/completion/git-completion.bash \ + $PKG/usr/share/bash-completion/completions/git + +make $NUMJOBS \ + prefix=/usr \ + mandir=/usr/man \ + CFLAGS="$SLKCFLAGS" \ + INSTALLDIRS=vendor \ + ASCIIDOC8=YesPlease \ + USE_LIBPCRE2=YesPlease \ + all doc || exit 1 + +make \ + prefix=/usr \ + mandir=/usr/man \ + "CFLAGS=$SLKCFLAGS" \ + INSTALLDIRS=vendor \ + ASCIIDOC8=YesPlease \ + USE_LIBPCRE2=YesPlease \ + install \ + install-doc \ + DESTDIR=$PKG || exit 1 + +mv $PKG/usr/share/man/man3 $PKG/usr/man +rmdir $PKG/usr/share/man + +# Don't stomp on perl's file: +rm -f $PKG/usr/lib*/perl5/perllocal.pod + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.* + ) + done + ) +fi + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Since Stuart Winter hates hard links. ;-) +# +# Switch a hard link with a soft link: +( cd $PKG/usr/bin + find . -links +1 -not -name git | while read gitfile ; do + if [ git -ef $gitfile ]; then + rm -vf $gitfile + ln -vfs git $gitfile + fi + done +) + +# This removes our DESTDIR from the packlist filenames, to keep perl's +# internal inventories consistent and correct. +find $PKG -name .packlist | while read plist ; do + sed -e "s%/share/man%/man%g" \ + -e "s%$PKG%%g" \ + -e "s%\.1$%\.1\.gz%g" \ + -e "s%\.2$%\.2\.gz%g" \ + -e "s%\.3$%\.3\.gz%g" \ + -e "s%\.3pm$%\.3pm\.gz%g" \ + -e "s%\.4$%\.4\.gz%g" \ + -e "s%\.5$%\.5\.gz%g" \ + -e "s%\.6$%\.6\.gz%g" \ + -e "s%\.7$%\.7\.gz%g" \ + -e "s%\.8$%\.8\.gz%g" \ + ${plist} > ${plist}.new + mv -f ${plist}.new ${plist} +done + +# This is junk: +eval $(perl '-V:privlib') +( cd $PKG$(dirname $privlib) && rm -rf 5.* ) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/git-$VERSION-$ARCH-$BUILD.txz + diff --git a/patches/source/git/git.url b/patches/source/git/git.url new file mode 100644 index 000000000..a4c15db38 --- /dev/null +++ b/patches/source/git/git.url @@ -0,0 +1 @@ +https://www.kernel.org/pub/software/scm/git/ diff --git a/patches/source/git/slack-desc b/patches/source/git/slack-desc new file mode 100644 index 000000000..0e68a383f --- /dev/null +++ b/patches/source/git/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +git: git (the stupid content tracker) +git: +git: Git is a fast, scalable, distributed revision control system with an +git: unusually rich command set that provides both high-level operations +git: and full access to internals. +git: +git: "git" can mean anything, depending on your mood. +git: +git: Git was originally written by Linus Torvalds and is currently +git: maintained by Junio C. Hamano. +git: diff --git a/patches/source/gzip/gzip.SlackBuild b/patches/source/gzip/gzip.SlackBuild new file mode 100755 index 000000000..275134a38 --- /dev/null +++ b/patches/source/gzip/gzip.SlackBuild @@ -0,0 +1,176 @@ +#!/bin/bash + +# Copyright 2006-2018 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=gzip +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1_slack15.0} + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# 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 +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" +fi + +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 +cd ${PKGNAM}-$VERSION + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --bindir=/bin \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --build=$ARCH-slackware-linux + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# The ncompress package already has this: +rm -f $PKG/bin/uncompress + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null +) + +# Fix locations: +#( cd $PKG + #mkdir bin + #mv usr/bin/gzip bin + #( cd bin ; rm -rf gunzip ) + #( cd bin ; ln -sf gzip gunzip ) + #( cd bin ; rm -rf zcat ) + #( cd bin ; ln -sf gzip zcat ) + #( cd usr/bin ; rm -rf gzip ) + #( cd usr/bin ; ln -sf ../../bin/gzip gzip ) + #( cd usr/bin ; rm -rf gunzip ) + #( cd usr/bin ; ln -sf ../../bin/gunzip gunzip ) + #( cd usr/bin ; rm -rf zcat ) + #( cd usr/bin ; ln -sf ../../bin/zcat zcat ) + #( cd usr/bin ; rm -rf zcmp ) + #( cd usr/bin ; ln -sf zdiff zcmp ) + #( cd usr/bin ; rm -rf zegrep ) + #( cd usr/bin ; ln -sf zgrep zegrep ) + #( cd usr/bin ; rm -rf zfgrep ) + #( cd usr/bin ; ln -sf zgrep zfgrep ) +#) + +mkdir -p $PKG/usr/bin +( cd $PKG/bin + for file in * ; do + ( cd $PKG/usr/bin ; ln -sf ../../bin/$file . ) + done +) + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING* NEWS README* THANKS TODO \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $TMP/package-${PKGNAM} +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz + diff --git a/patches/source/gzip/slack-desc b/patches/source/gzip/slack-desc new file mode 100644 index 000000000..38129ab6b --- /dev/null +++ b/patches/source/gzip/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +gzip: gzip (file compression utility) +gzip: +gzip: Gzip reduces the size of the named files using Lempel-Ziv coding +gzip: (LZ77). Whenever possible, each file is replaced by one with the +gzip: extension .gz, while keeping the same ownership modes, access and +gzip: modification times. +gzip: +gzip: +gzip: +gzip: +gzip: diff --git a/patches/source/xz/slack-desc b/patches/source/xz/slack-desc new file mode 100644 index 000000000..30a6bb342 --- /dev/null +++ b/patches/source/xz/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xz: xz (compression utility based on the LZMA algorithm) +xz: +xz: LZMA is a general purpose compression algorithm designed by Igor +xz: Pavlov as part of 7-Zip. It provides high compression ratio while +xz: keeping the decompression speed fast. XZ Utils are an attempt to make +xz: LZMA compression easy to use on free (as in freedom) operating +xz: systems. +xz: +xz: The people most responsible for xz are Igor Pavlov, Ville Koskinen, +xz: and Lasse Collin. Homepage: http://tukaani.org/xz/ +xz: diff --git a/patches/source/xz/xz.SlackBuild b/patches/source/xz/xz.SlackBuild new file mode 100755 index 000000000..66e70e3ea --- /dev/null +++ b/patches/source/xz/xz.SlackBuild @@ -0,0 +1,169 @@ +#!/bin/bash + +# Copyright 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=xz +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-4_slack15.0} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# 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 +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +case "$ARCH" in + i586) SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" + ;; + s390) SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ;; + powerpc) SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ;; + x86_64) SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + ;; + athlon-xp) SLKCFLAGS="-march=athlon-xp -O3 -pipe -fomit-frame-pointer" + LIBDIRSUFFIX="" + ;; + arm) SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" + LIBDIRSUFFIX="" + ;; + armel) SLKCFLAGS="-O2 -march=armv4t" + LIBDIRSUFFIX="" + ;; + *) SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ;; +esac + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +cat $CWD/xzgrep-ZDI-CAN-16587.patch | patch -p1 --verbose || exit 1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --docdir=/usr/doc/xz-$VERSION \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --enable-shared \ + --disable-static \ + --disable-rpath \ + --program-prefix= \ + --program-suffix= \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make DESTDIR=$PKG install || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# It might be advisable to have the libraries in /lib${LIBDIRSUFFIX}: +mkdir -p $PKG/lib${LIBDIRSUFFIX} +mv $PKG/usr/lib${LIBDIRSUFFIX}/liblzma.so.* $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + rm -f liblzma.so + ln -sf ../../lib${LIBDIRSUFFIX}/liblzma.so.? liblzma.so +) + +# At least the xz binary should also be in /bin: +mkdir -p $PKG/bin +mv $PKG/usr/bin/xz $PKG/bin +( cd $PKG/usr/bin + ln -sf ../../bin/xz . +) + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + ABOUT-NLS AUTHORS COPYING* INSTALL* NEWS PACKAGERS README* THANKS \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/patches/source/xz/xzgrep-ZDI-CAN-16587.patch b/patches/source/xz/xzgrep-ZDI-CAN-16587.patch new file mode 100644 index 000000000..406ded590 --- /dev/null +++ b/patches/source/xz/xzgrep-ZDI-CAN-16587.patch @@ -0,0 +1,94 @@ +From 69d1b3fc29677af8ade8dc15dba83f0589cb63d6 Mon Sep 17 00:00:00 2001 +From: Lasse Collin +Date: Tue, 29 Mar 2022 19:19:12 +0300 +Subject: [PATCH] xzgrep: Fix escaping of malicious filenames (ZDI-CAN-16587). + +Malicious filenames can make xzgrep to write to arbitrary files +or (with a GNU sed extension) lead to arbitrary code execution. + +xzgrep from XZ Utils versions up to and including 5.2.5 are +affected. 5.3.1alpha and 5.3.2alpha are affected as well. +This patch works for all of them. + +This bug was inherited from gzip's zgrep. gzip 1.12 includes +a fix for zgrep. + +The issue with the old sed script is that with multiple newlines, +the N-command will read the second line of input, then the +s-commands will be skipped because it's not the end of the +file yet, then a new sed cycle starts and the pattern space +is printed and emptied. So only the last line or two get escaped. + +One way to fix this would be to read all lines into the pattern +space first. However, the included fix is even simpler: All lines +except the last line get a backslash appended at the end. To ensure +that shell command substitution doesn't eat a possible trailing +newline, a colon is appended to the filename before escaping. +The colon is later used to separate the filename from the grep +output so it is fine to add it here instead of a few lines later. + +The old code also wasn't POSIX compliant as it used \n in the +replacement section of the s-command. Using \ is the +POSIX compatible method. + +LC_ALL=C was added to the two critical sed commands. POSIX sed +manual recommends it when using sed to manipulate pathnames +because in other locales invalid multibyte sequences might +cause issues with some sed implementations. In case of GNU sed, +these particular sed scripts wouldn't have such problems but some +other scripts could have, see: + + info '(sed)Locale Considerations' + +This vulnerability was discovered by: +cleemy desu wayo working with Trend Micro Zero Day Initiative + +Thanks to Jim Meyering and Paul Eggert discussing the different +ways to fix this and for coordinating the patch release schedule +with gzip. +--- + src/scripts/xzgrep.in | 20 ++++++++++++-------- + 1 file changed, 12 insertions(+), 8 deletions(-) + +diff --git a/src/scripts/xzgrep.in b/src/scripts/xzgrep.in +index b180936..e5186ba 100644 +--- a/src/scripts/xzgrep.in ++++ b/src/scripts/xzgrep.in +@@ -180,22 +180,26 @@ for i; do + { test $# -eq 1 || test $no_filename -eq 1; }; then + eval "$grep" + else ++ # Append a colon so that the last character will never be a newline ++ # which would otherwise get lost in shell command substitution. ++ i="$i:" ++ ++ # Escape & \ | and newlines only if such characters are present ++ # (speed optimization). + case $i in + (*' + '* | *'&'* | *'\'* | *'|'*) +- i=$(printf '%s\n' "$i" | +- sed ' +- $!N +- $s/[&\|]/\\&/g +- $s/\n/\\n/g +- ');; ++ i=$(printf '%s\n' "$i" | LC_ALL=C sed 's/[&\|]/\\&/g; $!s/$/\\/');; + esac +- sed_script="s|^|$i:|" ++ ++ # $i already ends with a colon so don't add it here. ++ sed_script="s|^|$i|" + + # Fail if grep or sed fails. + r=$( + exec 4>&1 +- (eval "$grep" 4>&-; echo $? >&4) 3>&- | sed "$sed_script" >&3 4>&- ++ (eval "$grep" 4>&-; echo $? >&4) 3>&- | ++ LC_ALL=C sed "$sed_script" >&3 4>&- + ) || r=2 + exit $r + fi >&3 5>&- +-- +2.35.1 + -- cgit v1.2.3