[v2] slirp: clarify license of slirp as BSD-3

[Qemu-devel] [PATCH v2 3/4] slirp: remove reference to COPYRIGHT file

Posted by Marc-André Lureau 6 years, 11 months ago

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 <marcandre.lureau@redhat.com>
---
 slirp/src/debug.h      | 3 ---
 slirp/src/if.h         | 3 ---
 slirp/src/main.h       | 3 ---
 slirp/src/misc.h       | 3 ---
 slirp/src/sbuf.h       | 3 ---
 slirp/src/socket.h     | 3 ---
 slirp/src/if.c         | 3 ---
 slirp/src/ip_input.c   | 3 ---
 slirp/src/ip_output.c  | 3 ---
 slirp/src/mbuf.c       | 3 ---
 slirp/src/misc.c       | 3 ---
 slirp/src/sbuf.c       | 3 ---
 slirp/src/socket.c     | 3 ---
 slirp/src/tcp_input.c  | 3 ---
 slirp/src/tcp_output.c | 3 ---
 slirp/src/tcp_subr.c   | 3 ---
 16 files changed, 48 deletions(-)

diff --git a/slirp/src/debug.h b/slirp/src/debug.h
index 2e503ad7fa..c95fd8ffd2 100644
--- a/slirp/src/debug.h
+++ b/slirp/src/debug.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #ifndef DEBUG_H_
diff --git a/slirp/src/if.h b/slirp/src/if.h
index 8a60c4e052..b71c37d6ea 100644
--- a/slirp/src/if.h
+++ b/slirp/src/if.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #ifndef IF_H
diff --git a/slirp/src/main.h b/slirp/src/main.h
index a88774215f..3b3f883703 100644
--- a/slirp/src/main.h
+++ b/slirp/src/main.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #ifndef SLIRP_MAIN_H
diff --git a/slirp/src/misc.h b/slirp/src/misc.h
index 4eaa2466d7..23b7490448 100644
--- a/slirp/src/misc.h
+++ b/slirp/src/misc.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #ifndef MISC_H
diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h
index ece616e317..337af1bbde 100644
--- a/slirp/src/sbuf.h
+++ b/slirp/src/sbuf.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #ifndef SBUF_H
diff --git a/slirp/src/socket.h b/slirp/src/socket.h
index 10a0c78a26..25403898cd 100644
--- a/slirp/src/socket.h
+++ b/slirp/src/socket.h
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #ifndef SLIRP_SOCKET_H
diff --git a/slirp/src/if.c b/slirp/src/if.c
index b8cddebf66..6eaac7292a 100644
--- a/slirp/src/if.c
+++ b/slirp/src/if.c
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c
index 6ad6765938..a714fecd58 100644
--- a/slirp/src/ip_input.c
+++ b/slirp/src/ip_input.c
@@ -34,9 +34,6 @@
 /*
  * Changes and additions relating to SLiRP are
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/ip_output.c b/slirp/src/ip_output.c
index 9299997efb..8560197cf6 100644
--- a/slirp/src/ip_output.c
+++ b/slirp/src/ip_output.c
@@ -34,9 +34,6 @@
 /*
  * Changes and additions relating to SLiRP are
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/mbuf.c b/slirp/src/mbuf.c
index f079a86d78..800406ca9e 100644
--- a/slirp/src/mbuf.c
+++ b/slirp/src/mbuf.c
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 /*
diff --git a/slirp/src/misc.c b/slirp/src/misc.c
index da41f3bb5f..7c5db0e0aa 100644
--- a/slirp/src/misc.c
+++ b/slirp/src/misc.c
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c
index 815823ffbe..9c0b31b513 100644
--- a/slirp/src/sbuf.c
+++ b/slirp/src/sbuf.c
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/socket.c b/slirp/src/socket.c
index ad58262a06..4a3c935e25 100644
--- a/slirp/src/socket.c
+++ b/slirp/src/socket.c
@@ -1,9 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause */
 /*
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c
index cf54eeee92..50a1145ec9 100644
--- a/slirp/src/tcp_input.c
+++ b/slirp/src/tcp_input.c
@@ -34,9 +34,6 @@
 /*
  * Changes and additions relating to SLiRP
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/tcp_output.c b/slirp/src/tcp_output.c
index 272c261d07..6bbaf6ca6f 100644
--- a/slirp/src/tcp_output.c
+++ b/slirp/src/tcp_output.c
@@ -34,9 +34,6 @@
 /*
  * Changes and additions relating to SLiRP
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c
index 086e4e98e2..fde9207b0c 100644
--- a/slirp/src/tcp_subr.c
+++ b/slirp/src/tcp_subr.c
@@ -34,9 +34,6 @@
 /*
  * Changes and additions relating to SLiRP
  * Copyright (c) 1995 Danny Gasparovski.
- *
- * Please read the file COPYRIGHT for the
- * terms and conditions of the copyright.
  */
 
 #include "slirp.h"
-- 
2.21.0.4.g36eb1cb9cf

Re: [Qemu-devel] [PATCH v2 3/4] slirp: remove reference to COPYRIGHT file

Posted by Eric Blake 6 years, 11 months ago

On 3/13/19 11:42 AM, Marc-André Lureau wrote:
> The slirp COPYRIGHT file is a BSD-3 license.

Is it? I only see 2 clauses listed there.

My understanding (although I may be wrong) is that 2-clause can be
strengthened to 3-clause unilaterally, but 3-clause cannot be weakened
to 2-clause without copyright owner buy-in.

> Instead of referring to
> another project file, the SPDX license notice present in all source
> files states that unequivocally.

Should we put this patch before 2/4?  You'd have to reword things if you
do it in that order, though.

> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---

> +++ b/slirp/src/debug.h
> @@ -1,9 +1,6 @@
>  /* SPDX-License-Identifier: BSD-3-Clause */
>  /*
>   * Copyright (c) 1995 Danny Gasparovski.
> - *
> - * Please read the file COPYRIGHT for the
> - * terms and conditions of the copyright.

If we resolve the issue about slirp/COPYRIGHT being 2-clause or
3-clause, and we are happy with the addition of the SPDX tag in 2/4,
then this change makes sense.  But I'm hesitant to give R-b to this one
without resolving those questions first.

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

Re: [Qemu-devel] [PATCH v2 3/4] slirp: remove reference to COPYRIGHT file

Posted by Marc-André Lureau 6 years, 11 months ago

Hi

On Wed, Mar 13, 2019 at 6:57 PM Eric Blake <eblake@redhat.com> wrote:
>
> On 3/13/19 11:42 AM, Marc-André Lureau wrote:
> > The slirp COPYRIGHT file is a BSD-3 license.
>
> Is it? I only see 2 clauses listed there.

In commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec ("Remove the
advertising clause from the slirp license"). the 4th BSD clause was
removed.

Daniel Gasparovski & Kelly Price gave permission to license slirp
under 3-clause BSD.

So I think we should instead put back the 3rd clause in COPYRIGHT file.

What do you think?

>
> My understanding (although I may be wrong) is that 2-clause can be
> strengthened to 3-clause unilaterally, but 3-clause cannot be weakened
> to 2-clause without copyright owner buy-in.
>
> > Instead of referring to
> > another project file, the SPDX license notice present in all source
> > files states that unequivocally.
>
> Should we put this patch before 2/4?  You'd have to reword things if you
> do it in that order, though.
>
> >
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
>
> > +++ b/slirp/src/debug.h
> > @@ -1,9 +1,6 @@
> >  /* SPDX-License-Identifier: BSD-3-Clause */
> >  /*
> >   * Copyright (c) 1995 Danny Gasparovski.
> > - *
> > - * Please read the file COPYRIGHT for the
> > - * terms and conditions of the copyright.
>
> If we resolve the issue about slirp/COPYRIGHT being 2-clause or
> 3-clause, and we are happy with the addition of the SPDX tag in 2/4,
> then this change makes sense.  But I'm hesitant to give R-b to this one
> without resolving those questions first.
>
> --
> Eric Blake, Principal Software Engineer
> Red Hat, Inc.           +1-919-301-3226
> Virtualization:  qemu.org | libvirt.org
>

Re: [Qemu-devel] [PATCH v2 3/4] slirp: remove reference to COPYRIGHT file

Posted by Eric Blake 6 years, 11 months ago

On 3/13/19 1:07 PM, Marc-André Lureau wrote:
> Hi
> 
> On Wed, Mar 13, 2019 at 6:57 PM Eric Blake <eblake@redhat.com> wrote:
>>
>> On 3/13/19 11:42 AM, Marc-André Lureau wrote:
>>> The slirp COPYRIGHT file is a BSD-3 license.
>>
>> Is it? I only see 2 clauses listed there.
> 
> In commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec ("Remove the
> advertising clause from the slirp license"). the 4th BSD clause was
> removed.
> 
> Daniel Gasparovski & Kelly Price gave permission to license slirp
> under 3-clause BSD.
> 
> So I think we should instead put back the 3rd clause in COPYRIGHT file.
> 
> What do you think?

Checking the history, 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.  Therefore:

Yes, a pre-requisite patch that changes COPYRIGHT to use full 3-clause
wording, with full reference back to Danny's explicit mention of "I have
no objection to having Slirp code in QEMU be licensed under the 3-clause
BSD license.", seems warranted.  Feel free to copy any of my wording
into your commit message.

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

[Qemu-devel] [PATCH v2 1/4] slirp: relicense GPL files to BSD-3
[Qemu-devel] [PATCH v2 2/4] slirp: clarify license of slirp files using SPDX
[Qemu-devel] [PATCH v2 3/4] slirp: remove reference to COPYRIGHT file
[Qemu-devel] [PATCH v2 4/4] RFC: slirp: is not maintained by Kelly Price for a long time