[Qemu-commits] [qemu/qemu] 772c71: slirp: update COPYRIGHT to use full 3

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 772c71: slirp: update COPYRIGHT to use full 3

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 772c71: slirp: update COPYRIGHT to use full 3-Clause BSD L...
Date:	Mon, 25 Mar 2019 04:17:38 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 772c712731e2f4c0eac1f50991446177ecf5a373
      
https://github.com/qemu/qemu/commit/772c712731e2f4c0eac1f50991446177ecf5a373
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/COPYRIGHT

  Log Message:
  -----------
  slirp: update COPYRIGHT to use full 3-Clause BSD License

According to commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec ("Remove
the advertising clause from the slirp license"), Danny Gasparovski
gave permission to license slirp code under 3-clause BSD license:

    Subject: RE: Slirp license
    Date: Thu, 8 Jan 2009 10:51:00 +1100
    From: "Gasparovski, Daniel" <address@hidden>
    To: "Richard Fontana" <address@hidden>

    I have no objection to having Slirp code in QEMU be licensed under
    the 3-clause BSD license.

slirp/COPYRIGHT's initial version in 2004 (commit 5fafdf24) listed
only 3 clauses BUT used the poisonous advertising clause for clause 3
which is the controversial clause of non-free 4-clause (that is, it
appears that the BSD-4 license was copied, and then the WRONG clause
was deleted, when creating COPYRIGHT.  Perhaps explained as an easy
mistake to make since 3-clause was created by removing clause 3 of the
4-clause, where you sometimes see the three-clause version with
clauses 1, 2, 4; but more commonly see a renumbered version with
clauses 1, 2, 3 to close the gap. If you pay attention only to clause
numbers instead of content, it can be easy to confuse which clause to
delete to go from 4-clause to 3-clause).

Commit 2f5f89963 removed the poisonous wrong clause on
the grounds of moving from 4-clause to 3-clause; but did not add the
missing clause, which makes it LOOK like the 2-clause version.  But I
think we have a decent enough trail showing the intent for 3-clause.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: 87ecdc711555c9e13907f9bd38d90a35225b0e63
      
https://github.com/qemu/qemu/commit/87ecdc711555c9e13907f9bd38d90a35225b0e63
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/src/dhcpv6.c
    M slirp/src/dhcpv6.h
    M slirp/src/ncsi-pkt.h
    M slirp/src/ncsi.c
    M slirp/src/vmstate.c
    M slirp/src/vmstate.h

  Log Message:
  -----------
  slirp: relicense GPL files to BSD-3

In order to make slirp a standalone project, the project must have a
clear license, and be compatible with the GPL or LGPL.

Since commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec ("Remove the
advertising clause from the slirp license"), slirp is BSD-3. But new
files have been added under slirp/ with QEMU GPL license since then.

The copyright holders have been asked to relicense files to BSD-3 and
gave their permission:

- slirp/dhcpv6.{c,h}

Subject: Re: Clearing slirp/ license
To: "Marc-André Lureau" <address@hidden>, QEMU <address@hidden>, Thomas Huth 
<address@hidden>
Cc: Peter Maydell <address@hidden>, Samuel Thibault <address@hidden>
References: <address@hidden>
From: "Cédric Le Goater" <address@hidden>
Message-ID: <address@hidden>
Date: Mon, 11 Mar 2019 16:23:25 +0100

> Could you reply that you have no objection in relicensing those files
> are 3-Clause BSD?

Fine for me. You can change the license of slirp/ncsi.c and
slirp/ncsi-pkt.hto a 3-Clause BSD.

Thanks,

C.

Subject: Re: [Qemu-devel] Clearing slirp/ license
To: Peter Maydell <address@hidden>, Shan Gavin <address@hidden>
Cc: Alexey Kardashevskiy <address@hidden>, "Marc-André Lureau" 
<address@hidden>, Gavin Shan <address@hidden>, Thomas Huth <address@hidden>, 
QEMU <address@hidden>, Samuel Thibault <address@hidden>
References: <address@hidden> <address@hidden> <address@hidden> <address@hidden> 
<address@hidden> <address@hidden>
From: "Cédric Le Goater" <address@hidden>
Message-ID: <address@hidden>
Date: Tue, 12 Mar 2019 11:49:21 +0100

> Is the code in question copyright you personally, or copyright
> IBM as your employer at the time ? If the latter, it is IBM that
> would need to approve the relicensing.

That was done. I had our legal team approve the change of license.

Thanks,

C.

From: Shan Gavin <address@hidden>
Date: Tue, 12 Mar 2019 15:04:54 +0800
Message-ID: <address@hidden>
Subject: Re: [Qemu-devel] Clearing slirp/ license
To: Alexey Kardashevskiy <address@hidden>
Cc: "Marc-André Lureau" <address@hidden>, "Cédric Le Goater" <address@hidden>, 
address@hidden, Peter Maydell <address@hidden>, Thomas Huth <address@hidden>, 
QEMU <address@hidden>, Samuel Thibault <address@hidden>

> Gavin, could you reply that you have no objection in relicensing
> ncsi-pkt.h as 3-Clause BSD?

No objection. Please go ahead with the relicensing.

Cheers,
Gavin

- ncsi.c, ncsi-pkt.h

Subject: Re: Clearing slirp/ license
To: "Marc-André Lureau" <address@hidden>, QEMU <address@hidden>, "Cédric Le 
Goater" <address@hidden>
Cc: Peter Maydell <address@hidden>, Samuel Thibault <address@hidden>
References: <address@hidden>
From: Thomas Huth <address@hidden>
Message-ID: <address@hidden>
Date: Wed, 13 Feb 2019 12:30:32 +0100

> Could you reply that you have no objection in relicensing those files
> are 3-Clause BSD?

Ok, for the records: I'm fine if you change the license of dhcpv6.[ch]
to either 3-Clause BSD or 2-Clause BSD.

 Thomas

- vmstate.{c,h}

From: Juan Quintela <address@hidden>
To: "Marc-André Lureau" <address@hidden>
Cc: QEMU <address@hidden>, Peter Maydell <address@hidden>, Samuel Thibault 
<address@hidden>
Subject: Re: Clearing slirp/ license
Date: Tue, 12 Mar 2019 12:43:17 +0100
Message-ID: <address@hidden>

> Juan, Could you reply that you have no objection in relicensing the
> vmstate files as 3-Clause BSD?

No problem at all on my side.

Later, Juan.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
[ for the NC-SI files ]
Reviewed-by: Cédric Le Goater <address@hidden>
Acked-by: Thomas Huth <address@hidden>


  Commit: d2f27fcbdffbda887f703adac476cc3c1a7dbcb7
      
https://github.com/qemu/qemu/commit/d2f27fcbdffbda887f703adac476cc3c1a7dbcb7
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/src/cksum.c
    M slirp/src/dhcpv6.c
    M slirp/src/dhcpv6.h
    M slirp/src/ip.h
    M slirp/src/ip_icmp.c
    M slirp/src/ip_icmp.h
    M slirp/src/ip_input.c
    M slirp/src/ip_output.c
    M slirp/src/mbuf.h
    M slirp/src/ncsi-pkt.h
    M slirp/src/ncsi.c
    M slirp/src/qtailq.h
    M slirp/src/tcp.h
    M slirp/src/tcp_input.c
    M slirp/src/tcp_output.c
    M slirp/src/tcp_subr.c
    M slirp/src/tcp_timer.c
    M slirp/src/tcp_timer.h
    M slirp/src/tcp_var.h
    M slirp/src/tcpip.h
    M slirp/src/udp.c
    M slirp/src/udp.h
    M slirp/src/vmstate.c
    M slirp/src/vmstate.h

  Log Message:
  -----------
  slirp: clarify license of slirp files using SPDX: explicit BSD

Add SPDX license identifier to clarify the license of files with
explicit 3-clause BSD license header.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: 6087fd53a368ef0abbaf8b26c50dce19088987d4
      
https://github.com/qemu/qemu/commit/6087fd53a368ef0abbaf8b26c50dce19088987d4
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/src/arp_table.c
    M slirp/src/bootp.c
    M slirp/src/dnssearch.c
    M slirp/src/slirp.c
    M slirp/src/state.c
    M slirp/src/stream.c
    M slirp/src/tftp.c
    M slirp/src/util.c
    M slirp/src/util.h

  Log Message:
  -----------
  slirp: clarify license of slirp files using SPDX: explicit MIT

Add SPDX license identifier to clarify the license of files with
explicit MIT license header.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: 3e6d35e56048894385fbf394818db45707643349
      
https://github.com/qemu/qemu/commit/3e6d35e56048894385fbf394818db45707643349
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/src/debug.h
    M slirp/src/if.c
    M slirp/src/if.h
    M slirp/src/main.h
    M slirp/src/mbuf.c
    M slirp/src/misc.c
    M slirp/src/misc.h
    M slirp/src/sbuf.c
    M slirp/src/sbuf.h
    M slirp/src/socket.c
    M slirp/src/socket.h

  Log Message:
  -----------
  slirp: clarify license of slirp files using SPDX: implicit via COPYRIGHT

Add SPDX license identifier to clarify the license of files with
reference to BSD license from slirp COPYRIGHT file.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: dfacac4c819f57f3a3e11ef2114a86a5d68fb648
      
https://github.com/qemu/qemu/commit/dfacac4c819f57f3a3e11ef2114a86a5d68fb648
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/src/bootp.h
    M slirp/src/ip6.h
    M slirp/src/ip6_icmp.c
    M slirp/src/ip6_icmp.h
    M slirp/src/ip6_input.c
    M slirp/src/ip6_output.c
    M slirp/src/libslirp.h
    M slirp/src/ndp_table.c
    M slirp/src/slirp.h
    M slirp/src/stream.h
    M slirp/src/tftp.h
    M slirp/src/udp6.c

  Log Message:
  -----------
  slirp: clarify license of slirp files using SPDX: implicit via unstated

Add SPDX license identifier to clarify the license of files without
explicit license header.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>


  Commit: 0c4cc4e2184831fecce64c1d734a1f754ea00cb4
      
https://github.com/qemu/qemu/commit/0c4cc4e2184831fecce64c1d734a1f754ea00cb4
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/src/debug.h
    M slirp/src/if.c
    M slirp/src/if.h
    M slirp/src/ip_input.c
    M slirp/src/ip_output.c
    M slirp/src/main.h
    M slirp/src/mbuf.c
    M slirp/src/misc.c
    M slirp/src/misc.h
    M slirp/src/sbuf.c
    M slirp/src/sbuf.h
    M slirp/src/socket.c
    M slirp/src/socket.h
    M slirp/src/tcp_input.c
    M slirp/src/tcp_output.c
    M slirp/src/tcp_subr.c

  Log Message:
  -----------
  slirp: remove reference to COPYRIGHT file

The slirp COPYRIGHT file is a BSD-3 license. Instead of referring to
another project file, the SPDX license notice present in all source
files states that unequivocally.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 7849f0c2ecf35f04c8dfcea30f675182cafdd455
      
https://github.com/qemu/qemu/commit/7849f0c2ecf35f04c8dfcea30f675182cafdd455
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-03-22 (Fri, 22 Mar 2019)

  Changed paths:
    M slirp/COPYRIGHT

  Log Message:
  -----------
  slirp: is not maintained by Kelly Price for a long time

slirp has been maintained by the QEMU maintainers and will be
maintained under an independent project soon.

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kelly Price <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>


  Commit: c442b7b4a7ae8696bcdf46091d781bd9052731be
      
https://github.com/qemu/qemu/commit/c442b7b4a7ae8696bcdf46091d781bd9052731be
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-25 (Mon, 25 Mar 2019)

  Changed paths:
    M slirp/COPYRIGHT
    M slirp/src/arp_table.c
    M slirp/src/bootp.c
    M slirp/src/bootp.h
    M slirp/src/cksum.c
    M slirp/src/debug.h
    M slirp/src/dhcpv6.c
    M slirp/src/dhcpv6.h
    M slirp/src/dnssearch.c
    M slirp/src/if.c
    M slirp/src/if.h
    M slirp/src/ip.h
    M slirp/src/ip6.h
    M slirp/src/ip6_icmp.c
    M slirp/src/ip6_icmp.h
    M slirp/src/ip6_input.c
    M slirp/src/ip6_output.c
    M slirp/src/ip_icmp.c
    M slirp/src/ip_icmp.h
    M slirp/src/ip_input.c
    M slirp/src/ip_output.c
    M slirp/src/libslirp.h
    M slirp/src/main.h
    M slirp/src/mbuf.c
    M slirp/src/mbuf.h
    M slirp/src/misc.c
    M slirp/src/misc.h
    M slirp/src/ncsi-pkt.h
    M slirp/src/ncsi.c
    M slirp/src/ndp_table.c
    M slirp/src/qtailq.h
    M slirp/src/sbuf.c
    M slirp/src/sbuf.h
    M slirp/src/slirp.c
    M slirp/src/slirp.h
    M slirp/src/socket.c
    M slirp/src/socket.h
    M slirp/src/state.c
    M slirp/src/stream.c
    M slirp/src/stream.h
    M slirp/src/tcp.h
    M slirp/src/tcp_input.c
    M slirp/src/tcp_output.c
    M slirp/src/tcp_subr.c
    M slirp/src/tcp_timer.c
    M slirp/src/tcp_timer.h
    M slirp/src/tcp_var.h
    M slirp/src/tcpip.h
    M slirp/src/tftp.c
    M slirp/src/tftp.h
    M slirp/src/udp.c
    M slirp/src/udp.h
    M slirp/src/udp6.c
    M slirp/src/util.c
    M slirp/src/util.h
    M slirp/src/vmstate.c
    M slirp/src/vmstate.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into 
staging

slirp: clarify license of slirp as BSD-3

# gpg: Signature made Fri 22 Mar 2019 19:16:50 GMT
# gpg:                using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <address@hidden>" [full]
# gpg:                 aka "Marc-André Lureau <address@hidden>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/slirp-pull-request:
  slirp: is not maintained by Kelly Price for a long time
  slirp: remove reference to COPYRIGHT file
  slirp: clarify license of slirp files using SPDX: implicit via unstated
  slirp: clarify license of slirp files using SPDX: implicit via COPYRIGHT
  slirp: clarify license of slirp files using SPDX: explicit MIT
  slirp: clarify license of slirp files using SPDX: explicit BSD
  slirp: relicense GPL files to BSD-3
  slirp: update COPYRIGHT to use full 3-Clause BSD License

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/d97a39d903fe...c442b7b4a7ae
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 772c71: slirp: update COPYRIGHT to use full 3-Clause BSD L..., Peter Maydell <=
Prev by Date: [Qemu-commits] [qemu/qemu] 485b1d: i386: kvm: Disable arch_capabilities if MSR can't ...
Next by Date: [Qemu-commits] [qemu/qemu] 447e13: configure: add --target-list-exclude
Previous by thread: [Qemu-commits] [qemu/qemu] 485b1d: i386: kvm: Disable arch_capabilities if MSR can't ...
Next by thread: [Qemu-commits] [qemu/qemu] 447e13: configure: add --target-list-exclude
Index(es):
- Date
- Thread