1
0
Fork 0
mirror of git://slackware.nl/current.git synced 2025-01-26 08:03:16 +01:00

Tue Oct 19 01:10:06 UTC 2021

a/file-5.41-x86_64-1.txz:  Upgraded.
ap/vim-8.2.3536-x86_64-1.txz:  Upgraded.
kde/plasma-workspace-5.23.0-x86_64-4.txz:  Rebuilt.
  Fixed appling the previous patch. Thanks to LuckyCyborg.
xap/vim-gvim-8.2.3536-x86_64-1.txz:  Upgraded.
This commit is contained in:
Patrick J Volkerding 2021-10-19 01:10:06 +00:00 committed by Eric Hameleers
parent 48bc5b3a92
commit 499145d97d
19 changed files with 342 additions and 571 deletions

View file

@ -11,9 +11,40 @@
<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>Sun, 17 Oct 2021 18:52:33 GMT</pubDate>
<lastBuildDate>Mon, 18 Oct 2021 06:59:47 GMT</lastBuildDate>
<pubDate>Tue, 19 Oct 2021 01:10:06 GMT</pubDate>
<lastBuildDate>Tue, 19 Oct 2021 06:59:46 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.12</generator>
<item>
<title>Tue, 19 Oct 2021 01:10:06 GMT</title>
<pubDate>Tue, 19 Oct 2021 01:10:06 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20211019011006</link>
<guid isPermaLink="false">20211019011006</guid>
<description>
<![CDATA[<pre>
a/file-5.41-x86_64-1.txz: Upgraded.
ap/vim-8.2.3536-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.23.0-x86_64-4.txz: Rebuilt.
Fixed appling the previous patch. Thanks to LuckyCyborg.
xap/vim-gvim-8.2.3536-x86_64-1.txz: Upgraded.
</pre>]]>
</description>
</item>
<item>
<title>Mon, 18 Oct 2021 18:40:47 GMT</title>
<pubDate>Mon, 18 Oct 2021 18:40:47 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20211018184047</link>
<guid isPermaLink="false">20211018184047</guid>
<description>
<![CDATA[<pre>
a/kernel-firmware-20211018_d34196f-noarch-1.txz: Upgraded.
ap/hplip-3.20.5-x86_64-5.txz: Rebuilt.
Applied patch to fix hp-scan when using Python 3.10. Thanks to kingbeowulf.
ap/mpg123-1.29.1-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.23.0-x86_64-3.txz: Rebuilt.
[PATCH] Revert "No icons on the desktop by default". Thanks to LuckyCyborg.
</pre>]]>
</description>
</item>
<item>
<title>Sun, 17 Oct 2021 18:52:33 GMT</title>
<pubDate>Sun, 17 Oct 2021 18:52:33 GMT</pubDate>

View file

@ -1,3 +1,18 @@
Tue Oct 19 01:10:06 UTC 2021
a/file-5.41-x86_64-1.txz: Upgraded.
ap/vim-8.2.3536-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.23.0-x86_64-4.txz: Rebuilt.
Fixed appling the previous patch. Thanks to LuckyCyborg.
xap/vim-gvim-8.2.3536-x86_64-1.txz: Upgraded.
+--------------------------+
Mon Oct 18 18:40:47 UTC 2021
a/kernel-firmware-20211018_d34196f-noarch-1.txz: Upgraded.
ap/hplip-3.20.5-x86_64-5.txz: Rebuilt.
Applied patch to fix hp-scan when using Python 3.10. Thanks to kingbeowulf.
ap/mpg123-1.29.1-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.23.0-x86_64-3.txz: Rebuilt.
[PATCH] Revert "No icons on the desktop by default". Thanks to LuckyCyborg.
+--------------------------+
Sun Oct 17 18:52:33 UTC 2021
a/glibc-zoneinfo-2021d-noarch-1.txz: Upgraded.
a/kernel-generic-5.14.13-x86_64-1.txz: Upgraded.

View file

