summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2006-06-11 17:40:05 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2006-06-11 17:40:05 +0000
commit7385dea1163c20ee57eda64c1a5d88c57d75f4be (patch)
treef36e0c2aa2c95c66269e656535a0fcd0713b75ae /x11-apps
parentFixes for security bug #135623, and config bug #129473 (diff)
downloadgentoo-2-7385dea1163c20ee57eda64c1a5d88c57d75f4be.tar.gz
gentoo-2-7385dea1163c20ee57eda64c1a5d88c57d75f4be.tar.bz2
gentoo-2-7385dea1163c20ee57eda64c1a5d88c57d75f4be.zip
Fix executable test in xinitrc. (truc, bug #136316)
(Portage version: 2.1)
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/xinit/ChangeLog5
-rw-r--r--x11-apps/xinit/files/xinitrc2
2 files changed, 5 insertions, 2 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 15e240b0dc48..5be4c5595cb6 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-apps/xinit
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.51 2006/05/31 10:34:46 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.52 2006/06/11 17:40:05 joshuabaergen Exp $
+
+ 11 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org> files/xinitrc:
+ Fix executable test in xinitrc. (truc, bug #136316)
31 May 2006; Donnie Berkholz <spyderous@gentoo.org>;
xinit-1.0.2-r4.ebuild:
diff --git a/x11-apps/xinit/files/xinitrc b/x11-apps/xinit/files/xinitrc
index bcc80b19c348..6072d116d08d 100644
--- a/x11-apps/xinit/files/xinitrc
+++ b/x11-apps/xinit/files/xinitrc
@@ -28,7 +28,7 @@ fi
# First try ~/.xinitrc
if [ -f "$HOME/.xinitrc" ]; then
XINITRC="$HOME/.xinitrc"
- if [ -e $XINITRC ]; then
+ if [ -x $XINITRC ]; then
# if the x bit is set on .xinitrc
# it means the xinitrc is not a
# shell script but something else