(#62086) Allow ~/.xinitrc to be an executable file of any type, not just a /bin/sh script (Carlo von Loesch).

Package-Manager: portage-2.1_pre7-r5

5 files changed, 29 insertions, 15 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 205641a02755..b7b140b5b173 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2006/04/08 21:02:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.42 2006/04/20 05:30:14 spyderous Exp $
+
+*xinit-1.0.2-r1 (20 Apr 2006)
+
+  20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xinitrc,
+  -xinit-1.0.2.ebuild, +xinit-1.0.2-r1.ebuild:
+  (#62086) Allow ~/.xinitrc to be an executable file of any type, not just a
+  /bin/sh script (Carlo von Loesch).
 
   08 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; -xinit-1.0.1.ebuild:
   Pull old ebuild.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index ef68f9968431..8a6bdd870532 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,15 +1,15 @@
-MD5 9567d2234b3530ae40bcb621a6b616bd ChangeLog 6306
-RMD160 75ae9f6f664e8898bcafb97c78ae2d6abd05d073 ChangeLog 6306
-SHA256 1c374669fa28b63d418cc394b208e674ad8ffdd0b04f956de3aa76dab4337f17 ChangeLog 6306
+MD5 1127a554bc30a53ec3b31c87d7553422 ChangeLog 6569
+RMD160 747e3cec97ba6bb8acd4e3c8374949166ae23d68 ChangeLog 6569
+SHA256 888753b08d459da500b37da28185ad16ccb545801ca2ca10f42fc156cf53fe08 ChangeLog 6569
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187
 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 files/Xsession 2187
 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 files/Xsession 2187
 MD5 821912b0616c553a799e8404376e0158 files/chooser.sh 1506
 RMD160 164d582885f01a71bd5b6e6d824fcfcbedba2e9c files/chooser.sh 1506
 SHA256 e262a03579fd353020bac38213bfb9821875644b6f06228874f2c1d90d7a47a0 files/chooser.sh 1506
-MD5 c8f5beff4bef1118192ff37d20b3819a files/digest-xinit-1.0.2 235
-RMD160 4a431e028d1dda40bc62e2b5af370efd00d821d7 files/digest-xinit-1.0.2 235
-SHA256 a8f4441513332ff52b02d667e403ebb39418f3eb6df177c51899f70b21c59cd1 files/digest-xinit-1.0.2 235
+MD5 c8f5beff4bef1118192ff37d20b3819a files/digest-xinit-1.0.2-r1 235
+RMD160 4a431e028d1dda40bc62e2b5af370efd00d821d7 files/digest-xinit-1.0.2-r1 235
+SHA256 a8f4441513332ff52b02d667e403ebb39418f3eb6df177c51899f70b21c59cd1 files/digest-xinit-1.0.2-r1 235
 MD5 de00e8a136985faa77ce4bfa4e724ff8 files/gentoo-startx-customization-0.99.4.patch 3965
 RMD160 a1b2a04f2de1b40721536e75f224565cf0aba8c4 files/gentoo-startx-customization-0.99.4.patch 3965
 SHA256 9452459f4880b2de599a502425ccb6897386af5d0649772e6a67b6d0b0c568e8 files/gentoo-startx-customization-0.99.4.patch 3965
@@ -22,15 +22,15 @@ SHA256 36781509e239d5d7777e181c3d95462602bcc41a95f4881c3bca2a463086f9f7 files/st
 MD5 2d8c9c76bd932f311ad86f490680d349 files/xdm.start 3418
 RMD160 cc2ab8c312c595edb7f181868783d91399ee1c2e files/xdm.start 3418
 SHA256 85623bc26002fa7626b2c07292fa55b9af10682f00221bcfb55bec7efa8ccdcc files/xdm.start 3418
-MD5 49f1bd860cfa5fc4adb6023d8a1bb4f8 files/xinitrc 900
-RMD160 83c79cd32df084f75c4b461ae3fe649a23016465 files/xinitrc 900
-SHA256 2061aa5e8a4e01f82aaebcec145ed087cd4b995baaf42e08ae241715b00e18d0 files/xinitrc 900
+MD5 84d641c4893196734309e0391aa4297b files/xinitrc 1059
+RMD160 092565257dec801a10150785ce32d0ca729ae398 files/xinitrc 1059
+SHA256 7f681943a905a4f1bc7ea400f8ef39fc0a1b62a1f4bb01b8a4037f5840beec93 files/xinitrc 1059
 MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 files/xserver.pamd 125
 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2 files/xserver.pamd 125
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
-MD5 c11ae49843f530ca2653bd0df24c6197 xinit-1.0.2.ebuild 1226
-RMD160 2bf4aa18cbda0d4ad33eb73459c48f039d156066 xinit-1.0.2.ebuild 1226
-SHA256 0009fcc35145de80080b4288cbea5d19a8965239145539e51329d93df50a7f11 xinit-1.0.2.ebuild 1226
+MD5 e001de6537daa1e68f55723067518d56 xinit-1.0.2-r1.ebuild 1229
+RMD160 de84be6c131bf02573e47f76893dd391c3666578 xinit-1.0.2-r1.ebuild 1229
+SHA256 dcf1c73d9a4f9724ea21478402be64db18f07971e1c0ed86d8693a57674e38c8 xinit-1.0.2-r1.ebuild 1229
diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2 b/x11-apps/xinit/files/digest-xinit-1.0.2-r1
index 29ec40dd3a6d..29ec40dd3a6d 100644
--- a/x11-apps/xinit/files/digest-xinit-1.0.2
+++ b/x11-apps/xinit/files/digest-xinit-1.0.2-r1
diff --git a/x11-apps/xinit/files/xinitrc b/x11-apps/xinit/files/xinitrc
index f2ba1d79626b..bcc80b19c348 100644
--- a/x11-apps/xinit/files/xinitrc
+++ b/x11-apps/xinit/files/xinitrc
@@ -28,7 +28,14 @@ fi
 # First try ~/.xinitrc
 if [ -f "$HOME/.xinitrc" ]; then
 	XINITRC="$HOME/.xinitrc"
-	exec /bin/sh "$HOME/.xinitrc"
+	if [ -e $XINITRC ]; then
+		# if the x bit is set on .xinitrc
+		# it means the xinitrc is not a
+		# shell script but something else
+		exec $XINITRC
+	else
+		exec /bin/sh "$HOME/.xinitrc"
+	fi
 # If not present, try the system default
 elif [ -n "`/etc/X11/chooser.sh`" ]; then
 	exec "`/etc/X11/chooser.sh`"
diff --git a/x11-apps/xinit/xinit-1.0.2.ebuild b/x11-apps/xinit/xinit-1.0.2-r1.ebuild
index 8bae4c7fdece..2f870f40c83f 100644
--- a/x11-apps/xinit/xinit-1.0.2.ebuild
+++ b/x11-apps/xinit/xinit-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.2.ebuild,v 1.1 2006/04/04 00:52:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.2-r1.ebuild,v 1.1 2006/04/20 05:30:14 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches