Merge pull request #1 from sophos/feature/NCL-1802-Upgrade-OpenVPN-fo…

…r-Sophos-Connect-Client-to-2.6.0

NCL-1802 : Upgrade OpenVPN for Sophos Connect Client to 2.6.0

.git-blame-ignore-revs

@@ -39,3 +39,12 @@ f57431cdc88f22fa4d7962946f0d3187fe058539
 
 # The Great Reformatting - first phase
 81d882d5302b8b647202a6893b57dfdc61fd6df2
+
+# Fix trailing-whitespace errors in last patch.
+3282632d9325267c850072db7545a884a1637f51
+
+# The Great Reformatting of 2022
+abe49856d81f51136d543539202a0bf8fb946474
+
+# Reformat for sp_after_comma=add
+e51d9a73693ee742b36e19fb1718e5e27167831d

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior. Please make sure to not post any secrets like keys and passwords.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Version information (please complete the following information):**
+ - OS: [e.g. Ubuntu 22.04]
+ - OpenVPN version: [e.g. 2.5.8]
+ - Repeat for peer if relevant
+
+**Additional context**
+Add any other context about the problem here.

.gitignore

@@ -44,6 +44,7 @@ m4/ltoptions.m4
 m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
+vcpkg_installed
 
 version.sh
 msvc-env-local.bat
@@ -67,6 +68,10 @@ tests/t_client-*-20??????-??????/
 t_client.rc
 t_client_ips.rc
 tests/unit_tests/**/*_testdriver
+tests/unit_tests/engine-key/client.key
+tests/unit_tests/engine-key/log.txt
+tests/unit_tests/engine-key/openssl.cnf
+tests/unit_tests/engine-key/passwd
 
 src/openvpn/openvpn
 include/openvpn-plugin.h

CONTRIBUTING.rst

@@ -18,6 +18,14 @@ When sending patches to "openvpn-devel" the subject line should be prefixed with
 git-format-patch or sent using git-send-email. Try to split large patches into
 small, atomic pieces to make reviews easier.
 
+Please make sure that the source code formatting follows the guidelines at
+https://community.openvpn.net/openvpn/wiki/CodeStyle. Automated checking can be
+done with uncrustify (http://uncrustify.sourceforge.net/) and the configuration
+file which can be found in the git repository at dev-tools/uncrustify.conf.
+There is also a git pre-commit hook script, which runs uncrustify automatically
+each time you commit and lets you format your code conveniently, if needed.
+To install the hook simply run: dev-tools/git-pre-commit-uncrustify.sh install
+
 If you want quick feedback on a patch before sending it to openvpn-devel mailing
 list, you can visit the #openvpn-devel channel on irc.libera.chat. Note that
 you need to be logged in to Libera to join the channel:

COPYING

@@ -1,6 +1,6 @@
 OpenVPN (TM) -- An Open Source VPN daemon
 
-Copyright (C) 2002-2022 OpenVPN Inc <sales@openvpn.net>
+Copyright (C) 2002-2023 OpenVPN Inc <sales@openvpn.net>
 
 This distribution contains multiple components, some
 of which fall under different licenses.  By using OpenVPN