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

Marc-André Lureau posted 4 patches 5 years, 1 month ago
Test asan failed
Test docker-clang@ubuntu failed
Test docker-mingw@fedora failed
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190313164207.25166-1-marcandre.lureau@redhat.com
Maintainers: Samuel Thibault <samuel.thibault@ens-lyon.org>, Jan Kiszka <jan.kiszka@siemens.com>
There is a newer version of this series
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/state.h      |  0
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        |  2 --
58 files changed, 226 insertions(+), 85 deletions(-)
delete mode 100644 slirp/src/state.h
[Qemu-devel] [PATCH v2 0/4] slirp: clarify license of slirp as BSD-3
Posted by Marc-André Lureau 5 years, 1 month 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.

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 (4):
  slirp: relicense GPL files to BSD-3
  slirp: clarify license of slirp files using SPDX
  slirp: remove reference to COPYRIGHT file
  RFC: 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/state.h      |  0
 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        |  2 --
 58 files changed, 226 insertions(+), 85 deletions(-)
 delete mode 100644 slirp/src/state.h

-- 
2.21.0.4.g36eb1cb9cf


Re: [Qemu-devel] [PATCH v2 0/4] slirp: clarify license of slirp as BSD-3
Posted by no-reply@patchew.org 5 years, 1 month ago
Patchew URL: https://patchew.org/QEMU/20190313164207.25166-1-marcandre.lureau@redhat.com/



Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 NETWORK=1
=== TEST SCRIPT END ===

  CC      /tmp/qemu-test/build/slirp/src/udp6.o
  CC      /tmp/qemu-test/build/slirp/src/tcp_input.o
  CC      /tmp/qemu-test/build/slirp/src/if.o
/tmp/qemu-test/src/slirp/src/state.c:27:10: fatal error: state.h: No such file or directory
 #include "state.h"
          ^~~~~~~~~
compilation terminated.


The full log is available at
http://patchew.org/logs/20190313164207.25166-1-marcandre.lureau@redhat.com/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Re: [Qemu-devel] [PATCH v2 0/4] slirp: clarify license of slirp as BSD-3
Posted by Marc-André Lureau 5 years, 1 month ago
Hi

On Wed, Mar 13, 2019 at 6:19 PM <no-reply@patchew.org> wrote:
>
> Patchew URL: https://patchew.org/QEMU/20190313164207.25166-1-marcandre.lureau@redhat.com/
>
>
>
> Hi,
>
> This series failed the docker-mingw@fedora build test. Please find the testing commands and
> their output below. If you have Docker installed, you can probably reproduce it
> locally.
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> time make docker-test-mingw@fedora SHOW_ENV=1 J=14 NETWORK=1
> === TEST SCRIPT END ===
>
>   CC      /tmp/qemu-test/build/slirp/src/udp6.o
>   CC      /tmp/qemu-test/build/slirp/src/tcp_input.o
>   CC      /tmp/qemu-test/build/slirp/src/if.o
> /tmp/qemu-test/src/slirp/src/state.c:27:10: fatal error: state.h: No such file or directory
>  #include "state.h"
>           ^~~~~~~~~
> compilation terminated.
>
>
> The full log is available at
> http://patchew.org/logs/20190313164207.25166-1-marcandre.lureau@redhat.com/testing.docker-mingw@fedora/?type=message.
> ---
> Email generated automatically by Patchew [http://patchew.org/].
> Please send your feedback to patchew-devel@redhat.com

My bad, the file was empty, I did something wrong with git. I will
make a separate patch to remove it first.



-- 
Marc-André Lureau