@ -1,20 +1,20 @@
Sun Oct 17 18:58:47 UTC 2021
Tue Oct 19 01:13:05 UTC 2021
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 2021-10-17 18:52 .
drwxr-xr-x 12 root root 4096 2021-10-19 01:10 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 15590 2021-08-07 23:14 ./CHANGES_AND_HINTS.TXT
-rw-r--r-- 1 root root 1085672 2021-10-16 18:15 ./CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2021-10-16 18:15 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 1085876 2021-10-18 18:44 ./CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2021-10-18 18:44 ./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 1717491 2021-10-17 18:52 ./ChangeLog.txt
-rw-r--r-- 1 root root 1718193 2021-10-19 01:10 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2021-10-17 18:52 ./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 2021-10-17 18:52 ./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 1413220 2021-10-16 18:15 ./FILELIST.TXT
-rw-r--r-- 1 root root 1413456 2021-10-18 18:44 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
-rw-r--r-- 1 root root 856953 2021-10-17 18:58 ./PACKAGES.TXT
-rw-r--r-- 1 root root 856953 2021-10-19 01:12 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3635 2021-10-17 18:42 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@ -715,13 +715,13 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches
-rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT
drwxr-xr-x 17 root root 4096 2021-10-17 18:58 ./slackware64
-rw-r--r-- 1 root root 334792 2021-10-17 18:58 ./slackware64/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2021-10-17 18:58 ./slackware64/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 415307 2021-10-17 18:57 ./slackware64/FILE_LIST
-rw-r--r-- 1 root root 4160099 2021-10-17 18:57 ./slackware64/MANIFEST.bz2
drwxr-xr-x 17 root root 4096 2021-10-19 01:12 ./slackware64
-rw-r--r-- 1 root root 334792 2021-10-19 01:12 ./slackware64/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2021-10-19 01:12 ./slackware64/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 415307 2021-10-19 01:12 ./slackware64/FILE_LIST
-rw-r--r-- 1 root root 4165433 2021-10-19 01:12 ./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 2021-10-17 18:57 ./slackware64/a
drwxr-xr-x 2 root root 32768 2021-10-19 01:11 ./slackware64/a
-rw-r--r-- 1 root root 327 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txt
-rw-r--r-- 1 root root 10788 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-07-17 17:47 ./slackware64/a/aaa_base-15.0-x86_64-1.txz.asc
@ -818,9 +818,9 @@ drwxr-xr-x 2 root root 32768 2021-10-17 18:57 ./slackware64/a
-rw-r--r-- 1 root root 541 2021-02-13 11:01 ./slackware64/a/f2fs-tools-1.14.0-x86_64-3.txt
-rw-r--r-- 1 root root 187464 2021-02-13 11:01 ./slackware64/a/f2fs-tools-1.14.0-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:01 ./slackware64/a/f2fs-tools-1.14.0-x86_64-3.txz.asc
-rw-r--r-- 1 root root 271 2021-04-24 18:22 ./slackware64/a/file-5.40-x86_64-3.txt
-rw-r--r-- 1 root root 416500 2021-04-24 18:22 ./slackware64/a/file-5.40-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-04-24 18:22 ./slackware64/a/file-5.40-x86_64-3.txz.asc
-rw-r--r-- 1 root root 271 2021-10-19 00:56 ./slackware64/a/file-5.41-x86_64-1.txt
-rw-r--r-- 1 root root 430068 2021-10-19 00:56 ./slackware64/a/file-5.41-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-19 00:56 ./slackware64/a/file-5.41-x86_64-1.txz.asc
-rw-r--r-- 1 root root 366 2021-02-13 11:02 ./slackware64/a/findutils-4.8.0-x86_64-3.txt
-rw-r--r-- 1 root root 501460 2021-02-13 11:02 ./slackware64/a/findutils-4.8.0-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:02 ./slackware64/a/findutils-4.8.0-x86_64-3.txz.asc
@ -883,9 +883,9 @@ drwxr-xr-x 2 root root 32768 2021-10-17 18:57 ./slackware64/a
-rw-r--r-- 1 root root 461 2021-02-13 11:08 ./slackware64/a/kbd-1.15.3-x86_64-6.txt
-rw-r--r-- 1 root root 1137072 2021-02-13 11:08 ./slackware64/a/kbd-1.15.3-x86_64-6.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:08 ./slackware64/a/kbd-1.15.3-x86_64-6.txz.asc
-rw-r--r-- 1 root root 422 2021-10-12 19:01 ./slackware64/a/kernel-firmware-20211012_b563148-noarch-1.txt
-rw-r--r-- 1 root root 177811360 2021-10-12 19:01 ./slackware64/a/kernel-firmware-20211012_b563148-noarch-1.txz
-rw-r--r-- 1 root root 163 2021-10-12 19:01 ./slackware64/a/kernel-firmware-20211012_b563148-noarch-1.txz.asc
-rw-r--r-- 1 root root 422 2021-10-18 18:27 ./slackware64/a/kernel-firmware-20211018_d34196f-noarch-1.txt
-rw-r--r-- 1 root root 177811488 2021-10-18 18:27 ./slackware64/a/kernel-firmware-20211018_d34196f-noarch-1.txz
-rw-r--r-- 1 root root 163 2021-10-18 18:27 ./slackware64/a/kernel-firmware-20211018_d34196f-noarch-1.txz.asc
-rw-r--r-- 1 root root 624 2021-10-17 18:31 ./slackware64/a/kernel-generic-5.14.13-x86_64-1.txt
-rw-r--r-- 1 root root 8024620 2021-10-17 18:31 ./slackware64/a/kernel-generic-5.14.13-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-17 18:31 ./slackware64/a/kernel-generic-5.14.13-x86_64-1.txz.asc
@ -1102,7 +1102,7 @@ drwxr-xr-x 2 root root 32768 2021-10-17 18:57 ./slackware64/a
-rw-r--r-- 1 root root 540 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txt
-rw-r--r-- 1 root root 56160 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz.asc
drwxr-xr-x 2 root root 20480 2021-10-16 18:14 ./slackware64/ap
drwxr-xr-x 2 root root 20480 2021-10-19 01:11 ./slackware64/ap
-rw-r--r-- 1 root root 291 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txt
-rw-r--r-- 1 root root 703580 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txz.asc
@ -1184,9 +1184,9 @@ drwxr-xr-x 2 root root 20480 2021-10-16 18:14 ./slackware64/ap
-rw-r--r-- 1 root root 592 2021-02-13 11:30 ./slackware64/ap/gutenprint-5.3.4-x86_64-3.txt
-rw-r--r-- 1 root root 2764424 2021-02-13 11:30 ./slackware64/ap/gutenprint-5.3.4-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:30 ./slackware64/ap/gutenprint-5.3.4-x86_64-3.txz.asc
-rw-r--r-- 1 root root 459 2021-10-09 03:46 ./slackware64/ap/hplip-3.20.5-x86_64-4.txt
-rw-r--r-- 1 root root 19095924 2021-10-09 03:46 ./slackware64/ap/hplip-3.20.5-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-10-09 03:46 ./slackware64/ap/hplip-3.20.5-x86_64-4.txz.asc
-rw-r--r-- 1 root root 459 2021-10-18 18:24 ./slackware64/ap/hplip-3.20.5-x86_64-5.txt
-rw-r--r-- 1 root root 19096928 2021-10-18 18:24 ./slackware64/ap/hplip-3.20.5-x86_64-5.txz
-rw-r--r-- 1 root root 163 2021-10-18 18:24 ./slackware64/ap/hplip-3.20.5-x86_64-5.txz.asc
-rw-r--r-- 1 root root 481 2021-10-15 18:02 ./slackware64/ap/htop-3.1.1-x86_64-1.txt
-rw-r--r-- 1 root root 133696 2021-10-15 18:02 ./slackware64/ap/htop-3.1.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-15 18:02 ./slackware64/ap/htop-3.1.1-x86_64-1.txz.asc
@ -1254,9 +1254,9 @@ drwxr-xr-x 2 root root 20480 2021-10-16 18:14 ./slackware64/ap
-rw-r--r-- 1 root root 376 2021-02-13 11:40 ./slackware64/ap/most-5.1.0-x86_64-3.txt
-rw-r--r-- 1 root root 46904 2021-02-13 11:40 ./slackware64/ap/most-5.1.0-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:40 ./slackware64/ap/most-5.1.0-x86_64-3.txz.asc
-rw-r--r-- 1 root root 331 2021-09-18 19:45 ./slackware64/ap/mpg123-1.29.0-x86_64-2.txt
-rw-r--r-- 1 root root 473960 2021-09-18 19:45 ./slackware64/ap/mpg123-1.29.0-x86_64-2.txz
-rw-r--r-- 1 root root 163 2021-09-18 19:45 ./slackware64/ap/mpg123-1.29.0-x86_64-2.txz.asc
-rw-r--r-- 1 root root 331 2021-10-18 16:54 ./slackware64/ap/mpg123-1.29.1-x86_64-1.txt
-rw-r--r-- 1 root root 474548 2021-10-18 16:54 ./slackware64/ap/mpg123-1.29.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-18 16:54 ./slackware64/ap/mpg123-1.29.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 430 2021-10-06 18:02 ./slackware64/ap/nano-5.9-x86_64-1.txt
-rw-r--r-- 1 root root 616820 2021-10-06 18:02 ./slackware64/ap/nano-5.9-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-06 18:02 ./slackware64/ap/nano-5.9-x86_64-1.txz.asc
@ -1342,9 +1342,9 @@ drwxr-xr-x 2 root root 20480 2021-10-16 18:14 ./slackware64/ap
-rw-r--r-- 1 root root 375 2021-02-13 11:46 ./slackware64/ap/vbetool-1.2.2-x86_64-4.txt
-rw-r--r-- 1 root root 14756 2021-02-13 11:46 ./slackware64/ap/vbetool-1.2.2-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:46 ./slackware64/ap/vbetool-1.2.2-x86_64-4.txz.asc
-rw-r--r-- 1 root root 383 2021-10-09 04:01 ./slackware64/ap/vim-8.2.3487-x86_64-1.txt
-rw-r--r-- 1 root root 7889524 2021-10-09 04:01 ./slackware64/ap/vim-8.2.3487-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-09 04:01 ./slackware64/ap/vim-8.2.3487-x86_64-1.txz.asc
-rw-r--r-- 1 root root 383 2021-10-19 00:58 ./slackware64/ap/vim-8.2.3536-x86_64-1.txt
-rw-r--r-- 1 root root 7891352 2021-10-19 00:58 ./slackware64/ap/vim-8.2.3536-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-19 00:58 ./slackware64/ap/vim-8.2.3536-x86_64-1.txz.asc
-rw-r--r-- 1 root root 604 2021-02-13 11:47 ./slackware64/ap/vorbis-tools-1.4.2-x86_64-2.txt
-rw-r--r-- 1 root root 179076 2021-02-13 11:47 ./slackware64/ap/vorbis-tools-1.4.2-x86_64-2.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:47 ./slackware64/ap/vorbis-tools-1.4.2-x86_64-2.txz.asc
@ -1606,7 +1606,7 @@ drwxr-xr-x 2 root root 4096 2021-10-17 18:57 ./slackware64/k
-rw-r--r-- 1 root root 1171 2021-10-17 18:42 ./slackware64/k/maketag
-rw-r--r-- 1 root root 1171 2021-10-17 18:42 ./slackware64/k/maketag.ez
-rw-r--r-- 1 root root 18 2021-10-17 18:42 ./slackware64/k/tagfile
drwxr-xr-x 2 root root 86016 2021-10-15 20:50 ./slackware64/kde
drwxr-xr-x 2 root root 86016 2021-10-19 01:12 ./slackware64/kde
-rw-r--r-- 1 root root 382 2021-10-09 05:43 ./slackware64/kde/akonadi-21.08.2-x86_64-1.txt
-rw-r--r-- 1 root root 2550956 2021-10-09 05:43 ./slackware64/kde/akonadi-21.08.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-09 05:43 ./slackware64/kde/akonadi-21.08.2-x86_64-1.txz.asc
@ -2616,9 +2616,9 @@ drwxr-xr-x 2 root root 86016 2021-10-15 20:50 ./slackware64/kde
-rw-r--r-- 1 root root 424 2021-09-30 18:58 ./slackware64/kde/plasma-wayland-protocols-1.4.0-x86_64-2.txt
-rw-r--r-- 1 root root 37016 2021-09-30 18:58 ./slackware64/kde/plasma-wayland-protocols-1.4.0-x86_64-2.txz
-rw-r--r-- 1 root root 163 2021-09-30 18:58 ./slackware64/kde/plasma-wayland-protocols-1.4.0-x86_64-2.txz.asc
-rw-r--r-- 1 root root 378 2021-10-15 20:34 ./slackware64/kde/plasma-workspace-5.23.0-x86_64-2.txt
-rw-r--r-- 1 root root 10495912 2021-10-15 20:34 ./slackware64/kde/plasma-workspace-5.23.0-x86_64-2.txz
-rw-r--r-- 1 root root 163 2021-10-15 20:34 ./slackware64/kde/plasma-workspace-5.23.0-x86_64-2.txz.asc
-rw-r--r-- 1 root root 378 2021-10-19 00:51 ./slackware64/kde/plasma-workspace-5.23.0-x86_64-4.txt
-rw-r--r-- 1 root root 10494528 2021-10-19 00:51 ./slackware64/kde/plasma-workspace-5.23.0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-10-19 00:51 ./slackware64/kde/plasma-workspace-5.23.0-x86_64-4.txz.asc
-rw-r--r-- 1 root root 423 2021-10-14 17:56 ./slackware64/kde/plasma-workspace-wallpapers-5.23.0-x86_64-1.txt
-rw-r--r-- 1 root root 57050180 2021-10-14 17:56 ./slackware64/kde/plasma-workspace-wallpapers-5.23.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-14 17:56 ./slackware64/kde/plasma-workspace-wallpapers-5.23.0-x86_64-1.txz.asc
@ -5278,7 +5278,7 @@ drwxr-xr-x 2 root root 65536 2021-10-15 20:50 ./slackware64/x
-rw-r--r-- 1 root root 213 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txt
-rw-r--r-- 1 root root 25428 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 13:14 ./slackware64/x/xwud-1.0.5-x86_64-4.txz.asc
drwxr-xr-x 2 root root 16384 2021-10-15 20:50 ./slackware64/xap
drwxr-xr-x 2 root root 16384 2021-10-19 01:11 ./slackware64/xap
-rw-r--r-- 1 root root 625 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txt
-rw-r--r-- 1 root root 2738724 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-04-18 18:11 ./slackware64/xap/MPlayer-20210418-x86_64-1.txz.asc
@ -5392,9 +5392,9 @@ drwxr-xr-x 2 root root 16384 2021-10-15 20:50 ./slackware64/xap
-rw-r--r-- 1 root root 1340972 2021-09-03 02:17 ./slackware64/xap/ssr-0.4.3-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-09-03 02:17 ./slackware64/xap/ssr-0.4.3-x86_64-1.txz.asc
-rw-r--r-- 1 root root 676 2021-09-23 19:13 ./slackware64/xap/tagfile
-rw-r--r-- 1 root root 503 2021-10-09 04:02 ./slackware64/xap/vim-gvim-8.2.3487-x86_64-1.txt
-rw-r--r-- 1 root root 1606200 2021-10-09 04:02 ./slackware64/xap/vim-gvim-8.2.3487-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-09 04:02 ./slackware64/xap/vim-gvim-8.2.3487-x86_64-1.txz.asc
-rw-r--r-- 1 root root 503 2021-10-19 00:59 ./slackware64/xap/vim-gvim-8.2.3536-x86_64-1.txt
-rw-r--r-- 1 root root 1607676 2021-10-19 00:59 ./slackware64/xap/vim-gvim-8.2.3536-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-10-19 00:59 ./slackware64/xap/vim-gvim-8.2.3536-x86_64-1.txz.asc
-rw-r--r-- 1 root root 455 2021-02-13 13:43 ./slackware64/xap/windowmaker-0.95.9-x86_64-3.txt
-rw-r--r-- 1 root root 1761052 2021-02-13 13:43 ./slackware64/xap/windowmaker-0.95.9-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 13:43 ./slackware64/xap/windowmaker-0.95.9-x86_64-3.txz.asc
@ -5545,11 +5545,11 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:33 ./slackware64/y
-rw-r--r-- 1 root root 1486956 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz.asc
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
drwxr-xr-x 18 root root 4096 2021-10-17 18:58 ./source
-rw-r--r-- 1 root root 579510 2021-10-17 18:58 ./source/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2021-10-17 18:58 ./source/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 806344 2021-10-17 18:58 ./source/FILE_LIST
-rw-r--r-- 1 root root 23295072 2021-10-17 18:58 ./source/MANIFEST.bz2
drwxr-xr-x 18 root root 4096 2021-10-19 01:13 ./source
-rw-r--r-- 1 root root 578865 2021-10-19 01:13 ./source/CHECKSUMS.md5
-rw-r--r-- 1 root root 163 2021-10-19 01:13 ./source/CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 805611 2021-10-19 01:12 ./source/FILE_LIST
-rw-r--r-- 1 root root 23297216 2021-10-19 01:12 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
drwxr-xr-x 122 root root 4096 2021-09-25 00:50 ./source/a
-rw-r--r-- 1 root root 1591 2021-04-06 18:09 ./source/a/FTBFSlog
@ -5823,26 +5823,18 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/a/f2fs-tools
-rw-r--r-- 1 root root 276660 2020-08-26 19:44 ./source/a/f2fs-tools/f2fs-tools-1.14.0.tar.lz
-rwxr-xr-x 1 root root 4878 2021-02-13 05:31 ./source/a/f2fs-tools/f2fs-tools.SlackBuild
-rw-r--r-- 1 root root 1002 2018-11-26 21:31 ./source/a/f2fs-tools/slack-desc
drwxr-xr-x 3 root root 4096 2021-04-24 18:20 ./source/a/file
-rw-r--r-- 1 root root 607 2021-04-24 18:19 ./source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch.gz
drwxr-xr-x 3 root root 4096 2021-10-19 00:55 ./source/a/file
-rw-r--r-- 1 root root 132 2015-04-14 20:27 ./source/a/file/doinst.sh.gz
-rw-r--r-- 1 root root 744981 2021-03-31 00:29 ./source/a/file/file-5.40.tar.lz
-rw-r--r-- 1 root root 799080 2021-10-18 16:50 ./source/a/file/file-5.41.tar.lz
-rw-r--r-- 1 root root 249 2019-12-20 19:14 ./source/a/file/file.PT_DYNAMIC.is.dynamically.linked.diff.gz
-rwxr-xr-x 1 root root 6957 2021-04-24 18:21 ./source/a/file/file.SlackBuild
-rwxr-xr-x 1 root root 6109 2021-10-19 00:56 ./source/a/file/file.SlackBuild
-rw-r--r-- 1 root root 195 2009-02-23 01:20 ./source/a/file/file.crdaregbin.magic.gz
-rw-r--r-- 1 root root 212 2009-06-12 22:40 ./source/a/file/file.etc.file.diff.gz
-rw-r--r-- 1 root root 336 2009-02-09 04:19 ./source/a/file/file.quiet.diff.gz
-rw-r--r-- 1 root root 250 2011-08-24 02:10 ./source/a/file/file.short.diff.gz
-rw-r--r-- 1 root root 248 2009-04-23 04:50 ./source/a/file/file.xz.magic.gz
-rw-r--r-- 1 root root 214 2005-09-07 03:59 ./source/a/file/file.zisofs.magic.gz
drwxr-xr-x 2 root root 4096 2021-04-06 18:19 ./source/a/file/git-patches
-rw-r--r-- 1 root root 668 2021-04-06 18:14 ./source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch.gz
-rw-r--r-- 1 root root 1447 2021-04-06 18:13 ./source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch.gz
-rw-r--r-- 1 root root 633 2021-04-06 18:14 ./source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch.gz
-rw-r--r-- 1 root root 1168 2021-04-06 18:13 ./source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch.gz
-rw-r--r-- 1 root root 636 2021-04-06 18:14 ./source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch.gz
-rw-r--r-- 1 root root 435 2021-04-06 18:14 ./source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch.gz
-rw-r--r-- 1 root root 1838 2021-04-06 18:19 ./source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch.gz
drwxr-xr-x 2 root root 4096 2021-10-19 00:55 ./source/a/file/git-patches
-rw-r--r-- 1 root root 233 2015-04-14 20:30 ./source/a/file/recompile_magic.mgc.sh.gz
-rw-r--r-- 1 root root 723 2018-02-27 06:13 ./source/a/file/slack-desc
drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/a/findutils
@ -6792,15 +6784,16 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/gutenprint
-rwxr-xr-x 1 root root 4776 2021-02-13 05:31 ./source/ap/gutenprint/gutenprint.SlackBuild
-rw-r--r-- 1 root root 121 2016-02-03 04:22 ./source/ap/gutenprint/setup.cups-genppdupdate
-rw-r--r-- 1 root root 1050 2019-08-27 20:54 ./source/ap/gutenprint/slack-desc
drwxr-xr-x 2 root root 4096 2021-10-09 02:13 ./source/ap/hplip
drwxr-xr-x 2 root root 4096 2021-10-18 18:09 ./source/ap/hplip
-rw-r--r-- 1 root root 869 2018-09-30 10:10 ./source/ap/hplip/0021-Add-include-cups-ppd.h-in-various-places-as-CUPS-2.2.patch.gz
-rw-r--r-- 1 root root 1759 2018-09-30 10:10 ./source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch.gz
-rw-r--r-- 1 root root 118 2009-03-05 16:38 ./source/ap/hplip/doinst.sh.gz
-rw-r--r-- 1 root root 340 2021-03-01 05:02 ./source/ap/hplip/fix-desktop-file.patch.gz
-rw-r--r-- 1 root root 21092967 2020-05-14 10:16 ./source/ap/hplip/hplip-3.20.5.tar.lz
-rwxr-xr-x 1 root root 6607 2021-10-09 02:13 ./source/ap/hplip/hplip.SlackBuild
-rwxr-xr-x 1 root root 6675 2021-10-18 18:24 ./source/ap/hplip/hplip.SlackBuild
-rw-r--r-- 1 root root 676 2021-03-12 20:07 ./source/ap/hplip/hplip.is_alive.diff.gz
-rw-r--r-- 1 root root 419 2013-03-20 04:46 ./source/ap/hplip/hplip.no.upgrade.diff.gz
-rw-r--r-- 1 root root 852 2021-10-18 18:08 ./source/ap/hplip/hplip.python3.10.diff.gz
-rw-r--r-- 1 root root 291 2017-11-28 00:41 ./source/ap/hplip/hplip.python3.shebang.diff.gz
-rw-r--r-- 1 root root 217 2016-06-01 18:56 ./source/ap/hplip/setup.py.lc_all.c.diff.gz
-rw-r--r-- 1 root root 912 2018-10-30 21:11 ./source/ap/hplip/slack-desc
@ -6977,9 +6970,9 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/most
-rwxr-xr-x 1 root root 3306 2021-02-13 05:31 ./source/ap/most/most.SlackBuild
-rw-r--r-- 1 root root 39 2019-03-06 19:02 ./source/ap/most/most.url
-rw-r--r-- 1 root root 828 2018-02-27 06:12 ./source/ap/most/slack-desc
drwxr-xr-x 2 root root 4096 2021-09-18 19:47 ./source/ap/mpg123
-rw-r--r-- 1 root root 886015 2021-09-05 23:12 ./source/ap/mpg123/mpg123-1.29.0.tar.lz
-rwxr-xr-x 1 root root 6313 2021-09-18 19:48 ./source/ap/mpg123/mpg123.SlackBuild
drwxr-xr-x 2 root root 4096 2021-10-18 16:54 ./source/ap/mpg123
-rw-r--r-- 1 root root 883691 2021-10-17 21:00 ./source/ap/mpg123/mpg123-1.29.1.tar.lz
-rwxr-xr-x 1 root root 6313 2021-10-18 16:54 ./source/ap/mpg123/mpg123.SlackBuild
-rw-r--r-- 1 root root 250 2021-09-18 19:47 ./source/ap/mpg123/mpg123.lib64.diff.gz
-rw-r--r-- 1 root root 27 2019-08-26 18:16 ./source/ap/mpg123/mpg123.url
-rw-r--r-- 1 root root 785 2018-02-27 06:12 ./source/ap/mpg123/slack-desc
@ -7200,12 +7193,12 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/vbetool
-rw-r--r-- 1 root root 24915 2015-12-20 20:37 ./source/ap/vbetool/vbetool-1.2.2.tar.gz
-rwxr-xr-x 1 root root 3202 2021-02-13 05:31 ./source/ap/vbetool/vbetool.SlackBuild
-rw-r--r-- 1 root root 129 2008-11-24 18:23 ./source/ap/vbetool/vbetool.info
drwxr-xr-x 2 root root 4096 2021-10-08 19:20 ./source/ap/vim
drwxr-xr-x 2 root root 4096 2021-10-19 00:58 ./source/ap/vim
-rw-r--r-- 1 root root 299348 2009-07-09 22:03 ./source/ap/vim/ctags-5.8.tar.xz
-rw-r--r-- 1 root root 8249 2006-01-19 17:01 ./source/ap/vim/gvim.png
-rw-r--r-- 1 root root 834 2018-02-27 06:13 ./source/ap/vim/slack-desc.vim
-rw-r--r-- 1 root root 959 2018-03-15 02:41 ./source/ap/vim/slack-desc.vim-gvim
-rw-r--r-- 1 root root 10047394 2021-10-08 19:19 ./source/ap/vim/vim-8.2.3487.tar.lz
-rw-r--r-- 1 root root 10053480 2021-10-19 00:57 ./source/ap/vim/vim-8.2.3536.tar.lz
-rwxr-xr-x 1 root root 6360 2021-05-27 18:24 ./source/ap/vim/vim-gvim.SlackBuild
-rwxr-xr-x 1 root root 7740 2021-05-27 18:24 ./source/ap/vim/vim.SlackBuild
-rw-r--r-- 1 root root 283 2019-01-11 20:43 ./source/ap/vim/vim.vimrc.diff.gz
@ -8137,7 +8130,7 @@ drwxr-xr-x 2 root root 16384 2021-09-30 17:57 ./source/kde/kde/build
-rw-r--r-- 1 root root 2 2021-09-30 17:57 ./source/kde/kde/build/plasma-thunderbolt
-rw-r--r-- 1 root root 2 2021-10-14 16:34 ./source/kde/kde/build/plasma-vault
-rw-r--r-- 1 root root 2 2021-09-30 17:57 ./source/kde/kde/build/plasma-wayland-protocols
-rw-r--r-- 1 root root 2 2021-10-15 20:32 ./source/kde/kde/build/plasma-workspace
-rw-r--r-- 1 root root 2 2021-10-19 00:49 ./source/kde/kde/build/plasma-workspace
-rw-r--r-- 1 root root 2 2021-10-14 16:34 ./source/kde/kde/build/plasma-workspace-wallpapers
-rw-r--r-- 1 root root 2 2021-09-30 17:57 ./source/kde/kde/build/plymouth-kcm
-rw-r--r-- 1 root root 2 2021-10-14 16:34 ./source/kde/kde/build/polkit-kde-agent-1
@ -8348,8 +8341,9 @@ drwxr-xr-x 2 root root 4096 2018-06-20 17:39 ./source/kde/kde/patch/plasm
drwxr-xr-x 2 root root 4096 2020-11-22 01:56 ./source/kde/kde/patch/plasma-desktop
-rw-r--r-- 1 root root 357 2021-09-25 18:49 ./source/kde/kde/patch/plasma-desktop.patch
-rw-r--r-- 1 root root 840 2020-11-22 01:56 ./source/kde/kde/patch/plasma-desktop/plasma-desktop.default_launcher_tasks.diff
drwxr-xr-x 2 root root 4096 2021-10-15 20:31 ./source/kde/kde/patch/plasma-workspace
-rw-r--r-- 1 root root 250 2021-10-15 20:32 ./source/kde/kde/patch/plasma-workspace.patch
drwxr-xr-x 2 root root 4096 2021-10-19 00:48 ./source/kde/kde/patch/plasma-workspace
-rw-r--r-- 1 root root 479 2021-10-19 00:49 ./source/kde/kde/patch/plasma-workspace.patch
-rw-r--r-- 1 root root 5085 2021-05-31 05:01 ./source/kde/kde/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch
-rw-r--r-- 1 root root 1687 2021-10-15 08:57 ./source/kde/kde/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch
drwxr-xr-x 2 root root 4096 2021-08-29 18:16 ./source/kde/kde/patch/sddm
-rw-r--r-- 1 root root 1114 2021-08-29 16:37 ./source/kde/kde/patch/sddm.patch
@ -12007,20 +12001,20 @@ drwxr-xr-x 2 root root 4096 2020-01-21 18:39 ./source/n/krb5/conf
-rw-r--r-- 1 root root 756 2020-01-21 18:49 ./source/n/krb5/slack-desc
drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/lftp
-rw-r--r-- 1 root root 263 2009-05-31 06:11 ./source/n/lftp/doinst.sh.gz
-rw-r--r-- 1 root root 1654960 2020-08-13 20:37 ./source/n/lftp/lftp-4.9.2.tar.xz
-rw-r--r-- 1 root root 155 2020-08-13 20:37 ./source/n/lftp/lftp-4.9.2.tar.xz.asc
-rwxr-xr-x 1 root root 4342 2021-02-13 05:32 ./source/n/lftp/lftp.SlackBuild
-rw-r--r-- 1 root root 998 2018-02-27 06:13 ./source/n/lftp/slack-desc
drwxr-xr-x 2 root root 4096 2021-03-24 03:46 ./source/n/libassuan
-rw-r--r-- 1 root root 488363 2021-03-22 12:29 ./source/n/libassuan/libassuan-2.5.5.tar.lz
-rwxr-xr-x 1 root root 3860 2021-03-24 03:46 ./source/n/libassuan/libassuan.SlackBuild
-rw-r--r-- 1 root root 709 2018-02-27 06:13 ./source/n/libassuan/slack-desc
drwxr-xr-x 2 root root 4096 2021-08-23 18:09 ./source/n/libgcrypt
-rw-r--r-- 1 root root 2711602 2021-08-22 16:08 ./source/n/libgcrypt/libgcrypt-1.9.4.tar.lz
-rwxr-xr-x 1 root root 4316 2021-02-17 19:08 ./source/n/libgcrypt/libgcrypt.SlackBuild
-rw-r--r-- 1 root root 702 2018-02-27 06:13 ./source/n/libgcrypt/slack-desc
drwxr-xr-x 2 root root 4096 2021-03-22 18:29 ./source/n/libgpg-error
-rw-r--r-- 1 root root 779694 2021-03-22 10:53 ./source/n/libgpg-error/libgpg-error-1.42.tar.lz
-rw-r--r-- 1 root root 1654960 2020-08-13 20:37 ./source/n/lftp/lftp-4.9.2.tar.xz
-rw-r--r-- 1 root root 155 2020-08-13 20:37 ./source/n/lftp/lftp-4.9.2.tar.xz.asc
-rwxr-xr-x 1 root root 4342 2021-02-13 05:32 ./source/n/lftp/lftp.SlackBuild
-rw-r--r-- 1 root root 998 2018-02-27 06:13 ./source/n/lftp/slack-desc
drwxr-xr-x 2 root root 4096 2021-03-24 03:46 ./source/n/libassuan
-rw-r--r-- 1 root root 488363 2021-03-22 12:29 ./source/n/libassuan/libassuan-2.5.5.tar.lz
-rwxr-xr-x 1 root root 3860 2021-03-24 03:46 ./source/n/libassuan/libassuan.SlackBuild
-rw-r--r-- 1 root root 709 2018-02-27 06:13 ./source/n/libassuan/slack-desc
drwxr-xr-x 2 root root 4096 2021-08-23 18:09 ./source/n/libgcrypt
-rw-r--r-- 1 root root 2711602 2021-08-22 16:08 ./source/n/libgcrypt/libgcrypt-1.9.4.tar.lz
-rwxr-xr-x 1 root root 4316 2021-02-17 19:08 ./source/n/libgcrypt/libgcrypt.SlackBuild
-rw-r--r-- 1 root root 702 2018-02-27 06:13 ./source/n/libgcrypt/slack-desc
drwxr-xr-x 2 root root 4096 2021-03-22 18:29 ./source/n/libgpg-error
-rw-r--r-- 1 root root 779694 2021-03-22 10:53 ./source/n/libgpg-error/libgpg-error-1.42.tar.lz
-rwxr-xr-x 1 root root 4768 2021-03-22 18:29 ./source/n/libgpg-error/libgpg-error.SlackBuild
-rw-r--r-- 1 root root 41 2020-02-08 19:17 ./source/n/libgpg-error/libgpg-error.url
-rw-r--r-- 1 root root 852 2018-02-27 06:13 ./source/n/libgpg-error/slack-desc

