Merge pull request #630 from psafont/licenses

xapi-project · Mar 7, 2023 · 4345996 · 4345996
2 parents 34595e1 + f8cb65f
commit 4345996
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 11 deletions.
diff --git a/.github/known-licenses.txt b/.github/known-licenses.txt
@@ -0,0 +1,22 @@
+Apache-1.0
+Apache-2.0
+BSD-2-Clause
+BSD-3-Clause
+curl
+GPL-1.0-or-later
+GPL-2.0-only
+GPL-3.0-only
+ISC
+MIT
+MPL-2.0
+PSF-2.0
+LGPL-2.0-or-later
+LGPL-2.1-only
+LGPL-2.0-only WITH OCaml-LGPL-linking-exception
+LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception
+LGPL-2.1-only WITH OCaml-LGPL-linking-exception
+LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
+LGPL-3.0-only WITH OCaml-LGPL-linking-exception
+LGPL-2.1-or-later WITH OpenSSL-linking-exception
+GPL-2.0-only AND LGPL-3.0-only
+MIT AND LGPL-2.1-only WITH OCaml-LGPL-linking-exception
diff --git a/packages/upstream/angstrom.0.15.0/opam b/packages/upstream/angstrom.0.15.0/opam
@@ -12,7 +12,7 @@ with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by
 default and support unbounded lookahead."""
 maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
 authors: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
-license: "BSD-3-clause"
+license: "BSD-3-Clause"
 homepage: "https://github.com/inhabitedtype/angstrom"
 bug-reports: "https://github.com/inhabitedtype/angstrom/issues"
 depends: [

diff --git a/packages/upstream/bigstringaf.0.9.0/opam b/packages/upstream/bigstringaf.0.9.0/opam
@@ -14,7 +14,7 @@ Bigstrings and other string-like types.
 So here they are. Go crazy."""
 maintainer: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
 authors: "Spiros Eliopoulos <spiros@inhabitedtype.com>"
