[PATCH wireguard-apple] Update SPDX-License-Identifier tags from GPL-2.0 to MIT

[PATCH wireguard-apple] Update SPDX-License-Identifier tags from GPL-2.0 to MIT

[Adam Stiles]

Signed-off-by: Adam Stiles <ajstiles@gmail.com>
---
 Sources/WireGuardApp/UI/macOS/View/highlighter.c | 2 +-
 Sources/WireGuardApp/UI/macOS/View/highlighter.h | 2 +-
 Sources/WireGuardKitC/key.c                      | 2 +-
 Sources/WireGuardKitC/key.h                      | 2 +-
 Sources/WireGuardKitC/x25519.c                   | 2 +-
 Sources/WireGuardKitGo/Makefile                  | 2 +-
 Sources/WireGuardKitGo/wireguard.h               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Sources/WireGuardApp/UI/macOS/View/highlighter.c b/Sources/WireGuardApp/UI/macOS/View/highlighter.c
index e0d4e04..55fabfd 100644
--- a/Sources/WireGuardApp/UI/macOS/View/highlighter.c
+++ b/Sources/WireGuardApp/UI/macOS/View/highlighter.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: MIT
 /*
  * Copyright (C) 2015-2020 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  */
diff --git a/Sources/WireGuardApp/UI/macOS/View/highlighter.h b/Sources/WireGuardApp/UI/macOS/View/highlighter.h
index 885db2d..8b86acb 100644
--- a/Sources/WireGuardApp/UI/macOS/View/highlighter.h
+++ b/Sources/WireGuardApp/UI/macOS/View/highlighter.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
 /*
  * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  */
diff --git a/Sources/WireGuardKitC/key.c b/Sources/WireGuardKitC/key.c
index 140f278..84e7f16 100644
--- a/Sources/WireGuardKitC/key.c
+++ b/Sources/WireGuardKitC/key.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: MIT
 /*
  * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  *
diff --git a/Sources/WireGuardKitC/key.h b/Sources/WireGuardKitC/key.h
index 149e4ed..5353ade 100644
--- a/Sources/WireGuardKitC/key.h
+++ b/Sources/WireGuardKitC/key.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0 */
+/* SPDX-License-Identifier: MIT */
 /*
  * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  */
diff --git a/Sources/WireGuardKitC/x25519.c b/Sources/WireGuardKitC/x25519.c
index b77da0b..9ceed9f 100644
--- a/Sources/WireGuardKitC/x25519.c
+++ b/Sources/WireGuardKitC/x25519.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+
+/* SPDX-License-Identifier: MIT+
  *
  * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
  *
diff --git a/Sources/WireGuardKitGo/Makefile b/Sources/WireGuardKitGo/Makefile
index 767edbd..d59c61d 100644
--- a/Sources/WireGuardKitGo/Makefile
+++ b/Sources/WireGuardKitGo/Makefile
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0
+# SPDX-License-Identifier: MIT
 #
 # Copyright (C) 2018-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.

diff --git a/Sources/WireGuardKitGo/wireguard.h b/Sources/WireGuardKitGo/wireguard.h
index 9da8cef..8cefa49 100644
--- a/Sources/WireGuardKitGo/wireguard.h
+++ b/Sources/WireGuardKitGo/wireguard.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0
+/* SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2018-2020 WireGuard LLC. All Rights Reserved.
  */
--
2.21.0

Re: [PATCH wireguard-apple] Update SPDX-License-Identifier tags from GPL-2.0 to MIT

[Jonathan Neuschäfer]

