From 3b234388a5f545f071422864e1a274ba45a696a0 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 3 Mar 2019 22:03:39 +0000
Subject: Sun Mar  3 22:03:39 UTC 2019

a/mkinitrd-1.4.11-x86_64-12.txz:  Rebuilt.
  Updated to busybox-1.30.1.
  mkinitrd: allow a colon-delimited list of kernel versions with -k
  mkinitrd_command_generator.sh: allow a colon-delimited list of kernel
  versions with -k
  setup.01.mkinitrd: simplify script by using -k with a version list
ap/pamixer-1.4-x86_64-1.txz:  Upgraded.
d/python-2.7.16-x86_64-1.txz:  Upgraded.
  Updated to the latest 2.7.x release, which fixes a few security issues.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1752
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5010
  (* Security fix *)
d/vala-0.42.6-x86_64-1.txz:  Upgraded.
l/gegl-0.4.14-x86_64-1.txz:  Upgraded.
l/libsecret-0.18.8-x86_64-1.txz:  Upgraded.
l/xapian-core-1.4.11-x86_64-1.txz:  Upgraded.
x/mkfontscale-1.2.0-x86_64-1.txz:  Upgraded.
x/xditview-1.0.5-x86_64-1.txz:  Upgraded.
x/xdm-1.1.12-x86_64-1.txz:  Upgraded.
---
 source/x/x11/post-install/xdm/Xsession.orig | 63 +++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 17 deletions(-)

(limited to 'source/x/x11/post-install/xdm/Xsession.orig')

diff --git a/source/x/x11/post-install/xdm/Xsession.orig b/source/x/x11/post-install/xdm/Xsession.orig
index 993e7418d..6b9130e4f 100755
--- a/source/x/x11/post-install/xdm/Xsession.orig
+++ b/source/x/x11/post-install/xdm/Xsession.orig
@@ -1,37 +1,66 @@
 #!/bin/sh
-# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
 #
-#
-# $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 dawes Exp $
 
 # redirect errors to a file in user's home directory if we can
-for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
+
+errfile="$HOME/.xsession-errors"
+if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
+then
+	exec > "$errfile" 2>&1
+else
+    mktemp="/usr/bin/mktemp"
+    if [ "x$mktemp" != "x" -a -x "$mktemp" ]
+    then
+	for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+	do
+		if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
+		then
+			exec > "$ef" 2>&1
+			mv "$ef" "$errfile" 2> /dev/null
+			break
+		fi
+	done
+    else
+# Since this system doesn't have a mktemp command to allow secure
+# creation of files in shared directories, no fallback error log
+# is being used.   See https://bugs.freedesktop.org/show_bug.cgi?id=5898
+#
+# 	for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+#	do
+#		if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null )
+#		then
+#			exec > "$errfile" 2>&1
+#			break
+#		fi
+#	done
+
+	exec > /dev/null 2>&1
+    fi
+fi
 
 case $# in
 1)
 	case $1 in
 	failsafe)
-		exec xterm -geometry 80x24-0-0
+		exec /usr/bin/xterm -geometry 80x24-0-0
 		;;
 	esac
 esac
 
+# The startup script is not intended to have arguments.
+
 startup=$HOME/.xsession
 resources=$HOME/.Xresources
 
-if [ -s "$startup" -a -x "$startup" ]; then
-	exec "$startup"
+if [ -s "$startup" ]; then
+	if [ -x "$startup" ]; then
+		exec "$startup"
+	else
+		exec /bin/sh "$startup"
+	fi
 else
 	if [ -r "$resources" ]; then
-		xrdb -load "$resources"
+		/usr/bin/xrdb -load "$resources"
 	fi
-	exec xsm
+	exec /usr/bin/xsm
 fi
-- 
cgit v1.2.3-65-gdbad