Update building and vpnc-script pages for mandatory vpnc-script

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/www/building.xml b/www/building.xml
index 896fa9c..784b1e3 100644 (file)
--- a/www/building.xml
+++ b/www/building.xml
@@ -38,6 +38,23 @@ if you want OpenConnect to automatically use the appropriate proxies for your
 environment, without having to manually give it the <tt>--proxy</tt> argument
 on the command line.</p>
 
+<h2>Install vpnc-script</h2>
+ <p>Since version 3.17, OpenConnect automatically uses a <a href="vpnc-script.html">vpnc-script</a>
+ to configure the network. It needs to be told where that script is, when it is
+ being compiled.</p>
+ <p>The <tt>configure</tt> script will check whether <tt>/etc/vpnc/vpnc-script</tt>
+ exists and can be executed, and will fail if not. If you don't already have
+ a copy then you should install one. It might be in a separate <tt>vpnc-script</tt>
+ package for your operating system, it might be part of their <tt>vpnc</tt> package,
+ and there's one linked from from the <a href="vpnc-script.html">vpnc-script page</a>,
+ if you need to download it manually. Install it as <tt>/etc/vpnc/vpnc-script</tt>.</p>
+
+<p>If you do not want to use the standard location, you can configure OpenConnect to
+ use a different location by default. When running the <tt>./configure</tt> script
+ in the instructions below, you can append an argument such as <tt>--with-vpnc-script=<i>/where/I/put/vpnc-script</i></tt> to its command line. Note that the path you give will not be checked; the script doesn't have to be present when you <b>build</b> OpenConnect. But of course OpenConnect won't work very
+well without it, so you'll still have to install it later.</p>
+
+
 <h2>Building OpenConnect</h2>
 
 <p>If you checked the source code out from git rather from a release tarball

diff --git a/www/vpnc-script.xml b/www/vpnc-script.xml
index fbb937f..67589db 100644 (file)
--- a/www/vpnc-script.xml
+++ b/www/vpnc-script.xml
@@ -32,8 +32,16 @@ kernels amongst other bug fixes.</p>
 where SELinux or similar security systems won't prevent the root user
 from accessing it.</p>
 
-<p>To tell OpenConnect where to find the script, you use the <tt>--script</tt>
-argument on the command line. For example:
+<p>Current versions of OpenConnect <i>(since version 3.17)</i> are configured
+with the location of the script at build time, and will use the script
+automatically. If you are using a packaged build of OpenConnect rather than
+building it yourself, then the OpenConnect package should have a dependency
+on a suitable version of <tt>vpnc-script</tt> and should be built to look in
+the right place for it. Hopefully your distributions gets that right.</p>
+
+<p>If you're using an older version of OpenConnect, or if you want to use
+a script other than the one that OpenConnect was configured to use, you
+can use the <tt>--script</tt> argument on the command line. For example:
  <ul><li><tt>openconnect --script /etc/vpnc/vpnc-script https://vpn.example.com/</tt></li></ul></p>
 
 <p>If OpenConnect is invoked without a suitable script, it will not be able