From 8b1588afc8929eda7491496bfac0b004a1d88efc Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 5 Jan 2021 22:42:46 +0000 Subject: Tue Jan 5 22:42:46 UTC 2021 a/lzlib-1.12-x86_64-1.txz: Upgraded. ap/qpdf-10.1.0-x86_64-1.txz: Upgraded. kde/bluedevil-5.20.5-x86_64-1.txz: Upgraded. kde/breeze-5.20.5-x86_64-1.txz: Upgraded. kde/breeze-grub-5.20.5-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.20.5-x86_64-1.txz: Upgraded. kde/drkonqi-5.20.5-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.20.5-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.20.5-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.20.5-x86_64-1.txz: Upgraded. kde/kdecoration-5.20.5-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.20.5-x86_64-1.txz: Upgraded. kde/kgamma5-5.20.5-x86_64-1.txz: Upgraded. kde/khotkeys-5.20.5-x86_64-1.txz: Upgraded. kde/kinfocenter-5.20.5-x86_64-1.txz: Upgraded. kde/kmenuedit-5.20.5-x86_64-1.txz: Upgraded. kde/kscreen-5.20.5-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.20.5-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.20.5-x86_64-1.txz: Upgraded. kde/ksysguard-5.20.5-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.20.5-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.20.5-x86_64-1.txz: Upgraded. kde/kwayland-server-5.20.5-x86_64-1.txz: Upgraded. kde/kwin-5.20.5-x86_64-1.txz: Upgraded. kde/kwrited-5.20.5-x86_64-1.txz: Upgraded. kde/libkscreen-5.20.5-x86_64-1.txz: Upgraded. kde/libksysguard-5.20.5-x86_64-1.txz: Upgraded. kde/milou-5.20.5-x86_64-1.txz: Upgraded. kde/oxygen-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-disks-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-integration-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-nm-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-pa-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-vault-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.20.5-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.20.5-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.20.5-x86_64-1.txz: Upgraded. kde/powerdevil-5.20.5-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.20.5-x86_64-1.txz: Upgraded. kde/systemsettings-5.20.5-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.20.5-x86_64-1.txz: Upgraded. l/pipewire-0.3.19-x86_64-1.txz: Upgraded. l/vte-0.62.1-x86_64-2.txz: Rebuilt. Get rid of bogus symlink in the docs directory. Thanks to titopoquito. n/php-7.4.14-x86_64-1.txz: Upgraded. This update fixes bugs and a security issue: Standard: FILTER_VALIDATE_URL accepts URLs with invalid userinfo. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-7071 (* Security fix *) x/x11-skel-7.7-x86_64-6.txz: Rebuilt. Added /usr/share/xsessions/xwmconfig.desktop to run the session type configured by xwmconfig. This will show up in SDDM. x/xdm-1.1.11-x86_64-12.txz: Rebuilt. Fix some permissions in /etc/X11/xdm/. --- source/x/x11-skel/scripts/xwmconfig.desktop | 4 ++++ source/x/x11-skel/x11-skel.SlackBuild | 8 ++++++-- source/x/x11/build/xdm | 2 +- source/x/x11/doinst.sh/xdm | 4 ++-- source/x/x11/post-install/xdm.post-install | 2 +- 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 source/x/x11-skel/scripts/xwmconfig.desktop (limited to 'source/x') diff --git a/source/x/x11-skel/scripts/xwmconfig.desktop b/source/x/x11-skel/scripts/xwmconfig.desktop new file mode 100644 index 000000000..c604f74d9 --- /dev/null +++ b/source/x/x11-skel/scripts/xwmconfig.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Name=Xsession default +Comment=Use Xsession to start the desktop configured by xwmconfig +Exec=/etc/X11/xdm/Xsession diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild index 553e77664..c934c6692 100755 --- a/source/x/x11-skel/x11-skel.SlackBuild +++ b/source/x/x11-skel/x11-skel.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2011, 2012, 2018, 2021 Patrick J. Volkerding, Sebeka, Minnesota, 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=x11-skel VERSION=7.7 -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -63,6 +63,7 @@ mkdir -p usr/lib${LIBDIRSUFFIX}/X11 mkdir -p usr/bin mkdir -p var/log/setup mkdir -p usr/man/man1 +mkdir -p usr/share/xsessions # obsolete: #cp -a $CWD/scripts/xorg.conf-fbdev etc/X11 @@ -79,6 +80,9 @@ cp -a $CWD/scripts/setup.xwmconfig var/log/setup chown root:root var/log/setup/setup.xwmconfig chmod 755 var/log/setup/setup.xwmconfig cat $CWD/manpages/xwmconfig.1 | gzip -9c > $PKG/usr/man/man1/xwmconfig.1.gz +cp -a $CWD/scripts/xwmconfig.desktop usr/share/xsessions +chown root:root usr/share/xsessions/xwmconfig.desktop +chmod 644 usr/share/xsessions/xwmconfig.desktop mkdir -p install zcat $CWD/doinst.sh.gz \ diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm index b4de39476..48082f72f 100644 --- a/source/x/x11/build/xdm +++ b/source/x/x11/build/xdm @@ -1 +1 @@ -11 +12 diff --git a/source/x/x11/doinst.sh/xdm b/source/x/x11/doinst.sh/xdm index 68c356c50..fc3b5a679 100644 --- a/source/x/x11/doinst.sh/xdm +++ b/source/x/x11/doinst.sh/xdm @@ -4,8 +4,8 @@ config() { # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy - rm $NEW + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # MOVE IT OVER TO FIX PERMS + mv $NEW $OLD fi # Otherwise, we leave the .new copy for the admin to consider... } diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install index 31b390d80..9b4c481ab 100644 --- a/source/x/x11/post-install/xdm.post-install +++ b/source/x/x11/post-install/xdm.post-install @@ -30,8 +30,8 @@ do # pre Slackware-14.1 development cycle. awk "/[^ ]/ { copy=1 }; copy { print }" $PKG/etc/X11/xdm/${conffile} > $PKG/etc/X11/xdm/${conffile}.new touch -r $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new + chmod --reference=$PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new rm -f $PKG/etc/X11/xdm/${conffile} - #mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ; done # Change default auth type: -- cgit v1.2.3