Skip to contentSkip to conversation

Change in openvpn[master]: Remove conditional text for Apache2 linking exception

Openvpn-devel In review plaisthos (Code Review) 2 participants 6 messages Jan 18, 2024 1 message not in the archive Licenses and spdx stuff

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1705584340000.Ia9c5453dc08679ffb73a275ddd4f28095ff1c1f8@...2715...

#1 lore raw

Attention is currently required from: flichtenheld.

Hello flichtenheld,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/502?usp=email

to review the following change.

Change subject: Remove conditional text for Apache2 linking exception
......................................................................

Remove conditional text for Apache2 linking exception

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
---
M COPYING

1 file changed, 0 insertions(+), 5 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/02/502/1

COPYING +0 -5
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

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/502?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia9c5453dc08679ffb73a275ddd4f28095ff1c1f8
Gerrit-Change-Number: 502
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

dazo has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/502?usp=email )

Change subject: Remove conditional text for Apache2 linking exception
......................................................................

Patch Set 1: Code-Review+2

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/502?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia9c5453dc08679ffb73a275ddd4f28095ff1c1f8
Gerrit-Change-Number: 502
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: dazo <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 18 Jan 2024 13:36:45 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH 1/1 Remove conditional text for Apache2 linking exception

In reply to a message not in the archive

From: Arne Schwabe <[email protected]...>

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

---

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 <[email protected]...>

COPYING +0 -5
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
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: Remove conditional text for Apache2 linking exception

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 <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg28077.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#2) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/502?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by dazo

Change subject: Remove conditional text for Apache2 linking exception
......................................................................

Remove conditional text for Apache2 linking exception

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

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28077.html

---
M COPYING

1 file changed, 0 insertions(+), 5 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/02/502/2

COPYING +0 -5
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

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/502?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia9c5453dc08679ffb73a275ddd4f28095ff1c1f8
Gerrit-Change-Number: 502
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: dazo <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/502?usp=email )

Change subject: Remove conditional text for Apache2 linking exception
......................................................................

Remove conditional text for Apache2 linking exception

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

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28077.html

---
M COPYING

1 file changed, 0 insertions(+), 5 deletions(-)
COPYING +0 -5
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

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/502?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ia9c5453dc08679ffb73a275ddd4f28095ff1c1f8
Gerrit-Change-Number: 502
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: dazo <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged