From 708126e40c9fd01e4b8e58e54e4141887e8fc4d9 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Tue, 10 Sep 2024 11:52:08 +0100 Subject: [PATCH] Use more conventional `LICENSE_EXCEPTION` filename --- LICENSE-OpenSSL | 4 ---- LICENSE_EXCEPTION | 12 ++++++++++++ README.md | 3 +-- 3 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 LICENSE-OpenSSL create mode 100644 LICENSE_EXCEPTION diff --git a/LICENSE-OpenSSL b/LICENSE-OpenSSL deleted file mode 100644 index 18a6754e9..000000000 --- a/LICENSE-OpenSSL +++ /dev/null @@ -1,4 +0,0 @@ -In addition, as a special exception, the copyright holders give permission to link the code of this -project with the OpenSSL library (or with modified versions of OpenSSL that use the same license), -and distribute the linked executables. You must comply with the terms of the license of OpenSSL in -all respects for all of the code used other than OpenSSL. diff --git a/LICENSE_EXCEPTION b/LICENSE_EXCEPTION new file mode 100644 index 000000000..0a771c374 --- /dev/null +++ b/LICENSE_EXCEPTION @@ -0,0 +1,12 @@ +LICENSE EXCEPTION FOR OPENSSL + +In addition, as a special exception, the copyright holders give +permission to link the code of portions of this program with the OpenSSL +library. + +You must obey the GNU General Public License in all respects for all of +the code used other than OpenSSL. If you modify file(s) with this +exception, you may extend this exception to your version of the file(s), +but you are not obligated to do so. If you do not wish to do so, delete +this exception statement from your version. If you delete this exception +statement from all source files in the program, then also delete it here. diff --git a/README.md b/README.md index 936009927..283385488 100644 --- a/README.md +++ b/README.md @@ -249,5 +249,4 @@ versions across them and gathering other information. ## License -This project is licensed under [GPL-2.0](LICENSE), with a special exception for linking with -OpenSSL as detailed in the [LICENSE-OpenSSL](LICENSE-OpenSSL) file. +This project is licensed under [GPL-2.0](LICENSE) with an OpenSSL [exception](LICENSE_EXCEPTION).