From patchwork Sun Mar 3 14:52:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 17840 X-Patchwork-Delegate: sw@simonwunderlich.de Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id D7C0D81B6C; Sun, 3 Mar 2019 15:52:26 +0100 (CET) Authentication-Results: open-mesh.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=narfation.org header.i=@narfation.org header.b="MLpPg1s/"; dkim-atps=neutral Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver= Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id C652781AB8 for ; Sun, 3 Mar 2019 15:52:24 +0100 (CET) Received: from sven-desktop.home.narfation.org (p200300C5974904FD0000000000008096.dip0.t-ipconnect.de [IPv6:2003:c5:9749:4fd::8096]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 613CC11010E; Sun, 3 Mar 2019 15:52:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1551624744; bh=xPkyFw+s5j5J6GxR+zok3SSR/t8dzd+7TPQRUYN9p+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MLpPg1s/cYWG2d43LLNjeoJrlaODNIvAuFin89SQNp815wXkroAbj+oe1ZDLL3BKa 6Vb5FDlLbjCBVr8FC65O4X9EPTtYMIT0DvwEtM2hWiJ3Kfik7D+DfWvox7J4bvh2vZ qQFJaxWht2ebpB4zWPCvQDK/ydRL1N2twaFYbfZg= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Sun, 3 Mar 2019 15:52:04 +0100 Message-Id: <20190303145207.19864-2-sven@narfation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190303145207.19864-1-sven@narfation.org> References: <20190303145207.19864-1-sven@narfation.org> MIME-Version: 1.0 Subject: [B.A.T.M.A.N.] [PATCH 1/4] alfred: Switch packet.h license to MIT X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" The ISC license is considered as not recommended in "Linux kernel licensing rules". It should only be used for existing code or for importing code from a different project with that license. Since we already use this license for the batman-adv related uapi headers, we should also use this for our packet.h. This fixes at the same time the SPDX license identifier which switched incorrectly to GPL-2.0 in commit ea81a05080bd ("alfred: Add SPDX license identifier above copyright header"). Signed-off-by: Sven Eckelmann --- packet.h | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/packet.h b/packet.h index 4378694..e2112e4 100644 --- a/packet.h +++ b/packet.h @@ -1,21 +1,27 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: MIT */ /* Copyright (C) 2012-2019 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * 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 SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * License-Filename: LICENSES/preferred/GPL-2.0 + * 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. + * + * License-Filename: LICENSES/preferred/MIT */ #ifndef _ALFRED_PACKET_H