Backed out changeset ee89101cd0e4 (bug 1743993) for xpcshel failures …

…on test_httpssvc_retry_with_ech.js UPGRADE_NSS_RELEASE

build/moz.configure/nss.configure

@@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", help="Use system NSS")
 imply_option("--with-system-nspr", True, when="--with-system-nss")
 
 nss_pkg = pkg_check_modules(
-    "NSS", "nss >= 3.74", when="--with-system-nss", config=False
+    "NSS", "nss >= 3.73", when="--with-system-nss", config=False
 )
 
 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")

security/nss/TAG-INFO

@@ -1 +1 @@
-d41c0fcdcf85
+7d4f221b1fff

security/nss/automation/abi-check/expected-report-libssl3.so.txt

@@ -1,15 +0,0 @@
-
-1 function with some indirect sub-type change:
-
-  [C]'function SECStatus SSL_HandshakeNegotiatedExtension(PRFileDesc*, SSLExtensionType, PRBool*)' at sslreveal.c:72:1 has some indirect sub-type changes:
-    parameter 2 of type 'typedef SSLExtensionType' has sub-type changes:
-      underlying type 'enum __anonymous_enum__' at sslt.h:525:1 changed:
-        type size hasn't changed
-        1 enumerator deletion:
-          '__anonymous_enum__::ssl_tls13_ech_is_inner_xtn' value '55817'
-
-        1 enumerator change:
-          '__anonymous_enum__::ssl_tls13_encrypted_client_hello_xtn' from value '65034' to '65037' at sslt.h:525:1
-
-
-

security/nss/automation/abi-check/previous-nss-release

@@ -1 +1 @@
-NSS_3_73_BRANCH
+NSS_3_72_BRANCH

security/nss/coreconf/coreconf.dep

@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-

security/nss/gtests/google_test/VERSION

@@ -1,2 +1,2 @@
-release-1.10.0
-703bd9caab50b139428cea1aaff9974ebee5742e
+release-1.11.0
+e2239ee6043f73722e7aa812a459f54a28552929

security/nss/gtests/google_test/gtest/CMakeLists.txt

