rpms/vnc/devel vnc-nohttpd.patch,NONE,1.1 vnc.spec,1.85,1.86
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 11 11:29:47 UTC 2005
Author: twaugh
Update of /cvs/dist/rpms/vnc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17596
Modified Files:
vnc.spec
Added Files:
vnc-nohttpd.patch
Log Message:
* Thu Aug 11 2005 Tim Waugh <twaugh at redhat.com>
- Added -nohttpd option to vncserver, based on patch from bug #161288.
- Included -nohttpd, -nolisten tcp, and -localhost options in example
sysconfig file (bug #165334).
vnc-nohttpd.patch:
vncserver | 11 +++++++++--
vncserver.man | 5 +++++
2 files changed, 14 insertions(+), 2 deletions(-)
--- NEW FILE vnc-nohttpd.patch ---
--- vnc-4_1_1-unixsrc/unix/vncserver.nohttpd 2005-08-08 15:51:09.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/vncserver 2005-08-11 12:13:59.000000000 +0100
@@ -58,6 +58,7 @@
# Check command line options
&ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
+ "-nohttpd",0,
"-help",0,"-h",0,"--help",0);
&Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
@@ -78,6 +79,12 @@
if ($opt{'-pixelformat'}) {
$pixelformat = $opt{'-pixelformat'};
}
+if ($opt{'-nohttpd'}) {
+ $nohttpd = 1;
+ }
+else {
+ $nohttpd = 0;
+}
&CheckGeometryAndDepth();
@@ -137,7 +144,7 @@
$cmd = "Xvnc :$displayNumber";
$cmd .= " -desktop " . "edString($desktopName);
-$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles);
+$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles && ! $nohttpd);
$cmd .= " -auth $xauthorityFile";
$cmd .= " -geometry $geometry" if ($geometry);
$cmd .= " -depth $depth" if ($depth);
@@ -413,7 +420,7 @@
sub Usage
{
- die("\nusage: $prog [:<number>] [-name <desktop-name>] [-depth <depth>]\n".
+ die("\nusage: $prog [:<number>] [-nohttpd] [-name <desktop-name>] [-depth <depth>]\n".
" [-geometry <width>x<height>]\n".
" [-pixelformat rgbNNN|bgrNNN]\n".
" <Xvnc-options>...\n\n".
--- vnc-4_1_1-unixsrc/unix/vncserver.man.nohttpd 2005-08-11 12:17:46.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/vncserver.man 2005-08-11 12:19:35.000000000 +0100
@@ -77,6 +77,11 @@
must be 8 bits deep.
.TP
+.B \-nohttpd
+Do not instruct Xvnc to run a mini-httpd if the VNC Java applet is
+found.
+
+.TP
.B \-kill :\fIdisplay#\fP
This kills a VNC desktop previously started with vncserver. It does this by
killing the Xvnc process, whose process ID is stored in the file
Index: vnc.spec
===================================================================
RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- vnc.spec 8 Aug 2005 16:15:14 -0000 1.85
+++ vnc.spec 11 Aug 2005 11:29:44 -0000 1.86
@@ -27,6 +27,7 @@
Patch9: vnc-vncpasswd.patch
Patch10: vnc-def.patch
Patch11: vnc-xorg.patch
+Patch12: vnc-nohttpd.patch
Patch13: vnc-xorg-x11-fixes.patch
License: GPL
Group: User Interface/Desktops
@@ -77,6 +78,7 @@
%patch9 -p1 -b .vncpasswd
%patch10 -p1 -b .def
%patch11 -p1 -b .xorg
+%patch12 -p1 -b .nohttpd
%patch13 -p1 -b .xorg-x11-fixes
# Apply the patch from the VNC tarball.
@@ -126,8 +128,16 @@
# untrusted! For a secure way of using VNC, see
# <URL:http://www.uk.research.att.com/archive/vnc/sshvnc.html>.
+# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP.
+
+# Use "-nohttpd" to prevent web-based VNC clients connecting.
+
+# Use "-localhost" to prevent remote VNC clients connecting except when
+# doing so through a secure tunnel. See the "-via" option in the
+# `man vncviewer' manual page.
+
# VNCSERVERS="2:myusername"
-# VNCSERVERARGS[2]="-geometry 800x600"
+# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -nohttpd -localhost"
EOF
chmod 644 %{buildroot}/etc/sysconfig/vncservers
@@ -208,6 +218,11 @@
/usr/X11R6
%changelog
+* Thu Aug 11 2005 Tim Waugh <twaugh at redhat.com>
+- Added -nohttpd option to vncserver, based on patch from bug #161288.
+- Included -nohttpd, -nolisten tcp, and -localhost options in example
+ sysconfig file (bug #165334).
+
* Mon Aug 8 2005 Tim Waugh <twaugh at redhat.com> 4.1.1-15
- Fixed xorg-x11 build (__SSP__ gets set by -fstack-protector).
- Fixed desktop file again (bug #63689).
More information about the fedora-cvs-commits
mailing list