View file

@ -177,15 +177,7 @@ gzip ./source/a/file/recompile_magic.mgc.sh
gzip ./source/a/file/file.short.diff
gzip ./source/a/file/file.etc.file.diff
gzip ./source/a/file/doinst.sh
gzip ./source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch
gzip ./source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch
gzip ./source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch
gzip ./source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch
gzip ./source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch
gzip ./source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch
gzip ./source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch
gzip ./source/a/file/file.quiet.diff
gzip ./source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch
gzip ./source/a/bzip2/bzip2.saneso.diff
gzip ./source/a/floppy/fdutils-5.5-20081027.diff
gzip ./source/a/floppy/fdutils.mediaprm.diff
@ -633,6 +625,7 @@ gzip ./source/ap/dash/doinst.sh
gzip ./source/ap/hplip/hplip.no.upgrade.diff
gzip ./source/ap/hplip/hplip.is_alive.diff
gzip ./source/ap/hplip/setup.py.lc_all.c.diff
gzip ./source/ap/hplip/hplip.python3.10.diff
gzip ./source/ap/hplip/doinst.sh
gzip ./source/ap/hplip/hplip.python3.shebang.diff
gzip ./source/ap/hplip/0025-Remove-all-ImageProcessor-functionality-which-is-clo.patch

View file

@ -1,33 +0,0 @@
From 94ab14414606b794b7ccf60595493cd8715e195b Mon Sep 17 00:00:00 2001
From: ProgAndy <code@progandy.de>
Date: Fri, 2 Apr 2021 14:33:18 +0200
Subject: [PATCH] Fix mime type XZ after "Add checksum for XZ"
---
magic/Magdir/compress | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/magic/Magdir/compress b/magic/Magdir/compress
index 64d11a73..aef4bb49 100644
--- a/magic/Magdir/compress
+++ b/magic/Magdir/compress
@@ -265,14 +265,13 @@
# http://tukaani.org/xz/xz-file-format.txt
0 ustring \xFD7zXZ\x00 XZ compressed data, checksum
+!:strength * 2
+!:mime application/x-xz
>7 byte&0xf 0x0 NONE
>7 byte&0xf 0x1 CRC32
>7 byte&0xf 0x4 CRC64
>7 byte&0xf 0xa SHA-256
-!:strength * 2
-!:mime application/x-xz
-
# https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
0 string LRZI LRZIP compressed data
>4 byte x - version %d
--
2.31.1

View file

@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=file
VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
BUILD=${BUILD:-3}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@ -99,16 +99,7 @@ zcat $CWD/file.zisofs.magic.gz >> magic/Magdir/compress
zcat $CWD/file.crdaregbin.magic.gz >> magic/Magdir/crdaregbin
# Add some regression fixes from upstream:
zcat $CWD/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch.gz | patch -p1 --verbose || exit 1
# Fix detection of XZ compressed data:
zcat $CWD/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch.gz | patch -p1 --verbose || exit 1
# (none currently)
# This is needed after the default data directory patch above:
autoreconf -vif || exit 1

View file

@ -1,33 +0,0 @@
From 1c677c04c0fa43ecfeccdb9705dbbd19fb356891 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sun, 4 Apr 2021 21:02:19 +0000
Subject: [PATCH] Don't count each byte encounter as 1, count the total number
of bytes found (Anatol Belski). This makes it behave like 5.39.
---
src/encoding.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/encoding.c b/src/encoding.c
index c8b404390..c66703bb6 100644
--- a/src/encoding.c
+++ b/src/encoding.c
@@ -35,7 +35,7 @@
#include "file.h"
#ifndef lint
-FILE_RCSID("@(#)$File: encoding.c,v 1.27 2021/02/05 21:33:49 christos Exp $")
+FILE_RCSID("@(#)$File: encoding.c,v 1.28 2021/04/04 21:02:19 christos Exp $")
#endif /* lint */
#include "magic.h"
@@ -282,8 +282,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf, \
} \
u = 0; \
for (i = 0; i < __arraycount(dist); i++) { \
- if (dist[i]) \
- u++; \
+ u+= dist[i]; \
} \
if (u < 3) \
return 0; \

View file

@ -1,61 +0,0 @@
From 2f62d5544d13ca32dc09504ec70358db581e9e65 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Wed, 31 Mar 2021 19:51:14 +0000
Subject: [PATCH] Improve 8086 relocatable detection (Joerg Jenderek)
---
magic/Magdir/xenix | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/magic/Magdir/xenix b/magic/Magdir/xenix
index 3e248de26..d5ab69e5d 100644
--- a/magic/Magdir/xenix
+++ b/magic/Magdir/xenix
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: xenix,v 1.12 2021/02/23 00:51:10 christos Exp $
+# $File: xenix,v 1.13 2021/03/31 19:51:14 christos Exp $
# xenix: file(1) magic for Microsoft Xenix
#
# "Middle model" stuff, and "Xenix 8086 relocatable or 80286 small
@@ -13,25 +13,35 @@
#
0 string core core file (Xenix)
# URL: http://www.polarhome.com/service/man/?qf=86rel&tf=2&of=Xenix
+# http://fileformats.archiveteam.org/wiki/OMF
# Reference: http://www.azillionmonkeys.com/qed/Omfg.pdf
# Update: Joerg Jenderek
# recordtype~TranslatorHEADerRecord
0 byte 0x80
-# GRR: line above is too general as it catches also Extensible storage engine DataBase
+# GRR: line above is too general as it catches also Extensible storage engine DataBase,
+# all lif files like forth.lif hpcc88.lif lex90b.lif ( See ./lif)
+# and all compressed DEGAS low-res bitmaps like: MUNCHIE.PC1 PIDER1.PC1
# skip examples like GENA.SND Switch.Snd by looking for record length maximal 1024-3
>1 uleshort <1022
# skip examples like GAME.PICTURE Strange.Pic by looking for positive record length
>>1 uleshort >0
# skip examples like Xtable.Data FRACTAL.GEN SHR.VIEW by looking for positive string length
>>>3 ubyte >0
-# skip examples like OMBRE.6 with "UUUUUU" by looking for filename like "hello.c"
->>>>4 regex [a-zA-Z_/]{1,8}[.] 8086 relocatable (Microsoft)
+# skip examples like OMBRE.6 with "UUUUUU" name by looking for valid high second record type
+>>>>(1.s+3) ubyte >0x6D 8086 relocatable (Microsoft)
#!:mime application/octet-stream
!:mime application/x-object
-!:ext o/a
+!:ext obj/o/a
+# T-module name often source name like "hello.c" or "jmppm32.asm" in JMPPM32.OBJ or
+# "kbhit" in KBHITS.OBJ or "CAUSEWAY_KERNAL" in CWAPI.OBJ
>>>>>3 pstring x \b, "%s"
+# data length probably lower 256 according to TrID obj_omf.trid.xml
+>>>>>1 uleshort x \b, 1st record data length %u
# checksum
#>>>>>(3.b+4) ubyte x \b, checksum 0x%2.2x
+# second recordtype: 96h~LNAMES 88h~COMENT 8CH~EXTDEF
+>>>>>(1.s+3) ubyte x \b, 2nd record type 0x%x
+>>>>>(1.s+4) uleshort x \b, 2nd record data length %u
0 leshort 0xff65 x.out
>2 string __.SYMDEF randomized
>0 byte x archive

