summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhengruoqin <zhengrq.fnst@cn.fujitsu.com>2020-07-08 14:14:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-12 12:21:48 +0100
commitca7423ec13de4af218993d42bd9279c65104bd72 (patch)
tree5bfd969a263e171ac6759fcefde7e16acd8cf477
parent8f02ab63160ddd234a8a0c028696be23388cd61e (diff)
downloadpoky-ca7423ec13de4af218993d42bd9279c65104bd72.tar.gz
gnutls: Fix krb5 code license to GPLv2.1+ to match the LICENSE file.
This was discussed and accepted upstream by the project so their license is consistent. Please reference to https://gitlab.com/gnutls/gnutls/-/issues/1018 and https://gitlab.com/gnutls/gnutls/-/merge_requests/1285. (From OE-Core rev: 267d07301c79c24969c169add05284f612c41d77) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch90
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.6.14.bb1
2 files changed, 91 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch b/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch
new file mode 100644
index 0000000000..a610abf9b5
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch
@@ -0,0 +1,90 @@
1From c0ae3f659c6c130d151378ba4d7d861e3b7b970f Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Wed, 8 Jul 2020 14:50:27 +0900
4Subject: [PATCH] Modied the license to GPLv2.1+ to keep with LICENSE file.
5
6Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
7Please reference to https://gitlab.com/gnutls/gnutls/-/issues/1018.
8Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/merge_requests/1285].
9---
10 lib/x509/krb5.c | 20 +++++++++++---------
11 lib/x509/krb5.h | 20 +++++++++++---------
12 2 files changed, 22 insertions(+), 18 deletions(-)
13
14diff --git a/lib/x509/krb5.c b/lib/x509/krb5.c
15index 7fe84e6..d68c737 100644
16--- a/lib/x509/krb5.c
17+++ b/lib/x509/krb5.c
18@@ -1,21 +1,23 @@
19 /*
20 * Copyright (C) 2015 Red Hat, Inc.
21 *
22+ * Author: Nikos Mavrogiannopoulos
23+ *
24 * This file is part of GnuTLS.
25 *
26- * GnuTLS is free software: you can redistribute it and/or modify it
27- * under the terms of the GNU General Public License as published by
28- * the Free Software Foundation, either version 3 of the License, or
29- * (at your option) any later version.
30+ * The GnuTLS is free software; you can redistribute it and/or
31+ * modify it under the terms of the GNU Lesser General Public License
32+ * as published by the Free Software Foundation; either version 2.1 of
33+ * the License, or (at your option) any later version.
34 *
35- * GnuTLS is distributed in the hope that it will be useful, but
36+ * This library is distributed in the hope that it will be useful, but
37 * WITHOUT ANY WARRANTY; without even the implied warranty of
38 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
39- * General Public License for more details.
40+ * Lesser General Public License for more details.
41+ *
42+ * You should have received a copy of the GNU Lesser General Public License
43+ * along with this program. If not, see <https://www.gnu.org/licenses/>
44 *
45- * You should have received a copy of the GNU General Public License
46- * along with this program. If not, see
47- * <https://www.gnu.org/licenses/>.
48 */
49
50 #include <config.h>
51diff --git a/lib/x509/krb5.h b/lib/x509/krb5.h
52index d8926af..815bb28 100644
53--- a/lib/x509/krb5.h
54+++ b/lib/x509/krb5.h
55@@ -1,21 +1,23 @@
56 /*
57 * Copyright (C) 2015 Red Hat, Inc.
58 *
59+ * Author: Nikos Mavrogiannopoulos
60+ *
61 * This file is part of GnuTLS.
62 *
63- * GnuTLS is free software: you can redistribute it and/or modify it
64- * under the terms of the GNU General Public License as published by
65- * the Free Software Foundation, either version 3 of the License, or
66- * (at your option) any later version.
67+ * The GnuTLS is free software; you can redistribute it and/or
68+ * modify it under the terms of the GNU Lesser General Public License
69+ * as published by the Free Software Foundation; either version 2.1 of
70+ * the License, or (at your option) any later version.
71 *
72- * GnuTLS is distributed in the hope that it will be useful, but
73+ * This library is distributed in the hope that it will be useful, but
74 * WITHOUT ANY WARRANTY; without even the implied warranty of
75 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
76- * General Public License for more details.
77+ * Lesser General Public License for more details.
78+ *
79+ * You should have received a copy of the GNU Lesser General Public License
80+ * along with this program. If not, see <https://www.gnu.org/licenses/>
81 *
82- * You should have received a copy of the GNU General Public License
83- * along with this program. If not, see
84- * <https://www.gnu.org/licenses/>.
85 */
86
87 #ifndef GNUTLS_LIB_X509_KRB5_H
88--
892.17.1
90
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.14.bb b/meta/recipes-support/gnutls/gnutls_3.6.14.bb
index a285e5a1f1..cc0454a561 100644
--- a/meta/recipes-support/gnutls/gnutls_3.6.14.bb
+++ b/meta/recipes-support/gnutls/gnutls_3.6.14.bb
@@ -19,6 +19,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
19 19
20SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ 20SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \
21 file://arm_eabi.patch \ 21 file://arm_eabi.patch \
22 file://0001-Modied-the-license-to-GPLv2.1-to-keep-with-LICENSE-f.patch \
22" 23"
23 24
24SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63" 25SRC_URI[sha256sum] = "5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63"