From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552570158594665.676394154403; Thu, 14 Mar 2019 06:29:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:36886 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QQ7-000322-Ik for importer@patchew.org; Thu, 14 Mar 2019 09:29:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QH5-00040S-Gd for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q8R-0003IO-VL for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33922) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q8R-0003GR-Lm for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:10:59 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98CFA88AC1; Thu, 14 Mar 2019 13:10:58 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB3815F9DF; Thu, 14 Mar 2019 13:10:55 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:42 +0100 Message-Id: <20190314131049.23175-2-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 14 Mar 2019 13:10:58 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/8] slirp: update COPYRIGHT to use full 3-Clause BSD License X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, jan.kiszka@siemens.com, clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" According to commit 2f5f89963186d42a7ded253bc6cf5b32abb45cec ("Remove the advertising clause from the slirp license"), Danny Gasparovski gave permission to license slirp code under 3-clause BSD license: Subject: RE: Slirp license Date: Thu, 8 Jan 2009 10:51:00 +1100 From: "Gasparovski, Daniel" To: "Richard Fontana" I have no objection to having Slirp code in QEMU be licensed under the 3-clause BSD license. slirp/COPYRIGHT's initial version in 2004 (commit 5fafdf24) listed only 3 clauses BUT used the poisonous advertising clause for clause 3 which is the controversial clause of non-free 4-clause (that is, it appears that the BSD-4 license was copied, and then the WRONG clause was deleted, when creating COPYRIGHT. Perhaps explained as an easy mistake to make since 3-clause was created by removing clause 3 of the 4-clause, where you sometimes see the three-clause version with clauses 1, 2, 4; but more commonly see a renumbered version with clauses 1, 2, 3 to close the gap. If you pay attention only to clause numbers instead of content, it can be easy to confuse which clause to delete to go from 4-clause to 3-clause). Commit 2f5f89963 removed the poisonous wrong clause on the grounds of moving from 4-clause to 3-clause; but did not add the missing clause, which makes it LOOK like the 2-clause version. But I think we have a decent enough trail showing the intent for 3-clause. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake Reviewed-by: Thomas Huth --- slirp/COPYRIGHT | 3 +++ 1 file changed, 3 insertions(+) diff --git a/slirp/COPYRIGHT b/slirp/COPYRIGHT index 1bc83d497e..9863ea31cb 100644 --- a/slirp/COPYRIGHT +++ b/slirp/COPYRIGHT @@ -25,6 +25,9 @@ The copyright terms and conditions: 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. =20 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY --=20 2.21.0.4.g36eb1cb9cf From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552570200859792.6584056110155; Thu, 14 Mar 2019 06:30:00 -0700 (PDT) Received: from localhost ([127.0.0.1]:36890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QQn-0003aC-MP for importer@patchew.org; Thu, 14 Mar 2019 09:29:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45595) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QH2-0003pC-UN for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q8l-0003OL-L1 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35390) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q8l-0003M3-54 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94AE130017B5; Thu, 14 Mar 2019 13:11:10 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 68EC760BE6; Thu, 14 Mar 2019 13:10:59 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:43 +0100 Message-Id: <20190314131049.23175-3-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 14 Mar 2019 13:11:10 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/8] slirp: relicense GPL files to BSD-3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, Alexey Kardashevskiy , jan.kiszka@siemens.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 and gave their permission: - slirp/dhcpv6.{c,h} Subject: Re: Clearing slirp/ license To: "Marc-Andr=C3=A9 Lureau" , QEMU , Thomas Huth Cc: Peter Maydell , Samuel Thibault References: From: "C=C3=A9dric Le Goater" Message-ID: 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 , Shan Gavin Cc: Alexey Kardashevskiy , "Marc-Andr=C3=A9 Lureau" , Gavin Shan , Thomas Huth <= thuth@redhat.com>, QEMU , Samuel Thibault References: From: "C=C3=A9dric Le Goater" 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 Date: Tue, 12 Mar 2019 15:04:54 +0800 Message-ID: Subject: Re: [Qemu-devel] Clearing slirp/ license To: Alexey Kardashevskiy Cc: "Marc-Andr=C3=A9 Lureau" , "C=C3=A9dric Le = Goater" , gwshan@linux.vnet.ibm.com, Peter Maydell , Thomas Huth , QEMU , Samuel Thibault > 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=C3=A9 Lureau" , QEMU , "C=C3=A9dric Le Goater" Cc: Peter Maydell , Samuel Thibault References: From: Thomas Huth Message-ID: 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 To: "Marc-Andr=C3=A9 Lureau" Cc: QEMU , Peter Maydell ,= Samuel Thibault 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=C3=A9 Lureau Reviewed-by: Eric Blake Acked-by: Thomas Huth Reviewed-by: C=C3=A9dric Le Goater --- slirp/src/dhcpv6.h | 31 +++++++++++++++++++++++++++++-- slirp/src/ncsi-pkt.h | 33 +++++++++++++++++++++++++++++---- slirp/src/vmstate.h | 42 +++++++++++++++++++++++++++--------------- slirp/src/dhcpv6.c | 37 +++++++++++++++++++++++++++---------- slirp/src/ncsi.c | 31 +++++++++++++++++++++++++++++-- slirp/src/vmstate.c | 31 +++++++++++++++++++++++++++++-- 6 files changed, 170 insertions(+), 35 deletions(-) diff --git a/slirp/src/dhcpv6.h b/slirp/src/dhcpv6.h index 3373f6cb89..af0e193b06 100644 --- a/slirp/src/dhcpv6.h +++ b/slirp/src/dhcpv6.h @@ -3,8 +3,35 @@ * * 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. + * 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 copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #ifndef SLIRP_DHCPV6_H #define SLIRP_DHCPV6_H diff --git a/slirp/src/ncsi-pkt.h b/slirp/src/ncsi-pkt.h index ea07d1cd0f..3867feb1d3 100644 --- a/slirp/src/ncsi-pkt.h +++ b/slirp/src/ncsi-pkt.h @@ -1,10 +1,35 @@ /* * 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. + * 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 copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ =20 #ifndef NCSI_PKT_H diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h index cfa7b8c825..21157b5ec2 100644 --- a/slirp/src/vmstate.h +++ b/slirp/src/vmstate.h @@ -5,23 +5,35 @@ * * Original author: Juan Quintela * - * Permission is hereby granted, free of charge, to any person obtaining a= copy - * of this software and associated documentation files (the "Software"), t= o deal - * in the Software without restriction, including without limitation the r= ights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * The above copyright notice and this permission notice shall be included= in - * all copies or substantial portions of the Software. + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. * - * 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 OT= HER - * 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. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #ifndef VMSTATE_H_ #define VMSTATE_H_ diff --git a/slirp/src/dhcpv6.c b/slirp/src/dhcpv6.c index e655c7d5b1..df350e9f26 100644 --- a/slirp/src/dhcpv6.c +++ b/slirp/src/dhcpv6.c @@ -6,18 +6,35 @@ * * 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. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * 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. + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ =20 #include "slirp.h" diff --git a/slirp/src/ncsi.c b/slirp/src/ncsi.c index 359f52c284..1169da8241 100644 --- a/slirp/src/ncsi.c +++ b/slirp/src/ncsi.c @@ -3,8 +3,35 @@ * * 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. + * 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 copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #include "slirp.h" =20 diff --git a/slirp/src/vmstate.c b/slirp/src/vmstate.c index 4d08b47c61..3bc23d1d73 100644 --- a/slirp/src/vmstate.c +++ b/slirp/src/vmstate.c @@ -6,8 +6,35 @@ * Authors: * Juan Quintela * - * This work is licensed under the terms of the GNU GPL, version 2 or late= r. - * See the COPYING file in the top-level directory. + * 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 copyright holder nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 + * COPYRIGHT HOLDER 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. */ #include #include --=20 2.21.0.4.g36eb1cb9cf From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552570058674571.1444737333238; Thu, 14 Mar 2019 06:27:38 -0700 (PDT) Received: from localhost ([127.0.0.1]:36870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QOW-0001o6-J0 for importer@patchew.org; Thu, 14 Mar 2019 09:27:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45829) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QH3-0004Be-50 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q8m-0003Oe-3z for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51304) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q8l-0003NS-8n for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A41E3082E05; Thu, 14 Mar 2019 13:11:16 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25D116B8E8; Thu, 14 Mar 2019 13:11:11 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:44 +0100 Message-Id: <20190314131049.23175-4-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 14 Mar 2019 13:11:16 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 3/8] slirp: clarify license of slirp files using SPDX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, jan.kiszka@siemens.com, clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add SPDX license identifier to clarify the license of files with explicit 3-clause BSD license header. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth --- slirp/src/dhcpv6.h | 1 + slirp/src/ip.h | 1 + slirp/src/ip_icmp.h | 1 + slirp/src/mbuf.h | 1 + slirp/src/ncsi-pkt.h | 1 + slirp/src/qtailq.h | 1 + slirp/src/tcp.h | 1 + slirp/src/tcp_timer.h | 1 + slirp/src/tcp_var.h | 1 + slirp/src/tcpip.h | 1 + slirp/src/udp.h | 1 + slirp/src/vmstate.h | 1 + slirp/src/cksum.c | 1 + slirp/src/dhcpv6.c | 1 + slirp/src/ip_icmp.c | 1 + slirp/src/ip_input.c | 1 + slirp/src/ip_output.c | 1 + slirp/src/ncsi.c | 1 + slirp/src/tcp_input.c | 1 + slirp/src/tcp_output.c | 1 + slirp/src/tcp_subr.c | 1 + slirp/src/tcp_timer.c | 1 + slirp/src/udp.c | 1 + slirp/src/vmstate.c | 1 + 24 files changed, 24 insertions(+) diff --git a/slirp/src/dhcpv6.h b/slirp/src/dhcpv6.h index af0e193b06..dc26a93cff 100644 --- a/slirp/src/dhcpv6.h +++ b/slirp/src/dhcpv6.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Definitions and prototypes for SLIRP stateless DHCPv6 * diff --git a/slirp/src/ip.h b/slirp/src/ip.h index 73a4d2a3d2..1484de1176 100644 --- a/slirp/src/ip.h +++ b/slirp/src/ip.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip_icmp.h b/slirp/src/ip_icmp.h index a4e5b8b265..05d85c59dd 100644 --- a/slirp/src/ip_icmp.h +++ b/slirp/src/ip_icmp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/mbuf.h b/slirp/src/mbuf.h index e2d443418a..732c85c63c 100644 --- a/slirp/src/mbuf.h +++ b/slirp/src/mbuf.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ncsi-pkt.h b/slirp/src/ncsi-pkt.h index 3867feb1d3..4c0be39f6e 100644 --- a/slirp/src/ncsi-pkt.h +++ b/slirp/src/ncsi-pkt.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright Gavin Shan, IBM Corporation 2016. * diff --git a/slirp/src/qtailq.h b/slirp/src/qtailq.h index a89b0c439a..d8aa0e19a4 100644 --- a/slirp/src/qtailq.h +++ b/slirp/src/qtailq.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* $NetBSD: queue.h,v 1.52 2009/04/20 09:56:08 mschuett Exp $ */ =20 /* diff --git a/slirp/src/tcp.h b/slirp/src/tcp.h index 47aaea6c5b..79d3251bb5 100644 --- a/slirp/src/tcp.h +++ b/slirp/src/tcp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_timer.h b/slirp/src/tcp_timer.h index b25b3911d7..709f63987a 100644 --- a/slirp/src/tcp_timer.h +++ b/slirp/src/tcp_timer.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_var.h b/slirp/src/tcp_var.h index 27ef1a51cb..162be6e95e 100644 --- a/slirp/src/tcp_var.h +++ b/slirp/src/tcp_var.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcpip.h b/slirp/src/tcpip.h index 07dbf2c432..560a86417c 100644 --- a/slirp/src/tcpip.h +++ b/slirp/src/tcpip.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/udp.h b/slirp/src/udp.h index 3d29504caa..29c0297179 100644 --- a/slirp/src/udp.h +++ b/slirp/src/udp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/vmstate.h b/slirp/src/vmstate.h index 21157b5ec2..44efea7b50 100644 --- a/slirp/src/vmstate.h +++ b/slirp/src/vmstate.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * QEMU migration/snapshot declarations * diff --git a/slirp/src/cksum.c b/slirp/src/cksum.c index 25bfa67348..9599f6a280 100644 --- a/slirp/src/cksum.c +++ b/slirp/src/cksum.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1988, 1992, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/dhcpv6.c b/slirp/src/dhcpv6.c index df350e9f26..3c8f420912 100644 --- a/slirp/src/dhcpv6.c +++ b/slirp/src/dhcpv6.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * SLIRP stateless DHCPv6 * diff --git a/slirp/src/ip_icmp.c b/slirp/src/ip_icmp.c index 120108f582..1aea18afa7 100644 --- a/slirp/src/ip_icmp.c +++ b/slirp/src/ip_icmp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c index e0b94b0e42..6ad6765938 100644 --- a/slirp/src/ip_input.c +++ b/slirp/src/ip_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ip_output.c b/slirp/src/ip_output.c index f6ec141df5..9299997efb 100644 --- a/slirp/src/ip_output.c +++ b/slirp/src/ip_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/ncsi.c b/slirp/src/ncsi.c index 1169da8241..6d574ec5ec 100644 --- a/slirp/src/ncsi.c +++ b/slirp/src/ncsi.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * NC-SI (Network Controller Sideband Interface) "echo" model * diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c index b10477fc57..cf54eeee92 100644 --- a/slirp/src/tcp_input.c +++ b/slirp/src/tcp_input.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_output.c b/slirp/src/tcp_output.c index e9674df121..272c261d07 100644 --- a/slirp/src/tcp_output.c +++ b/slirp/src/tcp_output.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c index 1db59caa89..086e4e98e2 100644 --- a/slirp/src/tcp_subr.c +++ b/slirp/src/tcp_subr.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/tcp_timer.c b/slirp/src/tcp_timer.c index 7be54570af..be361a1bb6 100644 --- a/slirp/src/tcp_timer.c +++ b/slirp/src/tcp_timer.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/udp.c b/slirp/src/udp.c index fa9f4a08bd..27bb829c37 100644 --- a/slirp/src/udp.c +++ b/slirp/src/udp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/slirp/src/vmstate.c b/slirp/src/vmstate.c index 3bc23d1d73..43bb3ebc6f 100644 --- a/slirp/src/vmstate.c +++ b/slirp/src/vmstate.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * VMState interpreter * --=20 2.21.0.4.g36eb1cb9cf From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15525700568301001.3515873123421; Thu, 14 Mar 2019 06:27:36 -0700 (PDT) Received: from localhost ([127.0.0.1]:36868 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QOS-0001ku-M3 for importer@patchew.org; Thu, 14 Mar 2019 09:27:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QH0-00040S-M2 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q8p-0003PU-KE for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53394) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q8p-0003P6-AW for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:23 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 023617AEB6; Thu, 14 Mar 2019 13:11:22 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FE93600C1; Thu, 14 Mar 2019 13:11:18 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:45 +0100 Message-Id: <20190314131049.23175-5-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 14 Mar 2019 13:11:22 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 4/8] slirp: clarify license of slirp files using SPDX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, jan.kiszka@siemens.com, clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add SPDX license identifier to clarify the license of files with explicit MIT license header. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth --- slirp/src/util.h | 1 + slirp/src/arp_table.c | 1 + slirp/src/bootp.c | 1 + slirp/src/dnssearch.c | 1 + slirp/src/slirp.c | 1 + slirp/src/state.c | 1 + slirp/src/stream.c | 1 + slirp/src/tftp.c | 1 + slirp/src/util.c | 1 + 9 files changed, 9 insertions(+) diff --git a/slirp/src/util.h b/slirp/src/util.h index e94ee4e7f1..01f1e0e068 100644 --- a/slirp/src/util.h +++ b/slirp/src/util.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * Copyright (c) 2003-2008 Fabrice Bellard * Copyright (c) 2010-2019 Red Hat, Inc. diff --git a/slirp/src/arp_table.c b/slirp/src/arp_table.c index 58eafdcfd8..9d7a59eb2c 100644 --- a/slirp/src/arp_table.c +++ b/slirp/src/arp_table.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * ARP table * diff --git a/slirp/src/bootp.c b/slirp/src/bootp.c index d396849a05..b208e3b216 100644 --- a/slirp/src/bootp.c +++ b/slirp/src/bootp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * QEMU BOOTP/DHCP server * diff --git a/slirp/src/dnssearch.c b/slirp/src/dnssearch.c index c459cece8d..12c488971e 100644 --- a/slirp/src/dnssearch.c +++ b/slirp/src/dnssearch.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * Domain search option for DHCP (RFC 3397) * diff --git a/slirp/src/slirp.c b/slirp/src/slirp.c index 18af670a0a..169c85b906 100644 --- a/slirp/src/slirp.c +++ b/slirp/src/slirp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * libslirp glue * diff --git a/slirp/src/state.c b/slirp/src/state.c index c3e3f0b671..09cea3590e 100644 --- a/slirp/src/state.c +++ b/slirp/src/state.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * libslirp * diff --git a/slirp/src/stream.c b/slirp/src/stream.c index d114dde334..9c1764c0b7 100644 --- a/slirp/src/stream.c +++ b/slirp/src/stream.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * libslirp io streams * diff --git a/slirp/src/tftp.c b/slirp/src/tftp.c index 2d8f978786..2071dca2a6 100644 --- a/slirp/src/tftp.c +++ b/slirp/src/tftp.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * tftp.c - a simple, read-only tftp server for qemu * diff --git a/slirp/src/util.c b/slirp/src/util.c index 5ec2fa87ab..60bb200801 100644 --- a/slirp/src/util.c +++ b/slirp/src/util.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: MIT */ /* * util.c (mostly based on QEMU os-win32.c) * --=20 2.21.0.4.g36eb1cb9cf From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552570192958850.8209213927761; Thu, 14 Mar 2019 06:29:52 -0700 (PDT) Received: from localhost ([127.0.0.1]:36888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QQh-0003Th-T1 for importer@patchew.org; Thu, 14 Mar 2019 09:29:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QGz-0003bH-IG for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q8t-0003QZ-EQ for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37098) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q8s-0003Pk-03 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:26 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8009B8B95B; Thu, 14 Mar 2019 13:11:24 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAB9C600C1; Thu, 14 Mar 2019 13:11:23 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:46 +0100 Message-Id: <20190314131049.23175-6-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 14 Mar 2019 13:11:24 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 5/8] slirp: clarify license of slirp files using SPDX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, jan.kiszka@siemens.com, clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add SPDX license identifier to clarify the license of files with reference to BSD license from slirp COPYRIGHT file. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth --- slirp/src/debug.h | 1 + slirp/src/if.h | 1 + slirp/src/main.h | 1 + slirp/src/misc.h | 1 + slirp/src/sbuf.h | 1 + slirp/src/socket.h | 1 + slirp/src/if.c | 1 + slirp/src/mbuf.c | 1 + slirp/src/misc.c | 1 + slirp/src/sbuf.c | 1 + slirp/src/socket.c | 1 + 11 files changed, 11 insertions(+) diff --git a/slirp/src/debug.h b/slirp/src/debug.h index 44d922df37..2e503ad7fa 100644 --- a/slirp/src/debug.h +++ b/slirp/src/debug.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/if.h b/slirp/src/if.h index 69569c10df..8a60c4e052 100644 --- a/slirp/src/if.h +++ b/slirp/src/if.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/main.h b/slirp/src/main.h index f11d4572b7..a88774215f 100644 --- a/slirp/src/main.h +++ b/slirp/src/main.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/misc.h b/slirp/src/misc.h index c2ceadb591..4eaa2466d7 100644 --- a/slirp/src/misc.h +++ b/slirp/src/misc.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h index 1cb9a42834..ece616e317 100644 --- a/slirp/src/sbuf.h +++ b/slirp/src/sbuf.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/socket.h b/slirp/src/socket.h index e4d12cd591..10a0c78a26 100644 --- a/slirp/src/socket.h +++ b/slirp/src/socket.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/if.c b/slirp/src/if.c index 1830cc396c..b8cddebf66 100644 --- a/slirp/src/if.c +++ b/slirp/src/if.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/mbuf.c b/slirp/src/mbuf.c index 521c02c967..f079a86d78 100644 --- a/slirp/src/mbuf.c +++ b/slirp/src/mbuf.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski * diff --git a/slirp/src/misc.c b/slirp/src/misc.c index 937a418d4e..da41f3bb5f 100644 --- a/slirp/src/misc.c +++ b/slirp/src/misc.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c index 51a9f0cc7d..815823ffbe 100644 --- a/slirp/src/sbuf.c +++ b/slirp/src/sbuf.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * diff --git a/slirp/src/socket.c b/slirp/src/socket.c index f2428a3ae8..ad58262a06 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. * --=20 2.21.0.4.g36eb1cb9cf From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552570022119596.5658498382667; Thu, 14 Mar 2019 06:27:02 -0700 (PDT) Received: from localhost ([127.0.0.1]:36862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QNm-0001Gr-DB for importer@patchew.org; Thu, 14 Mar 2019 09:26:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QGz-0004BH-Co for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q94-0003WC-Dr for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60562) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q90-0003QI-PM for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:35 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B64A55859E; Thu, 14 Mar 2019 13:11:26 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41F4F6B8F4; Thu, 14 Mar 2019 13:11:25 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:47 +0100 Message-Id: <20190314131049.23175-7-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 14 Mar 2019 13:11:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 6/8] slirp: clarify license of slirp files using SPDX X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, jan.kiszka@siemens.com, clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add SPDX license identifier to clarify the license of files without explicit license header. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth --- slirp/src/bootp.h | 1 + slirp/src/ip6.h | 1 + slirp/src/ip6_icmp.h | 1 + slirp/src/libslirp.h | 1 + slirp/src/slirp.h | 1 + slirp/src/stream.h | 1 + slirp/src/tftp.h | 1 + slirp/src/ip6_icmp.c | 1 + slirp/src/ip6_input.c | 1 + slirp/src/ip6_output.c | 1 + slirp/src/ndp_table.c | 1 + slirp/src/udp6.c | 1 + 12 files changed, 12 insertions(+) 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 */ =20 #ifndef SLIRP_BOOTP_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/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 =20 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 =20 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_ =20 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 */ =20 #ifndef SLIRP_TFTP_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/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/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 --=20 2.21.0.4.g36eb1cb9cf From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552569908957840.2338228805207; Thu, 14 Mar 2019 06:25:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:36814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QM5-0008Rb-S7 for importer@patchew.org; Thu, 14 Mar 2019 09:25:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QGz-00044M-1r for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q9I-0003bT-HC for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37558) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q9C-0003SD-BT for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:48 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F2908553B; Thu, 14 Mar 2019 13:11:29 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDFAD6B8E8; Thu, 14 Mar 2019 13:11:28 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:48 +0100 Message-Id: <20190314131049.23175-8-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 14 Mar 2019 13:11:29 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 7/8] slirp: remove reference to COPYRIGHT file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, jan.kiszka@siemens.com, clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The slirp COPYRIGHT file is a BSD-3 license. Instead of referring to another project file, the SPDX license notice present in all source files states that unequivocally. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Eric Blake --- slirp/src/debug.h | 3 --- slirp/src/if.h | 3 --- slirp/src/main.h | 3 --- slirp/src/misc.h | 3 --- slirp/src/sbuf.h | 3 --- slirp/src/socket.h | 3 --- slirp/src/if.c | 3 --- slirp/src/ip_input.c | 3 --- slirp/src/ip_output.c | 3 --- slirp/src/mbuf.c | 3 --- slirp/src/misc.c | 3 --- slirp/src/sbuf.c | 3 --- slirp/src/socket.c | 3 --- slirp/src/tcp_input.c | 3 --- slirp/src/tcp_output.c | 3 --- slirp/src/tcp_subr.c | 3 --- 16 files changed, 48 deletions(-) diff --git a/slirp/src/debug.h b/slirp/src/debug.h index 2e503ad7fa..c95fd8ffd2 100644 --- a/slirp/src/debug.h +++ b/slirp/src/debug.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #ifndef DEBUG_H_ diff --git a/slirp/src/if.h b/slirp/src/if.h index 8a60c4e052..b71c37d6ea 100644 --- a/slirp/src/if.h +++ b/slirp/src/if.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #ifndef IF_H diff --git a/slirp/src/main.h b/slirp/src/main.h index a88774215f..3b3f883703 100644 --- a/slirp/src/main.h +++ b/slirp/src/main.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #ifndef SLIRP_MAIN_H diff --git a/slirp/src/misc.h b/slirp/src/misc.h index 4eaa2466d7..23b7490448 100644 --- a/slirp/src/misc.h +++ b/slirp/src/misc.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #ifndef MISC_H diff --git a/slirp/src/sbuf.h b/slirp/src/sbuf.h index ece616e317..337af1bbde 100644 --- a/slirp/src/sbuf.h +++ b/slirp/src/sbuf.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #ifndef SBUF_H diff --git a/slirp/src/socket.h b/slirp/src/socket.h index 10a0c78a26..25403898cd 100644 --- a/slirp/src/socket.h +++ b/slirp/src/socket.h @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #ifndef SLIRP_SOCKET_H diff --git a/slirp/src/if.c b/slirp/src/if.c index b8cddebf66..6eaac7292a 100644 --- a/slirp/src/if.c +++ b/slirp/src/if.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c index 6ad6765938..a714fecd58 100644 --- a/slirp/src/ip_input.c +++ b/slirp/src/ip_input.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP are * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/ip_output.c b/slirp/src/ip_output.c index 9299997efb..8560197cf6 100644 --- a/slirp/src/ip_output.c +++ b/slirp/src/ip_output.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP are * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/mbuf.c b/slirp/src/mbuf.c index f079a86d78..800406ca9e 100644 --- a/slirp/src/mbuf.c +++ b/slirp/src/mbuf.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 /* diff --git a/slirp/src/misc.c b/slirp/src/misc.c index da41f3bb5f..7c5db0e0aa 100644 --- a/slirp/src/misc.c +++ b/slirp/src/misc.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c index 815823ffbe..9c0b31b513 100644 --- a/slirp/src/sbuf.c +++ b/slirp/src/sbuf.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/socket.c b/slirp/src/socket.c index ad58262a06..4a3c935e25 100644 --- a/slirp/src/socket.c +++ b/slirp/src/socket.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/tcp_input.c b/slirp/src/tcp_input.c index cf54eeee92..50a1145ec9 100644 --- a/slirp/src/tcp_input.c +++ b/slirp/src/tcp_input.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/tcp_output.c b/slirp/src/tcp_output.c index 272c261d07..6bbaf6ca6f 100644 --- a/slirp/src/tcp_output.c +++ b/slirp/src/tcp_output.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" diff --git a/slirp/src/tcp_subr.c b/slirp/src/tcp_subr.c index 086e4e98e2..fde9207b0c 100644 --- a/slirp/src/tcp_subr.c +++ b/slirp/src/tcp_subr.c @@ -34,9 +34,6 @@ /* * Changes and additions relating to SLiRP * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ =20 #include "slirp.h" --=20 2.21.0.4.g36eb1cb9cf From nobody Thu Apr 25 15:41:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552569905185346.39939190326913; Thu, 14 Mar 2019 06:25:05 -0700 (PDT) Received: from localhost ([127.0.0.1]:36812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QM2-0008Gi-5V for importer@patchew.org; Thu, 14 Mar 2019 09:25:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4QGz-0003pF-9w for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:19:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4Q99-0003YE-23 for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4Q92-0003Tm-LV for qemu-devel@nongnu.org; Thu, 14 Mar 2019 09:11:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B672A3087E89; Thu, 14 Mar 2019 13:11:32 +0000 (UTC) Received: from localhost (ovpn-112-25.ams2.redhat.com [10.36.112.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 069471001DEF; Thu, 14 Mar 2019 13:11:30 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 14:10:49 +0100 Message-Id: <20190314131049.23175-9-marcandre.lureau@redhat.com> In-Reply-To: <20190314131049.23175-1-marcandre.lureau@redhat.com> References: <20190314131049.23175-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 14 Mar 2019 13:11:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 8/8] slirp: is not maintained by Kelly Price for a long time X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, quintela@redhat.com, jan.kiszka@siemens.com, clg@kaod.org, shan.gavin@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org, Kelly Price Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" slirp has been maintained by the QEMU maintainers and will be maintained under an independent project soon. Reviewed-by: Eric Blake Signed-off-by: Kelly Price Signed-off-by: Marc-Andr=C3=A9 Lureau --- slirp/COPYRIGHT | 2 -- 1 file changed, 2 deletions(-) diff --git a/slirp/COPYRIGHT b/slirp/COPYRIGHT index 9863ea31cb..ed49512dbc 100644 --- a/slirp/COPYRIGHT +++ b/slirp/COPYRIGHT @@ -1,8 +1,6 @@ Slirp was written by Danny Gasparovski. Copyright (c), 1995,1996 All Rights Reserved. =20 -Slirp is maintained by Kelly Price - Slirp is free software; "free" as in you don't have to pay for it, and you are free to do whatever you want with it. I do not accept any donations, monetary or otherwise, for Slirp. Instead, I would ask you to pass this --=20 2.21.0.4.g36eb1cb9cf