xfs port option

5 files changed, 41 insertions, 11 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 7e3a604ebd0a..d601778daed6 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,10 +1,15 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.19 2002/05/29 01:13:41 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.20 2002/05/31 15:38:02 azarah Exp $
 
+*xfree-4.2.0-r11 (28 May 2002)
 
+  30 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild,
+                                                    xfs.start, xfs.conf.d,
+						    xfs.config :
 
-*xfree-4.2.0-r11 (28 May 2002)
+  Fix the xfs port issue in a sane manner ... btw, what happned to the
+  idea that changes should be added to the Changelog ?
 
   29 May 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.0-r11.ebuild :
 
diff --git a/x11-base/xfree/files/4.2.0-r11/xfs.conf.d b/x11-base/xfree/files/4.2.0-r11/xfs.conf.d
new file mode 100644
index 000000000000..4c986fa4e89c
--- /dev/null
+++ b/x11-base/xfree/files/4.2.0-r11/xfs.conf.d
@@ -0,0 +1,14 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xfs.conf.d,v 1.1 2002/05/31 15:38:03 azarah Exp $
+
+# Config file for /etc/init.d/xfs
+
+
+# Port for xfs to listen on.  Default is set to "-1", meaning
+# it will only listen on unix sockets, and not tcp ports.  If
+# you however want it to listen on tcp, remember to comment
+# "nolisten = tcp" in /etc/X11/fs/config.
+
+XFS_PORT="-1"
+
diff --git a/x11-base/xfree/files/4.2.0-r11/xfs.config b/x11-base/xfree/files/4.2.0-r11/xfs.config
index d7ec3963a4bd..d8bc52b30d68 100644
--- a/x11-base/xfree/files/4.2.0-r11/xfs.config
+++ b/x11-base/xfree/files/4.2.0-r11/xfs.config
@@ -5,11 +5,6 @@
 # allow a max of 4 clients to connect to this font server
 #client-limit = 4
 
-# the port to listen on; -1 means only listen on the local unix domain
-# socket, doesn't work however
-#port = -1
-#
-
 # no tcp, use sockets!
 no-listen  =  tcp
 
diff --git a/x11-base/xfree/files/4.2.0-r11/xfs.start b/x11-base/xfree/files/4.2.0-r11/xfs.start
index 412818718883..16c824341792 100644
--- a/x11-base/xfree/files/4.2.0-r11/xfs.start
+++ b/x11-base/xfree/files/4.2.0-r11/xfs.start
@@ -1,21 +1,35 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xfs.start,v 1.1 2002/05/29 00:21:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/files/4.2.0-r11/xfs.start,v 1.2 2002/05/31 15:38:03 azarah Exp $
+
+#NB: Config is in /etc/conf.d/xfs
+
 
 depend() {
 	use logger
 }
 
+check_config() {
+	if [ -z "${XFS_PORT}" ]
+	then
+		eerror "Please set \$XFS_PORT in /etc/conf.d/xfs!"
+		return 1
+	fi
+	return 0
+}
+
 start() {
+	check_config || return 1
 	ebegin "Starting X Font Server"
 	if [ "`grep xfs /etc/passwd`" ] ; then
 		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
 			-- -daemon -config /etc/X11/fs/config \
-				-droppriv -user xfs 1>&2
+				-droppriv -user xfs -port ${XFS_PORT} 1>&2
 	else
 		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
-			-- -daemon -config /etc/X11/fs/config 1>&2
+			-- -daemon -config /etc/X11/fs/config \
+				-port ${XFS_PORT} 1>&2
 	fi
 	eend $?
 }
diff --git a/x11-base/xfree/xfree-4.2.0-r11.ebuild b/x11-base/xfree/xfree-4.2.0-r11.ebuild
index 46b0f801e63a..bdf8d1cad317 100644
--- a/x11-base/xfree/xfree-4.2.0-r11.ebuild
+++ b/x11-base/xfree/xfree-4.2.0-r11.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Achim Gottinger <achim@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r11.ebuild,v 1.4 2002/05/30 15:00:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.0-r11.ebuild,v 1.5 2002/05/31 15:38:02 azarah Exp $
 
 FT2_VER=2.0.9
 MY_V="`echo ${PV} |sed -e 's:\.::g'`"
@@ -219,6 +219,8 @@ src_install() {
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/${PVR}/xdm.start xdm
 	newexe ${FILESDIR}/${PVR}/xfs.start xfs
+	insinto /etc/conf.d
+	newins ${FILESDIR}/${PVR}/xfs.conf.d xfs
 
 	# we want libGLU.so* in /usr/lib
 	mv ${D}/usr/X11R6/lib/libGLU.* ${D}/usr/lib