[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] slirp: update COPYRIGHT to use full 3-Clause BSD
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 1/8] slirp: update COPYRIGHT to use full 3-Clause BSD License |
Date: |
Fri, 22 Mar 2019 20:17:43 +0100 |
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>
---
slirp/COPYRIGHT | 3 +++
1 file changed, 3 insertions(+)
diff --git a/slirp/COPYRIGHT b/slirp/COPYRIGHT
index 1bc83d497e..9863ea31cb 100644
--- a/slirp/COPYRIGHT
+++ b/slirp/COPYRIGHT
@@ -25,6 +25,9 @@ The copyright terms and conditions:
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
--
2.21.0.4.g36eb1cb9cf
- [Qemu-devel] [PULL 0/8] Slirp patches, Marc-André Lureau, 2019/03/22
- [Qemu-devel] [PULL 8/8] slirp: is not maintained by Kelly Price for a long time, Marc-André Lureau, 2019/03/22
- [Qemu-devel] [PULL 7/8] slirp: remove reference to COPYRIGHT file, Marc-André Lureau, 2019/03/22
- [Qemu-devel] [PULL 2/8] slirp: relicense GPL files to BSD-3, Marc-André Lureau, 2019/03/22
- [Qemu-devel] [PULL 4/8] slirp: clarify license of slirp files using SPDX: explicit MIT, Marc-André Lureau, 2019/03/22
- [Qemu-devel] [PULL 1/8] slirp: update COPYRIGHT to use full 3-Clause BSD License,
Marc-André Lureau <=
- [Qemu-devel] [PULL 3/8] slirp: clarify license of slirp files using SPDX: explicit BSD, Marc-André Lureau, 2019/03/22
- [Qemu-devel] [PULL 5/8] slirp: clarify license of slirp files using SPDX: implicit via COPYRIGHT, Marc-André Lureau, 2019/03/22
- [Qemu-devel] [PULL 6/8] slirp: clarify license of slirp files using SPDX: implicit via unstated, Marc-André Lureau, 2019/03/22
- Re: [Qemu-devel] [PULL 0/8] Slirp patches, Peter Maydell, 2019/03/25