From 2822f056939e1344a94142322ae210b6cb73adfb8a4e18d798f00e4d6b03d76b Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 28 Apr 2011 06:41:37 +0000 Subject: [PATCH] 3.12.10beta1 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=66 --- PayPalEE.cert | Bin 1615 -> 0 bytes mozilla-nss.changes | 9 +++++++++ mozilla-nss.spec | 22 +++++++++++----------- nss-3.12.10.tar.bz2 | 3 +++ nss-3.12.9.tar.bz2 | 3 --- 5 files changed, 23 insertions(+), 14 deletions(-) delete mode 100644 PayPalEE.cert create mode 100644 nss-3.12.10.tar.bz2 delete mode 100644 nss-3.12.9.tar.bz2 diff --git a/PayPalEE.cert b/PayPalEE.cert deleted file mode 100644 index 7dfb1c7a6ce96f5c190f2b36d49cc87231a2ebd7c57e84428de947029c601be0..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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*ey!bppm#KUwlSWZNPf=%X%md;j> zH;^=qN8yRvt&}l`%E7gyL7zif^(G^((Y%ev$HF412LTX8FfaDWWK060flx##RZ3MR z*by&61U`JXrF;ZK>?>YJ5$@EK3qblRh>BbjCq+$9#{K1cf-Nd3K zBU7|+nwV1BN)^&G*T@xnvZR~IQZs2_DQ74Nesu*99*4`Y#9?qDYDW;xiH_}o!zX&> zahicG?&$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 zWNb3@6#`y=ZHs&w2AYL>pSxEb{>yEUD{MP|QH2xJd=4Vw>=UE=3^)qRJZA(=Ze zs#6;{y1F|X3*w=CCKy35GZ-Oa#s;J&=-)$`bhLTSRIqwB9Q`i`q@J7;JdBOxOroi9laS=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)AxdewZI~_ez^Ie)5yS*ys?yU++=PY4^X|+&}dE(6eJJX~)Bc zv)6JTc#S{c43@(oN1C#J$!GUQ*G) 1030 BuildRequires: sqlite3-devel %endif -License: GPLv2+ ; LGPLv2.1+ ; MPL -Version: 3.12.9 +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ +Version: 3.12.10 Release: 1 # bug437293 %ifarch ppc64 @@ -49,7 +49,7 @@ Source6: setup-nsssysinit.sh Source7: cert9.db Source8: key4.db Source9: pkcs11.txt -Source10: PayPalEE.cert +#Source10: PayPalEE.cert Patch1: nss-opt.patch Patch3: system-nspr.patch Patch4: char.patch @@ -76,7 +76,7 @@ certificates, and other security standards. %package devel -License: GPLv2+ ; LGPLv2.1+ ; MPL +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: Network (Netscape) Security Services development files Group: Development/Libraries/Other Requires: mozilla-nspr-devel @@ -97,7 +97,7 @@ certificates, and other security standards. %package tools -License: GPLv2+ ; LGPLv2.1+ ; MPL +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: Tools for developing, debugging, and managing applications that use NSS Group: System/Management PreReq: mozilla-nss >= %{version} @@ -108,7 +108,7 @@ applications that use NSS. %package sysinit -License: GPLv2+ ; LGPLv2.1+ ; MPL +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: System NSS Initialization Group: System/Management Requires: mozilla-nss >= %{version} @@ -122,7 +122,7 @@ any system or user configured modules. %package -n libfreebl3 -License: GPLv2+ ; LGPLv2.1+ ; MPL +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: Freebl library for the Network Security Services Group: System/Libraries @@ -137,7 +137,7 @@ This package installs the freebl library from NSS. %package -n libsoftokn3 -License: GPLv2+ ; LGPLv2.1+ ; MPL +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: Network Security Services Soktoken Module Group: System/Libraries Requires: libfreebl3 = %{version}-%{release} @@ -153,7 +153,7 @@ Network Security Services Softoken Cryptographic Module %package certs -License: GPLv2+ ; LGPLv2.1+ ; MPL +License: MPLv1.1 or GPLv2+ or LGPLv2.1+ Summary: CA certificates for NSS Group: Productivity/Networking/Security @@ -180,7 +180,7 @@ cd mozilla %build cd mozilla/security/nss -cp %SOURCE10 tests/libpkix/certs/PayPalEE.cert +#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` diff --git a/nss-3.12.10.tar.bz2 b/nss-3.12.10.tar.bz2 new file mode 100644 index 0000000..6acf5b1 --- /dev/null +++ b/nss-3.12.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7d6797d473ec7fee9b7c8edd1dfb9c9e9e385d2fb98e6372fe92cc525cd5512 +size 4614383 diff --git a/nss-3.12.9.tar.bz2 b/nss-3.12.9.tar.bz2 deleted file mode 100644 index df10138..0000000 --- a/nss-3.12.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8de1ca0e0a4e49989ea59fb4ac37cb06cbaf9264254839124f5759f5fcccbc5f -size 4547808