From cfa1c704e3732c2e6bd9bc2e702f56e6d40d86af Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Wed, 18 Sep 2024 15:49:16 -0400 Subject: [PATCH] webpki-roots/webpki-root-certs: fix LICENSE files These crates mistakenly had license files included for Apache and MIT licenses. Both are derived works under an MPL 2.0 license. --- LICENSE-MPL | 21 +++++++++++++++++++++ README.md | 3 ++- webpki-root-certs/LICENSE | 1 + webpki-root-certs/LICENSE-APACHE | 1 - webpki-root-certs/LICENSE-MIT | 1 - webpki-roots/LICENSE | 1 + webpki-roots/LICENSE-APACHE | 1 - webpki-roots/LICENSE-MIT | 1 - 8 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 LICENSE-MPL create mode 120000 webpki-root-certs/LICENSE delete mode 120000 webpki-root-certs/LICENSE-APACHE delete mode 120000 webpki-root-certs/LICENSE-MIT create mode 120000 webpki-roots/LICENSE delete mode 120000 webpki-roots/LICENSE-APACHE delete mode 120000 webpki-roots/LICENSE-MIT diff --git a/LICENSE-MPL b/LICENSE-MPL new file mode 100644 index 0000000..54814b6 --- /dev/null +++ b/LICENSE-MPL @@ -0,0 +1,21 @@ +This packge contains a modified version of ca-bundle.crt: + +ca-bundle.crt -- Bundle of CA Root Certificates + +Certificate data from Mozilla as of: Thu Nov 3 19:04:19 2011# +This is a bundle of X.509 certificates of public Certificate Authorities +(CA). These were automatically extracted from Mozilla's root certificates +file (certdata.txt). This file can be found in the mozilla source tree: +http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1# +It contains the certificates in PEM format and therefore +can be directly used with curl / libcurl / php_curl, or with +an Apache+mod_ssl webserver for SSL client authentication. +Just configure this file as the SSLCACertificateFile.# + +***** BEGIN LICENSE BLOCK ***** +This Source Code Form is subject to the terms of the Mozilla Public License, +v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain +one at http://mozilla.org/MPL/2.0/. + +***** END LICENSE BLOCK ***** +@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $ diff --git a/README.md b/README.md index b5489e9..919fee3 100644 --- a/README.md +++ b/README.md @@ -28,4 +28,5 @@ and revocation data. # License The underlying data is MPL-licensed, and the data in `webpki-roots` and `webpki-root-certs` -is therefore a derived work. +is therefore a derived work. The tooling in `webpki-ccadb` is licensed under +both MIT and Apache licenses. diff --git a/webpki-root-certs/LICENSE b/webpki-root-certs/LICENSE new file mode 120000 index 0000000..0fa4726 --- /dev/null +++ b/webpki-root-certs/LICENSE @@ -0,0 +1 @@ +../LICENSE-MPL \ No newline at end of file diff --git a/webpki-root-certs/LICENSE-APACHE b/webpki-root-certs/LICENSE-APACHE deleted file mode 120000 index 965b606..0000000 --- a/webpki-root-certs/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-APACHE \ No newline at end of file diff --git a/webpki-root-certs/LICENSE-MIT b/webpki-root-certs/LICENSE-MIT deleted file mode 120000 index 76219eb..0000000 --- a/webpki-root-certs/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-MIT \ No newline at end of file diff --git a/webpki-roots/LICENSE b/webpki-roots/LICENSE new file mode 120000 index 0000000..0fa4726 --- /dev/null +++ b/webpki-roots/LICENSE @@ -0,0 +1 @@ +../LICENSE-MPL \ No newline at end of file diff --git a/webpki-roots/LICENSE-APACHE b/webpki-roots/LICENSE-APACHE deleted file mode 120000 index 965b606..0000000 --- a/webpki-roots/LICENSE-APACHE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-APACHE \ No newline at end of file diff --git a/webpki-roots/LICENSE-MIT b/webpki-roots/LICENSE-MIT deleted file mode 120000 index 76219eb..0000000 --- a/webpki-roots/LICENSE-MIT +++ /dev/null @@ -1 +0,0 @@ -../LICENSE-MIT \ No newline at end of file