Tue Oct 19 01:10:06 UTC 202120211019011006

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.

15 files changed, 221 insertions, 483 deletions

diff --git a/source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch b/source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch
deleted file mode 100644
index c71d2f817..000000000
--- a/source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch
+++ /dev/null
@@ -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
-
diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild
index 1a5e65011..d2870c5bd 100755
--- a/source/a/file/file.SlackBuild
+++ b/source/a/file/file.SlackBuild
@@ -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
diff --git a/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch b/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch
deleted file mode 100644
index 47c8c2aed..000000000
--- a/source/a/file/git-patches/1c677c04c0fa43ecfeccdb9705dbbd19fb356891.patch
+++ /dev/null
@@ -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; \
diff --git a/source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch b/source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch
deleted file mode 100644
index 61919d5c7..000000000
--- a/source/a/file/git-patches/2f62d5544d13ca32dc09504ec70358db581e9e65.patch
+++ /dev/null
@@ -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
diff --git a/source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch b/source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch
deleted file mode 100644
index 1e80ac99d..000000000
--- a/source/a/file/git-patches/576d713ec955faafdc9d7b783f3f4c27b7bc1793.patch
+++ /dev/null
@@ -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
diff --git a/source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch b/source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch
deleted file mode 100644
index f026891fb..000000000
--- a/source/a/file/git-patches/64dcffa715049351327851c8b5a6f3430a32ff39.patch
+++ /dev/null
@@ -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 \
diff --git a/source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch b/source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch
deleted file mode 100644
index 78f7d31c6..000000000
--- a/source/a/file/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch
+++ /dev/null
@@ -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
diff --git a/source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch b/source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch
deleted file mode 100644
index 9fa3ab4f0..000000000
--- a/source/a/file/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch
+++ /dev/null
@@ -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
diff --git a/source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch b/source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch
deleted file mode 100644
index c0cbf3cb8..000000000
--- a/source/a/file/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch
+++ /dev/null
@@ -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 \
diff --git a/source/ap/hplip/hplip.SlackBuild b/source/ap/hplip/hplip.SlackBuild
index 45bb30cc9..382b8c9c0 100755
--- a/source/ap/hplip/hplip.SlackBuild
+++ b/source/ap/hplip/hplip.SlackBuild
@@ -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 \
diff --git a/source/ap/hplip/hplip.python3.10.diff b/source/ap/hplip/hplip.python3.10.diff
new file mode 100644
index 000000000..5963f567a
--- /dev/null
+++ b/source/ap/hplip/hplip.python3.10.diff
@@ -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"
+
diff --git a/source/ap/mpg123/mpg123.SlackBuild b/source/ap/mpg123/mpg123.SlackBuild
index 5cca00ab5..262184756 100755
--- a/source/ap/mpg123/mpg123.SlackBuild
+++ b/source/ap/mpg123/mpg123.SlackBuild
@@ -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) "}
 
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index 0cfbf0888..b8626c4cf 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-2
+4
diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch
index 5bea067fd..e885eddd3 100644
--- a/source/kde/kde/patch/plasma-workspace.patch
+++ b/source/kde/kde/patch/plasma-workspace.patch
@@ -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 ; }
diff --git a/source/kde/kde/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch b/source/kde/kde/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch
new file mode 100644
index 000000000..f4215c4f9
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch
@@ -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 =