Revision: | 1.2 |
Committed: | 2012-03-30T01:10:28Z (12 years, 7 months ago) by asvitkine |
Content type: | text/plain |
Branch: | MAIN |
CVS Tags: | HEAD |
Changes since 1.1: | +1 -5 lines |
Log Message: | Switch slirp to 3-clause BSD license. This change went in upstream to QEMU's version of slirp (where this code comes from), with the following checkin: commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec Author: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Date: Mon Jan 26 19:37:41 2009 +0000 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" <Daniel.Gasparovski@ato.gov.au> To: "Richard Fontana" <rfontana@redhat.com> 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" <strredwolf@gmail.com> To: "Richard Fontana" <rfontana@redhat.com> 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 <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6451 c046a42c-6fe2-441c-8c8c-71466251a162 |
# | User | Rev | Content |
---|---|---|---|
1 | gbeauche | 1.1 | /* |
2 | * Copyright (c) 1982, 1986, 1993 | ||
3 | * The Regents of the University of California. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * 1. Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * 2. Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | asvitkine | 1.2 | * 3. Neither the name of the University nor the names of its contributors |
14 | gbeauche | 1.1 | * may be used to endorse or promote products derived from this software |
15 | * without specific prior written permission. | ||
16 | * | ||
17 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
18 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
19 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
20 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
21 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
22 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
23 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
24 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
25 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
26 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
27 | * SUCH DAMAGE. | ||
28 | * | ||
29 | * @(#)tcpip.h 8.1 (Berkeley) 6/10/93 | ||
30 | * tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp | ||
31 | */ | ||
32 | |||
33 | #ifndef _TCPIP_H_ | ||
34 | #define _TCPIP_H_ | ||
35 | |||
36 | /* | ||
37 | * Tcp+ip header, after ip options removed. | ||
38 | */ | ||
39 | struct tcpiphdr { | ||
40 | struct ipovly ti_i; /* overlaid ip structure */ | ||
41 | struct tcphdr ti_t; /* tcp header */ | ||
42 | }; | ||
43 | #define ti_next ti_i.ih_next | ||
44 | #define ti_prev ti_i.ih_prev | ||
45 | #define ti_x1 ti_i.ih_x1 | ||
46 | #define ti_pr ti_i.ih_pr | ||
47 | #define ti_len ti_i.ih_len | ||
48 | #define ti_src ti_i.ih_src | ||
49 | #define ti_dst ti_i.ih_dst | ||
50 | #define ti_sport ti_t.th_sport | ||
51 | #define ti_dport ti_t.th_dport | ||
52 | #define ti_seq ti_t.th_seq | ||
53 | #define ti_ack ti_t.th_ack | ||
54 | #define ti_x2 ti_t.th_x2 | ||
55 | #define ti_off ti_t.th_off | ||
56 | #define ti_flags ti_t.th_flags | ||
57 | #define ti_win ti_t.th_win | ||
58 | #define ti_sum ti_t.th_sum | ||
59 | #define ti_urp ti_t.th_urp | ||
60 | |||
61 | /* | ||
62 | * Just a clean way to get to the first byte | ||
63 | * of the packet | ||
64 | */ | ||
65 | struct tcpiphdr_2 { | ||
66 | struct tcpiphdr dummy; | ||
67 | char first_char; | ||
68 | }; | ||
69 | |||
70 | #endif |