View file

@ -1,32 +0,0 @@
From 576d713ec955faafdc9d7b783f3f4c27b7bc1793 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Tue, 6 Apr 2021 15:43:11 +0000
Subject: [PATCH] Add more ash paths from Cormac Stephenson
---
magic/Magdir/commands | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/magic/Magdir/commands b/magic/Magdir/commands
index 10f8d2b20..5f6be0cce 100644
--- a/magic/Magdir/commands
+++ b/magic/Magdir/commands
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: commands,v 1.63 2020/06/06 15:36:30 christos Exp $
+# $File: commands,v 1.64 2021/04/06 15:43:11 christos Exp $
# commands: file(1) magic for various shells and interpreters
#
#0 string/w : shell archive or script for antique kernel text
@@ -38,6 +38,10 @@
0 search/1 #!/usr/bin/env\ zsh Paul Falstad's zsh script text executable
!:mime text/x-shellscript
+0 string/wt #!\ /bin/ash Neil Brown's ash script text executable
+!:mime text/x-shellscript
+0 string/wt #!\ /usr/bin/ash Neil Brown's ash script text executable
+!:mime text/x-shellscript
0 string/wt #!\ /usr/local/bin/ash Neil Brown's ash script text executable
!:mime text/x-shellscript
0 string/wt #!\ /usr/local/bin/ae Neil Brown's ae script text executable

View file

@ -1,102 +0,0 @@
From 64dcffa715049351327851c8b5a6f3430a32ff39 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sun, 4 Apr 2021 18:24:34 +0000
Subject: [PATCH] Add arm-coff (Mark Harmstone)
---
magic/Magdir/arm | 41 +++++++++++++++++++++++++++++++++++++++++
magic/Magdir/coff | 7 ++++++-
magic/Makefile.am | 3 ++-
3 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 magic/Magdir/arm
diff --git a/magic/Magdir/arm b/magic/Magdir/arm
new file mode 100644
index 000000000..8869d1928
--- /dev/null
+++ b/magic/Magdir/arm
@@ -0,0 +1,41 @@
+#------------------------------------------------------------------------------
+# $File: arm,v 1.1 2021/04/04 18:24:34 christos Exp $
+# arm: file(1) magic for ARM COFF
+#
+# https://docs.microsoft.com/en-us/windows/win32/debug/pe-format
+
+# Aarch64
+0 leshort 0xaa64
+# test for unused flag bits in f_flags
+>18 uleshort&0x8E80 0
+# use little endian variant of subroutine to
+# display name+variables+flags for common object formated files
+>>0 use display-coff
+!:strength -10
+
+# ARM
+0 leshort 0x01c0
+# test for unused flag bits in f_flags
+>18 uleshort&0x8E80 0
+# use little endian variant of subroutine to
+# display name+variables+flags for common object formated files
+>>0 use display-coff
+!:strength -10
+
+# ARM Thumb
+0 leshort 0x01c2
+# test for unused flag bits in f_flags
+>18 uleshort&0x8E80 0
+# use little endian variant of subroutine to
+# display name+variables+flags for common object formated files
+>>0 use display-coff
+!:strength -10
+
+# ARMv7 Thumb
+0 leshort 0x01c4
+# test for unused flag bits in f_flags
+>18 uleshort&0x8E80 0
+# use little endian variant of subroutine to
+# display name+variables+flags for common object formated files
+>>0 use display-coff
+!:strength -10
diff --git a/magic/Magdir/coff b/magic/Magdir/coff
index 18e7b665e..5063bc19e 100644
--- a/magic/Magdir/coff
+++ b/magic/Magdir/coff
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: coff,v 1.4 2021/02/10 00:37:02 christos Exp $
+# $File: coff,v 1.5 2021/04/04 18:24:34 christos Exp $
# coff: file(1) magic for Common Object Files not specific to known cpu types or manufactures
#
# COFF
@@ -34,6 +34,11 @@
# https://msdn.microsoft.com/en-us/library/windows/desktop/ms680313(v=vs.85).aspx
>>>>0 uleshort 0x0200 Intel ia64
>>>>0 uleshort 0x8664 Intel amd64
+# ARM COFF (./arm)
+>>>>0 uleshort 0xaa64 Aarch64
+>>>>0 uleshort 0x01c0 ARM
+>>>>0 uleshort 0x01c2 ARM Thumb
+>>>>0 uleshort 0x01c4 ARMv7 Thumb
# TODO for other COFFs
#>>>>0 uleshort 0xABCD COFF_TEMPLATE
>>>>0 default x
diff --git a/magic/Makefile.am b/magic/Makefile.am
index 0eb5865b7..75d39bbde 100644
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -1,5 +1,5 @@
#
-# $File: Makefile.am,v 1.166 2021/03/14 16:24:18 christos Exp $
+# $File: Makefile.am,v 1.167 2021/04/04 18:24:34 christos Exp $
#
MAGIC_FRAGMENT_BASE = Magdir
MAGIC_DIR = $(top_srcdir)/magic
@@ -29,6 +29,7 @@ $(MAGIC_FRAGMENT_DIR)/application \
$(MAGIC_FRAGMENT_DIR)/applix \
$(MAGIC_FRAGMENT_DIR)/apt \
$(MAGIC_FRAGMENT_DIR)/archive \
+$(MAGIC_FRAGMENT_DIR)/arm \
$(MAGIC_FRAGMENT_DIR)/asf \
$(MAGIC_FRAGMENT_DIR)/assembler \
$(MAGIC_FRAGMENT_DIR)/asterix \

View file

@ -1,26 +0,0 @@
From 6b34436ac766dae64749b8d14f18c6910be40131 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 5 Apr 2021 16:36:14 +0000
Subject: [PATCH] remove "u" from the pattern (Joerg Jenderek)
---
magic/Magdir/mail.news | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/magic/Magdir/mail.news b/magic/Magdir/mail.news
index 3a2eeb962..6a2229107 100644
--- a/magic/Magdir/mail.news
+++ b/magic/Magdir/mail.news
@@ -1,5 +1,5 @@
#------------------------------------------------------------------------------
-# $File: mail.news,v 1.26 2021/03/21 14:37:03 christos Exp $
+# $File: mail.news,v 1.27 2021/04/05 16:36:14 christos Exp $
# mail.news: file(1) magic for mail and news
#
# Unfortunately, saved netnews also has From line added in some news software.
@@ -81,4 +81,4 @@
# File format spec: https://wiki.dovecot.org/Design/Dcrypt/#File_format
# From: Stephen Gildea
0 string CRYPTED\003\007 Dovecot encrypted message
->9 byte xu \b, dcrypt version %d
+>9 byte x \b, dcrypt version %d

View file

@ -1,22 +0,0 @@
From 9e2becec20d023409a1671bf10a682f699350e85 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sun, 4 Apr 2021 21:03:43 +0000
Subject: [PATCH] Encoding bug fix.
---
ChangeLog | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 23a93cf4b..2238ba6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-04-04 17:02 Christos Zoulas <christos@zoulas.com>
+
+ * count the total bytes found not the total byte positions
+ in order to determine encoding (Anatol Belski)
+
2021-03-30 20:21 Christos Zoulas <christos@zoulas.com>
* release 5.40

View file

@ -1,159 +0,0 @@
From f06015040e7ffb3be21bb7622f9f8291b749aaf9 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Sun, 4 Apr 2021 17:46:17 +0000
Subject: [PATCH] Fix regression after unsigned/signed printing changes by
making types unsigned (Richard W.M. Jones)
---
magic/Magdir/filesystems | 54 +++++++++++++++++++--------------------
magic/Magdir/linux | 30 +++++++++++-----------
tests/Makefile.am | 1 +
tests/ext4.result | 1 +
tests/ext4.testfile | Bin 0 -> 2048 bytes
5 files changed, 44 insertions(+), 42 deletions(-)
create mode 100644 tests/ext4.result
create mode 100644 tests/ext4.testfile
diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 0cb45cbfe..81966d6cc 100644
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -1,5 +1,5 @@
#------------------------------------------------------------------------------
-# $File: filesystems,v 1.140 2021/02/23 00:51:10 christos Exp $
+# $File: filesystems,v 1.141 2021/04/04 17:46:17 christos Exp $
# filesystems: file(1) magic for different filesystems
#
0 name partid
@@ -1739,12 +1739,12 @@
>>>0x464 lelong >0x0000007 ext4 filesystem data
# else large INCOMPAT?
>>0x460 lelong >0x000003f ext4 filesystem data
->0x468 belong x \b, UUID=%08x
->0x46c beshort x \b-%04x
->0x46e beshort x \b-%04x
->0x470 beshort x \b-%04x
->0x472 belong x \b-%08x
->0x476 beshort x \b%04x
+>0x468 ubelong x \b, UUID=%08x
+>0x46c ubeshort x \b-%04x
+>0x46e ubeshort x \b-%04x
+>0x470 ubeshort x \b-%04x
+>0x472 ubelong x \b-%08x
+>0x476 ubeshort x \b%04x
>0x478 string >0 \b, volume name "%s"
# General flags for any ext* fs
>0x460 lelong &0x0000004 (needs journal recovery)
@@ -1767,12 +1767,12 @@
# f2fs filesystem - Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
0x400 lelong 0xF2F52010 F2FS filesystem
->0x46c belong x \b, UUID=%08x
->0x470 beshort x \b-%04x
->0x472 beshort x \b-%04x
->0x474 beshort x \b-%04x
->0x476 belong x \b-%08x
->0x47a beshort x \b%04x
+>0x46c ubelong x \b, UUID=%08x
+>0x470 ubeshort x \b-%04x
+>0x472 ubeshort x \b-%04x
+>0x474 ubeshort x \b-%04x
+>0x476 ubelong x \b-%08x
+>0x47a ubeshort x \b%04x
>0x147c lestring16 x \b, volume name "%s"
# Minix filesystems - Juan Cespedes <cespedes@debian.org>
@@ -2296,20 +2296,20 @@
>>0x10060 string >\0 lockproto %s)
# Russell Coker <russell@coker.com.au>
-0x10040 string _BHRfS_M BTRFS Filesystem
->0x1012b string >\0 label "%s",
->0x10090 lelong x sectorsize %d,
->0x10094 lelong x nodesize %d,
->0x10098 lelong x leafsize %d,
->0x10020 belong x UUID=%08x-
->0x10024 beshort x \b%04x-
->0x10026 beshort x \b%04x-
->0x10028 beshort x \b%04x-
->0x1002a beshort x \b%04x
->0x1002c belong x \b%08x,
->0x10078 lequad x %lld/
->0x10070 lequad x \b%lld bytes used,
->0x10088 lequad x %lld devices
+0x10040 string _BHRfS_M BTRFS Filesystem
+>0x1012b string >\0 label "%s",
+>0x10090 lelong x sectorsize %d,
+>0x10094 lelong x nodesize %d,
+>0x10098 lelong x leafsize %d,
+>0x10020 ubelong x UUID=%08x-
+>0x10024 ubeshort x \b%04x-
+>0x10026 ubeshort x \b%04x-
+>0x10028 ubeshort x \b%04x-
+>0x1002a ubeshort x \b%04x
+>0x1002c ubelong x \b%08x,
+>0x10078 lequad x %lld/
+>0x10070 lequad x \b%lld bytes used,
+>0x10088 lequad x %lld devices
# dvdisaster's .ecc
# From: "Nelson A. de Oliveira" <naoliv@gmail.com>
diff --git a/magic/Magdir/linux b/magic/Magdir/linux
index 693cef6f5..f25243e20 100644
--- a/magic/Magdir/linux
+++ b/magic/Magdir/linux
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: linux,v 1.77 2021/02/24 23:05:02 christos Exp $
+# $File: linux,v 1.78 2021/04/04 17:46:17 christos Exp $
# linux: file(1) magic for Linux files
#
# Values for Linux/i386 binaries, from Daniel Quinlan <quinlan@yggdrasil.com>
@@ -83,20 +83,20 @@
# format v1, supported since 1998
0 name linux-swap
->0x400 lelong 1 little endian, version %u,
->>0x404 lelong x size %u pages,
->>0x408 lelong x %u bad pages,
->0x400 belong 1 big endian, version %u,
->>0x404 belong x size %u pages,
->>0x408 belong x %u bad pages,
->0x41c string \0 no label,
->0x41c string >\0 LABEL=%s,
->0x40c belong x UUID=%08x
->0x410 beshort x \b-%04x
->0x412 beshort x \b-%04x
->0x414 beshort x \b-%04x
->0x416 belong x \b-%08x
->0x41a beshort x \b%04x
+>0x400 lelong 1 little endian, version %u,
+>>0x404 lelong x size %u pages,
+>>0x408 lelong x %u bad pages,
+>0x400 belong 1 big endian, version %u,
+>>0x404 belong x size %u pages,
+>>0x408 belong x %u bad pages,
+>0x41c string \0 no label,
+>0x41c string >\0 LABEL=%s,
+>0x40c ubelong x UUID=%08x
+>0x410 ubeshort x \b-%04x
+>0x412 ubeshort x \b-%04x
+>0x414 ubeshort x \b-%04x
+>0x416 ubelong x \b-%08x
+>0x41a ubeshort x \b%04x
0xff6 string SWAPSPACE2 Linux swap file, 4k page size,
>0 use linux-swap
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b38a25b3d..a63c2f65a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ regex-eol.magic \
CVE-2014-1943.testfile \
JW07022A.mp3.testfile \
escapevel.testfile \
+ext4.testfile \
fit-map-data.testfile \
gedcom.testfile \
hddrawcopytool.testfile \

View file

@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=hplip
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-4}
BUILD=${BUILD:-5}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@ -89,6 +89,9 @@ zcat $CWD/fix-desktop-file.patch.gz | patch -p1 --verbose || exit 1
# Fix for deprecated python function:
zcat $CWD/hplip.is_alive.diff.gz | patch -p1 --verbose || exit 1
# Patch for Python 3.10:
zcat $CWD/hplip.python3.10.diff.gz | patch -p1 --verbose || exit 1
# Choose correct options depending on whether PAM is installed:
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
unset SHADOW_OPTIONS
@ -130,7 +133,7 @@ done
# Needed because Makefile.am was patched:
autoreconf -vif || exit 1
CFLAGS="$SLKCFLAGS -I/usr/include/python3.8" \
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
PYTHON=/usr/bin/python3 \
./configure \

View file

@ -0,0 +1,77 @@
diff --git a/io/mudext/hpmudext.c b/io/mudext/hpmudext.c
index dca3e9d..dfcd22a 100644
--- a/io/mudext/hpmudext.c
+++ b/io/mudext/hpmudext.c
@@ -24,6 +24,8 @@ Authors: Don Welch, David Suffield, Naga Samrat Chowdary Narla
\*****************************************************************************/
+#define PY_SSIZE_T_CLEAN
+
#include <Python.h>
#include <stdarg.h>
#include "hpmud.h"
@@ -187,14 +189,22 @@ static PyObject *write_channel(PyObject *self, PyObject *args)
HPMUD_CHANNEL cd;
int timeout = 30;
char * buf;
- int buf_size = 0;
+ Py_ssize_t buf_size = 0;
+ int buf_size_asInt = 0;
int bytes_written = 0;
if (!PyArg_ParseTuple(args, "iis#|i", &dd, &cd, &buf, &buf_size, &timeout))
return NULL;
+ if (buf_size < INT_MIN)
+ buf_size_asInt = INT_MIN;
+ else if (buf_size > INT_MAX)
+ buf_size_asInt = INT_MAX;
+ else
+ buf_size_asInt = (int)buf_size;
+
Py_BEGIN_ALLOW_THREADS
- result = hpmud_write_channel(dd, cd, buf, buf_size, timeout, &bytes_written);
+ result = hpmud_write_channel(dd, cd, buf, buf_size_asInt, timeout, &bytes_written);
Py_END_ALLOW_THREADS
return Py_BuildValue("(ii)", result, bytes_written);
@@ -231,14 +241,22 @@ static PyObject *set_pml(PyObject *self, PyObject *args)
char * oid;
int type;
char * data;
- int data_size;
+ Py_ssize_t data_size = 0;
+ int data_size_asInt = 0;
int pml_result;
if (!PyArg_ParseTuple(args, "iisis#", &dd, &cd, &oid, &type, &data, &data_size))
return NULL;
+ if (data_size < INT_MIN)
+ data_size_asInt = INT_MIN;
+ else if (data_size > INT_MAX)
+ data_size_asInt = INT_MAX;
+ else
+ data_size_asInt = (int)data_size;
+
Py_BEGIN_ALLOW_THREADS
- result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size, &pml_result);
+ result = hpmud_set_pml(dd, cd, oid, type, (void *)data, data_size_asInt, &pml_result);
Py_END_ALLOW_THREADS
return Py_BuildValue("(ii)", result, pml_result);
diff --git a/scan/scanext/scanext.c b/scan/scanext/scanext.c
index 1e6b514..597abd8 100755
--- a/scan/scanext/scanext.c
+++ b/scan/scanext/scanext.c
@@ -45,6 +45,8 @@ PERFORMANCE OF THIS SOFTWARE.
*******************************************************************/
+#define PY_SSIZE_T_CLEAN
+
/* _ScanDevice objects */
#include "Python.h"

View file

@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mpg123
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-2}
BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}

View file

@ -1 +1 @@
2
4

View file

@ -1,2 +1,4 @@
# [PATCH] sddm-theme: fix missing password field on "Other" page:
cat $CWD/patch/plasma-workspace/0001-sddm-theme-fix-missing-password-field-on-Other-page.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
# [PATCH] Revert "No icons on the desktop by default":
cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }

View file

@ -0,0 +1,133 @@
From a437cb34a3cacc0daae012a26cb5a28407a6f873 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 28 Feb 2018 17:10:14 +0100
Subject: [PATCH] Revert "No icons on the desktop by default"
This reverts commit 240d0d6fe1e5db88e304199339396bd48c23e130.
We want those icons in openSUSE. They've always been there and there is no
reason not to have them.
---
kioslave/desktop/CMakeLists.txt | 1 +
kioslave/desktop/Home.desktop | 88 ++++++++++++++++++++++++++++++++++++++++
kioslave/desktop/kio_desktop.cpp | 4 ++
3 files changed, 93 insertions(+)
create mode 100644 kioslave/desktop/Home.desktop
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/CMakeLists.txt
===================================================================
--- plasma-workspace-5.17.80git.20210531T011335~40d302afe.orig/kioslave/desktop/CMakeLists.txt 2021-05-31 03:13:35.000000000 +0200
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/CMakeLists.txt 2021-05-31 06:59:47.519362944 +0200
@@ -31,3 +31,4 @@
########### install files ###############
install(FILES directory.desktop directory.trash DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop)
+install(FILES Home.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop/DesktopLinks)
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/Home.desktop
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/Home.desktop 2021-05-31 06:59:47.519362944 +0200
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Home
+Name[ca]=Inici
+Name[ca@valencia]=Inici
+Name[cs]=Můj adresář
+Name[da]=Hjem
+Name[de]=Persönlicher Ordner
+Name[el]=Προσωπικός φάκελος
+Name[en_GB]=Home
+Name[es]=Inicio
+Name[et]=Kodu
+Name[eu]=Etxea
+Name[fi]=Koti
+Name[fr]=Dossier personnel
+Name[gl]=Persoal
+Name[he]=בית
+Name[hu]=Saját mappa
+Name[is]=Heimamappa
+Name[it]=Home
+Name[ja]=ホーム
+Name[ko]=홈
+Name[lt]=Pradžia
+Name[nl]=Home
+Name[nn]=Heim
+Name[pa]=ਘਰ
+Name[pl]=Katalog domowy
+Name[pt]=Pasta Pessoal
+Name[pt_BR]=Pasta Pessoal
+Name[ru]=Домашняя папка
+Name[se]=Ruoktu
+Name[sk]=Domov
+Name[sl]=Dom
+Name[sr]=Домаће
+Name[sr@ijekavian]=Домаће
+Name[sr@ijekavianlatin]=Domaće
+Name[sr@latin]=Domaće
+Name[sv]=Hem
+Name[tr]=Başlangıç
+Name[uk]=Домівка
+Name[x-test]=xxHomexx
+Name[zh_CN]=主文件夹
+Name[zh_TW]=家目錄
+GenericName=Personal Files
+GenericName[ca]=Fitxers personals
+GenericName[ca@valencia]=Fitxers personals
+GenericName[cs]=Osobní soubory
+GenericName[da]=Personlige filer
+GenericName[de]=Persönliche Dateien
+GenericName[el]=Προσωπικά αρχεία
+GenericName[en_GB]=Personal Files
+GenericName[es]=Archivos personales
+GenericName[et]=Isiklikud failid
+GenericName[eu]=Fitxategi pertsonalak
+GenericName[fi]=Omat tiedostot
+GenericName[fr]=Fichiers personnels
+GenericName[gl]=Ficheiros persoais
+GenericName[he]=קבצים אישיים
+GenericName[hu]=Személyes fájlok
+GenericName[is]=Einkaskrár
+GenericName[it]=File personali
+GenericName[ja]=個人のファイル
+GenericName[ko]=개인적인 파일
+GenericName[lt]=Asmeniniai failai
+GenericName[nl]=Persoonlijke bestanden
+GenericName[nn]=Personlege filer
+GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲਾਂ
+GenericName[pl]=Pliki osobiste
+GenericName[pt]=Ficheiros Pessoais
+GenericName[pt_BR]=Arquivos pessoais
+GenericName[ru]=Личные файлы
+GenericName[se]=Iežat fiillat
+GenericName[sk]=Osobné súbory
+GenericName[sl]=Osebne datoteke
+GenericName[sr]=Лични фајлови
+GenericName[sr@ijekavian]=Лични фајлови
+GenericName[sr@ijekavianlatin]=Lični fajlovi
+GenericName[sr@latin]=Lični fajlovi
+GenericName[sv]=Personliga filer
+GenericName[tr]=Kişisel Dosyalar
+GenericName[uk]=Особисті файли
+GenericName[x-test]=xxPersonal Filesxx
+GenericName[zh_CN]=个人文件
+GenericName[zh_TW]=個人檔案
+URL[$e]=$HOME
+Icon=user-home
+Type=Link
+
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/kio_desktop.cpp
===================================================================
--- plasma-workspace-5.17.80git.20210531T011335~40d302afe.orig/kioslave/desktop/kio_desktop.cpp 2021-05-31 03:13:35.000000000 +0200
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/kio_desktop.cpp 2021-05-31 06:59:47.519362944 +0200
@@ -90,6 +90,10 @@
// Copy the .directory file
QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), desktopPath + "/.directory");
+ // Copy the trash link
+ QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.trash")),
+ desktopPath + "/trash.desktop");
+
// Copy the desktop links
QSet<QString> links;
const auto dirs =