diff options
| -rw-r--r-- | ChangeLog.rss | 21 | ||||
| -rw-r--r-- | ChangeLog.txt | 9 | ||||
| -rw-r--r-- | FILELIST.TXT | 147 | ||||
| -rwxr-xr-x | source/d/rust-bindgen/fetch-sources.sh | 2 | ||||
| -rwxr-xr-x | source/l/exiv2/exiv2.SlackBuild | 14 | ||||
| -rwxr-xr-x | source/l/exiv2/paredown.sh | 30 | ||||
| -rw-r--r-- | source/l/exiv2/patches/16c1cd7d.patch | 98 | ||||
| -rw-r--r-- | source/l/exiv2/patches/3664f5b8.patch | 275 | ||||
| -rw-r--r-- | source/l/exiv2/patches/b4f435a4.patch | 23 | ||||
| -rw-r--r-- | source/l/exiv2/patches/f47e7bd6.patch | 25 | ||||
| -rwxr-xr-x | source/xap/gimp/gimp.SlackBuild | 2 |
11 files changed, 120 insertions, 526 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index 8a7e35787..3600469ca 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,27 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Sat, 4 Nov 2023 17:56:53 GMT</pubDate> - <lastBuildDate>Sat, 4 Nov 2023 18:37:34 GMT</lastBuildDate> + <pubDate>Mon, 6 Nov 2023 20:15:40 GMT</pubDate> + <lastBuildDate>Mon, 6 Nov 2023 20:58:10 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.17</generator> <item> + <title>Mon, 6 Nov 2023 20:15:40 GMT</title> + <pubDate>Mon, 6 Nov 2023 20:15:40 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20231106201540</link> + <guid isPermaLink="false">20231106201540</guid> + <description> + <![CDATA[<pre> +a/btrfs-progs-6.6.1-x86_64-1.txz: Upgraded. +d/mercurial-6.5.3-x86_64-1.txz: Upgraded. +d/rust-bindgen-0.69.1-x86_64-1.txz: Upgraded. +l/exiv2-0.28.1-x86_64-1.txz: Upgraded. +l/jasper-4.0.1-x86_64-1.txz: Upgraded. +x/fcitx5-5.1.4-x86_64-1.txz: Upgraded. +xap/gimp-2.10.36-x86_64-1.txz: Upgraded. + </pre>]]> + </description> + </item> + <item> <title>Sat, 4 Nov 2023 17:56:53 GMT</title> <pubDate>Sat, 4 Nov 2023 17:56:53 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20231104175653</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 8e3f1649c..882655b0f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ +Mon Nov 6 20:15:40 UTC 2023 +a/btrfs-progs-6.6.1-x86_64-1.txz: Upgraded. +d/mercurial-6.5.3-x86_64-1.txz: Upgraded. +d/rust-bindgen-0.69.1-x86_64-1.txz: Upgraded. +l/exiv2-0.28.1-x86_64-1.txz: Upgraded. +l/jasper-4.0.1-x86_64-1.txz: Upgraded. +x/fcitx5-5.1.4-x86_64-1.txz: Upgraded. +xap/gimp-2.10.36-x86_64-1.txz: Upgraded. ++--------------------------+ Sat Nov 4 17:56:53 UTC 2023 l/sof-firmware-2023.09.1-noarch-1.txz: Upgraded. n/iproute2-6.6.0-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 41ff6c110..67fad0fda 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Sat Nov 4 18:00:06 UTC 2023 +Mon Nov 6 20:19:00 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-11-04 17:56 . +drwxr-xr-x 12 root root 4096 2023-11-06 20:15 . -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 1122017 2023-11-03 23:51 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-11-03 23:51 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1122025 2023-11-04 18:00 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-11-04 18:00 ./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 842271 2023-11-04 17:56 ./ChangeLog.txt +-rw-r--r-- 1 root root 842626 2023-11-06 20:15 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2023-11-02 20:32 ./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-11-02 20:32 ./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 1464603 2023-11-03 23:50 ./FILELIST.TXT +-rw-r--r-- 1 root root 1464611 2023-11-04 18:00 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 885835 2023-11-04 17:59 ./PACKAGES.TXT +-rw-r--r-- 1 root root 885837 2023-11-06 20:18 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3629 2023-11-02 20:19 ./README.initrd -rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT @@ -666,13 +666,13 @@ 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-11-04 17:59 ./slackware64 --rw-r--r-- 1 root root 344943 2023-11-04 17:59 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-11-04 17:59 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 427527 2023-11-04 17:58 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4348922 2023-11-04 17:59 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2023-11-06 20:18 ./slackware64 +-rw-r--r-- 1 root root 344949 2023-11-06 20:18 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-11-06 20:18 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 427531 2023-11-06 20:17 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4350221 2023-11-06 20:17 ./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-11-03 23:49 ./slackware64/a +drwxr-xr-x 2 root root 32768 2023-11-06 20:17 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt -rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc @@ -700,9 +700,9 @@ drwxr-xr-x 2 root root 32768 2023-11-03 23:49 ./slackware64/a -rw-r--r-- 1 root root 226 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txt -rw-r--r-- 1 root root 39244 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txz -rw-r--r-- 1 root root 163 2021-02-13 10:55 ./slackware64/a/bin-11.1-x86_64-5.txz.asc --rw-r--r-- 1 root root 482 2023-11-03 23:45 ./slackware64/a/btrfs-progs-6.6-x86_64-1.txt --rw-r--r-- 1 root root 965212 2023-11-03 23:45 ./slackware64/a/btrfs-progs-6.6-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-11-03 23:45 ./slackware64/a/btrfs-progs-6.6-x86_64-1.txz.asc +-rw-r--r-- 1 root root 482 2023-11-06 18:12 ./slackware64/a/btrfs-progs-6.6.1-x86_64-1.txt +-rw-r--r-- 1 root root 964432 2023-11-06 18:12 ./slackware64/a/btrfs-progs-6.6.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-06 18:12 ./slackware64/a/btrfs-progs-6.6.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 477 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txt -rw-r--r-- 1 root root 92456 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 10:55 ./slackware64/a/bzip2-1.0.8-x86_64-3.txz.asc @@ -1317,7 +1317,7 @@ drwxr-xr-x 2 root root 20480 2023-11-03 18:40 ./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-11-03 18:40 ./slackware64/d +drwxr-xr-x 2 root root 20480 2023-11-06 20:17 ./slackware64/d -rw-r--r-- 1 root root 360 2023-09-26 19:28 ./slackware64/d/Cython-0.29.36-x86_64-1.txt -rw-r--r-- 1 root root 2416392 2023-09-26 19:28 ./slackware64/d/Cython-0.29.36-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-09-26 19:28 ./slackware64/d/Cython-0.29.36-x86_64-1.txz.asc @@ -1454,9 +1454,9 @@ drwxr-xr-x 2 root root 20480 2023-11-03 18:40 ./slackware64/d -rw-r--r-- 1 root root 163 2023-02-27 19:42 ./slackware64/d/make-4.4.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 5933 2023-08-30 18:10 ./slackware64/d/maketag -rw-r--r-- 1 root root 5933 2023-08-30 18:10 ./slackware64/d/maketag.ez --rw-r--r-- 1 root root 659 2023-09-06 23:01 ./slackware64/d/mercurial-6.5.2-x86_64-1.txt --rw-r--r-- 1 root root 4648016 2023-09-06 23:01 ./slackware64/d/mercurial-6.5.2-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-09-06 23:01 ./slackware64/d/mercurial-6.5.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 659 2023-11-06 19:34 ./slackware64/d/mercurial-6.5.3-x86_64-1.txt +-rw-r--r-- 1 root root 4648584 2023-11-06 19:34 ./slackware64/d/mercurial-6.5.3-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-06 19:34 ./slackware64/d/mercurial-6.5.3-x86_64-1.txz.asc -rw-r--r-- 1 root root 410 2023-10-21 18:47 ./slackware64/d/meson-1.2.3-x86_64-1.txt -rw-r--r-- 1 root root 1300792 2023-10-21 18:47 ./slackware64/d/meson-1.2.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-10-21 18:47 ./slackware64/d/meson-1.2.3-x86_64-1.txz.asc @@ -1523,9 +1523,9 @@ drwxr-xr-x 2 root root 20480 2023-11-03 18:40 ./slackware64/d -rw-r--r-- 1 root root 426 2023-10-28 19:31 ./slackware64/d/rust-1.70.0-x86_64-3.txt -rw-r--r-- 1 root root 103239820 2023-10-28 19:31 ./slackware64/d/rust-1.70.0-x86_64-3.txz -rw-r--r-- 1 root root 163 2023-10-28 19:31 ./slackware64/d/rust-1.70.0-x86_64-3.txz.asc --rw-r--r-- 1 root root 352 2023-09-07 18:42 ./slackware64/d/rust-bindgen-0.68.1-x86_64-1.txt --rw-r--r-- 1 root root 1745184 2023-09-07 18:42 ./slackware64/d/rust-bindgen-0.68.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-09-07 18:42 ./slackware64/d/rust-bindgen-0.68.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 352 2023-11-06 19:37 ./slackware64/d/rust-bindgen-0.69.1-x86_64-1.txt +-rw-r--r-- 1 root root 1758584 2023-11-06 19:37 ./slackware64/d/rust-bindgen-0.69.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-06 19:37 ./slackware64/d/rust-bindgen-0.69.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 309 2021-05-21 18:57 ./slackware64/d/sassc-3.6.2-x86_64-1.txt -rw-r--r-- 1 root root 7420 2021-05-21 18:57 ./slackware64/d/sassc-3.6.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-05-21 18:57 ./slackware64/d/sassc-3.6.2-x86_64-1.txz.asc @@ -2712,7 +2712,7 @@ drwxr-xr-x 2 root root 86016 2023-11-02 20:36 ./slackware64/kde -rw-r--r-- 1 root root 453392 2023-10-22 18:40 ./slackware64/kde/stellarsolver-2.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-10-22 18:40 ./slackware64/kde/stellarsolver-2.5-x86_64-1.txz.asc -rw-r--r-- 1 root root 409 2023-10-12 18:53 ./slackware64/kde/step-23.08.2-x86_64-1.txt --rw-r--r-- 1 root root 1288500 2023-10-12 18:53 ./slackware64/kde/step-23.08.2-x86_64-1.txz +-rw-r--r-- 1 root root 1288500 2023-10-12 18:53 ./slackware64/kde/step-23.08.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-10-12 18:53 ./slackware64/kde/step-23.08.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 164 2023-10-12 18:24 ./slackware64/kde/svgpart-23.08.2-x86_64-1.txt -rw-r--r-- 1 root root 32188 2023-10-12 18:24 ./slackware64/kde/svgpart-23.08.2-x86_64-1.txz @@ -2754,7 +2754,7 @@ drwxr-xr-x 2 root root 86016 2023-11-02 20:36 ./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-11-04 17:58 ./slackware64/l +drwxr-xr-x 2 root root 86016 2023-11-06 20:17 ./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 @@ -2917,9 +2917,9 @@ drwxr-xr-x 2 root root 86016 2023-11-04 17:58 ./slackware64/l -rw-r--r-- 1 root root 572 2022-06-23 04:37 ./slackware64/l/espeak-ng-1.51.1-x86_64-1.txt -rw-r--r-- 1 root root 4457992 2022-06-23 04:37 ./slackware64/l/espeak-ng-1.51.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-06-23 04:37 ./slackware64/l/espeak-ng-1.51.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 257 2023-10-27 18:20 ./slackware64/l/exiv2-0.28.0-x86_64-1.txt --rw-r--r-- 1 root root 1988548 2023-10-27 18:20 ./slackware64/l/exiv2-0.28.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-10-27 18:20 ./slackware64/l/exiv2-0.28.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 257 2023-11-06 18:26 ./slackware64/l/exiv2-0.28.1-x86_64-1.txt +-rw-r--r-- 1 root root 1995264 2023-11-06 18:26 ./slackware64/l/exiv2-0.28.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-06 18:26 ./slackware64/l/exiv2-0.28.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 301 2022-10-25 17:58 ./slackware64/l/expat-2.5.0-x86_64-1.txt -rw-r--r-- 1 root root 126892 2022-10-25 17:58 ./slackware64/l/expat-2.5.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-10-25 17:58 ./slackware64/l/expat-2.5.0-x86_64-1.txz.asc @@ -3129,9 +3129,9 @@ drwxr-xr-x 2 root root 86016 2023-11-04 17:58 ./slackware64/l -rw-r--r-- 1 root root 399 2021-09-10 17:35 ./slackware64/l/jansson-2.14-x86_64-1.txt -rw-r--r-- 1 root root 36124 2021-09-10 17:35 ./slackware64/l/jansson-2.14-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-09-10 17:35 ./slackware64/l/jansson-2.14-x86_64-1.txz.asc --rw-r--r-- 1 root root 387 2022-11-18 19:09 ./slackware64/l/jasper-4.0.0-x86_64-1.txt --rw-r--r-- 1 root root 198568 2022-11-18 19:09 ./slackware64/l/jasper-4.0.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-11-18 19:09 ./slackware64/l/jasper-4.0.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 387 2023-11-05 17:30 ./slackware64/l/jasper-4.0.1-x86_64-1.txt +-rw-r--r-- 1 root root 199992 2023-11-05 17:30 ./slackware64/l/jasper-4.0.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-05 17:30 ./slackware64/l/jasper-4.0.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 246 2022-09-22 18:28 ./slackware64/l/jemalloc-5.3.0-x86_64-2.txt -rw-r--r-- 1 root root 323512 2022-09-22 18:28 ./slackware64/l/jemalloc-5.3.0-x86_64-2.txz -rw-r--r-- 1 root root 163 2022-09-22 18:28 ./slackware64/l/jemalloc-5.3.0-x86_64-2.txz.asc @@ -4485,7 +4485,7 @@ drwxr-xr-x 2 root root 4096 2023-11-01 23:47 ./slackware64/tcl -rw-r--r-- 1 root root 227 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txt -rw-r--r-- 1 root root 1802760 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2023-11-04 17:58 ./slackware64/x +drwxr-xr-x 2 root root 65536 2023-11-06 20:17 ./slackware64/x -rw-r--r-- 1 root root 440 2023-10-17 18:03 ./slackware64/x/OpenCC-1.1.7-x86_64-1.txt -rw-r--r-- 1 root root 644060 2023-10-17 18:03 ./slackware64/x/OpenCC-1.1.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-10-17 18:03 ./slackware64/x/OpenCC-1.1.7-x86_64-1.txz.asc @@ -4525,9 +4525,9 @@ drwxr-xr-x 2 root root 65536 2023-11-04 17:58 ./slackware64/x -rw-r--r-- 1 root root 330 2023-02-28 18:08 ./slackware64/x/encodings-1.0.7-noarch-1.txt -rw-r--r-- 1 root root 585776 2023-02-28 18:08 ./slackware64/x/encodings-1.0.7-noarch-1.txz -rw-r--r-- 1 root root 163 2023-02-28 18:08 ./slackware64/x/encodings-1.0.7-noarch-1.txz.asc --rw-r--r-- 1 root root 515 2023-11-04 17:09 ./slackware64/x/fcitx5-5.1.3-x86_64-1.txt --rw-r--r-- 1 root root 8421456 2023-11-04 17:09 ./slackware64/x/fcitx5-5.1.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-11-04 17:09 ./slackware64/x/fcitx5-5.1.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 515 2023-11-05 17:28 ./slackware64/x/fcitx5-5.1.4-x86_64-1.txt +-rw-r--r-- 1 root root 8425180 2023-11-05 17:28 ./slackware64/x/fcitx5-5.1.4-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-05 17:28 ./slackware64/x/fcitx5-5.1.4-x86_64-1.txz.asc -rw-r--r-- 1 root root 250 2023-11-02 17:34 ./slackware64/x/fcitx5-anthy-5.1.2-x86_64-1.txt -rw-r--r-- 1 root root 167564 2023-11-02 17:34 ./slackware64/x/fcitx5-anthy-5.1.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-11-02 17:34 ./slackware64/x/fcitx5-anthy-5.1.2-x86_64-1.txz.asc @@ -5370,7 +5370,7 @@ drwxr-xr-x 2 root root 65536 2023-11-04 17:58 ./slackware64/x -rw-r--r-- 1 root root 213 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txt -rw-r--r-- 1 root root 25896 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz.asc -drwxr-xr-x 2 root root 16384 2023-10-27 19:49 ./slackware64/xap +drwxr-xr-x 2 root root 16384 2023-11-06 20:17 ./slackware64/xap -rw-r--r-- 1 root root 625 2022-10-09 18:00 ./slackware64/xap/MPlayer-20221009-x86_64-1.txt -rw-r--r-- 1 root root 2750024 2022-10-09 18:00 ./slackware64/xap/MPlayer-20221009-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-10-09 18:00 ./slackware64/xap/MPlayer-20221009-x86_64-1.txz.asc @@ -5416,9 +5416,9 @@ drwxr-xr-x 2 root root 16384 2023-10-27 19:49 ./slackware64/xap -rw-r--r-- 1 root root 443 2023-03-08 02:10 ./slackware64/xap/gftp-2.9.1b-x86_64-3.txt -rw-r--r-- 1 root root 693100 2023-03-08 02:10 ./slackware64/xap/gftp-2.9.1b-x86_64-3.txz -rw-r--r-- 1 root root 163 2023-03-08 02:10 ./slackware64/xap/gftp-2.9.1b-x86_64-3.txz.asc --rw-r--r-- 1 root root 471 2023-09-01 19:03 ./slackware64/xap/gimp-2.10.34-x86_64-6.txt --rw-r--r-- 1 root root 19267424 2023-09-01 19:03 ./slackware64/xap/gimp-2.10.34-x86_64-6.txz --rw-r--r-- 1 root root 163 2023-09-01 19:03 ./slackware64/xap/gimp-2.10.34-x86_64-6.txz.asc +-rw-r--r-- 1 root root 471 2023-11-06 19:32 ./slackware64/xap/gimp-2.10.36-x86_64-1.txt +-rw-r--r-- 1 root root 19354132 2023-11-06 19:32 ./slackware64/xap/gimp-2.10.36-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-11-06 19:32 ./slackware64/xap/gimp-2.10.36-x86_64-1.txz.asc -rw-r--r-- 1 root root 513 2023-03-08 02:11 ./slackware64/xap/gkrellm-2.3.11-x86_64-4.txt -rw-r--r-- 1 root root 571732 2023-03-08 02:11 ./slackware64/xap/gkrellm-2.3.11-x86_64-4.txz -rw-r--r-- 1 root root 163 2023-03-08 02:11 ./slackware64/xap/gkrellm-2.3.11-x86_64-4.txz.asc @@ -5498,7 +5498,7 @@ drwxr-xr-x 2 root root 16384 2023-10-27 19:49 ./slackware64/xap -rw-r--r-- 1 root root 163 2023-03-08 03:14 ./slackware64/xap/x3270-4.0ga14-x86_64-3.txz.asc -rw-r--r-- 1 root root 426 2021-02-13 13:43 ./slackware64/xap/xaos-4.2.1-x86_64-2.txt -rw-r--r-- 1 root root 492136 2021-02-13 13:43 ./slackware64/xap/xaos-4.2.1-x86_64-2.txz --rw-r--r-- 1 root root 163 2021-02-13 13:43 ./slackware64/xap/xaos-4.2.1-x86_64-2.txz.asc +-rw-r--r-- 1 root root 163 2021-02-13 13:43 ./slackware64/xap/xaos-4.2.1-x86_64-2.txz.asc -rw-r--r-- 1 root root 239 2021-02-13 13:43 ./slackware64/xap/xgames-0.3-x86_64-8.txt -rw-r--r-- 1 root root 93540 2021-02-13 13:43 ./slackware64/xap/xgames-0.3-x86_64-8.txz -rw-r--r-- 1 root root 163 2021-02-13 13:43 ./slackware64/xap/xgames-0.3-x86_64-8.txz.asc @@ -5637,11 +5637,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-11-04 18:00 ./source --rw-r--r-- 1 root root 604100 2023-11-04 18:00 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-11-04 18:00 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 841019 2023-11-04 17:59 ./source/FILE_LIST --rw-r--r-- 1 root root 25145234 2023-11-04 17:59 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2023-11-06 20:19 ./source +-rw-r--r-- 1 root root 603829 2023-11-06 20:19 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-11-06 20:19 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 840612 2023-11-06 20:18 ./source/FILE_LIST +-rw-r--r-- 1 root root 25138862 2023-11-06 20:18 ./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-10-25 01:30 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog @@ -5735,9 +5735,9 @@ drwxr-xr-x 2 root root 4096 2006-12-23 06:28 ./source/a/bin/scripts -rw-r--r-- 1 root root 595 1993-05-02 00:04 ./source/a/bin/scripts/xx.gz -rw-r--r-- 1 root root 677 2018-02-27 06:13 ./source/a/bin/slack-desc -rw-r--r-- 1 root root 2403 1997-06-15 20:38 ./source/a/bin/todos.tar.gz -drwxr-xr-x 2 root root 4096 2023-11-03 23:29 ./source/a/btrfs-progs --rw-r--r-- 1 root root 566 2023-11-03 20:14 ./source/a/btrfs-progs/btrfs-progs-v6.6.tar.sign --rw-r--r-- 1 root root 2548524 2023-11-03 20:14 ./source/a/btrfs-progs/btrfs-progs-v6.6.tar.xz +drwxr-xr-x 2 root root 4096 2023-11-06 18:12 ./source/a/btrfs-progs +-rw-r--r-- 1 root root 566 2023-11-05 22:21 ./source/a/btrfs-progs/btrfs-progs-v6.6.1.tar.sign +-rw-r--r-- 1 root root 2548648 2023-11-05 22:21 ./source/a/btrfs-progs/btrfs-progs-v6.6.1.tar.xz -rwxr-xr-x 1 root root 5161 2023-10-25 18:31 ./source/a/btrfs-progs/btrfs-progs.SlackBuild -rw-r--r-- 1 root root 66 2017-04-23 04:56 ./source/a/btrfs-progs/btrfs-progs.url -rw-r--r-- 1 root root 942 2018-11-04 19:06 ./source/a/btrfs-progs/slack-desc @@ -7362,7 +7362,7 @@ drwxr-xr-x 2 root root 4096 2022-05-15 17:07 ./source/ap/zsh -rwxr-xr-x 1 root root 4352 2022-02-13 19:39 ./source/ap/zsh/zsh.SlackBuild -rw-r--r-- 1 root root 23 2018-09-14 17:50 ./source/ap/zsh/zsh.url -rwxr-xr-x 1 root root 12001 2021-10-08 01:36 ./source/buildlist-from-changelog.sh -drwxr-xr-x 70 root root 4096 2023-11-02 18:15 ./source/d +drwxr-xr-x 70 root root 4096 2023-11-06 19:38 ./source/d drwxr-xr-x 2 root root 4096 2023-09-26 19:23 ./source/d/Cython -rw-r--r-- 1 root root 1623580 2023-07-04 19:24 ./source/d/Cython/Cython-0.29.36.tar.lz -rwxr-xr-x 1 root root 3031 2021-12-06 19:51 ./source/d/Cython/Cython.SlackBuild @@ -7622,9 +7622,9 @@ drwxr-xr-x 2 root root 4096 2023-02-27 19:41 ./source/d/make -rw-r--r-- 1 root root 833 2023-02-26 20:06 ./source/d/make/make-4.4.1.tar.lz.sig -rwxr-xr-x 1 root root 4383 2023-02-27 19:42 ./source/d/make/make.SlackBuild -rw-r--r-- 1 root root 918 2018-02-27 06:13 ./source/d/make/slack-desc -drwxr-xr-x 2 root root 4096 2023-09-06 23:00 ./source/d/mercurial +drwxr-xr-x 2 root root 4096 2023-11-06 19:31 ./source/d/mercurial -rw-r--r-- 1 root root 279 2010-05-18 06:20 ./source/d/mercurial/doinst.sh.gz --rw-r--r-- 1 root root 4882822 2023-09-06 16:11 ./source/d/mercurial/mercurial-6.5.2.tar.lz +-rw-r--r-- 1 root root 4884665 2023-11-06 14:39 ./source/d/mercurial/mercurial-6.5.3.tar.lz -rwxr-xr-x 1 root root 4120 2023-03-24 18:44 ./source/d/mercurial/mercurial.SlackBuild -rw-r--r-- 1 root root 38 2017-12-02 19:13 ./source/d/mercurial/mercurial.url -rw-r--r-- 1 root root 1245 2018-02-27 06:13 ./source/d/mercurial/slack-desc @@ -7770,10 +7770,10 @@ drwxr-xr-x 2 root root 4096 2023-03-30 20:24 ./source/d/ruby -rwxr-xr-x 1 root root 4807 2023-03-30 20:25 ./source/d/ruby/ruby.SlackBuild -rw-r--r-- 1 root root 837 2019-03-13 16:43 ./source/d/ruby/slack-desc drwxr-xr-x 2 root root 4096 2023-06-12 19:44 ./source/d/rust -drwxr-xr-x 2 root root 4096 2023-09-07 18:41 ./source/d/rust-bindgen --rw-r--r-- 1 root root 2309075 2023-09-07 18:41 ./source/d/rust-bindgen/cargo-rust-bindgen-0.68.1.tar.lz --rwxr-xr-x 1 root root 898 2023-09-07 18:40 ./source/d/rust-bindgen/fetch-sources.sh --rw-r--r-- 1 root root 1884053 2023-09-07 18:40 ./source/d/rust-bindgen/rust-bindgen-0.68.1.tar.lz +drwxr-xr-x 2 root root 4096 2023-11-06 19:37 ./source/d/rust-bindgen +-rw-r--r-- 1 root root 2309681 2023-11-06 19:36 ./source/d/rust-bindgen/cargo-rust-bindgen-0.69.1.tar.lz +-rwxr-xr-x 1 root root 898 2023-11-06 19:36 ./source/d/rust-bindgen/fetch-sources.sh +-rw-r--r-- 1 root root 1884183 2023-11-06 19:36 ./source/d/rust-bindgen/rust-bindgen-0.69.1.tar.lz -rwxr-xr-x 1 root root 3865 2022-12-07 18:28 ./source/d/rust-bindgen/rust-bindgen.SlackBuild -rw-r--r-- 1 root root 844 2022-12-07 17:56 ./source/d/rust-bindgen/slack-desc -rw-r--r-- 1 root root 261 2020-11-19 19:46 ./source/d/rust/link_libffi.diff.gz @@ -10145,16 +10145,11 @@ drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/espeak-ng -rwxr-xr-x 1 root root 3905 2022-09-06 18:27 ./source/l/espeak-ng/espeak-ng.SlackBuild -rw-r--r-- 1 root root 39 2020-07-29 01:37 ./source/l/espeak-ng/espeak-ng.url -rw-r--r-- 1 root root 1063 2020-07-29 02:35 ./source/l/espeak-ng/slack-desc -drwxr-xr-x 3 root root 4096 2023-10-27 18:20 ./source/l/exiv2 --rw-r--r-- 1 root root 1862535 2023-05-14 11:55 ./source/l/exiv2/exiv2-0.28.0-Source.tar.lz --rwxr-xr-x 1 root root 4728 2023-10-27 18:17 ./source/l/exiv2/exiv2.SlackBuild +drwxr-xr-x 2 root root 4096 2023-11-06 18:25 ./source/l/exiv2 +-rw-r--r-- 1 root root 1864899 2023-11-06 12:17 ./source/l/exiv2/exiv2-0.28.1.tar.lz +-rwxr-xr-x 1 root root 4412 2023-11-06 18:25 ./source/l/exiv2/exiv2.SlackBuild -rw-r--r-- 1 root root 31 2023-05-22 16:34 ./source/l/exiv2/exiv2.url --rwxr-xr-x 1 root root 1897 2020-09-29 00:01 ./source/l/exiv2/paredown.sh -drwxr-xr-x 2 root root 4096 2023-10-27 18:16 ./source/l/exiv2/patches --rw-r--r-- 1 root root 4997 2023-10-27 18:16 ./source/l/exiv2/patches/16c1cd7d.patch --rw-r--r-- 1 root root 12997 2023-10-27 18:16 ./source/l/exiv2/patches/3664f5b8.patch --rw-r--r-- 1 root root 757 2023-10-27 18:16 ./source/l/exiv2/patches/b4f435a4.patch --rw-r--r-- 1 root root 1127 2023-10-27 18:16 ./source/l/exiv2/patches/f47e7bd6.patch +-rwxr-xr-x 1 root root 1825 2023-11-06 18:23 ./source/l/exiv2/paredown.sh -rw-r--r-- 1 root root 710 2019-11-10 03:11 ./source/l/exiv2/slack-desc drwxr-xr-x 2 root root 4096 2022-10-25 17:58 ./source/l/expat -rw-r--r-- 1 root root 459132 2022-10-25 15:41 ./source/l/expat/expat-2.5.0.tar.lz @@ -10592,8 +10587,8 @@ drwxr-xr-x 2 root root 4096 2022-09-06 18:27 ./source/l/jansson -rw-r--r-- 1 root root 344025 2021-09-09 18:21 ./source/l/jansson/jansson-2.14.tar.lz -rwxr-xr-x 1 root root 4105 2022-09-06 18:27 ./source/l/jansson/jansson.SlackBuild -rw-r--r-- 1 root root 886 2020-05-08 18:15 ./source/l/jansson/slack-desc -drwxr-xr-x 2 root root 4096 2022-11-18 19:09 ./source/l/jasper --rw-r--r-- 1 root root 1884389 2022-11-05 18:50 ./source/l/jasper/jasper-4.0.0.tar.lz +drwxr-xr-x 2 root root 4096 2023-11-05 17:30 ./source/l/jasper +-rw-r--r-- 1 root root 1886368 2023-11-04 22:28 ./source/l/jasper/jasper-4.0.1.tar.lz -rwxr-xr-x 1 root root 4173 2022-02-20 19:04 ./source/l/jasper/jasper.SlackBuild -rw-r--r-- 1 root root 43 2019-03-13 17:33 ./source/l/jasper/jasper.url -rw-r--r-- 1 root root 841 2018-11-07 23:45 ./source/l/jasper/slack-desc @@ -13354,7 +13349,7 @@ drwxr-xr-x 2 root root 4096 2021-04-17 18:28 ./source/x/eglexternalplatfo -rwxr-xr-x 1 root root 3271 2021-04-17 18:30 ./source/x/eglexternalplatform/eglexternalplatform.SlackBuild -rw-r--r-- 1 root root 46 2021-04-17 18:27 ./source/x/eglexternalplatform/eglexternalplatform.url -rw-r--r-- 1 root root 815 2021-04-17 18:27 ./source/x/eglexternalplatform/slack-desc -drwxr-xr-x 2 root root 4096 2023-11-04 17:08 ./source/x/fcitx5 +drwxr-xr-x 2 root root 4096 2023-11-05 17:27 ./source/x/fcitx5 drwxr-xr-x 2 root root 4096 2023-11-02 16:46 ./source/x/fcitx5-anthy -rw-r--r-- 1 root root 84668 2023-11-02 12:34 ./source/x/fcitx5-anthy/fcitx5-anthy-5.1.2.tar.xz -rw-r--r-- 1 root root 310 2023-11-02 12:34 ./source/x/fcitx5-anthy/fcitx5-anthy-5.1.2.tar.xz.sig @@ -13423,8 +13418,8 @@ drwxr-xr-x 2 root root 4096 2023-10-03 02:03 ./source/x/fcitx5-unikey -rw-r--r-- 1 root root 52 2022-05-21 10:28 ./source/x/fcitx5-unikey/fcitx5-unikey.url -rw-r--r-- 1 root root 799 2022-05-21 10:28 ./source/x/fcitx5-unikey/slack-desc -rw-r--r-- 1 root root 132 2022-05-15 15:12 ./source/x/fcitx5/doinst.sh.gz --rw-r--r-- 1 root root 7485408 2023-11-04 04:16 ./source/x/fcitx5/fcitx5-5.1.3_dict.tar.xz --rw-r--r-- 1 root root 310 2023-11-04 04:16 ./source/x/fcitx5/fcitx5-5.1.3_dict.tar.xz.sig +-rw-r--r-- 1 root root 7487564 2023-11-05 01:24 ./source/x/fcitx5/fcitx5-5.1.4_dict.tar.xz +-rw-r--r-- 1 root root 310 2023-11-05 01:24 ./source/x/fcitx5/fcitx5-5.1.4_dict.tar.xz.sig -rwxr-xr-x 1 root root 554 2022-05-15 15:11 ./source/x/fcitx5/fcitx5-autostart -rwxr-xr-x 1 root root 3838 2023-08-19 18:09 ./source/x/fcitx5/fcitx5.SlackBuild -rw-r--r-- 1 root root 45 2022-05-15 14:21 ./source/x/fcitx5/fcitx5.url @@ -14991,9 +14986,9 @@ drwxr-xr-x 2 root root 4096 2023-03-07 21:39 ./source/xap/gftp -rwxr-xr-x 1 root root 3666 2023-03-07 21:39 ./source/xap/gftp/gftp.SlackBuild -rw-r--r-- 1 root root 32 2021-02-11 18:21 ./source/xap/gftp/gftp.url -rw-r--r-- 1 root root 895 2018-02-27 06:13 ./source/xap/gftp/slack-desc -drwxr-xr-x 2 root root 4096 2023-09-01 18:49 ./source/xap/gimp --rw-r--r-- 1 root root 23672523 2023-02-21 20:42 ./source/xap/gimp/gimp-2.10.34.tar.lz --rwxr-xr-x 1 root root 4636 2023-09-01 18:49 ./source/xap/gimp/gimp.SlackBuild +drwxr-xr-x 2 root root 4096 2023-11-06 19:28 ./source/xap/gimp +-rw-r--r-- 1 root root 23807835 2023-11-06 11:09 ./source/xap/gimp/gimp-2.10.36.tar.lz +-rwxr-xr-x 1 root root 4636 2023-11-06 19:28 ./source/xap/gimp/gimp.SlackBuild -rw-r--r-- 1 root root 923 2018-02-27 06:13 ./source/xap/gimp/slack-desc drwxr-xr-x 2 root root 4096 2023-03-07 21:39 ./source/xap/gkrellm -rw-r--r-- 1 root root 651098 2019-07-25 14:06 ./source/xap/gkrellm/gkrellm-2.3.11.tar.lz @@ -15267,10 +15262,10 @@ drwxr-xr-x 2 root root 4096 2021-01-29 18:38 ./source/xap/xpdf/lang -rw-r--r-- 1 root root 1804 2011-08-15 21:28 ./source/xap/xpdf/lang/xpdf-thai-2011-aug-15.tar.xz -rw-r--r-- 1 root root 252 2013-03-28 20:51 ./source/xap/xpdf/lang/xpdf-thai.diff.gz -rw-r--r-- 1 root root 1152 2011-08-15 21:28 ./source/xap/xpdf/lang/xpdf-turkish-2011-aug-15.tar.xz --rw-r--r-- 1 root root 239 2013-03-28 20:51 ./source/xap/xpdf/lang/xpdf-turkish.diff.gz -drwxr-xr-x 2 root root 4096 2021-01-29 18:32 ./source/xap/xpdf/patches --rw-r--r-- 1 root root 555 2017-09-26 04:39 ./source/xap/xpdf/patches/xpdfrc.diff.gz --rw-r--r-- 1 root root 640 2018-02-27 06:13 ./source/xap/xpdf/slack-desc +-rw-r--r-- 1 root root 239 2013-03-28 20:51 ./source/xap/xpdf/lang/xpdf-turkish.diff.gz +drwxr-xr-x 2 root root 4096 2021-01-29 18:32 ./source/xap/xpdf/patches +-rw-r--r-- 1 root root 555 2017-09-26 04:39 ./source/xap/xpdf/patches/xpdfrc.diff.gz +-rw-r--r-- 1 root root 640 2018-02-27 06:13 ./source/xap/xpdf/slack-desc -rw-r--r-- 1 root root 685124 2022-04-18 21:27 ./source/xap/xpdf/xpdf-4.04.tar.lz -rwxr-xr-x 1 root root 5287 2022-04-26 18:17 ./source/xap/xpdf/xpdf.SlackBuild -rw-r--r-- 1 root root 3260 2010-01-11 05:07 ./source/xap/xpdf/xpdf.desktop diff --git a/source/d/rust-bindgen/fetch-sources.sh b/source/d/rust-bindgen/fetch-sources.sh index 4085da729..71a5c904f 100755 --- a/source/d/rust-bindgen/fetch-sources.sh +++ b/source/d/rust-bindgen/fetch-sources.sh @@ -1,7 +1,7 @@ #!/bin/bash #VERSION=$1 -VERSION=0.68.1 +VERSION=0.69.1 rm -rf rust-bindgen-*.tar.?z cargo-rust-bindgen* diff --git a/source/l/exiv2/exiv2.SlackBuild b/source/l/exiv2/exiv2.SlackBuild index 49928b8b5..b3e0502d8 100755 --- a/source/l/exiv2/exiv2.SlackBuild +++ b/source/l/exiv2/exiv2.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=exiv2 -VERSION=${VERSION:-$(echo $PKGNAM-*-Source.tar.?z | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -68,10 +68,10 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PKGNAM-$VERSION-Source +rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION-Source.tar.?z || exit 1 -cd $PKGNAM-$VERSION-Source || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -80,12 +80,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Upstream regression patches: -cat $CWD/patches/16c1cd7d.patch | patch -p1 --verbose || exit 1 -cat $CWD/patches/3664f5b8.patch | patch -p1 --verbose || exit 1 -cat $CWD/patches/b4f435a4.patch | patch -p1 --verbose || exit 1 -cat $CWD/patches/f47e7bd6.patch | patch -p1 --verbose || exit 1 - # Configure, build, and install: mkdir cmake-build cd cmake-build diff --git a/source/l/exiv2/paredown.sh b/source/l/exiv2/paredown.sh index a40aa335c..64b293821 100755 --- a/source/l/exiv2/paredown.sh +++ b/source/l/exiv2/paredown.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2013, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2019, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,24 +21,24 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=exiv2 -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} +VERSION=${VERSION:-$(echo v*.tar.gz | cut -f 2- -d v | rev | cut -f 3- -d . | rev)} -if [ ! -r $PKGNAM-${VERSION}-Source.tar.gz ]; then - echo "$PKGNAM-${VERSION}-Source.tar.gz does not exist. Exiting." +if [ ! -r v${VERSION}.tar.gz ]; then + echo "v${VERSION}.tar.gz does not exist. Exiting." exit 1 fi -touch -r $PKGNAM-${VERSION}-Source.tar.gz tmp-timestamp || exit 1 +OUTPUT_TIMESTAMP=$(tar tvvf v${VERSION}.tar.gz | head -n 1 | tr -d / | rev | cut -f 2,3 -d ' ' | rev) -rm -rf $PKGNAM-${VERSION}-Source -tar xf $PKGNAM-${VERSION}-Source.tar.gz || exit 1 -rm -rf $PKGNAM-${VERSION}-Source/test/data/* -rm -rf $PKGNAM-${VERSION}-Source/tests/bugfixes/* -rm -f $PKGNAM-${VERSION}-Source.tar.lz -tar cf $PKGNAM-${VERSION}-Source.tar $PKGNAM-${VERSION}-Source -touch -r tmp-timestamp $PKGNAM-${VERSION}-Source.tar -plzip -9 -v $PKGNAM-${VERSION}-Source.tar -rm -rf $PKGNAM-${VERSION}-Source tmp-timestamp +rm -rf $PKGNAM-${VERSION} +tar xf v${VERSION}.tar.gz || exit 1 +rm -rf $PKGNAM-${VERSION}/test/data/* +rm -rf $PKGNAM-${VERSION}/tests/bugfixes/* +rm -f $PKGNAM-${VERSION}.tar.lz +tar cf $PKGNAM-${VERSION}.tar $PKGNAM-${VERSION} +touch -d "$OUTPUT_TIMESTAMP" $PKGNAM-${VERSION}.tar +plzip -9 -v $PKGNAM-${VERSION}.tar +rm -rf $PKGNAM-${VERSION} v${VERSION}.tar.gz -echo "Repacking of $PKGNAM-${VERSION}-Source.tar.lz complete." +echo "Repacking of v${VERSION}.tar.gz complete." diff --git a/source/l/exiv2/patches/16c1cd7d.patch b/source/l/exiv2/patches/16c1cd7d.patch deleted file mode 100644 index fc8dc9b28..000000000 --- a/source/l/exiv2/patches/16c1cd7d.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 16c1cd7da0cd159ee2d53c39088564edaf046c77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= - <miloskomarcevic@aim.com> -Date: Fri, 16 Jun 2023 17:05:39 +0200 -Subject: [PATCH] Fix regression parsing PNG text chunks with zero length - payload - ---- - src/pngchunk_int.cpp | 37 ++++++++++++++++++------------------- - 1 file changed, 18 insertions(+), 19 deletions(-) - -diff --git a/src/pngchunk_int.cpp b/src/pngchunk_int.cpp -index 697a30c63c..81fbcd942d 100644 ---- a/src/pngchunk_int.cpp -+++ b/src/pngchunk_int.cpp -@@ -100,20 +100,24 @@ DataBuf PngChunk::parseTXTChunk(const DataBuf& data, size_t keysize, TxtChunkTyp - } - - // compressed string after the compression technique spec -- const byte* compressedText = data.c_data(keysize + nullSeparators); - size_t compressedTextSize = data.size() - keysize - nullSeparators; -- enforce(compressedTextSize < data.size(), ErrorCode::kerCorruptedMetadata); -+ if (compressedTextSize) { -+ const byte* compressedText = data.c_data(keysize + nullSeparators); -+ enforce(compressedTextSize < data.size(), ErrorCode::kerCorruptedMetadata); - -- zlibUncompress(compressedText, static_cast<uint32_t>(compressedTextSize), arr); -+ zlibUncompress(compressedText, static_cast<uint32_t>(compressedTextSize), arr); -+ } - } else if (type == tEXt_Chunk) { - enforce(data.size() >= Safe::add(keysize, static_cast<size_t>(1)), ErrorCode::kerCorruptedMetadata); - // Extract a non-compressed Latin-1 text chunk - - // the text comes after the key, but isn't null terminated -- const byte* text = data.c_data(keysize + 1); - size_t textsize = data.size() - keysize - 1; -+ if (textsize) { -+ const byte* text = data.c_data(keysize + 1); - -- arr = DataBuf(text, textsize); -+ arr = DataBuf(text, textsize); -+ } - } else if (type == iTXt_Chunk) { - enforce(data.size() > Safe::add(keysize, static_cast<size_t>(3)), ErrorCode::kerCorruptedMetadata); - const size_t nullCount = std::count(data.c_data(keysize + 3), data.c_data(data.size() - 1), '\0'); -@@ -127,7 +131,8 @@ DataBuf PngChunk::parseTXTChunk(const DataBuf& data, size_t keysize, TxtChunkTyp - const byte compressionMethod = data.read_uint8(keysize + 2); - - enforce(compressionFlag == 0x00 || compressionFlag == 0x01, ErrorCode::kerCorruptedMetadata); -- enforce(compressionMethod == 0x00, ErrorCode::kerCorruptedMetadata); -+ if (compressionFlag == 0x01) -+ enforce(compressionMethod == 0x00, ErrorCode::kerFailedToReadImageData); - - // language description string after the compression technique spec - const size_t languageTextMaxSize = data.size() - keysize - 3; -@@ -141,14 +146,14 @@ DataBuf PngChunk::parseTXTChunk(const DataBuf& data, size_t keysize, TxtChunkTyp - data.size() - (keysize + 3 + languageTextSize + 1)); - const size_t translatedKeyTextSize = translatedKeyText.size(); - -- if ((compressionFlag == 0x00) || (compressionFlag == 0x01 && compressionMethod == 0x00)) { -- enforce(Safe::add(keysize + 3 + languageTextSize + 1, Safe::add(translatedKeyTextSize, static_cast<size_t>(1))) <= -- data.size(), -- ErrorCode::kerCorruptedMetadata); -+ enforce(Safe::add(keysize + 3 + languageTextSize + 1, Safe::add(translatedKeyTextSize, static_cast<size_t>(1))) <= -+ data.size(), -+ ErrorCode::kerCorruptedMetadata); - -+ const auto textsize = -+ static_cast<long>(data.size() - (keysize + 3 + languageTextSize + 1 + translatedKeyTextSize + 1)); -+ if (textsize) { - const byte* text = data.c_data(keysize + 3 + languageTextSize + 1 + translatedKeyTextSize + 1); -- const auto textsize = -- static_cast<long>(data.size() - (keysize + 3 + languageTextSize + 1 + translatedKeyTextSize + 1)); - - if (compressionFlag == 0x00) { - // then it's an uncompressed iTXt chunk -@@ -156,7 +161,7 @@ DataBuf PngChunk::parseTXTChunk(const DataBuf& data, size_t keysize, TxtChunkTyp - std::cout << "Exiv2::PngChunk::parseTXTChunk: We found an uncompressed iTXt field\n"; - #endif - arr = DataBuf(text, textsize); -- } else if (compressionFlag == 0x01 && compressionMethod == 0x00) { -+ } else { - // then it's a zlib compressed iTXt chunk - #ifdef EXIV2_DEBUG_MESSAGES - std::cout << "Exiv2::PngChunk::parseTXTChunk: We found a zlib compressed iTXt field\n"; -@@ -165,12 +170,6 @@ DataBuf PngChunk::parseTXTChunk(const DataBuf& data, size_t keysize, TxtChunkTyp - // the compressed text comes after the translated keyword, but isn't null terminated - zlibUncompress(text, textsize, arr); - } -- } else { -- // then it isn't zlib compressed and we are sunk --#ifdef EXIV2_DEBUG_MESSAGES -- std::cerr << "Exiv2::PngChunk::parseTXTChunk: Non-standard iTXt compression method.\n"; --#endif -- throw Error(ErrorCode::kerFailedToReadImageData); - } - } else { - #ifdef DEBUG diff --git a/source/l/exiv2/patches/3664f5b8.patch b/source/l/exiv2/patches/3664f5b8.patch deleted file mode 100644 index 4a14765b7..000000000 --- a/source/l/exiv2/patches/3664f5b8.patch +++ /dev/null @@ -1,275 +0,0 @@ -From 360c6cd41f15baf6d999da12e1fc077180f5da91 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Sun, 25 Jun 2023 16:14:06 +0100 -Subject: [PATCH 1/2] Check if the metadata is NULL. - ---- - src/nikonmn_int.cpp | 16 ++++++++-------- - src/sonymn_int.cpp | 4 ++-- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp -index 2887c1b621..949023d00e 100644 ---- a/src/nikonmn_int.cpp -+++ b/src/nikonmn_int.cpp -@@ -3384,7 +3384,7 @@ std::ostream& Nikon3MakerNote::printExternalFlashData2(std::ostream& os, const V - - std::ostream& Nikon3MakerNote::printFlashMasterDataFl6(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -@@ -3413,7 +3413,7 @@ std::ostream& Nikon3MakerNote::printFlashMasterDataFl6(std::ostream& os, const V - - std::ostream& Nikon3MakerNote::printFlashMasterDataFl7(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -@@ -3480,7 +3480,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupBCControlData(std::ostream& os, co - - std::ostream& Nikon3MakerNote::printFlashGroupADataFl6(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -@@ -3509,7 +3509,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupADataFl6(std::ostream& os, const V - - std::ostream& Nikon3MakerNote::printFlashGroupADataFl7(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -@@ -3538,7 +3538,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupADataFl7(std::ostream& os, const V - - std::ostream& Nikon3MakerNote::printFlashGroupBDataFl6(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -@@ -3567,7 +3567,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupBDataFl6(std::ostream& os, const V - - std::ostream& Nikon3MakerNote::printFlashGroupBDataFl7(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -@@ -3596,7 +3596,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupBDataFl7(std::ostream& os, const V - - std::ostream& Nikon3MakerNote::printFlashGroupCDataFl6(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -@@ -3625,7 +3625,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupCDataFl6(std::ostream& os, const V - - std::ostream& Nikon3MakerNote::printFlashGroupCDataFl7(std::ostream& os, const Value& value, const ExifData* metadata) { - std::ios::fmtflags f(os.flags()); -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - os.flags(f); - return os; -diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp -index f2950c4608..2fe62bdbf2 100644 ---- a/src/sonymn_int.cpp -+++ b/src/sonymn_int.cpp -@@ -1799,7 +1799,7 @@ const TagInfo* SonyMakerNote::tagListFp() { - - std::ostream& SonyMakerNote::printSony2FpAmbientTemperature(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1) -+ if (value.count() != 1 || !metadata) - return os << "(" << value << ")"; - - auto pos = metadata->findKey(ExifKey("Exif.Sony2Fp.0x0002")); -@@ -1879,7 +1879,7 @@ const TagInfo* SonyMakerNote::tagListSonyMisc1() { - - std::ostream& SonyMakerNote::printSonyMisc1CameraTemperature(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1) -+ if (value.count() != 1 || !metadata) - return os << "(" << value << ")"; - - auto pos = metadata->findKey(ExifKey("Exif.SonyMisc1.0x0004")); - -From 1119a68a1e90b5a278f4ecc70461bfca786eee0d Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Sun, 25 Jun 2023 22:23:24 +0100 -Subject: [PATCH 2/2] Check if the metadata is NULL. - ---- - src/sonymn_int.cpp | 34 +++++++++++++++++----------------- - 1 file changed, 17 insertions(+), 17 deletions(-) - -diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp -index 2fe62bdbf2..a2cde2282c 100644 ---- a/src/sonymn_int.cpp -+++ b/src/sonymn_int.cpp -@@ -827,7 +827,7 @@ std::ostream& SonyMakerNote::printWBShiftABGM(std::ostream& os, const Value& val - } - - std::ostream& SonyMakerNote::printFocusMode2(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -854,7 +854,7 @@ std::ostream& SonyMakerNote::printFocusMode2(std::ostream& os, const Value& valu - } - - std::ostream& SonyMakerNote::printAFAreaModeSetting(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -891,7 +891,7 @@ std::ostream& SonyMakerNote::printAFAreaModeSetting(std::ostream& os, const Valu - } - - std::ostream& SonyMakerNote::printFlexibleSpotPosition(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 2 || value.typeId() != unsignedShort) { -+ if (value.count() != 2 || value.typeId() != unsignedShort || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -916,7 +916,7 @@ std::ostream& SonyMakerNote::printFlexibleSpotPosition(std::ostream& os, const V - } - - std::ostream& SonyMakerNote::printAFPointSelected(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -967,7 +967,7 @@ std::ostream& SonyMakerNote::printAFPointSelected(std::ostream& os, const Value& - } - - std::ostream& SonyMakerNote::printAFPointsUsed(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.typeId() != unsignedByte) { -+ if (value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -994,7 +994,7 @@ std::ostream& SonyMakerNote::printAFPointsUsed(std::ostream& os, const Value& va - } - - std::ostream& SonyMakerNote::printAFTracking(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedByte) { -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -1297,7 +1297,7 @@ std::ostream& SonyMakerNote::printImageSize(std::ostream& os, const Value& value - } - - std::ostream& SonyMakerNote::printFocusMode(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedShort) { -+ if (value.count() != 1 || value.typeId() != unsignedShort || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -1314,7 +1314,7 @@ std::ostream& SonyMakerNote::printFocusMode(std::ostream& os, const Value& value - } - - std::ostream& SonyMakerNote::printAFMode(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedShort) { -+ if (value.count() != 1 || value.typeId() != unsignedShort || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -1336,7 +1336,7 @@ std::ostream& SonyMakerNote::printAFMode(std::ostream& os, const Value& value, c - } - - std::ostream& SonyMakerNote::printFocusMode3(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedShort) { -+ if (value.count() != 1 || value.typeId() != unsignedShort || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -1353,7 +1353,7 @@ std::ostream& SonyMakerNote::printFocusMode3(std::ostream& os, const Value& valu - - std::ostream& SonyMakerNote::printHighISONoiseReduction2(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedShort) { -+ if (value.count() != 1 || value.typeId() != unsignedShort || !metadata) { - os << "(" << value << ")"; - return os; - } -@@ -1840,7 +1840,7 @@ std::ostream& SonyMakerNote::printSony2FpFocusMode(std::ostream& os, const Value - - std::ostream& SonyMakerNote::printSony2FpFocusPosition2(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1) -+ if (value.count() != 1 || !metadata) - os << "(" << value << ")"; - else { - std::string model; -@@ -1944,7 +1944,7 @@ const TagInfo* SonyMakerNote::tagListSonyMisc2b() { - - std::ostream& SonyMakerNote::printSonyMisc2bLensZoomPosition(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1) -+ if (value.count() != 1 || !metadata) - return os << "(" << value << ")"; - - std::string model; -@@ -1966,7 +1966,7 @@ std::ostream& SonyMakerNote::printSonyMisc2bLensZoomPosition(std::ostream& os, c - - std::ostream& SonyMakerNote::printSonyMisc2bFocusPosition2(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1) -+ if (value.count() != 1 || !metadata) - return os << "(" << value << ")"; - - std::string model; -@@ -2052,7 +2052,7 @@ const TagInfo* SonyMakerNote::tagListSonyMisc3c() { - - std::ostream& SonyMakerNote::printSonyMisc3cShotNumberSincePowerUp(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedLong) -+ if (value.count() != 1 || value.typeId() != unsignedLong || !metadata) - return os << "(" << value << ")"; - - std::string model; -@@ -2083,7 +2083,7 @@ std::ostream& SonyMakerNote::printSonyMisc3cSequenceNumber(std::ostream& os, con - } - - std::ostream& SonyMakerNote::printSonyMisc3cQuality2(std::ostream& os, const Value& value, const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedByte) -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) - return os << "(" << value << ")"; - - std::string model; -@@ -2108,7 +2108,7 @@ std::ostream& SonyMakerNote::printSonyMisc3cQuality2(std::ostream& os, const Val - - std::ostream& SonyMakerNote::printSonyMisc3cSonyImageHeight(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedShort) -+ if (value.count() != 1 || value.typeId() != unsignedShort || !metadata) - return os << "(" << value << ")"; - - std::string model; -@@ -2131,7 +2131,7 @@ std::ostream& SonyMakerNote::printSonyMisc3cSonyImageHeight(std::ostream& os, co - - std::ostream& SonyMakerNote::printSonyMisc3cModelReleaseYear(std::ostream& os, const Value& value, - const ExifData* metadata) { -- if (value.count() != 1 || value.typeId() != unsignedByte) -+ if (value.count() != 1 || value.typeId() != unsignedByte || !metadata) - return os << "(" << value << ")"; - - std::string model; diff --git a/source/l/exiv2/patches/b4f435a4.patch b/source/l/exiv2/patches/b4f435a4.patch deleted file mode 100644 index 8332a1e84..000000000 --- a/source/l/exiv2/patches/b4f435a4.patch +++ /dev/null @@ -1,23 +0,0 @@ -From b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1 Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Sat, 17 Jun 2023 13:39:15 +0100 -Subject: [PATCH] Avoid triggering assertion in std::vector::operator[] - -(cherry picked from commit 3202e86e737ea181a1904c9d3b9a6b619c3baba5) ---- - src/types.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/types.cpp b/src/types.cpp -index 6559e20f4d..1c6963cda4 100644 ---- a/src/types.cpp -+++ b/src/types.cpp -@@ -173,7 +173,7 @@ byte* Exiv2::DataBuf::data(size_t offset) { - } - - const byte* Exiv2::DataBuf::c_data(size_t offset) const { -- if (pData_.empty()) { -+ if (pData_.empty() || offset == pData_.size()) { - return nullptr; - } - if (offset > pData_.size()) { diff --git a/source/l/exiv2/patches/f47e7bd6.patch b/source/l/exiv2/patches/f47e7bd6.patch deleted file mode 100644 index 1b74678a5..000000000 --- a/source/l/exiv2/patches/f47e7bd6.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a Mon Sep 17 00:00:00 2001 -From: Kevin Backhouse <kevinbackhouse@github.com> -Date: Sat, 17 Jun 2023 13:10:07 +0100 -Subject: [PATCH] Fix unit test failure. - -(cherry picked from commit 33071f33b2996a3ccbdd51f8cc3b958b5eed0e0b) ---- - unitTests/test_types.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/unitTests/test_types.cpp b/unitTests/test_types.cpp -index 5cfd80d5e9..b13bbc6825 100644 ---- a/unitTests/test_types.cpp -+++ b/unitTests/test_types.cpp -@@ -49,8 +49,8 @@ TEST(DataBuf, canBeConstructedFromExistingData) { - TEST(DataBuf, tryingToAccessTooFarElementThrows) { - const std::array<byte, 4> data{'h', 'o', 'l', 'a'}; - DataBuf instance(data.data(), data.size()); -- ASSERT_THROW([[maybe_unused]] auto d = instance.data(4), std::out_of_range); -- ASSERT_THROW([[maybe_unused]] auto d = instance.c_data(4), std::out_of_range); -+ ASSERT_THROW([[maybe_unused]] auto d = instance.data(5), std::out_of_range); -+ ASSERT_THROW([[maybe_unused]] auto d = instance.c_data(5), std::out_of_range); - } - - TEST(DataBuf, readUintFunctionsWorksOnExistingData) { diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild index c661e4a3e..c854d3424 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gimp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |