From 9c7f37de38be04dd11fe72bff8513b120f0a753180a9a6d84129efa55beba477 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Sun, 4 Apr 2010 10:20:48 +0000
Subject: [PATCH] fixed failing test due to expired cert

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=48
---
 mozilla-nss.changes  |  5 +++++
 mozilla-nss.spec     |  3 +++
 no-paypal-test.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 no-paypal-test.patch

diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index e2c287e..0da75be 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Apr  4 12:19:43 CEST 2010 - wr@rosenauer.org
+
+- disabled a test using an expired cert (bmo#557071)
+
 -------------------------------------------------------------------
 Sat Mar 20 20:19:50 CET 2010 - wr@rosenauer.org
 
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index 891805f..81d0998 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -53,6 +53,7 @@ Patch3:         system-nspr.patch
 Patch4:         char.patch
 Patch5:         nss-no-rpath.patch
 Patch6:         renegotiate-transitional.patch
+Patch7:         no-paypal-test.patch
 Patch9:         malloc.patch
 %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
 PreReq:         mozilla-nspr >= %nspr_ver
@@ -167,6 +168,8 @@ cd mozilla
 %patch4
 %patch5
 %patch6
+# bmo#557071
+%patch7
 %if %suse_version > 1110
 %patch9
 %endif
diff --git a/no-paypal-test.patch b/no-paypal-test.patch
new file mode 100644
index 0000000..b734126
--- /dev/null
+++ b/no-paypal-test.patch
@@ -0,0 +1,52 @@
+Index: security/nss/tests/chains/scenarios/realcerts.cfg
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/tests/chains/scenarios/realcerts.cfg,v
+retrieving revision 1.3
+diff -u -r1.3 realcerts.cfg
+--- security/nss/tests/chains/scenarios/realcerts.cfg	9 Nov 2009 14:18:58 -0000	1.3
++++ security/nss/tests/chains/scenarios/realcerts.cfg	4 Apr 2010 08:19:54 -0000
+@@ -43,7 +43,6 @@
+ import TestUser51:x:
+ import PayPalRootCA:x:CT,C,C
+ import PayPalICA:x:
+-import PayPalEE:x:
+ import BrAirWaysBadSig:x:
+ 
+ verify TestUser50:x
+@@ -52,10 +51,6 @@
+ verify TestUser51:x
+   result pass
+ 
+-verify PayPalEE:x
+-  policy OID.2.16.840.1.113733.1.7.23.6 
+-  result pass
+-
+ verify BrAirWaysBadSig:x
+   result fail
+ 
+Index: security/nss/tests/libpkix/cert_trust.map
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/tests/libpkix/cert_trust.map,v
+retrieving revision 1.2
+diff -u -r1.2 cert_trust.map
+--- security/nss/tests/libpkix/cert_trust.map	17 Jun 2008 22:29:09 -0000	1.2
++++ security/nss/tests/libpkix/cert_trust.map	4 Apr 2010 08:19:54 -0000
+@@ -1,6 +1,3 @@
+ TestCA.ca CT,C,C
+ TestUser50 ,,
+ TestUser51 ,,
+-PayPalRootCA CT,C,C
+-PayPalICA ,,
+-PayPalEE ,,
+Index: security/nss/tests/libpkix/vfychain_test.lst
+===================================================================
+RCS file: /cvsroot/mozilla/security/nss/tests/libpkix/vfychain_test.lst,v
+retrieving revision 1.2
+diff -u -r1.2 vfychain_test.lst
+--- security/nss/tests/libpkix/vfychain_test.lst	17 Jun 2008 22:29:09 -0000	1.2
++++ security/nss/tests/libpkix/vfychain_test.lst	4 Apr 2010 08:19:54 -0000
+@@ -1,4 +1,3 @@
+ # Status | Leaf Cert | Policies | Others(undef)
+ 0 TestUser50 undef
+ 0 TestUser51 undef
+-0 PayPalEE OID.2.16.840.1.113733.1.7.23.6