summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/soma/soma.SlackBuild4
-rw-r--r--source/ap/soma/soma.desktop.strip.trailing.whitespace.diff22
-rw-r--r--source/k/kernel-configs/config-generic-6.6.17 (renamed from source/k/kernel-configs/config-generic-6.6.16)3
-rw-r--r--source/k/kernel-configs/config-generic-6.6.17.x64 (renamed from source/k/kernel-configs/config-generic-6.6.16.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-6.6.17 (renamed from source/k/kernel-configs/config-huge-6.6.16)3
-rw-r--r--source/k/kernel-configs/config-huge-6.6.17.x64 (renamed from source/k/kernel-configs/config-huge-6.6.16.x64)2
-rw-r--r--source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch60
-rw-r--r--source/k/patches-i686/README3
-rwxr-xr-xsource/l/mozilla-nss/mozilla-nss.SlackBuild2
-rw-r--r--source/n/ca-certificates/certdata-20240216.txt (renamed from source/n/ca-certificates/certdata-20240203.txt)2
10 files changed, 33 insertions, 70 deletions
diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild
index be716350c..a5724403f 100755
--- a/source/ap/soma/soma.SlackBuild
+++ b/source/ap/soma/soma.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=soma
VERSION=${VERSION:-3.3.7}
ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
@@ -56,6 +56,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+cat $CWD/soma.desktop.strip.trailing.whitespace.diff | patch -p1 || exit 1
+
mkdir -p \
$PKG/install \
$PKG/etc/soma/themes \
diff --git a/source/ap/soma/soma.desktop.strip.trailing.whitespace.diff b/source/ap/soma/soma.desktop.strip.trailing.whitespace.diff
new file mode 100644
index 000000000..617f3d38a
--- /dev/null
+++ b/source/ap/soma/soma.desktop.strip.trailing.whitespace.diff
@@ -0,0 +1,22 @@
+--- ./soma.desktop.orig 2021-02-07 12:21:29.000000000 -0600
++++ ./soma.desktop 2024-02-16 13:58:32.684887399 -0600
+@@ -1,11 +1,11 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Application
++[Desktop Entry]
++Version=1.0
++Type=Application
+ Name=Internet Radio
+-Comment=Soma - Live Internet Streams
+-Exec=soma
+-Icon=Radio
+-Terminal=true
+-StartupNotify=false
++Comment=Soma - Live Internet Streams
++Exec=soma
++Icon=Radio
++Terminal=true
++StartupNotify=false
+ Categories=Application;Network;Audio;Player;
+ GenericName=Live Internet Radio Streams
diff --git a/source/k/kernel-configs/config-generic-6.6.16 b/source/k/kernel-configs/config-generic-6.6.17
index a88dbf2c7..f1387cdf6 100644
--- a/source/k/kernel-configs/config-generic-6.6.16
+++ b/source/k/kernel-configs/config-generic-6.6.17
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.16 Kernel Configuration
+# Linux/x86 6.6.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -11,6 +11,7 @@ CONFIG_AS_VERSION=24200
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24200
CONFIG_LLD_VERSION=0
+CONFIG_RUST_IS_AVAILABLE=y
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
diff --git a/source/k/kernel-configs/config-generic-6.6.16.x64 b/source/k/kernel-configs/config-generic-6.6.17.x64
index 9eaa2a9ee..901185251 100644
--- a/source/k/kernel-configs/config-generic-6.6.16.x64
+++ b/source/k/kernel-configs/config-generic-6.6.17.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.16 Kernel Configuration
+# Linux/x86 6.6.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/kernel-configs/config-huge-6.6.16 b/source/k/kernel-configs/config-huge-6.6.17
index c0f4f2d0c..e426c9c13 100644
--- a/source/k/kernel-configs/config-huge-6.6.16
+++ b/source/k/kernel-configs/config-huge-6.6.17
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.16 Kernel Configuration
+# Linux/x86 6.6.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
@@ -11,6 +11,7 @@ CONFIG_AS_VERSION=24200
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24200
CONFIG_LLD_VERSION=0
+CONFIG_RUST_IS_AVAILABLE=y
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
diff --git a/source/k/kernel-configs/config-huge-6.6.16.x64 b/source/k/kernel-configs/config-huge-6.6.17.x64
index d974af92a..2b9269513 100644
--- a/source/k/kernel-configs/config-huge-6.6.16.x64
+++ b/source/k/kernel-configs/config-huge-6.6.17.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.16 Kernel Configuration
+# Linux/x86 6.6.17 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0"
CONFIG_CC_IS_GCC=y
diff --git a/source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch b/source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch
deleted file mode 100644
index bfc7cd804..000000000
--- a/source/k/patches-i686/31e97d7c9ae3de072d7b424b2cf706a03ec10720.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 31e97d7c9ae3de072d7b424b2cf706a03ec10720 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Sat, 13 Jan 2024 19:33:31 +0100
-Subject: media: solo6x10: replace max(a, min(b, c)) by clamp(b, a, c)
-
-This patch replaces max(a, min(b, c)) by clamp(b, a, c) in the solo6x10
-driver. This improves the readability and more importantly, for the
-solo6x10-p2m.c file, this reduces on my system (x86-64, gcc 13):
-
- - the preprocessed size from 121 MiB to 4.5 MiB;
-
- - the build CPU time from 46.8 s to 1.6 s;
-
- - the build memory from 2786 MiB to 98MiB.
-
-In fine, this allows this relatively simple C file to be built on a
-32-bit system.
-
-Reported-by: Jiri Slaby <jirislaby@gmail.com>
-Closes: https://lore.kernel.org/lkml/18c6df0d-45ed-450c-9eda-95160a2bbb8e@gmail.com/
-Cc: <stable@vger.kernel.org> # v6.7+
-Suggested-by: David Laight <David.Laight@ACULAB.COM>
-Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-Reviewed-by: David Laight <David.Laight@ACULAB.COM>
-Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- drivers/media/pci/solo6x10/solo6x10-offsets.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-(limited to 'drivers/media/pci/solo6x10/solo6x10-offsets.h')
-
-diff --git a/drivers/media/pci/solo6x10/solo6x10-offsets.h b/drivers/media/pci/solo6x10/solo6x10-offsets.h
-index f414ee1316f29c..fdbb817e63601c 100644
---- a/drivers/media/pci/solo6x10/solo6x10-offsets.h
-+++ b/drivers/media/pci/solo6x10/solo6x10-offsets.h
-@@ -57,16 +57,16 @@
- #define SOLO_MP4E_EXT_ADDR(__solo) \
- (SOLO_EREF_EXT_ADDR(__solo) + SOLO_EREF_EXT_AREA(__solo))
- #define SOLO_MP4E_EXT_SIZE(__solo) \
-- max((__solo->nr_chans * 0x00080000), \
-- min(((__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo)) - \
-- __SOLO_JPEG_MIN_SIZE(__solo)), 0x00ff0000))
-+ clamp(__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo) - \
-+ __SOLO_JPEG_MIN_SIZE(__solo), \
-+ __solo->nr_chans * 0x00080000, 0x00ff0000)
-
- #define __SOLO_JPEG_MIN_SIZE(__solo) (__solo->nr_chans * 0x00080000)
- #define SOLO_JPEG_EXT_ADDR(__solo) \
- (SOLO_MP4E_EXT_ADDR(__solo) + SOLO_MP4E_EXT_SIZE(__solo))
- #define SOLO_JPEG_EXT_SIZE(__solo) \
-- max(__SOLO_JPEG_MIN_SIZE(__solo), \
-- min((__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo)), 0x00ff0000))
-+ clamp(__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo), \
-+ __SOLO_JPEG_MIN_SIZE(__solo), 0x00ff0000)
-
- #define SOLO_SDRAM_END(__solo) \
- (SOLO_JPEG_EXT_ADDR(__solo) + SOLO_JPEG_EXT_SIZE(__solo))
---
-cgit 1.2.3-korg
diff --git a/source/k/patches-i686/README b/source/k/patches-i686/README
deleted file mode 100644
index 8fc981b95..000000000
--- a/source/k/patches-i686/README
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix extreme memory usage with min/max macros.
-
-This should land in 6.6.17.
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index 1586964e3..822207cbc 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-nss
SRCNAM=nss
-VERSION=${VERSION:-3.97}
+VERSION=${VERSION:-3.98}
NSPR=${NSPR:-4.35}
BUILD=${BUILD:-1}
diff --git a/source/n/ca-certificates/certdata-20240203.txt b/source/n/ca-certificates/certdata-20240216.txt
index 62b33278b..ed5e6cb17 100644
--- a/source/n/ca-certificates/certdata-20240203.txt
+++ b/source/n/ca-certificates/certdata-20240216.txt
@@ -13626,7 +13626,7 @@ CKA_SERIAL_NUMBER MULTILINE_OCTAL
\072\352
END
CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
-CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
generated by cgit v1.2.3-80-g2a13 (git 2.46.2) at 2024-10-30 20:19:48 +0000