Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(243)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 12197027: Merge NSS_3_14_2_RTM. (Closed)

Created:
7 years, 10 months ago by mattm
Modified:
7 years, 10 months ago
Reviewers:
wtc
CC:
chromium-reviews
Visibility:
Public.

Description

Merge NSS_3_14_2_RTM. Add nss-sqlite-tempfilename-ifdef.patch to fix compile failure. TEST=compile on mac and win. Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=180595

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Patch Set 4 : #

Total comments: 4

Patch Set 5 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+605 lines, -393 lines) Patch
M README.chromium View 1 2 3 4 3 chunks +6 lines, -3 lines 0 comments Download
M mozilla/security/nss/lib/certdb/certdb.c View 3 chunks +25 lines, -18 lines 0 comments Download
M mozilla/security/nss/lib/certdb/certt.h View 3 chunks +13 lines, -1 line 0 comments Download
M mozilla/security/nss/lib/certdb/stanpcertdb.c View 1 chunk +0 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/certhigh/certhigh.c View 1 chunk +3 lines, -5 lines 0 comments Download
M mozilla/security/nss/lib/certhigh/certvfy.c View 19 chunks +24 lines, -20 lines 0 comments Download
M mozilla/security/nss/lib/certhigh/certvfypkix.c View 1 chunk +7 lines, -0 lines 0 comments Download
M mozilla/security/nss/lib/certhigh/ocsp.h View 1 chunk +1 line, -1 line 0 comments Download
M mozilla/security/nss/lib/certhigh/ocsp.c View 8 chunks +7 lines, -8 lines 0 comments Download
M mozilla/security/nss/lib/certhigh/ocspi.h View 2 chunks +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/certhigh/ocspt.h View 1 chunk +1 line, -1 line 0 comments Download
M mozilla/security/nss/lib/certhigh/ocspti.h View 2 chunks +7 lines, -3 lines 0 comments Download
M mozilla/security/nss/lib/ckfw/builtins/certdata.c View 9 chunks +58 lines, -149 lines 0 comments Download
M mozilla/security/nss/lib/ckfw/builtins/nssckbi.h View 1 chunk +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/freebl/arcfour.c View 1 chunk +1 line, -1 line 0 comments Download
M mozilla/security/nss/lib/freebl/desblapi.c View 2 chunks +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/freebl/drbg.c View 2 chunks +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/freebl/pqg.c View 2 chunks +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/freebl/rijndael.c View 8 chunks +33 lines, -8 lines 0 comments Download
M mozilla/security/nss/lib/freebl/unix_rand.c View 3 chunks +2 lines, -9 lines 0 comments Download
M mozilla/security/nss/lib/libpkix/include/pkix_params.h View 2 chunks +70 lines, -3 lines 0 comments Download
M mozilla/security/nss/lib/libpkix/pkix/params/pkix_procparams.h View 1 chunk +1 line, -0 lines 0 comments Download
M mozilla/security/nss/lib/libpkix/pkix/params/pkix_procparams.c View 2 chunks +39 lines, -0 lines 0 comments Download
M mozilla/security/nss/lib/libpkix/pkix/top/pkix_build.h View 1 chunk +1 line, -0 lines 0 comments Download
M mozilla/security/nss/lib/libpkix/pkix/top/pkix_build.c View 4 chunks +8 lines, -4 lines 0 comments Download
M mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_cert.c View 1 chunk +1 line, -1 line 0 comments Download
M mozilla/security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c View 1 chunk +1 line, -1 line 0 comments Download
M mozilla/security/nss/lib/nss/nss.h View 2 chunks +3 lines, -3 lines 0 comments Download
M mozilla/security/nss/lib/pk11wrap/pk11cert.c View 7 chunks +13 lines, -7 lines 0 comments Download
M mozilla/security/nss/lib/pk11wrap/pk11merge.c View 2 chunks +4 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/pkcs7/certread.c View 4 chunks +30 lines, -20 lines 0 comments Download
M mozilla/security/nss/lib/pkcs7/p7decode.c View 2 chunks +1 line, -2 lines 0 comments Download
M mozilla/security/nss/lib/pki/pki3hack.c View 7 chunks +19 lines, -6 lines 0 comments Download
M mozilla/security/nss/lib/softoken/pkcs11c.c View 4 chunks +30 lines, -8 lines 0 comments Download
M mozilla/security/nss/lib/softoken/sdb.c View 1 2 3 4 5 chunks +139 lines, -88 lines 0 comments Download
M mozilla/security/nss/lib/softoken/softkver.h View 1 chunk +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/util/nssutil.h View 1 chunk +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/util/secasn1t.h View 2 chunks +2 lines, -2 lines 0 comments Download
M mozilla/security/nss/lib/util/secoid.c View 3 chunks +13 lines, -1 line 0 comments Download
M mozilla/security/nss/lib/util/secoidt.h View 2 chunks +7 lines, -1 line 0 comments Download
A patches/nss-sqlite-tempfilename-ifdef.patch View 1 2 3 4 1 chunk +20 lines, -0 lines 0 comments Download
M scripts/nss-checkout.sh View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 3 (0 generated)
mattm
7 years, 10 months ago (2013-02-05 00:41:02 UTC) #1
wtc
Patch set 4 LGTM. I suggest using the upstream patch for the SQLite compilation problem. ...
7 years, 10 months ago (2013-02-05 00:58:23 UTC) #2
mattm
7 years, 10 months ago (2013-02-05 01:16:54 UTC) #3 
https://codereview.chromium.org/12197027/diff/22049/README.chromium
File README.chromium (right):

https://codereview.chromium.org/12197027/diff/22049/README.chromium#newcode10
README.chromium:10: NSS 3.14.2 RTM with NSPR 4.9.5 Beta 2
On 2013/02/05 00:58:23, wtc wrote:
> 
> Nit: you can omit "RTM" here and on line 4, partly because
> it is not commonly used in Chromium.

Done.

https://codereview.chromium.org/12197027/diff/22049/README.chromium#newcode72
README.chromium:72: versions which do not define SQLITE_FCNTL_TEMPFILENAME.
On 2013/02/05 00:58:23, wtc wrote:
> 
> Ah, this problem was just fixed today. Please reference
>    https://bugzilla.mozilla.org/show_bug.cgi?id=837799
> 
> I suggest using the upstream patch (slightly different from
> the patch in the NSS bug report):
> 
>
http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show...

Done.

Powered by Google App Engine
This is Rietveld 408576698