20140927 (patches unapplied)

Imported using git-ubuntu import.
This commit is contained in:
Michael Shuler 2014-09-27 15:14:00 -05:00 committed by git-ubuntu importer
parent 7816079f6c
commit a862c0c6ad
Notes: git-ubuntu importer 2020-07-14 23:29:24 +00:00
  * Update Mozilla certificate authority bundle to version 2.1.
    The following certificate authorities were added (+):
    + "DigiCert Assured ID Root G2"
    + "DigiCert Assured ID Root G3"
    + "DigiCert Global Root G2"
    + "DigiCert Global Root G3"
    + "DigiCert Trusted Root G4"
    + "QuoVadis Root CA 1 G3"
    + "QuoVadis Root CA 2 G3"
    + "QuoVadis Root CA 3 G3"
    + "WoSign"
    + "WoSign China"
    The following certificate authorities were removed (-):
    - "Entrust.net Secure Server CA"
    - "RSA Root Certificate 1"
    - "TDC Internet Root CA"
    - "ValiCert Class 1 VA"
    - "ValiCert Class 2 VA"
  * Include clear list of CAs added/removed, as above, and include better note
    in README.Debian for trust reconfiguration.  Closes: #743365
  * Remove debian/config in debian/rules clean target.
  * Include d/{changelog,NEWS} entries in 20140223 for duplicate CKA_LABEL
    rename of "StartCom Certification Authority"_2.
7 changed files with 1721 additions and 1094 deletions

26
debian/NEWS vendored
View file

@ -1,3 +1,26 @@
ca-certificates (20140927) unstable; urgency=medium
Update Mozilla Certificate Authority bundle to version 2.1.
The following Certificate Authorities were added (+):
+ "DigiCert Assured ID Root G2"
+ "DigiCert Assured ID Root G3"
+ "DigiCert Global Root G2"
+ "DigiCert Global Root G3"
+ "DigiCert Trusted Root G4"
+ "QuoVadis Root CA 1 G3"
+ "QuoVadis Root CA 2 G3"
+ "QuoVadis Root CA 3 G3"
+ "WoSign"
+ "WoSign China"
The following Certificate Authorities were removed (-):
- "Entrust.net Secure Server CA"
- "RSA Root Certificate 1"
- "TDC Internet Root CA"
- "ValiCert Class 1 VA"
- "ValiCert Class 2 VA"
-- Michael Shuler <michael@pbandjelly.org> Sat, 27 Sep 2014 15:16:51 -0500
ca-certificates (20140325) unstable; urgency=medium
Update mozilla/certdata.txt to version 1.97+revert_of_936304
@ -23,6 +46,9 @@ ca-certificates (20140223) unstable; urgency=medium
+ "Atos TrustedRoot 2011"
+ "E-Tugra Certification Authority"
+ "SG TRUST SERVICES RACINE"
+ "StartCom Certification Authority"
~ "StartCom Certification Authority"_2
(both StartCom CAs now included with duplicate CKA_LABEL fix)
+ "T-TeleSec GlobalRoot Class 2"
+ "TWCA Global Root CA"
+ "TeliaSonera Root CA v1"

View file

@ -15,7 +15,9 @@ The CA certificates contained in this package are installed into
The configuration file /etc/ca-certificates.conf is seeded with
trust information through Debconf. Just call 'dpkg-reconfigure
ca-certificates' to adjust the settings.
ca-certificates' to adjust the settings to trust or disable the installed
certificate authorities. By default, all installed certificate authorities
are configured to be trusted.
'update-ca-certificates' will then update /etc/ssl/certs/ which may be
used by various software in Debian. It will also generate the hash

31
debian/changelog vendored
View file

@ -1,3 +1,31 @@
ca-certificates (20140927) unstable; urgency=medium
* Update Mozilla certificate authority bundle to version 2.1.
The following certificate authorities were added (+):
+ "DigiCert Assured ID Root G2"
+ "DigiCert Assured ID Root G3"
+ "DigiCert Global Root G2"
+ "DigiCert Global Root G3"
+ "DigiCert Trusted Root G4"
+ "QuoVadis Root CA 1 G3"
+ "QuoVadis Root CA 2 G3"
+ "QuoVadis Root CA 3 G3"
+ "WoSign"
+ "WoSign China"
The following certificate authorities were removed (-):
- "Entrust.net Secure Server CA"
- "RSA Root Certificate 1"
- "TDC Internet Root CA"
- "ValiCert Class 1 VA"
- "ValiCert Class 2 VA"
* Include clear list of CAs added/removed, as above, and include better note
in README.Debian for trust reconfiguration. Closes: #743365
* Remove debian/config in debian/rules clean target.
* Include d/{changelog,NEWS} entries in 20140223 for duplicate CKA_LABEL
rename of "StartCom Certification Authority"_2.
-- Michael Shuler <michael@pbandjelly.org> Sat, 27 Sep 2014 15:14:00 -0500
ca-certificates (20140325) unstable; urgency=medium
* Update mozilla/certdata.txt to version 1.97+revert_of_936304
@ -27,6 +55,9 @@ ca-certificates (20140223) unstable; urgency=medium
+ "Atos TrustedRoot 2011"
+ "E-Tugra Certification Authority"
+ "SG TRUST SERVICES RACINE"
+ "StartCom Certification Authority"
~ "StartCom Certification Authority"_2
(both StartCom CAs now included with duplicate CKA_LABEL fix)
+ "T-TeleSec GlobalRoot Class 2"
+ "TWCA Global Root CA"
+ "TeliaSonera Root CA v1"

163
debian/config vendored

File diff suppressed because one or more lines are too long

2
debian/rules vendored
View file

@ -27,7 +27,7 @@ build-stamp: configure-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
rm -f build-stamp configure-stamp debian/config
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) clean

File diff suppressed because it is too large Load diff

View file

@ -44,9 +44,9 @@
* whether we may use its full range (0-255) or only 0-99 because
* of the comment in the CK_VERSION type definition.
*/
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 97
#define NSS_BUILTINS_LIBRARY_VERSION "1.97"
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 2
#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 1
#define NSS_BUILTINS_LIBRARY_VERSION "2.1"
/* These version numbers detail the semantic changes to the ckfw engine. */
#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1