summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-11-02 23:27:18 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-11-02 23:27:18 +0000
commit3aa5dac4a0e64fb5120c4881c534b9b3404608d1 (patch)
tree30f25fc2cf2c9920f330f1f07630d1c905f72914
parenttypo (diff)
downloadgentoo-2-3aa5dac4a0e64fb5120c4881c534b9b3404608d1.tar.gz
gentoo-2-3aa5dac4a0e64fb5120c4881c534b9b3404608d1.tar.bz2
gentoo-2-3aa5dac4a0e64fb5120c4881c534b9b3404608d1.zip
Fix default xserverrc to accept parameters wrt #343911 by "Faustus".
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
-rw-r--r--x11-apps/xinit/ChangeLog8
-rw-r--r--x11-apps/xinit/files/xserverrc3
-rw-r--r--x11-apps/xinit/xinit-1.3.0-r1.ebuild (renamed from x11-apps/xinit/xinit-1.3.0.ebuild)2
3 files changed, 10 insertions, 3 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 9f155e0db61f..aab2fc8e77ac 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for x11-apps/xinit
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.183 2010/11/01 15:51:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.184 2010/11/02 23:27:18 ssuominen Exp $
+
+*xinit-1.3.0-r1 (02 Nov 2010)
+
+ 02 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+ +xinit-1.3.0-r1.ebuild, files/xserverrc:
+ Fix default xserverrc to accept parameters wrt #343911 by "Faustus".
*xinit-1.3.0 (01 Nov 2010)
diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
index 6a636c119060..b4de2528749e 100644
--- a/x11-apps/xinit/files/xserverrc
+++ b/x11-apps/xinit/files/xserverrc
@@ -1 +1,2 @@
-exec /usr/bin/X -nolisten tcp
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
diff --git a/x11-apps/xinit/xinit-1.3.0.ebuild b/x11-apps/xinit/xinit-1.3.0-r1.ebuild
index 2d88befae2c3..4c35477d2d78 100644
--- a/x11-apps/xinit/xinit-1.3.0.ebuild
+++ b/x11-apps/xinit/xinit-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0.ebuild,v 1.1 2010/11/01 15:51:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r1.ebuild,v 1.1 2010/11/02 23:27:18 ssuominen Exp $
EAPI=3