@@ -53,7 +53,7 @@ else()
   cmake_policy(SET CMP0048 NEW)
   project(gtest VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
 endif()
-cmake_minimum_required(VERSION 2.6.4)
+cmake_minimum_required(VERSION 2.8.12)
 
 if (POLICY CMP0063) # Visibility
   cmake_policy(SET CMP0063 NEW)
@@ -92,10 +92,13 @@ include(cmake/internal_utils.cmake)
 
 config_compiler_and_linker()  # Defined in internal_utils.cmake.
 
+# Needed to set the namespace for both the export targets and the
+# alias libraries
+set(cmake_package_name GTest CACHE INTERNAL "")
+
 # Create the CMake package file descriptors.
 if (INSTALL_GTEST)
   include(CMakePackageConfigHelpers)
-  set(cmake_package_name GTest)
   set(targets_export_name ${cmake_package_name}Targets CACHE INTERNAL "")
   set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated" CACHE INTERNAL "")
   set(cmake_files_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${cmake_package_name}")
@@ -126,7 +129,9 @@ include_directories(${gtest_build_include_dirs})
 # are used for other targets, to ensure that gtest can be compiled by a user
 # aggressive about warnings.
 cxx_library(gtest "${cxx_strict}" src/gtest-all.cc)
+set_target_properties(gtest PROPERTIES VERSION ${GOOGLETEST_VERSION})
 cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc)
+set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
 # If the CMake version supports it, attach header directory information
 # to the targets for when we are part of a parent build (ie being pulled
 # in via add_subdirectory() rather than being a standalone build).
@@ -182,20 +187,6 @@ if (gtest_build_tests)
   # 'make test' or ctest.
   enable_testing()
 
-  if (WIN32)
-    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/RunTest.ps1"
-         CONTENT
-"$project_bin = \"${CMAKE_BINARY_DIR}/bin/$<CONFIG>\"
-$env:Path = \"$project_bin;$env:Path\"
-& $args")
-  elseif (MINGW OR CYGWIN)
-    file(GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/RunTest.ps1"
-         CONTENT
-"$project_bin = (cygpath --windows ${CMAKE_BINARY_DIR}/bin)
-$env:Path = \"$project_bin;$env:Path\"
-& $args")
-  endif()
-
   ############################################################
   # C++ tests built with standard compiler flags.
 
@@ -266,6 +257,7 @@ $env:Path = \"$project_bin;$env:Path\"
   cxx_executable(googletest-break-on-failure-unittest_ test gtest)
   py_test(googletest-break-on-failure-unittest)
 
+  py_test(gtest_skip_check_output_test)
   py_test(gtest_skip_environment_check_output_test)
 
   # Visual Studio .NET 2003 does not support STL with exceptions disabled.
@@ -317,6 +309,9 @@ $env:Path = \"$project_bin;$env:Path\"
   cxx_executable(googletest-uninitialized-test_ test gtest)
   py_test(googletest-uninitialized-test)
 
+  cxx_executable(gtest_list_output_unittest_ test gtest)
+  py_test(gtest_list_output_unittest)
+
   cxx_executable(gtest_xml_outfile1_test_ test gtest_main)
   cxx_executable(gtest_xml_outfile2_test_ test gtest_main)
   py_test(gtest_xml_outfiles_test)

security/nss/gtests/google_test/gtest/CONTRIBUTORS

@@ -5,33 +5,59 @@
 
 Ajay Joshi <[email protected]>
 Balázs Dán <[email protected]>
+Benoit Sigoure <[email protected]>
 Bharat Mediratta <[email protected]>
+Bogdan Piloca <[email protected]>
 Chandler Carruth <[email protected]>
 Chris Prince <[email protected]>
 Chris Taylor <[email protected]>
 Dan Egnor <[email protected]>
+Dave MacLachlan <[email protected]>
+David Anderson <[email protected]>
+Dean Sturtevant
 Eric Roman <[email protected]>
+Gene Volovich <[email protected]>
 Hady Zalek <[email protected]>
+Hal Burch <[email protected]>
 Jeffrey Yasskin <[email protected]>
+Jim Keller <[email protected]>
+Joe Walnes <[email protected]>
+Jon Wray <[email protected]>
 Jói Sigurðsson <[email protected]>
 Keir Mierle <[email protected]>
 Keith Ray <[email protected]>
 Kenton Varda <[email protected]>
+Kostya Serebryany <[email protected]>
+Krystian Kuzniarek <[email protected]>
+Lev Makhlis
 Manuel Klimek <[email protected]>
+Mario Tanev <[email protected]>
+Mark Paskin
 Markus Heule <[email protected]>
+Matthew Simmons <[email protected]>
 Mika Raento <[email protected]>
+Mike Bland <[email protected]>
 Miklós Fazekas <[email protected]>
+Neal Norwitz <[email protected]>
+Nermin Ozkiranartli <[email protected]>
+Owen Carlsen <[email protected]>
+Paneendra Ba <[email protected]>
 Pasi Valminen <[email protected]>
 Patrick Hanna <[email protected]>
 Patrick Riley <[email protected]>
+Paul Menage <[email protected]>
 Peter Kaminski <[email protected]>
+Piotr Kaminski <[email protected]>
 Preston Jackson <[email protected]>
 Rainer Klaffenboeck <[email protected]>
 Russ Cox <[email protected]>
 Russ Rufer <[email protected]>
 Sean Mcafee <[email protected]>
 Sigurður Ásgeirsson <[email protected]>
+Sverre Sundsdal <[email protected]>
+Takeshi Yoshino <[email protected]>
 Tracy Bialik <[email protected]>
 Vadim Berman <[email protected]>
 Vlad Losev <[email protected]>
+Wolfgang Klier <[email protected]>
 Zhanyong Wan <[email protected]>