Commit Graph

27 Commits

Author SHA1 Message Date
Chris Jones
bc05dd163b Merge from mozilla-central 2010-02-22 21:31:18 -06:00
Benjamin Smedberg
33745658c4 Merge mozilla-central into electrolysis 2010-02-09 11:39:28 -05:00
Kai Engert
0ccf958b45 Bug 527659, Update mozilla-central to NSS 3.12.6 (beta)
== NSS portion
== r=rrelyea/wtc for upgrading mozilla-central to cvs tag NSS_3_12_6_BETA1
== This includes reapplying the (merged) patch from bug 519550 on top of NSS.
== PSM portion
== Includes the patch to disable TLS compression, r=kaie
== Include the patch to disable zlib test programs, which don't work on maemo, r=kaie
2010-02-07 12:54:28 +01:00
Kai Engert
5635ca4b0e Bug 546389, nsssysinit binary built inside source tree, not objdir, a=bsmedberg to land fix into CLOSED TREE
=== Removing binary output file security/nss/lib/sysinit/nsssysinit from tree, it was not intended to be added
=== Prevent file from being built, in order to prevent people to add it back accidentally when using hg addremove
=== I classify this as checkin as fixing tinderbox bustage, because developers experience problems when working with patch queues, as explained in bug 546389
2010-02-16 15:43:56 +01:00
Kai Engert
ce2e533bb3 Bug 527659, Update Mozilla-central to NSS 3.12.6
=== r=rrelyea for upgrading to release candidate 1
=== reapplying bug 519550 on top
=== includes PSM makefile tweak to keep TLS disabled (variables changed in the updated NSS snapshot)
=== change configure.in to require the newer system NSS, r=wtc
2010-02-12 09:47:51 +01:00
Ted Mielczarek
f261e84eaa NSS: Allow the specification of an alternate library for SQLite. b=519550 r=rrelyea 2009-12-15 01:52:21 -05:00
Kai Engert
f87e116006 Bug 528277, Release NSS 3.12.4 + new roots to Mozilla
approval-1.9.2=johnath (comment 3)
2009-12-04 07:04:06 +01:00
Wan-Teh Chang
02c92457de Bug 504080: Update NSS to the NSS_3_12_4_RTM CVS tag. r=kaie. 2009-08-19 06:59:06 -07:00
Wan-Teh Chang
8e431a056c Bug 504080: Update NSS from NSS_3_12_4_FIPS1_WITH_CKBI_1_75 to
NSS_3_12_4_FIPS4 in mozilla-central.  r=kaie.
2009-07-28 17:01:39 -07:00
Johnathan Nightingale
4d1a6744cb Bug 494236 - Update NSS to pick up new roots from bug 493660. Reviews in their respective NSS bugs. 2009-05-22 11:42:06 -04:00
Kai Engert
ada40a604e Bug 490864, deliver 3.12.4.1 (NSS_3_12_4_FIPS1) to mozilla-central for trunk testing
r=relyea, r=nelson
2009-05-05 17:22:50 +02:00
Kai Engert
15f8bb0d21 Bug 487721, deliver NSS 3.12.4 RC0 to mozilla-central
r=wtc
2009-04-21 03:51:56 +02:00
Kai Engert
cfbe080c1e Bug 487712, Pick up NSS_HEAD_20090409 to fix WINCE
Got r=nelson and r=rrelyea in today's NSS conference call.
CLOSED TREE
2009-04-10 02:00:56 +02:00
Kai Engert
a626dbc86e Disabling building NSS ckfw/capi in order to fix windows build bustage.
Will file a bug to get this reenabled, will build on windows to get this fixed.
r=nelson for temporary disabling
2009-04-07 05:08:16 +02:00
Kai Engert
2b43284096 Bug 486182, Land NSS 3.12.3 final in mozilla-central
r=nelson
2009-04-07 03:36:45 +02:00
Tyler Downer
a3e4d65efe Bug 412749 - "self signed" should read "self-signed". r=kaie, ui-r=johnath 2009-03-11 13:26:44 +01:00
Wan-Teh Chang
5f2e0cfef4 Bug 466745: Upgraded NSS to NSS_3_12_3_BETA3. 2009-02-10 09:18:32 -08:00
Daniel Holbert
fdfdfc97fe Bug 473236 - follow up patch v3b: restore original executable status for previously-executable Makefiles in nss folder. a=ted
Probably unnecessary, but it's conceivable that someone might execute them directly ( they do have a #! line at the top), and their executable status is going to get turned on at our next NSS snapshot-importing anyway.
2009-01-23 11:55:40 -08:00
Daniel Holbert
2a7d88e05a Bug 473236 - Remove executable bit from files that don't need it. (Only changes file mode -- no code changes.) r=bsmedberg 2009-01-21 22:55:08 -08:00
Kai Engert
2da188f9a8 Bug 473837, land NSS_3_12_3_BETA2
r=wtc
2009-01-21 04:43:31 +01:00
Kai Engert
10a74ea202 removing accidentally added leftover files from patching, a=dholbert 2009-01-16 20:35:31 +01:00
Kai Engert
1f24532149 Backout 6c571dc80a99, bug 473837 2009-01-16 20:15:28 +01:00
Kai Engert
e19a799fa6 Bug 473837, Import NSS_3_12_3_BETA1
r=wtc
2009-01-16 20:01:34 +01:00
Kai Engert
afdeb339c5 Bug 461082, Deliver NSS 3.12.2 and NSPR 4.7.2 to Mozilla
r=wtc
2008-10-23 02:38:29 +02:00
Kai Engert
5159954062 Bug 453227, fix import cert failure, see comment 80 and 81, update to NSS_3_12_1_RC2, r=wtc 2008-09-05 20:13:38 +02:00
Kai Engert
731c45f2b1 Bug 450646, Upgrade Mozilla to NSS 3.12.1 release candidate 1
r=rrelyea
2008-08-15 06:12:54 +02:00
Benjamin Smedberg
e0d84f35cb Import NSS_3_12_RC4 2008-06-06 08:40:11 -04:00