[Qemu-devel] [PATCH v3 0/8] slirp: clarify license of slirp as BSD-3

Marc-André Lureau posted 8 patches 9 weeks ago
Test asan passed
Test docker-clang@ubuntu passed
Test docker-mingw@fedora passed
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190314131049.23175-1-marcandre.lureau@redhat.com
Maintainers: Samuel Thibault <samuel.thibault@ens-lyon.org>, Jan Kiszka <jan.kiszka@siemens.com>
slirp/src/bootp.h      |  1 +
slirp/src/debug.h      |  4 +---
slirp/src/dhcpv6.h     | 32 +++++++++++++++++++++++++++++--
slirp/src/if.h         |  4 +---
slirp/src/ip.h         |  1 +
slirp/src/ip6.h        |  1 +
slirp/src/ip6_icmp.h   |  1 +
slirp/src/ip_icmp.h    |  1 +
slirp/src/libslirp.h   |  1 +
slirp/src/main.h       |  4 +---
slirp/src/mbuf.h       |  1 +
slirp/src/misc.h       |  4 +---
slirp/src/ncsi-pkt.h   | 34 +++++++++++++++++++++++++++++----
slirp/src/qtailq.h     |  1 +
slirp/src/sbuf.h       |  4 +---
slirp/src/slirp.h      |  1 +
slirp/src/socket.h     |  4 +---
slirp/src/stream.h     |  1 +
slirp/src/tcp.h        |  1 +
slirp/src/tcp_timer.h  |  1 +
slirp/src/tcp_var.h    |  1 +
slirp/src/tcpip.h      |  1 +
slirp/src/tftp.h       |  1 +
slirp/src/udp.h        |  1 +
slirp/src/util.h       |  1 +
slirp/src/vmstate.h    | 43 +++++++++++++++++++++++++++---------------
slirp/src/arp_table.c  |  1 +
slirp/src/bootp.c      |  1 +
slirp/src/cksum.c      |  1 +
slirp/src/dhcpv6.c     | 38 +++++++++++++++++++++++++++----------
slirp/src/dnssearch.c  |  1 +
slirp/src/if.c         |  4 +---
slirp/src/ip6_icmp.c   |  1 +
slirp/src/ip6_input.c  |  1 +
slirp/src/ip6_output.c |  1 +
slirp/src/ip_icmp.c    |  1 +
slirp/src/ip_input.c   |  4 +---
slirp/src/ip_output.c  |  4 +---
slirp/src/mbuf.c       |  4 +---
slirp/src/misc.c       |  4 +---
slirp/src/ncsi.c       | 32 +++++++++++++++++++++++++++++--
slirp/src/ndp_table.c  |  1 +
slirp/src/sbuf.c       |  4 +---
slirp/src/slirp.c      |  1 +
slirp/src/socket.c     |  4 +---
slirp/src/state.c      |  1 +
slirp/src/stream.c     |  1 +
slirp/src/tcp_input.c  |  4 +---
slirp/src/tcp_output.c |  4 +---
slirp/src/tcp_subr.c   |  4 +---
slirp/src/tcp_timer.c  |  1 +
slirp/src/tftp.c       |  1 +
slirp/src/udp.c        |  1 +
slirp/src/udp6.c       |  1 +
slirp/src/util.c       |  1 +
slirp/src/vmstate.c    | 32 +++++++++++++++++++++++++++++--
slirp/COPYRIGHT        |  5 +++--
57 files changed, 229 insertions(+), 85 deletions(-)

[Qemu-devel] [PATCH v3 0/8] slirp: clarify license of slirp as BSD-3

Posted by Marc-André Lureau 9 weeks ago
Hi,

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.

v3:
 - add preliminary "slirp: update COPYRIGHT to use full 3-Clause BSD
   License"
 - split "slirp: clarify license of slirp files using SPDX" patch,
 - fix SPDX for files with MIT license header
 - add r-b tags, wording/spelling changes

v2:
 - split the initial patch to add BSD-3 header & then SPDX lines
 - do not modify existing copyright headers without copyright holder
   authorization
 - drop the weak/ambiguous notice to the COPYRIGHT file
 - added a RFC patch to remove Kelly Price from the maintainer duties

