diff options
| author | joerg <joerg> | 2006-02-14 16:10:40 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-02-14 16:10:40 +0000 |
| commit | 4eaec8506c61d1c75a3c3890bf286f104f3d3da9 (patch) | |
| tree | 20262317476f55111a12276049be940a7181e248 /x11 | |
| parent | fcb201ff1f00a455fcc2233fb807cc1e21f5fae1 (diff) | |
| download | pkgsrc-4eaec8506c61d1c75a3c3890bf286f104f3d3da9.tar.gz | |
Fix race condition in xdm's Xsession. From PR 32804.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xorg-clients/Makefile | 4 | ||||
| -rw-r--r-- | x11/xorg-libs/distinfo | 4 | ||||
| -rw-r--r-- | x11/xorg-libs/patches/patch-ax | 15 |
3 files changed, 17 insertions, 6 deletions
diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile index 00b51b42e4b..17fe56eb7e4 100644 --- a/x11/xorg-clients/Makefile +++ b/x11/xorg-clients/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2006/02/14 15:54:55 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2006/02/14 16:10:40 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-clients-${XORG_VER} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz \ diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo index 56d58b5744d..ac5999e2362 100644 --- a/x11/xorg-libs/distinfo +++ b/x11/xorg-libs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2006/02/14 15:54:55 joerg Exp $ +$NetBSD: distinfo,v 1.34 2006/02/14 16:10:40 joerg Exp $ SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8 @@ -32,7 +32,7 @@ SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151 SHA1 (patch-av) = bfcdb21557e8e6f8c24399ad0077b75d4a5215c6 SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7 -SHA1 (patch-ax) = d0331ab8d2aa70930f541d6e6eea0d6028169a4c +SHA1 (patch-ax) = 582b2b9d8f0f8316b9e2b5528cd14753df1f4bdf SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5 SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6 SHA1 (patch-ba) = bf99c7ea9c07f048b8338f0a1f6b92e9f692879e diff --git a/x11/xorg-libs/patches/patch-ax b/x11/xorg-libs/patches/patch-ax index bfbfa74fa04..48cb595c051 100644 --- a/x11/xorg-libs/patches/patch-ax +++ b/x11/xorg-libs/patches/patch-ax @@ -1,8 +1,19 @@ -$NetBSD: patch-ax,v 1.3 2006/02/14 15:54:55 joerg Exp $ +$NetBSD: patch-ax,v 1.4 2006/02/14 16:10:40 joerg Exp $ --- programs/xdm/config/Xsession.cpp.orig 2006-02-12 16:32:25.000000000 +0100 +++ programs/xdm/config/Xsession.cpp -@@ -18,7 +18,7 @@ case $# in +@@ -6,9 +6,8 @@ XCOMM $XFree86: xc/programs/xdm/config/X + XCOMM 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 ) ++ if ( umask 077 && cp /dev/null "$errfile" 2> /dev/null ) + then +- chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +@@ -18,7 +17,7 @@ case $# in 1) case $1 in failsafe) |