Accepting request 480619 from mozilla:Factory

1

OBS-URL: https://build.opensuse.org/request/show/480619
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=123
This commit is contained in:
Dominique Leuenberger 2017-03-21 21:44:19 +00:00 committed by Git OBS Bridge
commit fb68cfad7c
3 changed files with 21 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 16 09:11:53 UTC 2017 - rguenther@suse.com
- Add nss-fix-hash.patch to fix hash computation (and build with
GCC 7 which complains about shifts of boolean values).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 20 11:53:55 UTC 2017 - wr@rosenauer.org Mon Feb 20 11:53:55 UTC 2017 - wr@rosenauer.org

View File

@ -56,6 +56,7 @@ Patch5: renegotiate-transitional.patch
Patch6: malloc.patch Patch6: malloc.patch
Patch7: nss-disable-ocsp-test.patch Patch7: nss-disable-ocsp-test.patch
Patch8: nss-sqlitename.patch Patch8: nss-sqlitename.patch
Patch9: nss-fix-hash.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}
@ -176,6 +177,7 @@ cd nss
%endif %endif
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1
# 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

13
nss-fix-hash.patch Normal file
View File

@ -0,0 +1,13 @@
--- nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c.orig 2017-03-16 09:01:59.024372645 +0000
+++ nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c 2017-03-16 09:02:37.280938434 +0000
@@ -89,8 +89,8 @@
PKIX_HASHCODE(ocspRq->signerCert, &signerHash, plContext,
PKIX_CERTHASHCODEFAILED);
- *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
- dateHash) << 8) || signerHash;
+ *pHashcode = (((((extensionHash << 8) | certHash) << 8) |
+ dateHash) << 8) | signerHash;
cleanup: