| Message ID | 20190313123850.25064-1-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | slirp: clarify license of slirp as BSD-3 | expand |
On 3/13/19 7:38 AM, Marc-André Lureau wrote: > 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. > > The copyright holders have been asked to relicense files to BSD-3: Can you please split this into JUST the relicensing of the affected files, and THEN the change to SPDX tags, rather than squashing it all in one? > +++ b/slirp/src/ip.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * ip.h,v 1.3 1994/08/21 05:27:30 paul Exp > + * The Regents of the University of California. All rights reserved. Is 'All rights reserved' really compatible with open source? It's one thing to say 'All rights reserved' and then proceed to list exceptions; but when the exceptions are no longer directly visible (but hidden behind the SPDX tag), I have to wonder if the file is still open source. Can we get an opinion from a lawyer (perhaps Red Hat legal) on whether the phrase 'All rights reserved' can be safely removed from all of these files as part of the licensing cleanup? I absolutely frown on users that mix GPL and 'All rights reserved', but when it comes to BSD, there is enough copy-and-paste mess that uses it that I know I'm fighting an uphill battle, so I'm less prone to reject patches that mix BSD and 'All rights reserved'. Still, as this is a clean start, we might as well get it right, if we can.
On 3/13/19 1:38 PM, Marc-André Lureau wrote: > 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. > > The copyright holders have been asked to relicense files to BSD-3: > > - slirp/dhcpv6.{c,h} > > Subject: Re: Clearing slirp/ license > To: "Marc-André Lureau" <marcandre.lureau@gmail.com>, QEMU <qemu-devel@nongnu.org>, Thomas Huth <thuth@redhat.com> > Cc: Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> > References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com> > From: "Cédric Le Goater" <clg@kaod.org> > Message-ID: <e942cdab-fe1b-fdf4-3b9f-da16a4afa953@kaod.org> > Date: Mon, 11 Mar 2019 16:23:25 +0100 > >> Could you reply that you have no objection in relicensing those files >> are 3-Clause BSD? > > Fine for me. You can change the license of slirp/ncsi.c and > slirp/ncsi-pkt.hto a 3-Clause BSD. > > Thanks, > > C. > > Subject: Re: [Qemu-devel] Clearing slirp/ license > To: Peter Maydell <peter.maydell@linaro.org>, Shan Gavin <shan.gavin@gmail.com> > Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, "Marc-André Lureau" <marcandre.lureau@gmail.com>, Gavin Shan <gwshan@linux.vnet.ibm.com>, Thomas Huth <thuth@redhat.com>, QEMU <qemu-devel@nongnu.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> > References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com> <e942cdab-fe1b-fdf4-3b9f-da16a4afa953@kaod.org> <CAJ+F1C+hFfsa5gcSdttTP5J+uyDvNdYJWrm9OJM26+Zc1ZQkew@mail.gmail.com> <cc62e1fd-c564-e1b7-d10c-30665b481352@ozlabs.ru> <CAOL5TwkQXhPjdPP9v7n7mxAVxbDCSo6MEaG+E-Xys=MoD_pg2g@mail.gmail.com> <CAFEAcA_g=L2LSo=B_5dpJhJJrqFiOb6sswMVohQwpVGiKi_A7w@mail.gmail.com> > From: "Cédric Le Goater" <clg@kaod.org> > Message-ID: <4ddf6031-0df1-b3b5-965e-a181266e42b0@kaod.org> > Date: Tue, 12 Mar 2019 11:49:21 +0100 > >> Is the code in question copyright you personally, or copyright >> IBM as your employer at the time ? If the latter, it is IBM that >> would need to approve the relicensing. > > That was done. I had our legal team approve the change of license. > > Thanks, > > C. > > From: Shan Gavin <shan.gavin@gmail.com> > Date: Tue, 12 Mar 2019 15:04:54 +0800 > Message-ID: <CAOL5TwkQXhPjdPP9v7n7mxAVxbDCSo6MEaG+E-Xys=MoD_pg2g@mail.gmail.com> > Subject: Re: [Qemu-devel] Clearing slirp/ license > To: Alexey Kardashevskiy <aik@ozlabs.ru> > Cc: "Marc-André Lureau" <marcandre.lureau@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, gwshan@linux.vnet.ibm.com, Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>, QEMU <qemu-devel@nongnu.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> > >> Gavin, could you reply that you have no objection in relicensing >> ncsi-pkt.h as 3-Clause BSD? > > No objection. Please go ahead with the relicensing. > > Cheers, > Gavin > > - ncsi.c, ncsi-pkt.h > > Subject: Re: Clearing slirp/ license > To: "Marc-André Lureau" <marcandre.lureau@gmail.com>, QEMU <qemu-devel@nongnu.org>, "Cédric Le Goater" <clg@kaod.org> > Cc: Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> > References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com> > From: Thomas Huth <thuth@redhat.com> > Message-ID: <ed5a9f55-f2e5-298d-58ac-414759e9b491@redhat.com> > Date: Wed, 13 Feb 2019 12:30:32 +0100 > >> Could you reply that you have no objection in relicensing those files >> are 3-Clause BSD? > > Ok, for the records: I'm fine if you change the license of dhcpv6.[ch] > to either 3-Clause BSD or 2-Clause BSD. > > Thomas > > - vmstate.{c,h} > > From: Juan Quintela <quintela@redhat.com> > To: "Marc-André Lureau" <marcandre.lureau@gmail.com> > Cc: QEMU <qemu-devel@nongnu.org>, Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> > Subject: Re: Clearing slirp/ license > Date: Tue, 12 Mar 2019 12:43:17 +0100 > Message-ID: <87k1h4qpwq.fsf@trasno.org> > >> Juan, Could you reply that you have no objection in relicensing the >> vmstate files as 3-Clause BSD? > > No problem at all on my side. > > Later, Juan. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > slirp/src/bootp.h | 1 + > slirp/src/debug.h | 4 +--- > slirp/src/dhcpv6.h | 4 +--- > slirp/src/if.h | 4 +--- > slirp/src/ip.h | 30 ++---------------------------- > slirp/src/ip6.h | 1 + > slirp/src/ip6_icmp.h | 1 + > slirp/src/ip_icmp.h | 30 ++---------------------------- > slirp/src/libslirp.h | 1 + > slirp/src/main.h | 4 +--- > slirp/src/mbuf.h | 30 ++---------------------------- > slirp/src/misc.h | 4 +--- > slirp/src/ncsi-pkt.h | 6 +----- > slirp/src/qtailq.h | 32 ++------------------------------ > slirp/src/sbuf.h | 4 +--- > slirp/src/slirp.h | 1 + > slirp/src/socket.h | 4 +--- > slirp/src/stream.h | 1 + > slirp/src/tcp.h | 30 ++---------------------------- > slirp/src/tcp_var.h | 30 ++---------------------------- > slirp/src/tcpip.h | 30 ++---------------------------- > slirp/src/tftp.h | 1 + > slirp/src/udp.h | 30 ++---------------------------- > slirp/src/util.h | 19 +------------------ > slirp/src/vmstate.h | 19 +------------------ > slirp/src/arp_table.c | 19 +------------------ > slirp/src/bootp.c | 19 +------------------ > slirp/src/cksum.c | 30 ++---------------------------- > slirp/src/dhcpv6.c | 14 +------------- > slirp/src/dnssearch.c | 19 +------------------ > 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 | 30 ++---------------------------- > slirp/src/ip_input.c | 35 ++--------------------------------- > slirp/src/ip_output.c | 35 ++--------------------------------- > slirp/src/mbuf.c | 4 +--- > slirp/src/misc.c | 4 +--- > slirp/src/ncsi.c | 4 +--- > slirp/src/ndp_table.c | 1 + > slirp/src/sbuf.c | 4 +--- > slirp/src/slirp.c | 19 +------------------ > slirp/src/socket.c | 4 +--- > slirp/src/state.c | 19 +------------------ > slirp/src/stream.c | 19 +------------------ > slirp/src/tcp_input.c | 33 ++------------------------------- > slirp/src/tcp_output.c | 33 ++------------------------------- > slirp/src/tcp_subr.c | 33 ++------------------------------- > slirp/src/tcp_timer.c | 30 ++---------------------------- > slirp/src/tftp.c | 19 +------------------ > slirp/src/udp.c | 33 ++------------------------------- > slirp/src/udp6.c | 1 + > slirp/src/util.c | 19 +------------------ > slirp/src/vmstate.c | 4 +--- > 55 files changed, 72 insertions(+), 740 deletions(-) > > diff --git a/slirp/src/bootp.h b/slirp/src/bootp.h > index 4043489835..d881ad620a 100644 > --- a/slirp/src/bootp.h > +++ b/slirp/src/bootp.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* bootp/dhcp defines */ > > #ifndef SLIRP_BOOTP_H > diff --git a/slirp/src/debug.h b/slirp/src/debug.h > index 44d922df37..c95fd8ffd2 100644 > --- a/slirp/src/debug.h > +++ b/slirp/src/debug.h > @@ -1,8 +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/dhcpv6.h b/slirp/src/dhcpv6.h > index 3373f6cb89..8b5ad064f0 100644 > --- a/slirp/src/dhcpv6.h > +++ b/slirp/src/dhcpv6.h > @@ -1,10 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Definitions and prototypes for SLIRP stateless DHCPv6 > * > * Copyright 2016 Thomas Huth, Red Hat Inc. > - * > - * This work is licensed under the terms of the GNU GPL, version 2 > - * or later. See the COPYING file in the top-level directory. > */ > #ifndef SLIRP_DHCPV6_H > #define SLIRP_DHCPV6_H > diff --git a/slirp/src/if.h b/slirp/src/if.h > index 69569c10df..b71c37d6ea 100644 > --- a/slirp/src/if.h > +++ b/slirp/src/if.h > @@ -1,8 +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/ip.h b/slirp/src/ip.h > index 73a4d2a3d2..bc6a26eba5 100644 > --- a/slirp/src/ip.h > +++ b/slirp/src/ip.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)ip.h 8.1 (Berkeley) 6/10/93 > - * ip.h,v 1.3 1994/08/21 05:27:30 paul Exp > + * The Regents of the University of California. All rights reserved. > */ > > #ifndef IP_H > diff --git a/slirp/src/ip6.h b/slirp/src/ip6.h > index 1b3364f960..33683c8e20 100644 > --- a/slirp/src/ip6.h > +++ b/slirp/src/ip6.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2013 > * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. > diff --git a/slirp/src/ip6_icmp.h b/slirp/src/ip6_icmp.h > index e8ed753db5..d8d13e30fc 100644 > --- a/slirp/src/ip6_icmp.h > +++ b/slirp/src/ip6_icmp.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2013 > * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. > diff --git a/slirp/src/ip_icmp.h b/slirp/src/ip_icmp.h > index a4e5b8b265..765943c1d1 100644 > --- a/slirp/src/ip_icmp.h > +++ b/slirp/src/ip_icmp.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 > - * ip_icmp.h,v 1.4 1995/05/30 08:09:43 rgrimes Exp > + * The Regents of the University of California. All rights reserved. > */ > > #ifndef NETINET_IP_ICMP_H > diff --git a/slirp/src/libslirp.h b/slirp/src/libslirp.h > index 2d13950065..3b28764bec 100644 > --- a/slirp/src/libslirp.h > +++ b/slirp/src/libslirp.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > #ifndef LIBSLIRP_H > #define LIBSLIRP_H > > diff --git a/slirp/src/main.h b/slirp/src/main.h > index f11d4572b7..3b3f883703 100644 > --- a/slirp/src/main.h > +++ b/slirp/src/main.h > @@ -1,8 +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/mbuf.h b/slirp/src/mbuf.h > index e2d443418a..b618c75cba 100644 > --- a/slirp/src/mbuf.h > +++ b/slirp/src/mbuf.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)mbuf.h 8.3 (Berkeley) 1/21/94 > - * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp > + * The Regents of the University of California. All rights reserved. > */ > > #ifndef MBUF_H > diff --git a/slirp/src/misc.h b/slirp/src/misc.h > index c2ceadb591..23b7490448 100644 > --- a/slirp/src/misc.h > +++ b/slirp/src/misc.h > @@ -1,8 +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/ncsi-pkt.h b/slirp/src/ncsi-pkt.h > index ea07d1cd0f..aced7960ea 100644 > --- a/slirp/src/ncsi-pkt.h > +++ b/slirp/src/ncsi-pkt.h > @@ -1,10 +1,6 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright Gavin Shan, IBM Corporation 2016. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, or > - * (at your option) any later version. > */ > > #ifndef NCSI_PKT_H > diff --git a/slirp/src/qtailq.h b/slirp/src/qtailq.h > index a89b0c439a..a809692625 100644 > --- a/slirp/src/qtailq.h > +++ b/slirp/src/qtailq.h > @@ -1,38 +1,10 @@ > -/* $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */ > +/* SPDX-License-Identifier: BSD-3-Clause */ > > /* > * slirp version: Copy from QEMU, removed all but tail queues. > - */ > - > -/* > + * > * Copyright (c) 1991, 1993 > * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)queue.h 8.5 (Berkeley) 8/20/94 > */ > > #ifndef QTAILQ_H > diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h > index 1cb9a42834..337af1bbde 100644 > --- a/slirp/src/sbuf.h > +++ b/slirp/src/sbuf.h > @@ -1,8 +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/slirp.h b/slirp/src/slirp.h > index 8068ba1d1e..39580934f3 100644 > --- a/slirp/src/slirp.h > +++ b/slirp/src/slirp.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > #ifndef SLIRP_H > #define SLIRP_H > > diff --git a/slirp/src/socket.h b/slirp/src/socket.h > index e4d12cd591..25403898cd 100644 > --- a/slirp/src/socket.h > +++ b/slirp/src/socket.h > @@ -1,8 +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/stream.h b/slirp/src/stream.h > index 985334c043..08bb5b6610 100644 > --- a/slirp/src/stream.h > +++ b/slirp/src/stream.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > #ifndef STREAM_H_ > #define STREAM_H_ > > diff --git a/slirp/src/tcp.h b/slirp/src/tcp.h > index 47aaea6c5b..07ac4a5db5 100644 > --- a/slirp/src/tcp.h > +++ b/slirp/src/tcp.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)tcp.h 8.1 (Berkeley) 6/10/93 > - * tcp.h,v 1.3 1994/08/21 05:27:34 paul Exp > + * The Regents of the University of California. All rights reserved. > */ > > #ifndef TCP_H > diff --git a/slirp/src/tcp_var.h b/slirp/src/tcp_var.h > index 27ef1a51cb..1c59e0dba3 100644 > --- a/slirp/src/tcp_var.h > +++ b/slirp/src/tcp_var.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1993, 1994 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)tcp_var.h 8.3 (Berkeley) 4/10/94 > - * tcp_var.h,v 1.3 1994/08/21 05:27:39 paul Exp > + * The Regents of the University of California. All rights reserved. > */ > > #ifndef TCP_VAR_H > diff --git a/slirp/src/tcpip.h b/slirp/src/tcpip.h > index 07dbf2c432..ff115a2718 100644 > --- a/slirp/src/tcpip.h > +++ b/slirp/src/tcpip.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)tcpip.h 8.1 (Berkeley) 6/10/93 > - * tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp > + * The Regents of the University of California. All rights reserved. > */ > > #ifndef TCPIP_H > diff --git a/slirp/src/tftp.h b/slirp/src/tftp.h > index a4c4a64e64..3fe3b70205 100644 > --- a/slirp/src/tftp.h > +++ b/slirp/src/tftp.h > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* tftp defines */ > > #ifndef SLIRP_TFTP_H > diff --git a/slirp/src/udp.h b/slirp/src/udp.h > index 3d29504caa..912e16705d 100644 > --- a/slirp/src/udp.h > +++ b/slirp/src/udp.h > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)udp.h 8.1 (Berkeley) 6/10/93 > - * udp.h,v 1.3 1994/08/21 05:27:41 paul Exp > + * The Regents of the University of California. All rights reserved. > */ > > #ifndef UDP_H > diff --git a/slirp/src/util.h b/slirp/src/util.h > index e94ee4e7f1..843a0635f9 100644 > --- a/slirp/src/util.h > +++ b/slirp/src/util.h > @@ -1,24 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2003-2008 Fabrice Bellard > * Copyright (c) 2010-2019 Red Hat, Inc. > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > #ifndef UTIL_H_ > #define UTIL_H_ > diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h > index cfa7b8c825..5ce06fd7b9 100644 > --- a/slirp/src/vmstate.h > +++ b/slirp/src/vmstate.h > @@ -1,27 +1,10 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * QEMU migration/snapshot declarations > * > * Copyright (c) 2009-2011 Red Hat, Inc. > * > * Original author: Juan Quintela <quintela@redhat.com> > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > #ifndef VMSTATE_H_ > #define VMSTATE_H_ > diff --git a/slirp/src/arp_table.c b/slirp/src/arp_table.c > index 58eafdcfd8..d4c1d725e1 100644 > --- a/slirp/src/arp_table.c > +++ b/slirp/src/arp_table.c > @@ -1,25 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * ARP table > * > * Copyright (c) 2011 AdaCore > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > > #include "slirp.h" > diff --git a/slirp/src/bootp.c b/slirp/src/bootp.c > index d396849a05..d486110f2e 100644 > --- a/slirp/src/bootp.c > +++ b/slirp/src/bootp.c > @@ -1,25 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * QEMU BOOTP/DHCP server > * > * Copyright (c) 2004 Fabrice Bellard > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > #include "slirp.h" > > diff --git a/slirp/src/cksum.c b/slirp/src/cksum.c > index 25bfa67348..76414ea699 100644 > --- a/slirp/src/cksum.c > +++ b/slirp/src/cksum.c > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1988, 1992, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 > - * in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp > + * he Regents of the University of California. All rights reserved. > */ > > #include "slirp.h" > diff --git a/slirp/src/dhcpv6.c b/slirp/src/dhcpv6.c > index e655c7d5b1..33cd44ad67 100644 > --- a/slirp/src/dhcpv6.c > +++ b/slirp/src/dhcpv6.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * SLIRP stateless DHCPv6 > * > @@ -5,19 +6,6 @@ > * See RFC 3315, RFC 3736, RFC 3646 and RFC 5970 for details. > * > * Copyright 2016 Thomas Huth, Red Hat Inc. > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License as published by > - * the Free Software Foundation; either version 2 of the License, > - * or (at your option) any later version. > - * > - * This program is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > - * GNU General Public License for more details. > - * > - * You should have received a copy of the GNU General Public License > - * along with this program; if not, see <http://www.gnu.org/licenses/>. > */ > > #include "slirp.h" > diff --git a/slirp/src/dnssearch.c b/slirp/src/dnssearch.c > index c459cece8d..5a7ab63327 100644 > --- a/slirp/src/dnssearch.c > +++ b/slirp/src/dnssearch.c > @@ -1,25 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Domain search option for DHCP (RFC 3397) > * > * Copyright (c) 2012 Klaus Stengel > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > > #include "slirp.h" > diff --git a/slirp/src/if.c b/slirp/src/if.c > index 1830cc396c..6eaac7292a 100644 > --- a/slirp/src/if.c > +++ b/slirp/src/if.c > @@ -1,8 +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/ip6_icmp.c b/slirp/src/ip6_icmp.c > index c1e3d30470..5642457fdd 100644 > --- a/slirp/src/ip6_icmp.c > +++ b/slirp/src/ip6_icmp.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2013 > * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. > diff --git a/slirp/src/ip6_input.c b/slirp/src/ip6_input.c > index 1b8c003c66..d9d2b7e9cd 100644 > --- a/slirp/src/ip6_input.c > +++ b/slirp/src/ip6_input.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2013 > * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. > diff --git a/slirp/src/ip6_output.c b/slirp/src/ip6_output.c > index 19d1ae7748..b86110662c 100644 > --- a/slirp/src/ip6_output.c > +++ b/slirp/src/ip6_output.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2013 > * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. > diff --git a/slirp/src/ip_icmp.c b/slirp/src/ip_icmp.c > index 120108f582..fd69e3e743 100644 > --- a/slirp/src/ip_icmp.c > +++ b/slirp/src/ip_icmp.c > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 > - * ip_icmp.c,v 1.7 1995/05/30 08:09:42 rgrimes Exp > + * The Regents of the University of California. All rights reserved. > */ > > #include "slirp.h" > diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c > index e0b94b0e42..a31358cc16 100644 > --- a/slirp/src/ip_input.c > +++ b/slirp/src/ip_input.c > @@ -1,41 +1,10 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1993 > - * The Regents of the University of California. All rights reserved. > + * The Regents of the University of California. All rights reserved. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 > - * ip_input.c,v 1.11 1994/11/16 10:17:08 jkh Exp > - */ > - > -/* > * 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 f6ec141df5..9fb7124309 100644 > --- a/slirp/src/ip_output.c > +++ b/slirp/src/ip_output.c > @@ -1,41 +1,10 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1990, 1993 > - * The Regents of the University of California. All rights reserved. > + * The Regents of the University of California. All rights reserved. > * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 > - * ip_output.c,v 1.9 1994/11/16 10:17:10 jkh Exp > - */ > - > -/* > * 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 521c02c967..800406ca9e 100644 > --- a/slirp/src/mbuf.c > +++ b/slirp/src/mbuf.c > @@ -1,8 +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 937a418d4e..7c5db0e0aa 100644 > --- a/slirp/src/misc.c > +++ b/slirp/src/misc.c > @@ -1,8 +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/ncsi.c b/slirp/src/ncsi.c > index 359f52c284..8fd461381f 100644 > --- a/slirp/src/ncsi.c > +++ b/slirp/src/ncsi.c > @@ -1,10 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * NC-SI (Network Controller Sideband Interface) "echo" model > * > * Copyright (C) 2016-2018 IBM Corp. > - * > - * This code is licensed under the GPL version 2 or later. See the > - * COPYING file in the top-level directory. > */ > #include "slirp.h" > > diff --git a/slirp/src/ndp_table.c b/slirp/src/ndp_table.c > index 34ea4fdf1f..78324877e2 100644 > --- a/slirp/src/ndp_table.c > +++ b/slirp/src/ndp_table.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2013 > * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. > diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c > index 51a9f0cc7d..9c0b31b513 100644 > --- a/slirp/src/sbuf.c > +++ b/slirp/src/sbuf.c > @@ -1,8 +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/slirp.c b/slirp/src/slirp.c > index 18af670a0a..d9ea835a13 100644 > --- a/slirp/src/slirp.c > +++ b/slirp/src/slirp.c > @@ -1,25 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * libslirp glue > * > * Copyright (c) 2004-2008 Fabrice Bellard > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > #include "slirp.h" > > diff --git a/slirp/src/socket.c b/slirp/src/socket.c > index f2428a3ae8..4a3c935e25 100644 > --- a/slirp/src/socket.c > +++ b/slirp/src/socket.c > @@ -1,8 +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/state.c b/slirp/src/state.c > index f5dd80cdc8..11ba93c132 100644 > --- a/slirp/src/state.c > +++ b/slirp/src/state.c > @@ -1,25 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * libslirp > * > * Copyright (c) 2004-2008 Fabrice Bellard > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > #include "slirp.h" > #include "vmstate.h" > diff --git a/slirp/src/stream.c b/slirp/src/stream.c > index d114dde334..9caf7df5ed 100644 > --- a/slirp/src/stream.c > +++ b/slirp/src/stream.c > @@ -1,25 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * libslirp io streams > * > * Copyright (c) 2018 Red Hat, Inc. > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > #include "stream.h" > #include <glib.h> > diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c > index b10477fc57..2987ebd4f9 100644 > --- a/slirp/src/tcp_input.c > +++ b/slirp/src/tcp_input.c > @@ -1,41 +1,12 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)tcp_input.c 8.5 (Berkeley) 4/10/94 > - * tcp_input.c,v 1.10 1994/10/13 18:36:32 wollman Exp > + * The Regents of the University of California. All rights reserved. > */ > > /* > * 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 e9674df121..143c4fbf85 100644 > --- a/slirp/src/tcp_output.c > +++ b/slirp/src/tcp_output.c > @@ -1,41 +1,12 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1990, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)tcp_output.c 8.3 (Berkeley) 12/30/93 > - * tcp_output.c,v 1.3 1994/09/15 10:36:55 davidg Exp > + * The Regents of the University of California. All rights reserved. > */ > > /* > * 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 1db59caa89..1c93bae6c1 100644 > --- a/slirp/src/tcp_subr.c > +++ b/slirp/src/tcp_subr.c > @@ -1,41 +1,12 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1990, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)tcp_subr.c 8.1 (Berkeley) 6/10/93 > - * tcp_subr.c,v 1.5 1994/10/08 22:39:58 phk Exp > + * The Regents of the University of California. All rights reserved. > */ > > /* > * 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_timer.c b/slirp/src/tcp_timer.c > index 7be54570af..774737c565 100644 > --- a/slirp/src/tcp_timer.c > +++ b/slirp/src/tcp_timer.c > @@ -1,33 +1,7 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1990, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)tcp_timer.c 8.1 (Berkeley) 6/10/93 > - * tcp_timer.c,v 1.2 1994/08/02 07:49:10 davidg Exp > + * The Regents of the University of California. All rights reserved. > */ > > #include "slirp.h" > diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c > index 2d8f978786..411a9f4ba4 100644 > --- a/slirp/src/tftp.c > +++ b/slirp/src/tftp.c > @@ -1,25 +1,8 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * tftp.c - a simple, read-only tftp server for qemu > * > * Copyright (c) 2004 Magnus Damm <damm@opensource.se> > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > > #include "slirp.h" > diff --git a/slirp/src/udp.c b/slirp/src/udp.c > index fa9f4a08bd..0c001757a4 100644 > --- a/slirp/src/udp.c > +++ b/slirp/src/udp.c > @@ -1,41 +1,12 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 1982, 1986, 1988, 1990, 1993 > - * The Regents of the University of California. All rights reserved. > - * > - * Redistribution and use in source and binary forms, with or without > - * modification, are permitted provided that the following conditions > - * are met: > - * 1. Redistributions of source code must retain the above copyright > - * notice, this list of conditions and the following disclaimer. > - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > - * SUCH DAMAGE. > - * > - * @(#)udp_usrreq.c 8.4 (Berkeley) 1/21/94 > - * udp_usrreq.c,v 1.4 1994/10/02 17:48:45 phk Exp > + * The Regents of the University of California. All rights reserved. > */ > > /* > * 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/udp6.c b/slirp/src/udp6.c > index be5cba1f54..bfcc7ec6fa 100644 > --- a/slirp/src/udp6.c > +++ b/slirp/src/udp6.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * Copyright (c) 2013 > * Guillaume Subiron > diff --git a/slirp/src/util.c b/slirp/src/util.c > index 5ec2fa87ab..d1f7811adf 100644 > --- a/slirp/src/util.c > +++ b/slirp/src/util.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * util.c (mostly based on QEMU os-win32.c) > * > @@ -6,24 +7,6 @@ > * > * QEMU library functions for win32 which are shared between QEMU and > * the QEMU tools. > - * > - * Permission is hereby granted, free of charge, to any person obtaining a copy > - * of this software and associated documentation files (the "Software"), to deal > - * in the Software without restriction, including without limitation the rights > - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > - * copies of the Software, and to permit persons to whom the Software is > - * furnished to do so, subject to the following conditions: > - * > - * The above copyright notice and this permission notice shall be included in > - * all copies or substantial portions of the Software. > - * > - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > - * THE SOFTWARE. > */ > #include "util.h" > > diff --git a/slirp/src/vmstate.c b/slirp/src/vmstate.c > index 4d08b47c61..f1c9311743 100644 > --- a/slirp/src/vmstate.c > +++ b/slirp/src/vmstate.c > @@ -1,3 +1,4 @@ > +/* SPDX-License-Identifier: BSD-3-Clause */ > /* > * VMState interpreter > * > @@ -5,9 +6,6 @@ > * > * Authors: > * Juan Quintela <quintela@redhat.com> > - * > - * This work is licensed under the terms of the GNU GPL, version 2 or later. > - * See the COPYING file in the top-level directory. > */ > #include <assert.h> > #include <errno.h> >
diff --git a/slirp/src/bootp.h b/slirp/src/bootp.h index 4043489835..d881ad620a 100644 --- a/slirp/src/bootp.h +++ b/slirp/src/bootp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* bootp/dhcp defines */ #ifndef SLIRP_BOOTP_H diff --git a/slirp/src/debug.h b/slirp/src/debug.h index 44d922df37..c95fd8ffd2 100644 --- a/slirp/src/debug.h +++ b/slirp/src/debug.h @@ -1,8 +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/dhcpv6.h b/slirp/src/dhcpv6.h index 3373f6cb89..8b5ad064f0 100644 --- a/slirp/src/dhcpv6.h +++ b/slirp/src/dhcpv6.h @@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Definitions and prototypes for SLIRP stateless DHCPv6 * * Copyright 2016 Thomas Huth, Red Hat Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2 - * or later. See the COPYING file in the top-level directory. */ #ifndef SLIRP_DHCPV6_H #define SLIRP_DHCPV6_H diff --git a/slirp/src/if.h b/slirp/src/if.h index 69569c10df..b71c37d6ea 100644 --- a/slirp/src/if.h +++ b/slirp/src/if.h @@ -1,8 +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/ip.h b/slirp/src/ip.h index 73a4d2a3d2..bc6a26eba5 100644 --- a/slirp/src/ip.h +++ b/slirp/src/ip.h @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip.h 8.1 (Berkeley) 6/10/93 - * ip.h,v 1.3 1994/08/21 05:27:30 paul Exp + * The Regents of the University of California. All rights reserved. */ #ifndef IP_H diff --git a/slirp/src/ip6.h b/slirp/src/ip6.h index 1b3364f960..33683c8e20 100644 --- a/slirp/src/ip6.h +++ b/slirp/src/ip6.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_icmp.h b/slirp/src/ip6_icmp.h index e8ed753db5..d8d13e30fc 100644 --- a/slirp/src/ip6_icmp.h +++ b/slirp/src/ip6_icmp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip_icmp.h b/slirp/src/ip_icmp.h index a4e5b8b265..765943c1d1 100644 --- a/slirp/src/ip_icmp.h +++ b/slirp/src/ip_icmp.h @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - * ip_icmp.h,v 1.4 1995/05/30 08:09:43 rgrimes Exp + * The Regents of the University of California. All rights reserved. */ #ifndef NETINET_IP_ICMP_H diff --git a/slirp/src/libslirp.h b/slirp/src/libslirp.h index 2d13950065..3b28764bec 100644 --- a/slirp/src/libslirp.h +++ b/slirp/src/libslirp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef LIBSLIRP_H #define LIBSLIRP_H diff --git a/slirp/src/main.h b/slirp/src/main.h index f11d4572b7..3b3f883703 100644 --- a/slirp/src/main.h +++ b/slirp/src/main.h @@ -1,8 +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/mbuf.h b/slirp/src/mbuf.h index e2d443418a..b618c75cba 100644 --- a/slirp/src/mbuf.h +++ b/slirp/src/mbuf.h @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)mbuf.h 8.3 (Berkeley) 1/21/94 - * mbuf.h,v 1.9 1994/11/14 13:54:20 bde Exp + * The Regents of the University of California. All rights reserved. */ #ifndef MBUF_H diff --git a/slirp/src/misc.h b/slirp/src/misc.h index c2ceadb591..23b7490448 100644 --- a/slirp/src/misc.h +++ b/slirp/src/misc.h @@ -1,8 +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/ncsi-pkt.h b/slirp/src/ncsi-pkt.h index ea07d1cd0f..aced7960ea 100644 --- a/slirp/src/ncsi-pkt.h +++ b/slirp/src/ncsi-pkt.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright Gavin Shan, IBM Corporation 2016. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. */ #ifndef NCSI_PKT_H diff --git a/slirp/src/qtailq.h b/slirp/src/qtailq.h index a89b0c439a..a809692625 100644 --- a/slirp/src/qtailq.h +++ b/slirp/src/qtailq.h @@ -1,38 +1,10 @@ -/* $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * slirp version: Copy from QEMU, removed all but tail queues. - */ - -/* + * * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)queue.h 8.5 (Berkeley) 8/20/94 */ #ifndef QTAILQ_H diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h index 1cb9a42834..337af1bbde 100644 --- a/slirp/src/sbuf.h +++ b/slirp/src/sbuf.h @@ -1,8 +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/slirp.h b/slirp/src/slirp.h index 8068ba1d1e..39580934f3 100644 --- a/slirp/src/slirp.h +++ b/slirp/src/slirp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef SLIRP_H #define SLIRP_H diff --git a/slirp/src/socket.h b/slirp/src/socket.h index e4d12cd591..25403898cd 100644 --- a/slirp/src/socket.h +++ b/slirp/src/socket.h @@ -1,8 +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/stream.h b/slirp/src/stream.h index 985334c043..08bb5b6610 100644 --- a/slirp/src/stream.h +++ b/slirp/src/stream.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ #ifndef STREAM_H_ #define STREAM_H_ diff --git a/slirp/src/tcp.h b/slirp/src/tcp.h index 47aaea6c5b..07ac4a5db5 100644 --- a/slirp/src/tcp.h +++ b/slirp/src/tcp.h @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp.h 8.1 (Berkeley) 6/10/93 - * tcp.h,v 1.3 1994/08/21 05:27:34 paul Exp + * The Regents of the University of California. All rights reserved. */ #ifndef TCP_H diff --git a/slirp/src/tcp_var.h b/slirp/src/tcp_var.h index 27ef1a51cb..1c59e0dba3 100644 --- a/slirp/src/tcp_var.h +++ b/slirp/src/tcp_var.h @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp_var.h 8.3 (Berkeley) 4/10/94 - * tcp_var.h,v 1.3 1994/08/21 05:27:39 paul Exp + * The Regents of the University of California. All rights reserved. */ #ifndef TCP_VAR_H diff --git a/slirp/src/tcpip.h b/slirp/src/tcpip.h index 07dbf2c432..ff115a2718 100644 --- a/slirp/src/tcpip.h +++ b/slirp/src/tcpip.h @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcpip.h 8.1 (Berkeley) 6/10/93 - * tcpip.h,v 1.3 1994/08/21 05:27:40 paul Exp + * The Regents of the University of California. All rights reserved. */ #ifndef TCPIP_H diff --git a/slirp/src/tftp.h b/slirp/src/tftp.h index a4c4a64e64..3fe3b70205 100644 --- a/slirp/src/tftp.h +++ b/slirp/src/tftp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* tftp defines */ #ifndef SLIRP_TFTP_H diff --git a/slirp/src/udp.h b/slirp/src/udp.h index 3d29504caa..912e16705d 100644 --- a/slirp/src/udp.h +++ b/slirp/src/udp.h @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)udp.h 8.1 (Berkeley) 6/10/93 - * udp.h,v 1.3 1994/08/21 05:27:41 paul Exp + * The Regents of the University of California. All rights reserved. */ #ifndef UDP_H diff --git a/slirp/src/util.h b/slirp/src/util.h index e94ee4e7f1..843a0635f9 100644 --- a/slirp/src/util.h +++ b/slirp/src/util.h @@ -1,24 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2010-2019 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #ifndef UTIL_H_ #define UTIL_H_ diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h index cfa7b8c825..5ce06fd7b9 100644 --- a/slirp/src/vmstate.h +++ b/slirp/src/vmstate.h @@ -1,27 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * QEMU migration/snapshot declarations * * Copyright (c) 2009-2011 Red Hat, Inc. * * Original author: Juan Quintela <quintela@redhat.com> - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #ifndef VMSTATE_H_ #define VMSTATE_H_ diff --git a/slirp/src/arp_table.c b/slirp/src/arp_table.c index 58eafdcfd8..d4c1d725e1 100644 --- a/slirp/src/arp_table.c +++ b/slirp/src/arp_table.c @@ -1,25 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * ARP table * * Copyright (c) 2011 AdaCore - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "slirp.h" diff --git a/slirp/src/bootp.c b/slirp/src/bootp.c index d396849a05..d486110f2e 100644 --- a/slirp/src/bootp.c +++ b/slirp/src/bootp.c @@ -1,25 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * QEMU BOOTP/DHCP server * * Copyright (c) 2004 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "slirp.h" diff --git a/slirp/src/cksum.c b/slirp/src/cksum.c index 25bfa67348..76414ea699 100644 --- a/slirp/src/cksum.c +++ b/slirp/src/cksum.c @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1988, 1992, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)in_cksum.c 8.1 (Berkeley) 6/10/93 - * in_cksum.c,v 1.2 1994/08/02 07:48:16 davidg Exp + * he Regents of the University of California. All rights reserved. */ #include "slirp.h" diff --git a/slirp/src/dhcpv6.c b/slirp/src/dhcpv6.c index e655c7d5b1..33cd44ad67 100644 --- a/slirp/src/dhcpv6.c +++ b/slirp/src/dhcpv6.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * SLIRP stateless DHCPv6 * @@ -5,19 +6,6 @@ * See RFC 3315, RFC 3736, RFC 3646 and RFC 5970 for details. * * Copyright 2016 Thomas Huth, Red Hat Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, - * or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #include "slirp.h" diff --git a/slirp/src/dnssearch.c b/slirp/src/dnssearch.c index c459cece8d..5a7ab63327 100644 --- a/slirp/src/dnssearch.c +++ b/slirp/src/dnssearch.c @@ -1,25 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Domain search option for DHCP (RFC 3397) * * Copyright (c) 2012 Klaus Stengel - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "slirp.h" diff --git a/slirp/src/if.c b/slirp/src/if.c index 1830cc396c..6eaac7292a 100644 --- a/slirp/src/if.c +++ b/slirp/src/if.c @@ -1,8 +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/ip6_icmp.c b/slirp/src/ip6_icmp.c index c1e3d30470..5642457fdd 100644 --- a/slirp/src/ip6_icmp.c +++ b/slirp/src/ip6_icmp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_input.c b/slirp/src/ip6_input.c index 1b8c003c66..d9d2b7e9cd 100644 --- a/slirp/src/ip6_input.c +++ b/slirp/src/ip6_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip6_output.c b/slirp/src/ip6_output.c index 19d1ae7748..b86110662c 100644 --- a/slirp/src/ip6_output.c +++ b/slirp/src/ip6_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/ip_icmp.c b/slirp/src/ip_icmp.c index 120108f582..fd69e3e743 100644 --- a/slirp/src/ip_icmp.c +++ b/slirp/src/ip_icmp.c @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_icmp.c 8.2 (Berkeley) 1/4/94 - * ip_icmp.c,v 1.7 1995/05/30 08:09:42 rgrimes Exp + * The Regents of the University of California. All rights reserved. */ #include "slirp.h" diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c index e0b94b0e42..a31358cc16 100644 --- a/slirp/src/ip_input.c +++ b/slirp/src/ip_input.c @@ -1,41 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * ip_input.c,v 1.11 1994/11/16 10:17:08 jkh Exp - */ - -/* * 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 f6ec141df5..9fb7124309 100644 --- a/slirp/src/ip_output.c +++ b/slirp/src/ip_output.c @@ -1,41 +1,10 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 - * ip_output.c,v 1.9 1994/11/16 10:17:10 jkh Exp - */ - -/* * 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 521c02c967..800406ca9e 100644 --- a/slirp/src/mbuf.c +++ b/slirp/src/mbuf.c @@ -1,8 +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 937a418d4e..7c5db0e0aa 100644 --- a/slirp/src/misc.c +++ b/slirp/src/misc.c @@ -1,8 +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/ncsi.c b/slirp/src/ncsi.c index 359f52c284..8fd461381f 100644 --- a/slirp/src/ncsi.c +++ b/slirp/src/ncsi.c @@ -1,10 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * NC-SI (Network Controller Sideband Interface) "echo" model * * Copyright (C) 2016-2018 IBM Corp. - * - * This code is licensed under the GPL version 2 or later. See the - * COPYING file in the top-level directory. */ #include "slirp.h" diff --git a/slirp/src/ndp_table.c b/slirp/src/ndp_table.c index 34ea4fdf1f..78324877e2 100644 --- a/slirp/src/ndp_table.c +++ b/slirp/src/ndp_table.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron, Yann Bordenave, Serigne Modou Wagne. diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c index 51a9f0cc7d..9c0b31b513 100644 --- a/slirp/src/sbuf.c +++ b/slirp/src/sbuf.c @@ -1,8 +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/slirp.c b/slirp/src/slirp.c index 18af670a0a..d9ea835a13 100644 --- a/slirp/src/slirp.c +++ b/slirp/src/slirp.c @@ -1,25 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * libslirp glue * * Copyright (c) 2004-2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "slirp.h" diff --git a/slirp/src/socket.c b/slirp/src/socket.c index f2428a3ae8..4a3c935e25 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -1,8 +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/state.c b/slirp/src/state.c index f5dd80cdc8..11ba93c132 100644 --- a/slirp/src/state.c +++ b/slirp/src/state.c @@ -1,25 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * libslirp * * Copyright (c) 2004-2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "slirp.h" #include "vmstate.h" diff --git a/slirp/src/stream.c b/slirp/src/stream.c index d114dde334..9caf7df5ed 100644 --- a/slirp/src/stream.c +++ b/slirp/src/stream.c @@ -1,25 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * libslirp io streams * * Copyright (c) 2018 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "stream.h" #include <glib.h> diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c index b10477fc57..2987ebd4f9 100644 --- a/slirp/src/tcp_input.c +++ b/slirp/src/tcp_input.c @@ -1,41 +1,12 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp_input.c 8.5 (Berkeley) 4/10/94 - * tcp_input.c,v 1.10 1994/10/13 18:36:32 wollman Exp + * The Regents of the University of California. All rights reserved. */ /* * 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 e9674df121..143c4fbf85 100644 --- a/slirp/src/tcp_output.c +++ b/slirp/src/tcp_output.c @@ -1,41 +1,12 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp_output.c 8.3 (Berkeley) 12/30/93 - * tcp_output.c,v 1.3 1994/09/15 10:36:55 davidg Exp + * The Regents of the University of California. All rights reserved. */ /* * 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 1db59caa89..1c93bae6c1 100644 --- a/slirp/src/tcp_subr.c +++ b/slirp/src/tcp_subr.c @@ -1,41 +1,12 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp_subr.c 8.1 (Berkeley) 6/10/93 - * tcp_subr.c,v 1.5 1994/10/08 22:39:58 phk Exp + * The Regents of the University of California. All rights reserved. */ /* * 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_timer.c b/slirp/src/tcp_timer.c index 7be54570af..774737c565 100644 --- a/slirp/src/tcp_timer.c +++ b/slirp/src/tcp_timer.c @@ -1,33 +1,7 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)tcp_timer.c 8.1 (Berkeley) 6/10/93 - * tcp_timer.c,v 1.2 1994/08/02 07:49:10 davidg Exp + * The Regents of the University of California. All rights reserved. */ #include "slirp.h" diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c index 2d8f978786..411a9f4ba4 100644 --- a/slirp/src/tftp.c +++ b/slirp/src/tftp.c @@ -1,25 +1,8 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * tftp.c - a simple, read-only tftp server for qemu * * Copyright (c) 2004 Magnus Damm <damm@opensource.se> - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "slirp.h" diff --git a/slirp/src/udp.c b/slirp/src/udp.c index fa9f4a08bd..0c001757a4 100644 --- a/slirp/src/udp.c +++ b/slirp/src/udp.c @@ -1,41 +1,12 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University 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 BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)udp_usrreq.c 8.4 (Berkeley) 1/21/94 - * udp_usrreq.c,v 1.4 1994/10/02 17:48:45 phk Exp + * The Regents of the University of California. All rights reserved. */ /* * 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/udp6.c b/slirp/src/udp6.c index be5cba1f54..bfcc7ec6fa 100644 --- a/slirp/src/udp6.c +++ b/slirp/src/udp6.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 2013 * Guillaume Subiron diff --git a/slirp/src/util.c b/slirp/src/util.c index 5ec2fa87ab..d1f7811adf 100644 --- a/slirp/src/util.c +++ b/slirp/src/util.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * util.c (mostly based on QEMU os-win32.c) * @@ -6,24 +7,6 @@ * * QEMU library functions for win32 which are shared between QEMU and * the QEMU tools. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. */ #include "util.h" diff --git a/slirp/src/vmstate.c b/slirp/src/vmstate.c index 4d08b47c61..f1c9311743 100644 --- a/slirp/src/vmstate.c +++ b/slirp/src/vmstate.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * VMState interpreter * @@ -5,9 +6,6 @@ * * Authors: * Juan Quintela <quintela@redhat.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. */ #include <assert.h> #include <errno.h>
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. The copyright holders have been asked to relicense files to BSD-3: - slirp/dhcpv6.{c,h} Subject: Re: Clearing slirp/ license To: "Marc-André Lureau" <marcandre.lureau@gmail.com>, QEMU <qemu-devel@nongnu.org>, Thomas Huth <thuth@redhat.com> Cc: Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com> From: "Cédric Le Goater" <clg@kaod.org> Message-ID: <e942cdab-fe1b-fdf4-3b9f-da16a4afa953@kaod.org> Date: Mon, 11 Mar 2019 16:23:25 +0100 > Could you reply that you have no objection in relicensing those files > are 3-Clause BSD? Fine for me. You can change the license of slirp/ncsi.c and slirp/ncsi-pkt.hto a 3-Clause BSD. Thanks, C. Subject: Re: [Qemu-devel] Clearing slirp/ license To: Peter Maydell <peter.maydell@linaro.org>, Shan Gavin <shan.gavin@gmail.com> Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, "Marc-André Lureau" <marcandre.lureau@gmail.com>, Gavin Shan <gwshan@linux.vnet.ibm.com>, Thomas Huth <thuth@redhat.com>, QEMU <qemu-devel@nongnu.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com> <e942cdab-fe1b-fdf4-3b9f-da16a4afa953@kaod.org> <CAJ+F1C+hFfsa5gcSdttTP5J+uyDvNdYJWrm9OJM26+Zc1ZQkew@mail.gmail.com> <cc62e1fd-c564-e1b7-d10c-30665b481352@ozlabs.ru> <CAOL5TwkQXhPjdPP9v7n7mxAVxbDCSo6MEaG+E-Xys=MoD_pg2g@mail.gmail.com> <CAFEAcA_g=L2LSo=B_5dpJhJJrqFiOb6sswMVohQwpVGiKi_A7w@mail.gmail.com> From: "Cédric Le Goater" <clg@kaod.org> Message-ID: <4ddf6031-0df1-b3b5-965e-a181266e42b0@kaod.org> Date: Tue, 12 Mar 2019 11:49:21 +0100 > Is the code in question copyright you personally, or copyright > IBM as your employer at the time ? If the latter, it is IBM that > would need to approve the relicensing. That was done. I had our legal team approve the change of license. Thanks, C. From: Shan Gavin <shan.gavin@gmail.com> Date: Tue, 12 Mar 2019 15:04:54 +0800 Message-ID: <CAOL5TwkQXhPjdPP9v7n7mxAVxbDCSo6MEaG+E-Xys=MoD_pg2g@mail.gmail.com> Subject: Re: [Qemu-devel] Clearing slirp/ license To: Alexey Kardashevskiy <aik@ozlabs.ru> Cc: "Marc-André Lureau" <marcandre.lureau@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, gwshan@linux.vnet.ibm.com, Peter Maydell <peter.maydell@linaro.org>, Thomas Huth <thuth@redhat.com>, QEMU <qemu-devel@nongnu.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> > Gavin, could you reply that you have no objection in relicensing > ncsi-pkt.h as 3-Clause BSD? No objection. Please go ahead with the relicensing. Cheers, Gavin - ncsi.c, ncsi-pkt.h Subject: Re: Clearing slirp/ license To: "Marc-André Lureau" <marcandre.lureau@gmail.com>, QEMU <qemu-devel@nongnu.org>, "Cédric Le Goater" <clg@kaod.org> Cc: Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> References: <CAJ+F1CKBRNdLPb_wOLhURdUJd-j1RHY2toKSTEhCBt_zs4Xk1w@mail.gmail.com> From: Thomas Huth <thuth@redhat.com> Message-ID: <ed5a9f55-f2e5-298d-58ac-414759e9b491@redhat.com> Date: Wed, 13 Feb 2019 12:30:32 +0100 > Could you reply that you have no objection in relicensing those files > are 3-Clause BSD? Ok, for the records: I'm fine if you change the license of dhcpv6.[ch] to either 3-Clause BSD or 2-Clause BSD. Thomas - vmstate.{c,h} From: Juan Quintela <quintela@redhat.com> To: "Marc-André Lureau" <marcandre.lureau@gmail.com> Cc: QEMU <qemu-devel@nongnu.org>, Peter Maydell <peter.maydell@linaro.org>, Samuel Thibault <samuel.thibault@ens-lyon.org> Subject: Re: Clearing slirp/ license Date: Tue, 12 Mar 2019 12:43:17 +0100 Message-ID: <87k1h4qpwq.fsf@trasno.org> > Juan, Could you reply that you have no objection in relicensing the > vmstate files as 3-Clause BSD? No problem at all on my side. Later, Juan. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- slirp/src/bootp.h | 1 + slirp/src/debug.h | 4 +--- slirp/src/dhcpv6.h | 4 +--- slirp/src/if.h | 4 +--- slirp/src/ip.h | 30 ++---------------------------- slirp/src/ip6.h | 1 + slirp/src/ip6_icmp.h | 1 + slirp/src/ip_icmp.h | 30 ++---------------------------- slirp/src/libslirp.h | 1 + slirp/src/main.h | 4 +--- slirp/src/mbuf.h | 30 ++---------------------------- slirp/src/misc.h | 4 +--- slirp/src/ncsi-pkt.h | 6 +----- slirp/src/qtailq.h | 32 ++------------------------------ slirp/src/sbuf.h | 4 +--- slirp/src/slirp.h | 1 + slirp/src/socket.h | 4 +--- slirp/src/stream.h | 1 + slirp/src/tcp.h | 30 ++---------------------------- slirp/src/tcp_var.h | 30 ++---------------------------- slirp/src/tcpip.h | 30 ++---------------------------- slirp/src/tftp.h | 1 + slirp/src/udp.h | 30 ++---------------------------- slirp/src/util.h | 19 +------------------ slirp/src/vmstate.h | 19 +------------------ slirp/src/arp_table.c | 19 +------------------ slirp/src/bootp.c | 19 +------------------ slirp/src/cksum.c | 30 ++---------------------------- slirp/src/dhcpv6.c | 14 +------------- slirp/src/dnssearch.c | 19 +------------------ 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 | 30 ++---------------------------- slirp/src/ip_input.c | 35 ++--------------------------------- slirp/src/ip_output.c | 35 ++--------------------------------- slirp/src/mbuf.c | 4 +--- slirp/src/misc.c | 4 +--- slirp/src/ncsi.c | 4 +--- slirp/src/ndp_table.c | 1 + slirp/src/sbuf.c | 4 +--- slirp/src/slirp.c | 19 +------------------ slirp/src/socket.c | 4 +--- slirp/src/state.c | 19 +------------------ slirp/src/stream.c | 19 +------------------ slirp/src/tcp_input.c | 33 ++------------------------------- slirp/src/tcp_output.c | 33 ++------------------------------- slirp/src/tcp_subr.c | 33 ++------------------------------- slirp/src/tcp_timer.c | 30 ++---------------------------- slirp/src/tftp.c | 19 +------------------ slirp/src/udp.c | 33 ++------------------------------- slirp/src/udp6.c | 1 + slirp/src/util.c | 19 +------------------ slirp/src/vmstate.c | 4 +--- 55 files changed, 72 insertions(+), 740 deletions(-)