OpenSSL exception as agreed, with new SPDX expression

Licence text approved by co-contributor Mark Wooding in personal
email.

DPDX expression roughly following
  https://spdx.github.io/spdx-spec/v2.3/using-SPDX-short-identifiers-in-source-files/
which doesn't contemplate using LicenseRef for an exception, but I
think the meaning is clear, and it is useful to do it this way.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/copyright b/debian/copyright
index 102f2f2ee7ea14f8248cfc6f0b0ca48a0002439e..1ca4aecf084365bec165db3df632fe992ab30f59 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,10 +43,11 @@ header, probably something like this:
 // There is NO WARRANTY.
 
 
-Hippotat-OpenSSL-Exception
---------------------------
+OpenSSL Licence Exception
+-------------------------
 
-Additional permission under GNU GPL version 3 section 7:
+Additional permission under GNU GPL version 3 section 7
+[LicenseRef-Hippotat-OpenSSL-Exception]:
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with the OpenSSL
@@ -65,7 +66,8 @@ Additional permission under GNU GPL version 3 section 7:
 
 This additional permission is indicated in the source code with
 the following SPDX licence declaration:
-    SPDX-License-Identifier: GPL-3.0-or-later WITH Hippotat-OpenSSL-Exception
+    SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
+(which is roughly but not exactly in accordance with the SPDX spec.)
 
 If you modify a file, you may extend this exception to your version of
 the file, but you are not obligated to do so. If you do not wish to do

diff --git a/src/ini.rs b/src/ini.rs
index 4d5d1e806e49a20f17beab4ea0a4c741399c0106..de6ea8e13efdbfce770f9ff5e2fc58e53eacd11c 100644 (file)
--- a/src/ini.rs
+++ b/src/ini.rs
@@ -1,5 +1,5 @@
 // Copyright 2021-2022 Ian Jackson and contributors to Hippotat
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Hippotat-OpenSSL-Exception
+// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception
 // There is NO WARRANTY.
 
 use crate::prelude::*;