-license: "BSD-3-clause"
+license: "BSD-3-Clause"
 homepage: "https://github.com/inhabitedtype/bigstringaf"
 bug-reports: "https://github.com/inhabitedtype/bigstringaf/issues"
 depends: [

diff --git a/packages/upstream/conf-libcurl.2/opam b/packages/upstream/conf-libcurl.2/opam
@@ -6,7 +6,7 @@ description:
   "This package can only install if the libcurl is installed on the system."
 maintainer: "blue-prawn"
 authors: "Daniel Stenberg"
-license: "BSD-like"
+license: "curl"
 homepage: "http://curl.haxx.se/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 flags: conf

diff --git a/packages/upstream/conf-python-2-7.1.2/opam b/packages/upstream/conf-python-2-7.1.2/opam
@@ -7,7 +7,7 @@ This package can only install if the Python-2.7 interpreter is available
 on the system."""
 maintainer: "unixjunkie@sdf.org"
 authors: "Python Software Foundation"
-license: "PSF"
+license: "PSF-2.0"
 homepage: "https://www.python.org/download/releases/2.7/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 flags: conf

diff --git a/packages/upstream/conf-xen.1/opam b/packages/upstream/conf-xen.1/opam
@@ -6,7 +6,7 @@ description:
   "This package can only install if the Xen headers are installed on the system."
 maintainer: "hannes@mehnert.org"
 authors: "hannes@mehnert.org"
-license: ["GPL-2.0-only" "LGPL-3.0-only"]
+license: "GPL-2.0-only AND LGPL-3.0-only"
 homepage: "https://xenproject.org/"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
 available: os != "macos"

diff --git a/packages/upstream/lwt_ssl.1.1.3/opam b/packages/upstream/lwt_ssl.1.1.3/opam
@@ -4,7 +4,7 @@ version: "1.1.3"
 synopsis: "OpenSSL binding with concurrent I/O"
 maintainer: "Anton Bachin <antonbachin@yahoo.com>"
 authors: ["Jérôme Vouillon" "Jérémie Dimino"]
-license: "LGPL with OpenSSL linking exception"
+license: "LGPL-2.1-or-later WITH OpenSSL-linking-exception"
 homepage: "https://github.com/ocsigen/lwt_ssl"
 doc: "https://github.com/ocsigen/lwt_ssl/blob/master/src/lwt_ssl.mli"
 bug-reports: "https://github.com/ocsigen/lwt_ssl/issues"

diff --git a/packages/upstream/menhir.20220210/opam b/packages/upstream/menhir.20220210/opam
@@ -7,7 +7,7 @@ authors: [
   "François Pottier <francois.pottier@inria.fr>"
   "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
 ]
-license: "LGPL-2.0-only with OCaml-LGPL-linking-exception"
+license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception"
 homepage: "http://gitlab.inria.fr/fpottier/menhir"
 bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues"
 depends: [

diff --git a/packages/upstream/menhirLib.20220210/opam b/packages/upstream/menhirLib.20220210/opam
@@ -7,7 +7,7 @@ authors: [
   "François Pottier <francois.pottier@inria.fr>"
   "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
 ]
-license: "LGPL-2.0-only with OCaml-LGPL-linking-exception"
+license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception"
 homepage: "http://gitlab.inria.fr/fpottier/menhir"
 bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues"
 depends: [

diff --git a/packages/upstream/menhirSdk.20220210/opam b/packages/upstream/menhirSdk.20220210/opam
@@ -7,7 +7,7 @@ authors: [
   "François Pottier <francois.pottier@inria.fr>"
   "Yann Régis-Gianas <yrg@pps.univ-paris-diderot.fr>"
 ]
-license: "LGPL-2.0-only with OCaml-LGPL-linking-exception"
+license: "LGPL-2.0-only WITH OCaml-LGPL-linking-exception"
 homepage: "http://gitlab.inria.fr/fpottier/menhir"
 bug-reports: "https://gitlab.inria.fr/fpottier/menhir/-/issues"
 depends: [

diff --git a/packages/upstream/mirage-profile.0.9.1/opam b/packages/upstream/mirage-profile.0.9.1/opam
@@ -18,7 +18,7 @@ these calls away, meaning there should be no overhead in the non-profiling
 case."""
 maintainer: "Thomas Leonard <talex5@gmail.com>"
 authors: "Thomas Leonard <talex5@gmail.com>"
-license: "BSD-2-clause"
+license: "BSD-2-Clause"
 homepage: "https://github.com/mirage/mirage-profile"
 doc: "https://mirage.github.io/mirage-profile/"
 bug-reports: "https://github.com/mirage/mirage-profile/issues"

diff --git a/packages/upstream/systemd.1.2/opam b/packages/upstream/systemd.1.2/opam
@@ -5,7 +5,7 @@ synopsis: "OCaml module for native access to the systemd facilities"
 description: "OCaml library allowing interaction with systemd and journald"
 maintainer: "Juergen Hoetzel <juergen@archlinux.org>"
 authors: "Juergen Hoetzel <juergen@archlinux.org>"
-license: "LGPL-3 with OCaml linking exception"
+license: "LGPL-3.0-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/juergenhoetzel/ocaml-systemd/"
 bug-reports: "https://github.com/mirage/mirage/issues/"
 depends: [

diff --git a/tools/license-check.sh b/tools/license-check.sh
@@ -12,6 +12,11 @@ do
     echo "ERROR: Package $name does not have a license"
     errors=true
   fi
+  license=$(grep -Po 'license: \K.*' $file| tr -d '"')
+  if echo $license | grep -qxvf .github/known-licenses.txt; then 
+    echo "Unrecognised license used for $name: $license. Is it a valid a SPDX identifier?"
+    errors=true
+  fi
 done
 
 if $errors; then