Accepting request 80334 from Base:System

Copy from Base:System/ca-certificates-mozilla based on submit request 80334 from user coolo

OBS-URL: https://build.opensuse.org/request/show/80334
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ca-certificates-mozilla?expand=0&rev=10

ca-certificates-mozilla.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed Aug 31 09:02:10 UTC 2011 - lnussel@suse.de
+
+- update certificates to revision 1.76
+  * new: Go_Daddy_Root_Certificate_Authority_G2.pem
+  * new: Starfield_Root_Certificate_Authority_G2.pem
+  * new: Starfield_Services_Root_Certificate_Authority_G2.pem
+  * new: AffirmTrust_Commercial.pem
+  * new: AffirmTrust_Networking.pem
+  * new: AffirmTrust_Premium.pem
+  * new: AffirmTrust_Premium_ECC.pem
+  * new: Certum_Trusted_Network_CA.pem
+  * new: Certinomis_Autorit_Racine.pem
+  * new: Root_CA_Generalitat_Valenciana.pem
+  * new: A_Trust_nQual_03.pem
+  * new: TWCA_Root_Certification_Authority.pem
+  * removed: DigiNotar_Root_CA.pem (bnc#714931)
+
 -------------------------------------------------------------------
 Mon Jan 31 13:43:23 UTC 2011 - lnussel@suse.de
 

ca-certificates-mozilla.spec

@@ -26,7 +26,7 @@ Name:           ca-certificates-mozilla
 License:        BSD3c(or similar) ; MPL 1.1/GPL 2.0/LGPL 2.1
 Group:          Productivity/Networking/Security
 AutoReqProv:    on
-Version:        1.70
+Version:        1.76
 Release:        1
 Summary:        CA certificates for OpenSSL
 Url:            http://www.mozilla.org
@@ -44,7 +44,6 @@ Source:         certdata.txt
 Source1:        extractcerts.pl
 Source2:        %{name}.COPYING
 Source3:        compareoldnew
-Patch0:         certdata.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 # for update-ca-certificates
@@ -63,7 +62,6 @@ from MozillaFirefox
 %prep
 %setup -qcT
 /bin/cp %{SOURCE0} .
-%patch0 -p1
 install -m 644 %{S:1} COPYING
 
 %build

certdata.diff

@@ -1,13 +0,0 @@
-Index: ca-certificates-mozilla/certdata.txt
-===================================================================
---- ca-certificates-mozilla.orig/certdata.txt
-+++ ca-certificates-mozilla/certdata.txt
-@@ -4646,7 +4646,7 @@ CKA_ISSUER MULTILINE_OCTAL
- \144\040\103\101\040\122\157\157\164
- END
- CKA_SERIAL_NUMBER MULTILINE_OCTAL
--\002\001\001
-+\001
- END
- CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR

extractcerts.pl

@@ -84,14 +84,21 @@ sub handle_object($)
 {
   my $object = shift;
   return unless $object;
+  ### convert old tags to be able to compare pre 1.74 files
+  $object->{'CKA_CLASS'} =~ s/^CKO_NETSCAPE/CKO_NSS/;
+  for my $type (keys %trust_types) {
+    next unless (exists $object->{$type});
+    $object->{$type} =~ s/^CKT_NETSCAPE/CKT_NSS/;
+  }
+  ####
   if($object->{'CKA_CLASS'} eq 'CKO_CERTIFICATE' && $object->{'CKA_CERTIFICATE_TYPE'} eq 'CKC_X_509') {
     push @certificates, $object;
-  } elsif ($object->{'CKA_CLASS'} eq 'CKO_NETSCAPE_TRUST') {
+  } elsif ($object->{'CKA_CLASS'} eq 'CKO_NSS_TRUST') {
     my $label = $object->{'CKA_LABEL'};
     my $serial = colonhex($object->{'CKA_SERIAL_NUMBER'});
     die "$label exists ($serial)" if exists($trusts{$label.$serial});
     $trusts{$label.$serial} = $object;
-  } elsif ($object->{'CKA_CLASS'} eq 'CKO_NETSCAPE_BUILTIN_ROOT_LIST') {
+  } elsif ($object->{'CKA_CLASS'} eq 'CKO_NSS_BUILTIN_ROOT_LIST') {
     # ignore
   } else {
     print STDERR "class ", $object->{'CKA_CLASS'} ," not handled\n";
@@ -159,7 +166,7 @@ for my $cert (@certificates) {
   if ($output_trustbits) {
 	  for my $type (keys %trust_types) {
 		  if (exists $trust->{$type}
-		  && $trust->{$type} eq 'CKT_NETSCAPE_TRUSTED_DELEGATOR') {
+		  && $trust->{$type} eq 'CKT_NSS_TRUSTED_DELEGATOR') {
 			  push @addtrust, $trust_types{$type};
 			  if (exists $openssl_trust{$type}) {
 				  push @addtrust_openssl, $openssl_trust{$type};
@@ -168,14 +175,14 @@ for my $cert (@certificates) {
 		  }
 	  }
   } else {
-	  if($trust->{'CKA_TRUST_SERVER_AUTH'} eq 'CKT_NETSCAPE_TRUSTED_DELEGATOR') {
+	  if($trust->{'CKA_TRUST_SERVER_AUTH'} eq 'CKT_NSS_TRUSTED_DELEGATOR') {
 		  $trusted = 1;
 	  }
   }
 
   if (!$trusted) {
 	  my $t = $trust->{'CKA_TRUST_SERVER_AUTH'};
-	  $t =~ s/CKT_NETSCAPE_//;
+	  $t =~ s/CKT_NSS_//;
 	  print STDERR "$t: $alias\n";
 	  next;
   }