summaryrefslogtreecommitdiff
path: root/x11/XFree86-4
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2001-10-27 12:18:10 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2001-10-27 12:18:10 +0000
commit11bfaab4147475457c02ffb31e575a8b1e238a84 (patch)
tree06f0e9c506c7079a54416d92a1f34338be43d9ae /x11/XFree86-4
parentUpdate to 0.1.4. (diff)
Patch startx so that X is started with the "-nolisten tcp" by default and
add a "-listen_tcp" option to run X in non-secure mode. Submitted by: Jochem Kossen <j.kossen@home.nl>
Notes
Notes: svn path=/head/; revision=49264
Diffstat (limited to 'x11/XFree86-4')
-rw-r--r--x11/XFree86-4/Makefile2
-rw-r--r--x11/XFree86-4/files/patch-startx54
2 files changed, 55 insertions, 1 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 629444b77262..1ddaed29b871 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 4.1.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0
diff --git a/x11/XFree86-4/files/patch-startx b/x11/XFree86-4/files/patch-startx
new file mode 100644
index 000000000000..7761db5a3024
--- /dev/null
+++ b/x11/XFree86-4/files/patch-startx
@@ -0,0 +1,54 @@
+--- programs/xinit/startx.cpp.orig Fri Apr 27 13:04:53 2001
++++ programs/xinit/startx.cpp Sat Oct 27 03:50:41 2001
+@@ -82,8 +82,12 @@
+
+ display=:0
+ whoseargs="client"
++listen_tcp="-nolisten tcp"
+ while [ "x$1" != "x" ]; do
+ case "$1" in
++ -listen_tcp)
++ listen_tcp=""
++ ;;
+ --)
+ whoseargs="server"
+ ;;
+@@ -134,7 +138,7 @@
+ done
+ #endif
+
+-xinit $clientargs -- $serverargs
++xinit $clientargs -- $serverargs $listen_tcp
+
+ if [ x"$removelist" != x ]; then
+ xauth remove $removelist
+--- programs/xinit/startx.man.orig Thu Apr 19 17:08:32 2001
++++ programs/xinit/startx.man Sat Oct 27 03:40:01 2001
+@@ -42,10 +42,17 @@
+ somewhat nicer user interface for running a single session of the X
+ Window System. It is often run with no arguments.
+ .PP
+-Arguments immediately following the
++Except for the
++.RB '-listen_tcp'
++option, arguments immediately following the
+ .I startx
+ command are used to start a client in the same manner as
+ .IR xinit (1).
++The
++.RB '-listen_tcp'
++option of startx enables the TCP/IP transport type which is needed for remote X
++displays. This is disabled by default for security reasons.
++.PP
+ The special argument
+ .RB '--'
+ marks the end of client arguments and the beginning of server options.
+@@ -66,6 +73,8 @@
+ startx -- -dpi 100
+ .PP
+ startx -- -layout Multihead
++.PP
++startx -listen_tcp -- -depth 16
+ .RE
+ .PP
+ To determine the client to run,