Charade -> Chardet and Add cacert.pem license #1934

Merged
merged 2 commits into from Mar 2, 2014

2 participants

@sigmavirus24
Collaborator
  • Charade is gone, long live Chardet.
  • cacert.pem is now taken wholesale from Mozilla so we need to display that itis licensed under the MPL2.0

Closes #1933

@sigmavirus24 sigmavirus24 Charade -> Chardet and Add cacert.pem license
- Charade is gone, long live Chardet.
- cacert.pem is now taken wholesale from Mozilla so we need to display that
  itis licensed under the MPL2.0
9b20cad
@Lukasa Lukasa was assigned by sigmavirus24 Feb 28, 2014
@sigmavirus24
Collaborator

@Lukasa this is essentially a documentation change. I included the other information about cacert.pem but I'm not sure it is entirely necessary in the NOTICE file. I'll happily remove it if you share the same doubts.

@Lukasa Lukasa commented on an outdated diff Feb 28, 2014
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-02110-1301
-
+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/.
+
+Issuer: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+Subject: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+Label: "GTE CyberTrust Global Root"
+Serial: 421
+MD5 Fingerprint: ca:3d:d3:68:f1:03:5c:d0:32:fa:b8:2b:59:e8:5a:db
+SHA1 Fingerprint: 97:81:79:50:d8:1c:96:70:cc:34:d8:09:cf:79:44:31:36:7e:f4:74
+SHA256 Fingerprint: a5:31:25:18:8d:21:10:aa:96:4b:02:c7:b7:c6:da:32:03:17:08:94:e5:fb:71:ff:fb:66:67:d5:e6:81:0a:36
@Lukasa
Collaborator
Lukasa added a line comment Feb 28, 2014

This was a bit enthusiastic. =)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@Lukasa
Collaborator

That extra bit of cacert.pem you included is actually part of the first certificate. =) We don't need it.

@sigmavirus24
Collaborator

That extra bit of cacert.pem you included is actually part of the first certificate. =) We don't need it

Thought so ;). Fixed in 64f0b3c

@Lukasa
Collaborator

Awesome, let's do it.

@Lukasa Lukasa merged commit 9a14086 into master Mar 2, 2014

1 check passed

Details default Merged build finished.
@Lukasa Lukasa deleted the update-notice branch Mar 2, 2014
@sigmavirus24
Collaborator

🍰

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment