[Openvpn-devel,v1] Remove conditional text for Apache2 linking exception

Message ID 20240118135530.3911-1-gert@greenie.muc.de
State Accepted
Headers show
Series [Openvpn-devel,v1] Remove conditional text for Apache2 linking exception | expand

Commit Message

Gert Doering Jan. 18, 2024, 1:55 p.m. UTC
From: Arne Schwabe <arne@rfc2549.org>

With the reimplementation of the tls-export feature and removal/approval
or being trivial of the rest of the code, now all the code falls under
new license. Remove the conditional text of the license to be only valid
for parts of OpenVPN.

Change-Id: Ia9c5453dc08679ffb73a275ddd4f28095ff1c1f8
Acked-by: dazo <dazo@eurephia.org>

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/502
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
dazo <dazo@eurephia.org>


Gert Doering Jan. 18, 2024, 3:06 p.m. UTC | #1
This concludes the changing of our license wrt the Apache2 exception -
it was quite a journey... :-)

Your patch has been applied to the master and release/2.6 branch.

commit 275aa892c30e91adfec9276f6d6845756b141c62 (master)
commit 20bc8bd5af9d1ee0489d0ee58ae9c2c2f9b0cf9f (release/2.6)
Author: Arne Schwabe
Date:   Thu Jan 18 14:55:30 2024 +0100

     Remove conditional text for Apache2 linking exception

     Acked-by: dazo <dazo@eurephia.org>
     Message-Id: <20240118135530.3911-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28077.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/COPYING b/COPYING
index ab59cef..28525d7 100644
@@ -33,11 +33,6 @@ 
 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