blob: a610abf9b56bfe3c005b1fe37b60be8dc172275b [file] [log] [blame]
Andrew Geisslerb7d28612020-07-24 16:15:54 -05001From 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