[-- Attachment #1: Type: text/plain, Size: 1655 bytes --]

Hi,

a little drive-by review, since I happened to see the patch.
In case I misunderstood something, I apologise in advance.

On Thu, Dec 10, 2020 at 03:54:12PM -0800, Adam Stiles wrote:
> Signed-off-by: Adam Stiles <ajstiles@gmail.com>
> ---
>  Sources/WireGuardApp/UI/macOS/View/highlighter.c | 2 +-
>  Sources/WireGuardApp/UI/macOS/View/highlighter.h | 2 +-
>  Sources/WireGuardKitC/key.c                      | 2 +-
>  Sources/WireGuardKitC/key.h                      | 2 +-
>  Sources/WireGuardKitC/x25519.c                   | 2 +-
>  Sources/WireGuardKitGo/Makefile                  | 2 +-
>  Sources/WireGuardKitGo/wireguard.h               | 2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/Sources/WireGuardApp/UI/macOS/View/highlighter.c b/Sources/WireGuardApp/UI/macOS/View/highlighter.c
> index e0d4e04..55fabfd 100644
> --- a/Sources/WireGuardApp/UI/macOS/View/highlighter.c
> +++ b/Sources/WireGuardApp/UI/macOS/View/highlighter.c
> @@ -1,4 +1,4 @@
> -// SPDX-License-Identifier: GPL-2.0
> +// SPDX-License-Identifier: MIT

AFAIUI, such a change expresses a relicensing of the code, and it should
(IMHO) be made clear in the commit message that this is the case.

All authors of the code must agree to a relicensing. It would be nice
to see the list of authors in the commit message, along with a
confirmation that all agreed to relicense the code to MIT.

> -/* SPDX-License-Identifier: GPL-2.0+
> +/* SPDX-License-Identifier: MIT+

I think MIT+ is an editing error. It's not on the official SPDX license
identifier list, in any case.


Best regards,
Jonathan Neuschäfer

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH wireguard-apple] Update SPDX-License-Identifier tags from GPL-2.0 to MIT

[Adam Stiles]

Hi Jonathan,

Thanks for looking at the patch. In retrospect, I should have asked
about this before I submitted it. I wasn't intending a re-license.
Rather, I assumed those SPDX identifiers were missed when repo was
converted from GPL to MIT a couple of years ago. Apologies,

Adam


On Sun, Dec 13, 2020 at 3:42 PM Jonathan Neuschäfer
<j.neuschaefer@gmx.net> wrote:
>
> Hi,
>
> a little drive-by review, since I happened to see the patch.
> In case I misunderstood something, I apologise in advance.
>
> On Thu, Dec 10, 2020 at 03:54:12PM -0800, Adam Stiles wrote:
> > Signed-off-by: Adam Stiles <ajstiles@gmail.com>
> > ---
> >  Sources/WireGuardApp/UI/macOS/View/highlighter.c | 2 +-
> >  Sources/WireGuardApp/UI/macOS/View/highlighter.h | 2 +-
> >  Sources/WireGuardKitC/key.c                      | 2 +-
> >  Sources/WireGuardKitC/key.h                      | 2 +-
> >  Sources/WireGuardKitC/x25519.c                   | 2 +-
> >  Sources/WireGuardKitGo/Makefile                  | 2 +-
> >  Sources/WireGuardKitGo/wireguard.h               | 2 +-
> >  7 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/Sources/WireGuardApp/UI/macOS/View/highlighter.c b/Sources/WireGuardApp/UI/macOS/View/highlighter.c
> > index e0d4e04..55fabfd 100644
> > --- a/Sources/WireGuardApp/UI/macOS/View/highlighter.c
> > +++ b/Sources/WireGuardApp/UI/macOS/View/highlighter.c
> > @@ -1,4 +1,4 @@
> > -// SPDX-License-Identifier: GPL-2.0
> > +// SPDX-License-Identifier: MIT
>
> AFAIUI, such a change expresses a relicensing of the code, and it should
> (IMHO) be made clear in the commit message that this is the case.
>
> All authors of the code must agree to a relicensing. It would be nice
> to see the list of authors in the commit message, along with a
> confirmation that all agreed to relicense the code to MIT.
>
> > -/* SPDX-License-Identifier: GPL-2.0+
> > +/* SPDX-License-Identifier: MIT+
>
> I think MIT+ is an editing error. It's not on the official SPDX license
> identifier list, in any case.
>
>
> Best regards,
> Jonathan Neuschäfer

Re: [PATCH wireguard-apple] Update SPDX-License-Identifier tags from GPL-2.0 to MIT

[Jonathan Neuschäfer]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]

On Sun, Dec 13, 2020 at 07:16:46PM -0800, Adam Stiles wrote:
> Hi Jonathan,
> 
> Thanks for looking at the patch. In retrospect, I should have asked
> about this before I submitted it. I wasn't intending a re-license.
> Rather, I assumed those SPDX identifiers were missed when repo was
> converted from GPL to MIT a couple of years ago.

I missed that detail. If you send a second version of the patch, please
mention it in the commit message, so that misunderstandings can be
avoided by reading the commit message.

> Apologies,
> 
> Adam

No problem :)


Best regards,
Jonathan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]