Marc-André Lureau (8):
  slirp: update COPYRIGHT to use full 3-Clause BSD License
  slirp: relicense GPL files to BSD-3
  slirp: clarify license of slirp files using SPDX
  slirp: clarify license of slirp files using SPDX
  slirp: clarify license of slirp files using SPDX
  slirp: clarify license of slirp files using SPDX
  slirp: remove reference to COPYRIGHT file
  slirp: is not maintained by Kelly Price for a long time

 slirp/src/bootp.h      |  1 +
 slirp/src/debug.h      |  4 +---
 slirp/src/dhcpv6.h     | 32 +++++++++++++++++++++++++++++--
 slirp/src/if.h         |  4 +---
 slirp/src/ip.h         |  1 +
 slirp/src/ip6.h        |  1 +
 slirp/src/ip6_icmp.h   |  1 +
 slirp/src/ip_icmp.h    |  1 +
 slirp/src/libslirp.h   |  1 +
 slirp/src/main.h       |  4 +---
 slirp/src/mbuf.h       |  1 +
 slirp/src/misc.h       |  4 +---
 slirp/src/ncsi-pkt.h   | 34 +++++++++++++++++++++++++++++----
 slirp/src/qtailq.h     |  1 +
 slirp/src/sbuf.h       |  4 +---
 slirp/src/slirp.h      |  1 +
 slirp/src/socket.h     |  4 +---
 slirp/src/stream.h     |  1 +
 slirp/src/tcp.h        |  1 +
 slirp/src/tcp_timer.h  |  1 +
 slirp/src/tcp_var.h    |  1 +
 slirp/src/tcpip.h      |  1 +
 slirp/src/tftp.h       |  1 +
 slirp/src/udp.h        |  1 +
 slirp/src/util.h       |  1 +
 slirp/src/vmstate.h    | 43 +++++++++++++++++++++++++++---------------
 slirp/src/arp_table.c  |  1 +
 slirp/src/bootp.c      |  1 +
 slirp/src/cksum.c      |  1 +
 slirp/src/dhcpv6.c     | 38 +++++++++++++++++++++++++++----------
 slirp/src/dnssearch.c  |  1 +
 slirp/src/if.c         |  4 +---
 slirp/src/ip6_icmp.c   |  1 +
 slirp/src/ip6_input.c  |  1 +
 slirp/src/ip6_output.c |  1 +
 slirp/src/ip_icmp.c    |  1 +
 slirp/src/ip_input.c   |  4 +---
 slirp/src/ip_output.c  |  4 +---
 slirp/src/mbuf.c       |  4 +---
 slirp/src/misc.c       |  4 +---
 slirp/src/ncsi.c       | 32 +++++++++++++++++++++++++++++--
 slirp/src/ndp_table.c  |  1 +
 slirp/src/sbuf.c       |  4 +---
 slirp/src/slirp.c      |  1 +
 slirp/src/socket.c     |  4 +---
 slirp/src/state.c      |  1 +
 slirp/src/stream.c     |  1 +
 slirp/src/tcp_input.c  |  4 +---
 slirp/src/tcp_output.c |  4 +---
 slirp/src/tcp_subr.c   |  4 +---
 slirp/src/tcp_timer.c  |  1 +
 slirp/src/tftp.c       |  1 +
 slirp/src/udp.c        |  1 +
 slirp/src/udp6.c       |  1 +
 slirp/src/util.c       |  1 +
 slirp/src/vmstate.c    | 32 +++++++++++++++++++++++++++++--
 slirp/COPYRIGHT        |  5 +++--
 57 files changed, 229 insertions(+), 85 deletions(-)

-- 
2.21.0.4.g36eb1cb9cf


Re: [Qemu-devel] [PATCH v3 0/8] slirp: clarify license of slirp as BSD-3

Posted by Samuel Thibault 9 weeks ago
Hello,

Should this go through my tree, or perhaps it can be directly pushed to
master by Peter since it's no-code-only-copyright changes?

Samuel

Marc-André Lureau, le jeu. 14 mars 2019 14:10:41 +0100, a ecrit:
> 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.
> 
> v3:
>  - add preliminary "slirp: update COPYRIGHT to use full 3-Clause BSD
>    License"
>  - split "slirp: clarify license of slirp files using SPDX" patch,
>  - fix SPDX for files with MIT license header
>  - add r-b tags, wording/spelling changes
> 
> v2:
>  - split the initial patch to add BSD-3 header & then SPDX lines
>  - do not modify existing copyright headers without copyright holder
>    authorization
>  - drop the weak/ambiguous notice to the COPYRIGHT file
>  - added a RFC patch to remove Kelly Price from the maintainer duties
> 
> Marc-André Lureau (8):
>   slirp: update COPYRIGHT to use full 3-Clause BSD License
>   slirp: relicense GPL files to BSD-3
>   slirp: clarify license of slirp files using SPDX
>   slirp: clarify license of slirp files using SPDX
>   slirp: clarify license of slirp files using SPDX
>   slirp: clarify license of slirp files using SPDX
>   slirp: remove reference to COPYRIGHT file
>   slirp: is not maintained by Kelly Price for a long time
> 
>  slirp/src/bootp.h      |  1 +
>  slirp/src/debug.h      |  4 +---
>  slirp/src/dhcpv6.h     | 32 +++++++++++++++++++++++++++++--
>  slirp/src/if.h         |  4 +---
>  slirp/src/ip.h         |  1 +
>  slirp/src/ip6.h        |  1 +
>  slirp/src/ip6_icmp.h   |  1 +
>  slirp/src/ip_icmp.h    |  1 +
>  slirp/src/libslirp.h   |  1 +
>  slirp/src/main.h       |  4 +---
>  slirp/src/mbuf.h       |  1 +
>  slirp/src/misc.h       |  4 +---
>  slirp/src/ncsi-pkt.h   | 34 +++++++++++++++++++++++++++++----
>  slirp/src/qtailq.h     |  1 +
>  slirp/src/sbuf.h       |  4 +---
>  slirp/src/slirp.h      |  1 +
>  slirp/src/socket.h     |  4 +---
>  slirp/src/stream.h     |  1 +
>  slirp/src/tcp.h        |  1 +
>  slirp/src/tcp_timer.h  |  1 +
>  slirp/src/tcp_var.h    |  1 +
>  slirp/src/tcpip.h      |  1 +
>  slirp/src/tftp.h       |  1 +
>  slirp/src/udp.h        |  1 +
>  slirp/src/util.h       |  1 +
>  slirp/src/vmstate.h    | 43 +++++++++++++++++++++++++++---------------
>  slirp/src/arp_table.c  |  1 +
>  slirp/src/bootp.c      |  1 +
>  slirp/src/cksum.c      |  1 +
>  slirp/src/dhcpv6.c     | 38 +++++++++++++++++++++++++++----------
>  slirp/src/dnssearch.c  |  1 +
>  slirp/src/if.c         |  4 +---
>  slirp/src/ip6_icmp.c   |  1 +
>  slirp/src/ip6_input.c  |  1 +
>  slirp/src/ip6_output.c |  1 +
>  slirp/src/ip_icmp.c    |  1 +
>  slirp/src/ip_input.c   |  4 +---
>  slirp/src/ip_output.c  |  4 +---
>  slirp/src/mbuf.c       |  4 +---
>  slirp/src/misc.c       |  4 +---
>  slirp/src/ncsi.c       | 32 +++++++++++++++++++++++++++++--
>  slirp/src/ndp_table.c  |  1 +
>  slirp/src/sbuf.c       |  4 +---
>  slirp/src/slirp.c      |  1 +
>  slirp/src/socket.c     |  4 +---
>  slirp/src/state.c      |  1 +
>  slirp/src/stream.c     |  1 +
>  slirp/src/tcp_input.c  |  4 +---
>  slirp/src/tcp_output.c |  4 +---
>  slirp/src/tcp_subr.c   |  4 +---
>  slirp/src/tcp_timer.c  |  1 +
>  slirp/src/tftp.c       |  1 +
>  slirp/src/udp.c        |  1 +
>  slirp/src/udp6.c       |  1 +
>  slirp/src/util.c       |  1 +
>  slirp/src/vmstate.c    | 32 +++++++++++++++++++++++++++++--
>  slirp/COPYRIGHT        |  5 +++--
>  57 files changed, 229 insertions(+), 85 deletions(-)
> 
> -- 
> 2.21.0.4.g36eb1cb9cf
> 

