pool/mozilla-nss
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=110

Browse Source
This commit is contained in:
Wolfgang Rosenauer 2012-12-30 18:23:59 +00:00 committed by Git OBS Bridge
parent 41f3cb6358
commit 61b05c4267
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla-nss.spec
View File

@ -54,6 +54,7 @@ Patch4: nss-no-rpath.patch
Patch5: renegotiate-transitional.patch Patch5: renegotiate-transitional.patch
Patch6: malloc.patch Patch6: malloc.patch
Patch7: nss-disable-ocsp-test.patch Patch7: nss-disable-ocsp-test.patch
Patch8: nssckbi-1.93.patch
%define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) %define nspr_ver %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
PreReq: mozilla-nspr >= %nspr_ver PreReq: mozilla-nspr >= %nspr_ver
PreReq: libfreebl3 >= %{nss_softokn_fips_version} PreReq: libfreebl3 >= %{nss_softokn_fips_version}
@ -168,6 +169,7 @@ cd mozilla
%patch6 %patch6
%endif %endif
%patch7 %patch7
%patch8
# additional CA certificates # additional CA certificates
#cd security/nss/lib/ckfw/builtins #cd security/nss/lib/ckfw/builtins
#cat %{SOURCE2} >> certdata.txt #cat %{SOURCE2} >> certdata.txt

4
nssckbi-1.93.patch
View File

@ -1,6 +1,6 @@
diff -uprN --exclude CVS nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/certdata.txt mozilla/security/nss/lib/ckfw/builtins/certdata.txt diff -uprN --exclude CVS nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/certdata.txt mozilla/security/nss/lib/ckfw/builtins/certdata.txt
--- nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-10-18 18:26:52.000000000 +0200 --- nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-10-18 18:26:52.000000000 +0200
+++ mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-12-29 17:32:45.000000000 +0100 +++ security/nss/lib/ckfw/builtins/certdata.txt 2012-12-29 17:32:45.000000000 +0100
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# This Source Code Form is subject to the terms of the Mozilla Public # This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
@ -256,7 +256,7 @@ diff -uprN --exclude CVS nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/certd
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff -uprN --exclude CVS nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h mozilla/security/nss/lib/ckfw/builtins/nssckbi.h diff -uprN --exclude CVS nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h mozilla/security/nss/lib/ckfw/builtins/nssckbi.h
--- nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2012-10-18 18:26:52.000000000 +0200 --- nss-3.14.1/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2012-10-18 18:26:52.000000000 +0200
+++ mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2012-12-29 17:32:45.000000000 +0100 +++ security/nss/lib/ckfw/builtins/nssckbi.h 2012-12-29 17:32:45.000000000 +0100
@@ -45,8 +45,8 @@ @@ -45,8 +45,8 @@
* of the comment in the CK_VERSION type definition. * of the comment in the CK_VERSION type definition.
*/ */