diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-08-08 22:42:46 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-08-09 01:50:17 +0200 |
commit | cba646cba8d9743163fd3f862ea894c53225c80f (patch) | |
tree | 8fc70445970a09b4906d1c3b1309c2428bd3322c /source | |
parent | 34b273fa615b326da9f883aea3addf0abf1d0c07 (diff) | |
download | current-cba646cba8d9743163fd3f862ea894c53225c80f.tar.gz current-cba646cba8d9743163fd3f862ea894c53225c80f.tar.xz |
Tue Aug 8 22:42:46 UTC 202320230808224246
a/kernel-firmware-20230808_0ab353f-noarch-1.txz: Upgraded.
a/kernel-generic-6.1.44-x86_64-1.txz: Upgraded.
a/kernel-huge-6.1.44-x86_64-1.txz: Upgraded.
a/kernel-modules-6.1.44-x86_64-1.txz: Upgraded.
d/kernel-headers-6.1.44-x86-1.txz: Upgraded.
d/meson-1.2.1-x86_64-1.txz: Upgraded.
k/kernel-source-6.1.44-noarch-1.txz: Upgraded.
+ARCH_HAS_CPU_FINALIZE_INIT y
+CPU_SRSO y
+GDS_FORCE_MITIGATION n
kde/ktextaddons-1.4.1-x86_64-1.txz: Upgraded.
kde/okteta-0.26.13-x86_64-1.txz: Upgraded.
kde/sddm-0.20.0-x86_64-3.txz: Rebuilt.
Also use .new for the files in /etc/pam.d/. Thanks to marav.
x/ibus-m17n-1.4.21-x86_64-1.txz: Upgraded.
xap/windowmaker-0.96.0-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source')
-rw-r--r-- | source/k/kernel-configs/config-generic-6.1.44 (renamed from source/k/kernel-configs/config-generic-6.1.43) | 4 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-6.1.44.x64 (renamed from source/k/kernel-configs/config-generic-6.1.43.x64) | 5 | ||||
-rw-r--r-- | source/k/kernel-configs/config-generic-smp-6.1.44-smp (renamed from source/k/kernel-configs/config-generic-smp-6.1.43-smp) | 4 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-6.1.44 (renamed from source/k/kernel-configs/config-huge-6.1.43) | 4 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-6.1.44.x64 (renamed from source/k/kernel-configs/config-huge-6.1.43.x64) | 5 | ||||
-rw-r--r-- | source/k/kernel-configs/config-huge-smp-6.1.44-smp (renamed from source/k/kernel-configs/config-huge-smp-6.1.43-smp) | 4 | ||||
-rw-r--r-- | source/kde/kde/build/sddm | 2 | ||||
-rw-r--r-- | source/kde/kde/doinst.sh/sddm | 4 | ||||
-rw-r--r-- | source/kde/kde/post-install/sddm.post-install | 2 | ||||
-rwxr-xr-x | source/xap/windowmaker/windowmaker.SlackBuild | 7 | ||||
-rw-r--r-- | source/xap/windowmaker/windowmaker.url | 2 | ||||
-rw-r--r-- | source/xap/windowmaker/wmaker.inst.diff | 46 |
12 files changed, 30 insertions, 59 deletions
diff --git a/source/k/kernel-configs/config-generic-6.1.43 b/source/k/kernel-configs/config-generic-6.1.44 index a4dbf9074..fe53c0b0d 100644 --- a/source/k/kernel-configs/config-generic-6.1.43 +++ b/source/k/kernel-configs/config-generic-6.1.44 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.43 Kernel Configuration +# Linux/x86 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -484,6 +484,7 @@ CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # @@ -721,6 +722,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y diff --git a/source/k/kernel-configs/config-generic-6.1.43.x64 b/source/k/kernel-configs/config-generic-6.1.44.x64 index c64f566f3..d928fc557 100644 --- a/source/k/kernel-configs/config-generic-6.1.43.x64 +++ b/source/k/kernel-configs/config-generic-6.1.44.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.43 Kernel Configuration +# Linux/x86 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -511,7 +511,9 @@ CONFIG_RETHUNK=y CONFIG_CPU_UNRET_ENTRY=y CONFIG_CPU_IBPB_ENTRY=y CONFIG_CPU_IBRS_ENTRY=y +CONFIG_CPU_SRSO=y CONFIG_SLS=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -750,6 +752,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y diff --git a/source/k/kernel-configs/config-generic-smp-6.1.43-smp b/source/k/kernel-configs/config-generic-smp-6.1.44-smp index 6a8ae6218..da7d20d37 100644 --- a/source/k/kernel-configs/config-generic-smp-6.1.43-smp +++ b/source/k/kernel-configs/config-generic-smp-6.1.44-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.43 Kernel Configuration +# Linux/x86 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -507,6 +507,7 @@ CONFIG_SPECULATION_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # @@ -749,6 +750,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y diff --git a/source/k/kernel-configs/config-huge-6.1.43 b/source/k/kernel-configs/config-huge-6.1.44 index 2ef22dd26..94fe7efd4 100644 --- a/source/k/kernel-configs/config-huge-6.1.43 +++ b/source/k/kernel-configs/config-huge-6.1.44 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.43 Kernel Configuration +# Linux/x86 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -484,6 +484,7 @@ CONFIG_CC_HAS_RETURN_THUNK=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # @@ -721,6 +722,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y diff --git a/source/k/kernel-configs/config-huge-6.1.43.x64 b/source/k/kernel-configs/config-huge-6.1.44.x64 index 1c80a9c70..1c8b1a656 100644 --- a/source/k/kernel-configs/config-huge-6.1.43.x64 +++ b/source/k/kernel-configs/config-huge-6.1.44.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.43 Kernel Configuration +# Linux/x86 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -511,7 +511,9 @@ CONFIG_RETHUNK=y CONFIG_CPU_UNRET_ENTRY=y CONFIG_CPU_IBPB_ENTRY=y CONFIG_CPU_IBRS_ENTRY=y +CONFIG_CPU_SRSO=y CONFIG_SLS=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y @@ -750,6 +752,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y diff --git a/source/k/kernel-configs/config-huge-smp-6.1.43-smp b/source/k/kernel-configs/config-huge-smp-6.1.44-smp index 57b59167f..d7d7e65d1 100644 --- a/source/k/kernel-configs/config-huge-smp-6.1.43-smp +++ b/source/k/kernel-configs/config-huge-smp-6.1.44-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.43 Kernel Configuration +# Linux/x86 6.1.44 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.2.0" CONFIG_CC_IS_GCC=y @@ -507,6 +507,7 @@ CONFIG_SPECULATION_MITIGATIONS=y CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y CONFIG_RETHUNK=y +# CONFIG_GDS_FORCE_MITIGATION is not set CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y # @@ -749,6 +750,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_SET_MEMORY=y CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_ARCH_HAS_CPU_FINALIZE_INIT=y CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y CONFIG_ARCH_WANTS_NO_INSTR=y diff --git a/source/kde/kde/build/sddm b/source/kde/kde/build/sddm index 0cfbf0888..00750edc0 100644 --- a/source/kde/kde/build/sddm +++ b/source/kde/kde/build/sddm @@ -1 +1 @@ -2 +3 diff --git a/source/kde/kde/doinst.sh/sddm b/source/kde/kde/doinst.sh/sddm index 13660d813..f5dd9379f 100644 --- a/source/kde/kde/doinst.sh/sddm +++ b/source/kde/kde/doinst.sh/sddm @@ -13,3 +13,7 @@ config() { config etc/sddm.conf.new config etc/default/sddm.new +config etc/pam.d/sddm.new +config etc/pam.d/sddm-autologin.new +config etc/pam.d/sddm-greeter.new + diff --git a/source/kde/kde/post-install/sddm.post-install b/source/kde/kde/post-install/sddm.post-install index 6b5ecd62f..b2e03c154 100644 --- a/source/kde/kde/post-install/sddm.post-install +++ b/source/kde/kde/post-install/sddm.post-install @@ -1,7 +1,7 @@ # Replace systemd-centric files with ours: rm -f $PKG/etc/pam.d/sddm* for FILE in sddm sddm-autologin sddm-greeter ; do - install -Dm644 $CWD/post-install/sddm/pam.d/$FILE $PKG/etc/pam.d/$FILE + install -Dm644 $CWD/post-install/sddm/pam.d/$FILE $PKG/etc/pam.d/${FILE}.new done # Create the SDDM home directory: diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild index b18507211..71f76c59d 100755 --- a/source/xap/windowmaker/windowmaker.SlackBuild +++ b/source/xap/windowmaker/windowmaker.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2015, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=windowmaker VERSION=${VERSION:-$(echo WindowMaker-0*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -78,9 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# This should be non-interactive where possible. -zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit 1 - # Get rid of OpenSUSE menu: zcat $CWD/WindowMaker.noopensusemenu.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/xap/windowmaker/windowmaker.url b/source/xap/windowmaker/windowmaker.url new file mode 100644 index 000000000..eb7d4fdd1 --- /dev/null +++ b/source/xap/windowmaker/windowmaker.url @@ -0,0 +1,2 @@ +https://github.com/window-maker/wmaker +https://github.com/window-maker/wmaker/releases/download/wmaker-0.96.0/WindowMaker-0.96.0.tar.gz diff --git a/source/xap/windowmaker/wmaker.inst.diff b/source/xap/windowmaker/wmaker.inst.diff deleted file mode 100644 index 3fdfe6431..000000000 --- a/source/xap/windowmaker/wmaker.inst.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur WindowMaker-0.95.2.orig/util/wmaker.inst.in WindowMaker-0.95.2/util/wmaker.inst.in ---- WindowMaker-0.95.2.orig/util/wmaker.inst.in 2012-02-14 13:36:01.000000000 -0600 -+++ WindowMaker-0.95.2/util/wmaker.inst.in 2012-02-14 18:25:28.213206250 -0600 -@@ -33,20 +33,7 @@ - - make_script() { - ISCRIPT="$1" -- -- cat << EOF >> "$ISCRIPT" --# Window Maker default X session startup script -- --PATH="\$PATH:$BINDIR" -- --# If you login from xdm, uncomment this to make error messages appear --# in the console window. --# --# tail -f "$HOME"/.xsession-errors > /dev/console & -- --exec wmaker -- --EOF -+ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT - chmod +rx "$ISCRIPT" - } - -@@ -298,19 +285,7 @@ - - trap "show_end_message;exit" 2 - --echo --echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that" --echo "it calls wmaker when you start an X session." --echo "Type the name of the file that must be changed (normally .xinitrc)." --echo "If the file already exists, it will be backed up with a .old.$DATE " --echo "extension" --echo "If you want to edit it by hand, hit <Control>-C now." --read file -- --if test "x$file" = "x"; then -- echo "Using .xinitrc as a default value" -- file=.xinitrc --fi -+file=.xinitrc - - if [ -f "$USERDIR/$file" ]; then - mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE" |