-- 
Samuel
As usual, this being a 1.3.x release, I haven't even compiled this
kernel yet.  So if it works, you should be doubly impressed.
(Linus Torvalds, announcing kernel 1.3.3 on the linux-kernel mailing list.)

Re: [Qemu-devel] [PATCH v3 0/8] slirp: clarify license of slirp as BSD-3

Posted by Eric Blake 9 weeks ago
On 3/14/19 8:19 AM, Samuel Thibault wrote:
> Hello,
> 
> Should this go through my tree, or perhaps it can be directly pushed to
> master by Peter since it's no-code-only-copyright changes?

I think this definitely qualifies as 4.0 material.

However, while it does not affect compilation, it DOES have legal
ramification; I'd feel a lot better about having R-b on every patch,
that we had a second (or third) set of eyes double-check that the right
SPDX identifier is used everywhere.  I don't have time to complete that
audit today, so I'm hoping someone else will step in and help.  (This is
complicated by the fact that the email alone does not show the existing
license; it may be easier to apply the patch locally, and then use git
diff tuned to give a 20 or 30 line context instead of the usual default
of 3, to make it easier to check for SPDX match to existing licenses on
each file being modified)

And thanks, Marc-André, for bearing with my nit-pickiness on this
series. I hope you agree with my insistence that we get this right, so
that we don't expose ourselves to legal troubles down the road. I like
the split in this series, even if I have not had time to finish an audit
that the changes in 3-6 are correct.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH v3 0/8] slirp: clarify license of slirp as BSD-3

Posted by Samuel Thibault 9 weeks ago
Eric Blake, le jeu. 14 mars 2019 08:44:06 -0500, a ecrit:
> However, while it does not affect compilation, it DOES have legal
> ramification; I'd feel a lot better about having R-b on every patch,

Sure, I was just asking for the git commit path :) I don't think it's
useful to make it go through my tree.

Samuel

Re: [Qemu-devel] [PATCH v3 0/8] slirp: clarify license of slirp as BSD-3

Posted by Eric Blake 9 weeks ago
On 3/14/19 8:10 AM, Marc-André Lureau wrote:
> Hi,
> 
> 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.
> 
> v3:
>  - add preliminary "slirp: update COPYRIGHT to use full 3-Clause BSD
>    License"
>  - split "slirp: clarify license of slirp files using SPDX" patch,
>  - fix SPDX for files with MIT license header
>  - add r-b tags, wording/spelling changes
> 
> v2:
>  - split the initial patch to add BSD-3 header & then SPDX lines
>  - do not modify existing copyright headers without copyright holder
>    authorization
>  - drop the weak/ambiguous notice to the COPYRIGHT file
>  - added a RFC patch to remove Kelly Price from the maintainer duties
> 
> Marc-André Lureau (8):
>   slirp: update COPYRIGHT to use full 3-Clause BSD License
>   slirp: relicense GPL files to BSD-3
>   slirp: clarify license of slirp files using SPDX
>   slirp: clarify license of slirp files using SPDX
>   slirp: clarify license of slirp files using SPDX
>   slirp: clarify license of slirp files using SPDX

Minor nit: This is four patches with identical subject, which makes
backports harder. If you have a reason to respin, titling them something
like:

slirp: clarify license of slirp files using SPDX: explicit BSD
slirp: clarify license of slirp files using SPDX: explicit MIT
slirp: clarify license of slirp files using SPDX: implicit via COPYING
slirp: clarify license of slirp files using SPDX: implicit via unstated

may help.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org