[vcl-site] branch master updated: VCL251InstallGuide.md - added block about patch for cygsshd name change cygsshd_patch.md - initial add, page about patch for cygwin sshd service name change to cygsshd download.md - small wording changes

[jf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jfthomps pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/vcl-site.git


The following commit(s) were added to refs/heads/master by this push:
     new bfbfe8a  VCL251InstallGuide.md - added block about patch for cygsshd name change cygsshd_patch.md  - initial add, page about patch for cygwin sshd service name change to cygsshd download.md - small wording changes
bfbfe8a is described below

commit bfbfe8a62a53ae5c03624da53ce24f65aa8a0e4b
Author: Josh Thompson <jf...@ncsu.edu>
AuthorDate: Wed May 13 16:31:32 2020 -0400

    VCL251InstallGuide.md - added block about patch for cygsshd name change
    cygsshd_patch.md  - initial add, page about patch for cygwin sshd service name change to cygsshd
    download.md - small wording changes
---
 source/docs/VCL251InstallGuide.md |  7 +++++
 source/docs/cygsshd_patch.md      | 63 +++++++++++++++++++++++++++++++++++++++
 source/downloads/download.md      |  6 ++--
 3 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/source/docs/VCL251InstallGuide.md b/source/docs/VCL251InstallGuide.md
index 73110a4..e4cb31d 100644
--- a/source/docs/VCL251InstallGuide.md
+++ b/source/docs/VCL251InstallGuide.md
@@ -21,6 +21,13 @@ wget https://www.apache.org/dist/vcl/2.5.1/vcl-install.sh.asc
 gpg --verify vcl-install.sh.asc
 ```
 
+<span class="docnote">
+<b>Required Patch for Windows Images</b><br>
+Microsoft added openssh as a package that can be installed on Windows. This forced
+the Cygwin project to change the name of their ssh service from sshd to cygsshd.
+<a href="/docs/cygsshd_patch.html">A patch</a> needs to be applied to VCL 2.5.1 to accommodate this change.
+</span>
+
 Running the installation script with no arguments will step you through installing all
 three parts of VCL.  Alternatively, the following explains optional arguments.  If
 installing the management node part of VCL, it will also prompt you to agree to the 
diff --git a/source/docs/cygsshd_patch.md b/source/docs/cygsshd_patch.md
new file mode 100644
index 0000000..21c32e6
--- /dev/null
+++ b/source/docs/cygsshd_patch.md
@@ -0,0 +1,63 @@
+---
+title: Cygwin SSHD Service Name Change Patch for VCL 2.5.1
+---
+
+When Microsoft made openssh available as an installable package on Windows, they
+used the same service name (sshd) that cygwin had been using for many years. This
+caused the Cygwin project to change the name of the sshd service they install from
+sshd to cygsshd. VCL 2.5.1 needs a patch applied to handle the service name change.
+
+# Download Patch
+
+The patch is available from the ASF distribution servers.
+
+[Download patch](https://dist.apache.org/repos/dist/release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch) 
+[ [GPG](https://dist.apache.org/repos/dist/release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.asc) ] 
+[ [SHA512](https://dist.apache.org/repos/dist/release/vcl/patches/cygwin_sshd_to_cygsshd/cygwin_sshd_for_2.5.1.patch.sha512) ] 
+
+# Validate Patch
+
+It is essential that you verify the integrity of the patch file using the GPG and 
+SHA signatures. By verifying the integrity of the patch, you ensure it has not
+been tainted.
+
+Run the following command to verify the SHA512 sum. You should get output 
+similar to "cygwin_sshd_for_2.5.1.patch: OK":</p>
+
+```bash
+sha512sum -c cygwin_sshd_for_2.5.1.patch.sha512
+```
+
+To verify the GPG signature (you'll need to have [GnuPG](http://www.gnupg.org/) installed):
+
+1. download and import the [VCL KEYS file](https://www.apache.org/dist/vcl/KEYS) (if you've imported the KEYS file for previously,
+you do not need to import it again):
+
+    ```bash
+    gpg --import KEYS
+    ```
+
+1. download the GPG Signature to the same location as the patch file
+1. from the directory containing both the release file and the GPG signature, run
+
+    ```bash
+    gpg --verify cygwin_sshd_for_2.5.1.patch.asc
+
+# Apply Patch
+The patch is applied to the management node code, which is typically installed to /usr/local/vcl.
+The following example assumes the patch was downloaded to /tmp.
+
+```bash
+cd /usr/local/vcl
+patch -p2 < /tmp/cygwin_sshd_for_2.5.1.patch
+```
+
+If it applies correctly, you should see a message similar to
+
+```bash
+patching file bin/cygwin-sshd-config.sh
+patching file bin/gen-node-key.sh
+patching file lib/VCL/Module/OS/Windows/Version_6/8.pm
+patching file lib/VCL/Module/OS/Windows.pm
+patching file tools/Windows/Scripts/update_cygwin.cmd
+```
diff --git a/source/downloads/download.md b/source/downloads/download.md
index 0dfd75b..b7bab05 100644
--- a/source/downloads/download.md
+++ b/source/downloads/download.md
@@ -63,8 +63,8 @@ You may also consult the [complete list of mirrors](http://www.apache.org/mirror
 <a name="verify"></a>
 ## Verifying the integrity of the files
 
-It is essential that you verify the integrity of the downloaded files using the PGP or 
-MD5 signatures. Security of the mirrors cannot be guaranteed, which means malicious code 
+It is essential that you verify the integrity of the downloaded files using the GPG and 
+SHA signatures. Security of the mirrors cannot be guaranteed, which means malicious code 
 could be added to the downloads from the mirrors. By verifying the integrity of 
 downloaded release files, you ensure they have not been tainted.
 
@@ -85,7 +85,7 @@ md5sum -c apache-VCL-2.5.1.tar.bz2.md5
 To verify the GPG signature (you'll need to have [GnuPG](http://www.gnupg.org/) installed):
 
 
-1. download and import the [VCL KEYS file](https://www.apache.org/dist/vcl/KEYS) (if you've imported the KEYS file for previously 
+1. download and import the [VCL KEYS file](https://www.apache.org/dist/vcl/KEYS) (if you've imported the KEYS file for previous 
 releases, you do not need to import it again):
 
     ```bash