From c2b33f1ad8e208a35cede67e6fcc360848a16e642b001257a86bfac9936d4cb8 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Mon, 19 Nov 2018 07:56:13 +0000 Subject: [PATCH] - Add Fixed-licenses-of-files.patch from upstream that fixes license issues (bsc#1086923) OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=29 --- Fixed-licenses-of-files.patch | 105 ++++++++++++++++++++++++++++++++++ mstflint.changes | 6 ++ mstflint.spec | 2 + 3 files changed, 113 insertions(+) create mode 100644 Fixed-licenses-of-files.patch diff --git a/Fixed-licenses-of-files.patch b/Fixed-licenses-of-files.patch new file mode 100644 index 0000000..f31a856 --- /dev/null +++ b/Fixed-licenses-of-files.patch @@ -0,0 +1,105 @@ +commit 053e885be87acdb3a080ff872bc73c495a40042e +Author: Dan Goldberg +Date: Sun Nov 18 10:57:18 2018 +0200 + + Fixed licenses of files. + + The license of mstflint is GPL/BSD. + All of the files were aligned accordingly. + + Signed-off-by: Nicolas Morey-Chaisemartin + +diff --git tools_layouts/reg_access_hca_layouts.c tools_layouts/reg_access_hca_layouts.c +index 47f6c3fb5e27..ad43dba8fa14 100644 +--- tools_layouts/reg_access_hca_layouts.c ++++ tools_layouts/reg_access_hca_layouts.c +@@ -1,15 +1,34 @@ + +-/* - Mellanox Confidential and Proprietary - ++/* ++ * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. + * +- * Copyright (C) 2010-2011, Mellanox Technologies Ltd. ALL RIGHTS RESERVED. ++ * This software is available to you under a choice of one of two ++ * licenses. You may choose to be licensed under the terms of the GNU ++ * General Public License (GPL) Version 2, available from the file ++ * COPYING in the main directory of this source tree, or the ++ * OpenIB.org BSD license below: + * +- * Except as specifically permitted herein, no portion of the information, +- * including but not limited to object code and source code, may be reproduced, +- * modified, distributed, republished or otherwise exploited in any form or by +- * any means for any purpose without the prior written permission of Mellanox +- * Technologies Ltd. Use of software subject to the terms and conditions +- * detailed in the file "LICENSE.txt". ++ * Redistribution and use in source and binary forms, with or ++ * without modification, are permitted provided that the following ++ * conditions are met: + * ++ * - Redistributions of source code must retain the above ++ * copyright notice, this list of conditions and the following ++ * disclaimer. ++ * ++ * - 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. ++ * ++ * 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. + */ + + +diff --git tools_layouts/reg_access_hca_layouts.h tools_layouts/reg_access_hca_layouts.h +index 8748ed60267c..2bf71de10e5a 100644 +--- tools_layouts/reg_access_hca_layouts.h ++++ tools_layouts/reg_access_hca_layouts.h +@@ -1,15 +1,34 @@ + +-/* - Mellanox Confidential and Proprietary - ++/* ++ * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. + * +- * Copyright (C) 2010-2011, Mellanox Technologies Ltd. ALL RIGHTS RESERVED. ++ * This software is available to you under a choice of one of two ++ * licenses. You may choose to be licensed under the terms of the GNU ++ * General Public License (GPL) Version 2, available from the file ++ * COPYING in the main directory of this source tree, or the ++ * OpenIB.org BSD license below: + * +- * Except as specifically permitted herein, no portion of the information, +- * including but not limited to object code and source code, may be reproduced, +- * modified, distributed, republished or otherwise exploited in any form or by +- * any means for any purpose without the prior written permission of Mellanox +- * Technologies Ltd. Use of software subject to the terms and conditions +- * detailed in the file "LICENSE.txt". ++ * Redistribution and use in source and binary forms, with or ++ * without modification, are permitted provided that the following ++ * conditions are met: + * ++ * - Redistributions of source code must retain the above ++ * copyright notice, this list of conditions and the following ++ * disclaimer. ++ * ++ * - 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. ++ * ++ * 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. + */ + + diff --git a/mstflint.changes b/mstflint.changes index f3f6d82..073e458 100644 --- a/mstflint.changes +++ b/mstflint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 19 07:52:54 UTC 2018 - nmoreychaisemartin@suse.com + +- Add Fixed-licenses-of-files.patch from upstream that + fixes license issues (bsc#1086923) + ------------------------------------------------------------------- Mon Oct 15 07:35:36 UTC 2018 - nmoreychaisemartin@suse.com diff --git a/mstflint.spec b/mstflint.spec index 1706d66..9fbdbfc 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -32,6 +32,7 @@ Patch2: Add-s390-s390x-support.patch Patch3: Add-armv6-and-armv7-support.patch Patch4: Fix-gcc7-and-gcc8.patch Patch5: fix-race-condition-during-install.patch +Patch6: Fixed-licenses-of-files.patch BuildRequires: gcc-c++ BuildRequires: infiniband-diags-devel BuildRequires: libibverbs-devel @@ -55,6 +56,7 @@ the downloads page at the Mellanox web site. %patch3 %patch4 %patch5 +%patch6 %build ./autogen.sh