components/x11/tigervnc/patches/23.vnc-nohttpd.patch

   1 ## Patch originally from Fedora - Revision 1.1 of:
   2 http://cvs.fedoraproject.org/viewvc/rpms/vnc/devel/vnc-nohttpd.patch
   3 ## Modified to make httpd service off by default and only offered via -httpd
   4
   5 --- a/unix/vncserver    2017-03-11 02:25:51.655811658 +0000
   6 +++ b/unix/vncserver    2017-03-11 02:27:56.454202127 +0000
   7 @@ -133,7 +133,7 @@
   8  # Check command line options
   9
  10  &ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
  11 -             "-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1);
  12 +             "-help",0,"-h",0,"--help",0,"-fp",1,"-list",0,"-fg",0,"-autokill",0,"-noxstartup",0,"-xstartup",1,"-httpd",0);
  13
  14  &Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
  15
  16 @@ -165,6 +165,12 @@
  17      $fontPath = $opt{'-fp'};
  18      $fpArgSpecified = 1;
  19  }
  20 +if ($opt{'-httpd'}) {
  21 +    $nohttpd = 0;
  22 +}
  23 +else {
  24 +    $nohttpd = 1;
  25 +}
  26
  27  &CheckGeometryAndDepth();
  28
  29 @@ -261,7 +267,7 @@
  30  my %config;
  31
  32  $default_opts{desktop} = &quotedString($desktopName);
  33 -$default_opts{httpd} = $vncJavaFiles if ($vncJavaFiles);
  34 +$default_opts{httpd} = $vncJavaFiles if ($vncJavaFiles && !$nohttpd);
  35  $default_opts{auth} = $xauthorityFile;
  36  $default_opts{geometry} = $geometry if ($geometry);
  37  $default_opts{depth} = $depth if ($depth);
  38 @@ -626,6 +632,7 @@
  39         "                 [-autokill]\n".
  40         "                 [-noxstartup]\n".
  41         "                 [-xstartup <file>]\n".
  42 +       "                 [-httpd]\n".
  43         "                 <Xvnc-options>...\n\n".
  44         "       $prog -kill <X-display>\n\n".
  45         "       $prog -list\n\n");
  46 --- a/unix/vncserver.man        2017-03-11 02:28:15.913476314 +0000
  47 +++ b/unix/vncserver.man        2017-03-11 02:29:47.782021044 +0000
  48 @@ -18,6 +18,7 @@
  49  .RB [ \-fg ]
  50  .RB [ \-autokill ]
  51  .RB [ \-noxstartup ]
  52 +.RB [ \-httpd ]
  53  .RB [ \-xstartup
  54  .IR script ]
  55  .RI [ Xvnc-options... ]
  56 @@ -88,6 +89,10 @@
  57  must have an 8-bit depth.
  58  .
  59  .TP
  60 +.B \-httpd
  61 +Instruct Xvnc to run a mini-httpd if the VNC Java applet is found.
  62 +.
  63 +.TP
  64  .B \-kill :\fIdisplay#\fP
  65  This kills a VNC desktop previously started with vncserver.  It does this by
  66  killing the Xvnc process, whose process ID is stored in the file