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
commitb5885779014848e15981533b09c05bd82f5cc5dc (patch)
tree7d8e3efe096b88a086924ee89c35b82f2ef71f0f /x11-apps/xinit
parentFixes for security bug #135623, and config bug #129473 (diff)
downloadhistorical-b5885779014848e15981533b09c05bd82f5cc5dc.tar.gz
historical-b5885779014848e15981533b09c05bd82f5cc5dc.tar.bz2
historical-b5885779014848e15981533b09c05bd82f5cc5dc.zip
Fix executable test in xinitrc. (truc, bug #136316)
Package-Manager: portage-2.1
Diffstat (limited to 'x11-apps/xinit')
-rw-r--r--x11-apps/xinit/ChangeLog5
-rw-r--r--x11-apps/xinit/Manifest18
-rw-r--r--x11-apps/xinit/files/xinitrc2
3 files changed, 14 insertions, 11 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/Manifest b/x11-apps/xinit/Manifest
index 930ec8be37af..93e79b059f86 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -26,23 +26,23 @@ AUX xdm.start 3724 RMD160 e7cfcbfd0b466debf0f3d98e9388e4101b0b3a6f SHA1 4edc9ae7
MD5 a2842f4b331e8332e362d4f0f98643f8 files/xdm.start 3724
RMD160 e7cfcbfd0b466debf0f3d98e9388e4101b0b3a6f files/xdm.start 3724
SHA256 d69aba5abf26fb88c91681cf7ba65ec002b422024060bae1ad29fca14df4831c files/xdm.start 3724
-AUX xinitrc 1059 RMD160 092565257dec801a10150785ce32d0ca729ae398 SHA1 388882a1687b8ca40c7a47f877a2d017d0120b01 SHA256 7f681943a905a4f1bc7ea400f8ef39fc0a1b62a1f4bb01b8a4037f5840beec93
-MD5 84d641c4893196734309e0391aa4297b files/xinitrc 1059
-RMD160 092565257dec801a10150785ce32d0ca729ae398 files/xinitrc 1059
-SHA256 7f681943a905a4f1bc7ea400f8ef39fc0a1b62a1f4bb01b8a4037f5840beec93 files/xinitrc 1059
+AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff
+MD5 42da076fe0af42da30ca06db97f985c7 files/xinitrc 1059
+RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db files/xinitrc 1059
+SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff files/xinitrc 1059
AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 files/xserver.pamd 125
SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 files/xserver.pamd 125
-DIST xinit-1.0.2.tar.bz2 96536 RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395
+DIST xinit-1.0.2.tar.bz2 96536 RMD160 b3ced92e7ffb1afc3880799ed18f584e7f58d048 SHA1 78a2fefebbe75a65682373fa22721c8789f55580 SHA256 254ee0f81384fb184229d73d546fb07344c5448bbd4f4a66fef595ae49f8f395
EBUILD xinit-1.0.2-r4.ebuild 1273 RMD160 84507d7aebeacadbf350c1af5229e52bf9d2dcbc SHA1 f0be3fba6c4be2879c44d6d721798784010f6b22 SHA256 7cd13b590a10bb09f0c765cbd04d3050763cad0c64086941ca3fd1eb0db636da
MD5 d0689b233610d833e34d9bc29aba5056 xinit-1.0.2-r4.ebuild 1273
RMD160 84507d7aebeacadbf350c1af5229e52bf9d2dcbc xinit-1.0.2-r4.ebuild 1273
SHA256 7cd13b590a10bb09f0c765cbd04d3050763cad0c64086941ca3fd1eb0db636da xinit-1.0.2-r4.ebuild 1273
-MISC ChangeLog 8381 RMD160 105697cc26fe874330cf14af59d6ad2660bcdda7 SHA1 da8d974e71dc007e2a2aa7ab7c07144927ab9d0a SHA256 04c58537c3a6a6b2e258564780522bacc9ec9c7420227c272a048fea1f2e5634
-MD5 c6bd9e27954cb150a08b75a0ded1c197 ChangeLog 8381
-RMD160 105697cc26fe874330cf14af59d6ad2660bcdda7 ChangeLog 8381
-SHA256 04c58537c3a6a6b2e258564780522bacc9ec9c7420227c272a048fea1f2e5634 ChangeLog 8381
+MISC ChangeLog 8513 RMD160 972a4685ecc4feec8aea0046a62f8da9544fa464 SHA1 d6533bf006c64763b495ebedaa82a5c3e08991ca SHA256 bbacb0dd94f6a3c79d243e5ffe75f5b2efd4ce8f0e63ff24f2d265b733caef95
+MD5 30f2b2a345dd88c025ccb40ddb923415 ChangeLog 8513
+RMD160 972a4685ecc4feec8aea0046a62f8da9544fa464 ChangeLog 8513
+SHA256 bbacb0dd94f6a3c79d243e5ffe75f5b2efd4ce8f0e63ff24f2d265b733caef95 ChangeLog 8513
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
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