qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [6451] Remove the advertising clause from the slirp license


From: Anthony Liguori
Subject: [Qemu-devel] [6451] Remove the advertising clause from the slirp license
Date: Mon, 26 Jan 2009 19:37:41 +0000

Revision: 6451
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6451
Author:   aliguori
Date:     2009-01-26 19:37:41 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Remove the advertising clause from the slirp license

According to the FSF, the 4-clause BSD license, which slirp is covered under,
is not compatible with the GPL or LGPL[1].

[1] http://www.fsf.org/licensing/licenses/index_html#GPLIncompatibleLicenses

There are three declared copyright holders in slirp that use the 4-clause
BSD license, the Regents of UC Berkley, Danny Gasparovski, and Kelly Price.
Below are the appropriate permissions to remove the advertise clause from slirp
from each party.

Special thanks go to Richard Fontana from Red Hat for contacting all of the
necessary authors to resolve this issue!

Regents of UC Berkley:
>From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change

July 22, 1999

To All Licensees, Distributors of Any Version of BSD:

As you know, certain of the Berkeley Software Distribution ("BSD") source
code files require that further distributions of products containing all or
portions of the software, acknowledge within their advertising materials
that such products contain software developed by UC Berkeley and its
contributors.

Specifically, the provision reads:

"     * 3. All advertising materials mentioning features or use of this software
      *    must display the following acknowledgement:
      *    This product includes software developed by the University of
      *    California, Berkeley and its contributors."

Effective immediately, licensees and distributors are no longer required to
include the acknowledgement within advertising materials.  Accordingly, the
foregoing paragraph of those BSD Unix files containing it is hereby deleted
in its entirety.

William Hoskins
Director, Office of Technology Licensing
University of California, Berkeley

Danny Gasparovski:

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

Hi Richard,

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

Thanks for taking the effort to consult me about this.


Dan ...

Kelly Price:

Date: Thu, 8 Jan 2009 19:38:56 -0500
From: "Kelly Price" <address@hidden>
To: "Richard Fontana" <address@hidden>
Subject: Re: Slirp license

Thanks for contacting me, Richard.  I'm glad you were able to find
Dan, as I've been "keeping the light on" for Slirp.  I have no use for
it now, and I have little time for it (now holding onto Keenspot's
Comic Genesis and having a regular US state government position). If
Dan would like to return to the project, I'd love to give it back to
him.

As for copyright, I don't own all of it.  Dan does, so I will defer to
him.  Any of my patches I will gladly license to the 3-part BSD
license.  My interest in re-licensing was because we didn't have ready
info to contact Dan.  If Dan would like to port Slirp back out of
QEMU, a lot of us 64-bit users would be grateful.

Feel free to share this email address with Dan.  I will be glad to
effect a transfer of the project to him and Mr. Bellard of the QEMU
project.

Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/slirp/COPYRIGHT
    trunk/slirp/cksum.c
    trunk/slirp/icmp_var.h
    trunk/slirp/ip.h
    trunk/slirp/ip_icmp.c
    trunk/slirp/ip_icmp.h
    trunk/slirp/ip_input.c
    trunk/slirp/ip_output.c
    trunk/slirp/mbuf.h
    trunk/slirp/tcp.h
    trunk/slirp/tcp_input.c
    trunk/slirp/tcp_output.c
    trunk/slirp/tcp_subr.c
    trunk/slirp/tcp_timer.c
    trunk/slirp/tcp_timer.h
    trunk/slirp/tcp_var.h
    trunk/slirp/tcpip.h
    trunk/slirp/udp.c
    trunk/slirp/udp.h

Modified: trunk/slirp/COPYRIGHT
===================================================================
--- trunk/slirp/COPYRIGHT       2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/COPYRIGHT       2009-01-26 19:37:41 UTC (rev 6451)
@@ -25,9 +25,6 @@
  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. All advertising materials mentioning features or use of this software
-    must display the following acknowledgment:
-      This product includes software developed by Danny Gasparovski.
 
  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

Modified: trunk/slirp/cksum.c
===================================================================
--- trunk/slirp/cksum.c 2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/cksum.c 2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/icmp_var.h
===================================================================
--- trunk/slirp/icmp_var.h      2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/icmp_var.h      2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/ip.h
===================================================================
--- trunk/slirp/ip.h    2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/ip.h    2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/ip_icmp.c
===================================================================
--- trunk/slirp/ip_icmp.c       2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/ip_icmp.c       2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/ip_icmp.h
===================================================================
--- trunk/slirp/ip_icmp.h       2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/ip_icmp.h       2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/ip_input.c
===================================================================
--- trunk/slirp/ip_input.c      2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/ip_input.c      2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/ip_output.c
===================================================================
--- trunk/slirp/ip_output.c     2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/ip_output.c     2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/mbuf.h
===================================================================
--- trunk/slirp/mbuf.h  2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/mbuf.h  2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcp.h
===================================================================
--- trunk/slirp/tcp.h   2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcp.h   2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcp_input.c
===================================================================
--- trunk/slirp/tcp_input.c     2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcp_input.c     2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcp_output.c
===================================================================
--- trunk/slirp/tcp_output.c    2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcp_output.c    2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcp_subr.c
===================================================================
--- trunk/slirp/tcp_subr.c      2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcp_subr.c      2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcp_timer.c
===================================================================
--- trunk/slirp/tcp_timer.c     2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcp_timer.c     2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcp_timer.h
===================================================================
--- trunk/slirp/tcp_timer.h     2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcp_timer.h     2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcp_var.h
===================================================================
--- trunk/slirp/tcp_var.h       2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcp_var.h       2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/tcpip.h
===================================================================
--- trunk/slirp/tcpip.h 2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/tcpip.h 2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/udp.c
===================================================================
--- trunk/slirp/udp.c   2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/udp.c   2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

Modified: trunk/slirp/udp.h
===================================================================
--- trunk/slirp/udp.h   2009-01-26 18:21:53 UTC (rev 6450)
+++ trunk/slirp/udp.h   2009-01-26 19:37:41 UTC (rev 6451)
@@ -10,11 +10,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *






reply via email to

[Prev in Thread] Current Thread [Next in Thread]