From 2a999d7988d886b5e887988c68095addbbf9a794 Mon Sep 17 00:00:00 2001 From: Philipp Gesang Date: Sat, 3 Nov 2018 19:52:31 +0100 Subject: add linking exception to license --- COPYING | 15 +++++++++++++++ _oasis | 4 ++-- sid.ml | 2 +- sid.mli | 2 +- sid.opam | 2 +- sid_test.ml | 2 ++ util/sidparse.ml | 2 +- util/sidparse_test.sh | 1 + xxd.ml | 2 +- 9 files changed, 25 insertions(+), 7 deletions(-) diff --git a/COPYING b/COPYING index 0a04128..4c06ca6 100644 --- a/COPYING +++ b/COPYING @@ -1,3 +1,18 @@ +As a special exception to the GNU Library General Public License, you +may link, statically or dynamically, a "work that uses the Library" +with a publicly distributed version of the Library to produce an +executable file containing portions of the Library, and distribute +that executable file under terms of your choice, without any of the +additional requirements listed in clause 6 of the GNU Library General +Public License. By "a publicly distributed version of the Library", +we mean either the unmodified Library as distributed by upstream +author, or a modified version of the Library that is distributed under +the conditions defined in clause 3 of the GNU Library General Public +License. This exception does not however invalidate any other reasons +why the executable file might be covered by the GNU Library General +Public License. + +----------------------------------------------------------------------- GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/_oasis b/_oasis index 1d33f12..cbf7164 100644 --- a/_oasis +++ b/_oasis @@ -1,9 +1,9 @@ OASISFormat: 0.4 Name: sid Version: 0 -Synopsis: non +Synopsis: Handle security identifiers (SID). Authors: phg -License: GPL-3 +License: LGPL-3 with OCaml linking exception BuildTools: ocamlbuild Plugins: META (0.4), DevFiles (0.4) AlphaFeatures: ocamlbuild_more_args diff --git a/sid.ml b/sid.ml index 7051ee3..12d708a 100644 --- a/sid.ml +++ b/sid.ml @@ -1,4 +1,4 @@ -(* SPDX-License-Identifier: LGPL-3.0-only *) +(* SPDX-License-Identifier: LGPL-3.0-only WITH OCaml-LGPL-linking-exception *) module U64 = Stdint.Uint64 module U32 = Stdint.Uint32 diff --git a/sid.mli b/sid.mli index f8e34cb..e9b5c78 100644 --- a/sid.mli +++ b/sid.mli @@ -1,4 +1,4 @@ -(* SPDX-License-Identifier: LGPL-3.0-only *) +(* SPDX-License-Identifier: LGPL-3.0-only WITH OCaml-LGPL-linking-exception *) type t type sub_auths = Stdint.Uint32.t array diff --git a/sid.opam b/sid.opam index de937d7..6b250f2 100644 --- a/sid.opam +++ b/sid.opam @@ -6,7 +6,7 @@ maintainer: "Philipp Gesang " bug-reports: "https://gitlab.com/phgsng/ocaml-sid" homepage: "https://gitlab.com/phgsng/ocaml-sid" authors: [ "Philipp Gesang" ] -license: "LGPL-3.0-only" +license: "LGPL-3.0-only with OCaml linking exception" depends: [ "ocamlbuild" {build} "oasis" {build} diff --git a/sid_test.ml b/sid_test.ml index 686e7aa..97af2a3 100644 --- a/sid_test.ml +++ b/sid_test.ml @@ -1,3 +1,5 @@ +(* SPDX-License-Identifier: LGPL-3.0-only WITH OCaml-LGPL-linking-exception *) + open OUnit module U64 = Stdint.Uint64 diff --git a/util/sidparse.ml b/util/sidparse.ml index ba0efc2..8027692 100644 --- a/util/sidparse.ml +++ b/util/sidparse.ml @@ -1,4 +1,4 @@ -(* SPDX-License-Identifier: LGPL-3.0-only *) +(* SPDX-License-Identifier: LGPL-3.0-only WITH OCaml-LGPL-linking-exception *) let err q v = match q, v with diff --git a/util/sidparse_test.sh b/util/sidparse_test.sh index feeb9ce..374810d 100755 --- a/util/sidparse_test.sh +++ b/util/sidparse_test.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-3.0-only WITH OCaml-LGPL-linking-exception set -u diff --git a/xxd.ml b/xxd.ml index 5c3bad9..50e0072 100644 --- a/xxd.ml +++ b/xxd.ml @@ -1,4 +1,4 @@ -(* SPDX-License-Identifier: LGPL-3.0-only *) +(* SPDX-License-Identifier: LGPL-3.0-only WITH OCaml-LGPL-linking-exception *) let (!!) = Bytes.unsafe_of_string let (??) = Bytes.unsafe_to_string -- cgit v1.2.3