From 214f14ebe43b31d0fb7e739cdb2def19e4da2f1a56d0f4ddf9bb332dc6f68669 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Tue, 9 Nov 2010 10:00:46 +0000
Subject: [PATCH] fix build

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=60
---
 PayPalEE.cert       | Bin 0 -> 1615 bytes
 mozilla-nss.changes |   9 +++++++--
 mozilla-nss.spec    |  16 +++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 PayPalEE.cert

diff --git a/PayPalEE.cert b/PayPalEE.cert
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..7dfb1c7a6ce96f5c190f2b36d49cc87231a2ebd7c57e84428de947029c601be0
GIT binary patch
literal 1615
zcmaJ>eM}Q~817xKg_dtyT1Ak92~w2uUZF~Ln(?)XOz0?7!xTBofrZkRUZH|aqzE!+
z!dL?;Ooc!&5k#4Zq__{KLkE)Sbj!#@&E}THp(5%gQ<=L%AhIR9KQ8w^@5k?bpWpi&
z*!js|=S8(}Q3OT3Z9$X%FYb6-&ZWLVZ+=3?f(Ks^UbD95i3fu4cpRwgBium1=VoAh
z5t^YPq~OaMLXoGIvgkGXJmWGv$*7YPfe^qt+(eQY2cB*zrmc7iWwn_s1;i>)y$n#K
zQ<g#+H|65RG=-B^e4Ev3rdLKr+H5v?2~(A3s>*ey!bppm#KUwlSWZNPf=%X%md;j>
zH;^=qN8yRvt&}l`%E7gyL7zif^(G^((Y%ev$HF412LTX8FfaDWWK060flx##RZ3MR
z*by&61U`JXrF;ZK>?>YJ5$@EK3qblRh>BbjC<AFDEfld37O<UoiRNhuIV{7OHrO$g
z^02Kk!W%qUCr{)O1w^!B`HH#Zv1c)EAF)uSB%+821t^HA1{ly)B#dVU$TeAvdXn$~
zFE-Le?5ZJ+_&O6!5fTuykU;FAV6yNOoM6b+SP5ScvA9s|t|m*>q+$9#{K1cf-Nd3K
zBU7|+nwV1BN)^&G*T@xnvZR~IQZs2_DQ74Nesu*99*4`Y#9?qDYDW;xiH_}o!zX&>
zah<IbWnQ6NofAbaS2Y+UeVX`vFE-%3{hIJIny!i({>icG?&$0ORRei_+8A^D(4uSQ
z2TvUp{npvjoYlcymG2yiRP;rR{N!wq_3c&va?4gy`n98sI@jNt^i7s;MrrS^g`3|T
z|Nis#xTe5H&1iSg?VRhWNqxQbgXYkLo{NQk_jVpR9ust9JWlO@dQVZ>yhI4LsOs#t
zT>{5ZMdzBk2OLGt2i?^>v{jGtj}&-^AOCC8$M=fAZ`V#ueBw}DX!fz3pjcBuWmA8q
z@2wq|4_B87n?FveT^XWoxkQXTyK`Y!JXTWae$8qs`tfOGcDtkJy|{Xmi*S%OJMxHO
zWNb<p0U`_q&eZk?cw!Pvd@N>3@6#`y=ZHs&w2AYL>pSx<Z3j2zG6K9XjEnMGAdWQx
zF-8%vqD9#fRYR~6U=)z3)lj-(3l*WW80Jc0#-jjOE@!-uz}CRA)xhe?ExTqdQZtc=
zxJdaB4q<#(W}|sL7Zj2B|DU>Eb{&GTyEUD{MP|QH2xJd=4Vw>=UE=3^)qRJZA(=Ze
zs#6;{y1F|X3*w=CCKy35GZ-Oa#s;J&=-)$`bhLTSRIqwB9Q`i`q@J7;J<HBZ4k!y4
zXVMXOY%659X0>dBOxOroi9laS=24M(`dkQtKycynmU?ngKTMol;0$ZzyPvs|7Sk;2
zN_P1mh&LZXC5xwfHJI{Da}O<{S&WdgrRM${8DSutW#7gGKYk3ikGv&Q)&@TrP@N7u
z|Iv7lcM~mbZ{up^2OUy=a)rjZ$MOdW?Q0(kx3m@iepN-9v4iP~-AQNnei^r|WB4+?
z_|s9@eOpsk{earz=2M0B-PZSI-5J<^d8MrOZ);sZ_W825KR4B#TQku=>b6f)Ax<gZ
zvRmHOT;jdnDLsh|W?8>dewZI~_ez^Ie)5yS*ys?yU++=PY4^X|+&}dE(6eJJX~)Bc
zv)6JTc#S{c43@(oN1C#J$!GUQ*G)<mO#J+?VtAxO?V7cL@BXO57_;PJ(2ewrhPa}4
k66};vkeYb&s$)<7g~oY)8xLToY6Xp}Mt-OZAGHkp0~fmvTL1t6

literal 0
HcmV?d00001

diff --git a/mozilla-nss.changes b/mozilla-nss.changes
index 8801912..775eed7 100644
--- a/mozilla-nss.changes
+++ b/mozilla-nss.changes
@@ -1,9 +1,14 @@
+-------------------------------------------------------------------
+Tue Nov  9 08:51:51 UTC 2010 - wr@rosenauer.org
+
+- replaced expired PayPal test certificate (fixing testsuite)
+
 -------------------------------------------------------------------
 Sat Sep 25 08:18:59 CEST 2010 - wr@rosenauer.org
 
 - update to 3.12.8 RTM release
   * support TLS false start (needed for Firefox4) (bmo#525092)
-  * fix wildcard matching for IP addresses (bnc#637290, bmo#578697) 
+  * fix wildcard matching for IP addresses (bnc#637290, bmo#578697)
     (CVE-2010-3170)
   * bugfixes
 
@@ -24,7 +29,7 @@ Fri Jul  9 16:32:33 UTC 2010 - jengelh@medozas.de
 -------------------------------------------------------------------
 Thu Jun  3 22:45:51 CEST 2010 - wr@rosenauer.org
 
-- Use preloaded empty system database since creating with 
+- Use preloaded empty system database since creating with
   modutil leaves database in nonusable state
 
 -------------------------------------------------------------------
diff --git a/mozilla-nss.spec b/mozilla-nss.spec
index a83831a..b35dbbd 100644
--- a/mozilla-nss.spec
+++ b/mozilla-nss.spec
@@ -30,7 +30,7 @@ BuildRequires:  sqlite3-devel
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPL
 Version:        3.12.8
-Release:        1
+Release:        2
 # bug437293
 %ifarch ppc64
 Obsoletes:      mozilla-nss-64bit
@@ -49,6 +49,7 @@ Source6:        setup-nsssysinit.sh
 Source7:        cert9.db
 Source8:        key4.db
 Source9:        pkcs11.txt
+Source10:       PayPalEE.cert
 Patch1:         nss-opt.patch
 Patch3:         system-nspr.patch
 Patch4:         char.patch
@@ -78,7 +79,7 @@ certificates, and other security standards.
 License:        GPLv2+ ; LGPLv2.1+ ; MPL
 Summary:        Network (Netscape) Security Services development files
 Group:          Development/Libraries/Other
-Requires:       mozilla-nspr-devel 
+Requires:       mozilla-nspr-devel
 Requires:       mozilla-nss = %{version}-%{release}
 Requires:       libfreebl3
 Requires:       libsoftokn3
@@ -137,7 +138,7 @@ This package installs the freebl library from NSS.
 
 %package -n libsoftokn3
 License:        GPLv2+ ; LGPLv2.1+ ; MPL
-Summary:        Network Security Services Soktoken Module 
+Summary:        Network Security Services Soktoken Module
 Group:          System/Libraries
 Requires:       libfreebl3 = %{version}-%{release}
 
@@ -148,7 +149,7 @@ applications. Applications built with NSS can support SSL v2 and v3,
 TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
 certificates, and other security standards.
 
-Network Security Services Softoken Cryptographic Module 
+Network Security Services Softoken Cryptographic Module
 
 
 %package certs
@@ -157,7 +158,7 @@ Summary:        CA certificates for NSS
 Group:          Productivity/Networking/Security
 
 %description certs
-This package contains the integrated CA root certificates from the 
+This package contains the integrated CA root certificates from the
 Mozilla project.
 
 
@@ -178,11 +179,12 @@ cd mozilla
 #make generate
 
 %build
-export FREEBL_NO_DEPEND=1
 cd mozilla/security/nss
+cp %SOURCE10 tests/libpkix/certs/PayPalEE.cert
+export FREEBL_NO_DEPEND=1
 export NSPR_INCLUDE_DIR=`nspr-config --includedir`
 export NSPR_LIB_DIR=`nspr-config --libdir`
-export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" 
+export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export LIBDIR=%{_libdir}
 %ifarch x86_64 s390x ppc64 ia64
 export USE_64=1