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

@@ -68,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 <[email protected]>
+Copyright (C) 2002-2023 OpenVPN Inc <[email protected]>
 
 This distribution contains multiple components, some
 of which fall under different licenses.  By using OpenVPN
@@ -31,53 +31,6 @@ OpenVPN license:
   file, but you are not obligated to do so.  If you do not wish to
   do so, delete this exception statement from your version.
 
-Apache2 linking exception:
----------------------------
-OpenVPN is currently undergoing a license change to add an exception for
-Apache 2 linking. The following exception is only valid for new contributions
-after 2023-05-03 and past contribution where the authors have already agreed
-to the exception.
-
-  In addition, as a special exception, OpenVPN Inc and the
-  contributors give permission to link the code of this program to
-  libraries (the "Libraries") licensed under the Apache License
-  version 2.0 (this work and any linked library the "Combined Work")
-  and copy and distribute the Combined Work without an obligation to
-  license the Libraries under the GNU General Public License v2
-  (GPL-2.0) as required by Section 2 of the GPL-2.0, and without an
-  obligation to refrain from imposing any additional restrictions in
-  the Apache License version 2 that are not in the GPL-2.0, as
-  required by Section 6 of the GPL-2.0.  You must comply with the
-  GPL-2.0 in all other respects for the Combined Work, including
-  the obligation to provide source code.  If you modify this file, you
-  may extend this exception to your version of the file, but you are
-  not obligated to do so.  If you do not wish to do so, delete this
-  exception statement from your version.
-
-For better understanding, in plain non-legalese English this basically says:
-
- * The intention for this license exception is to allow OpenVPN to be
-   linked against APL-2 licensed libraries, even where the GPL-2.0 and
-   APL-2 licenses conflict from a legal perspective.
-
- * OpenVPN itself will stay GPL-2.0 and the code belonging to the
-   OpenVPN project must comply to the GPL-2.0 license.  This is NOT
-   dual-licensing of the OpenVPN code base.
-
- * This license exception DOES NOT require NOR expect a license change
-   of the APL-2 based library.  This exception allows using the APL-2
-   library as-is.  However, when distributing a compiled OpenVPN binary
-   linking against APL-2 libraries ("Combined Work"), the REQUIREMENT is
-   that the APL-2 library MUST also be available on similar terms as in
-   GPL-2.0, like providing the source code of the library upon request,
-   except in the two specific ways mentioned.
-
- * If the APL-2 based library forbids such linking and distribution,
-   this license exception DOES NOT overrule the restriction of the APL-2
-   based library.  If the APL-2 library cannot satisfy the requirements
-   in this license exception, you CANNOT distribute an OpenVPN binary
-   linked with this library.
-
 LZO license:
 ------------