Bug 1934958 - land NSS NSS_3_108_BETA3 UPGRADE_NSS_RELEASE, r=nss-reviewers,nkulatova

Differential Revision: https://phabricator.services.mozilla.com/D234877

Author: dennisjackson

security/nss/TAG-INFO

@@ -1 +1 @@
-NSS_3_108_BETA1
+NSS_3_108_BETA3

security/nss/automation/taskcluster/graph/src/extend.js

@@ -61,8 +61,8 @@ queue.filter(task => {
 
   if (task.tests == "bogo" || task.tests == "tlsfuzzer") {
     // No windows
-    if (task.platform == "windows2012-64" ||
-        task.platform == "windows2012-32") {
+    if (task.platform == "windows2022-64" ||
+        task.platform == "windows2022-32") {
       return false;
     }
 
@@ -140,7 +140,7 @@ queue.map(task => {
   }
 
   // Windows is slow.
-  if ((task.platform == "windows2012-32" || task.platform == "windows2012-64") &&
+  if ((task.platform == "windows2022-32" || task.platform == "windows2012-64") &&
       task.tests == "chains") {
     task.maxRunTime = 7200;
   }
@@ -232,37 +232,37 @@ export default async function main() {
     image: LINUX_IMAGE,
   }, "--enable-fips --opt");
 
-  await scheduleWindows("Windows 2012 64 (debug, make)", {
-    platform: "windows2012-64",
+  await scheduleWindows("Windows 2022 64 (debug, make)", {
+    platform: "windows2022-64",
     collection: "make",
     env: {USE_64: "1"}
   }, "build.sh");
 
-  await scheduleWindows("Windows 2012 32 (debug, make)", {
-    platform: "windows2012-32",
+  await scheduleWindows("Windows 2022 32 (debug, make)", {
+    platform: "windows2022-32",
     collection: "make"
   }, "build.sh");
 
-  await scheduleWindows("Windows 2012 64 (opt)", {
-    platform: "windows2012-64",
+  await scheduleWindows("Windows 2022 64 (opt)", {
+    platform: "windows2022-64",
   }, "build_gyp.sh --opt");
 
-  await scheduleWindows("Windows 2012 64 (debug)", {
-    platform: "windows2012-64",
+  await scheduleWindows("Windows 2022 64 (debug)", {
+    platform: "windows2022-64",
     collection: "debug"
   }, "build_gyp.sh");
 
-  await scheduleWindows("Windows 2012 64 Static (opt)", {
-    platform: "windows2012-64",
+  await scheduleWindows("Windows 2022 64 Static (opt)", {
+    platform: "windows2022-64",
     collection: "opt-static"
   }, "build_gyp.sh --opt --static");
 
-  await scheduleWindows("Windows 2012 32 (opt)", {
-    platform: "windows2012-32",
+  await scheduleWindows("Windows 2022 32 (opt)", {
+    platform: "windows2022-32",
   }, "build_gyp.sh --opt -t ia32");
 
-  await scheduleWindows("Windows 2012 32 (debug)", {
-    platform: "windows2012-32",
+  await scheduleWindows("Windows 2022 32 (debug)", {
+    platform: "windows2022-32",
     collection: "debug"
   }, "build_gyp.sh -t ia32");
 
@@ -872,14 +872,8 @@ async function scheduleFuzzing32() {
 
 async function scheduleWindows(name, base, build_script) {
   base = merge(base, {
-    workerType: "b-win2012-azure",
+    workerType: "b-win2022",
     env: {
-      PATH: "c:\\mozilla-build\\bin;c:\\mozilla-build\\python;" +
-           "c:\\mozilla-build\\msys\\local\\bin;c:\\mozilla-build\\7zip;" +
-           "c:\\mozilla-build\\info-zip;c:\\mozilla-build\\python\\Scripts;" +
-           "c:\\mozilla-build\\yasm;c:\\mozilla-build\\msys\\bin;" +
-           "c:\\Windows\\system32;c:\\mozilla-build\\upx391w;" +
-           "c:\\mozilla-build\\moztools-x64\\bin;c:\\mozilla-build\\wget;c:\\Program Files\\Mercurial",
       DOMSUF: "localdomain",
       HOST: "localhost",
     },

security/nss/automation/taskcluster/graph/src/try_syntax.js

@@ -123,10 +123,10 @@ function filter(opts) {
         "linux64-fuzz": "linux64",
         "linux64-make": "linux64",
         "linux-make": "linux32",
-        "win64-make": "windows2012-64",
-        "win-make": "windows2012-32",
-        "win64": "windows2012-64",
-        "win": "windows2012-32"
+        "win64-make": "windows2022-64",
+        "win-make": "windows2022-32",
+        "win64": "windows2022-64",
+        "win": "windows2022-32"
       };
 
       // Check the platform name.

security/nss/automation/taskcluster/windows/build.sh

@@ -20,7 +20,7 @@ fi
 popd
 
 # Build.
-make -C nss nss_build_all
+mozmake -C nss nss_build_all
 
 # Package.
 7z a public/build/dist.7z dist

security/nss/automation/taskcluster/windows/build_gyp.sh

@@ -14,12 +14,14 @@ done
 [[ "$m" == "ia32" ]] && m=x86
 source "$(dirname "$0")/setup.sh"
 
+git clone https://chromium.googlesource.com/external/gyp
+
 # Install GYP.
 pushd gyp
-python -m virtualenv test-env
+python -m venv ./test-env
 test-env/Scripts/python setup.py install
 test-env/Scripts/python -m pip install --upgrade pip
-test-env/Scripts/pip install --upgrade 'setuptools<45.0.0'
+test-env/Scripts/pip install --upgrade 'setuptools<45.0.0' six
 # Fool GYP.
 touch "${VSPATH}/VC/vcvarsall.bat"
 export GYP_MSVS_OVERRIDE_PATH="${VSPATH}"
@@ -38,6 +40,11 @@ if [[ -f ../nss/nspr.patch && "$ALLOW_NSPR_PATCH" == "1" ]]; then
 fi
 popd
 
+make () {
+	mozmake "$@"
+}
+export -f make
+
 # Build with gyp.
 ./nss/build.sh -g -v --enable-libpkix -Denable_draft_hpke=1 "$@"
 

security/nss/automation/taskcluster/windows/releng.manifest

@@ -14,13 +14,5 @@
     "algorithm": "sha512",
     "filename": "ninja171.zip",
     "unpack": true
-  },
-  {
-    "size": 13063963,
-    "visibility": "public",
-    "digest": "47a19f8f863eab3414abab2b9e9bd901ab896c799b3d9254b456b2f59374b085b99de805e21069a0819f01eecb3f43f7e2395a8c644c04bcbfa5711261cca29d",
-    "algorithm": "sha512",
-    "filename": "gyp-2017-05-23.zip",
-    "unpack": true
   }
 ]

security/nss/automation/taskcluster/windows/setup.sh

@@ -15,42 +15,41 @@ hg_clone() {
     exit 1
 }
 
-hg_clone https://hg.mozilla.org/build/tools tools b8d7c263dfc3
-tools/scripts/tooltool/tooltool_wrapper.sh \
-    $(dirname $0)/releng.manifest http://taskcluster/tooltool.mozilla-releng.net/ \
-    non-existant-file.sh /c/mozilla-build/python/python.exe \
-    /c/builds/tooltool.py \
-    -c /c/builds/tooltool_cache
+export SSL_CERT_FILE=/c/mozilla-build/python3/Lib/site-packages/certifi/cacert.pem
 
-# This needs $m to be set.
-[[ -n "$m" ]]
-
-# Setup MSVC paths.
-export VSPATH="${PWD}/vs2017_15.4.2"
-UCRTVersion="10.0.15063.0"
+/c/mozilla-build/python/python.exe /c/builds/tooltool.py -c /c/builds/tooltool_cache --url ${TASKCLUSTER_PROXY_URL}/tooltool.mozilla-releng.net/ --overwrite -m $(dirname $0)/releng.manifest fetch
 
-export WINDOWSSDKDIR="${VSPATH}/SDK"
-export VS90COMNTOOLS="${VSPATH}/VC"
-export WIN32_REDIST_DIR="${VSPATH}/VC/redist/${m}/Microsoft.VC141.CRT"
-export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/${m}"
+# This needs $m to be set.
+if [ -n "$m" ]; then
+
+    # Setup MSVC paths.
+    export VSPATH="${PWD}/vs2017_15.4.2"
+    UCRTVersion="10.0.15063.0"
+
+    export WINDOWSSDKDIR="${VSPATH}/SDK"
+    export VS90COMNTOOLS="${VSPATH}/VC"
+    export WIN32_REDIST_DIR="${VSPATH}/VC/redist/${m}/Microsoft.VC141.CRT"
+    export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/${m}"
+
+    if [ "$m" == "x86" ]; then
+        PATH="${VSPATH}/VC/bin/Hostx64/x64:${PATH}"
+        PATH="${VSPATH}/VC/bin/Hostx64/x86:${PATH}"
+    fi
+    PATH="${VSPATH}/VC/bin/Host${m}/${m}:${PATH}"
+    PATH="${WIN32_REDIST_DIR}:${PATH}"
+    PATH="${WIN_UCRT_REDIST_DIR}:${PATH}"
+    PATH="${VSPATH}/SDK/bin/${UCRTVersion}/x64:${PATH}"
+    export PATH
+
+    LIB="${LIB}:${VSPATH}/VC/lib/${m}"
+    LIB="${LIB}:${VSPATH}/SDK/lib/${UCRTVersion}/ucrt/${m}"
+    LIB="${LIB}:${VSPATH}/SDK/lib/${UCRTVersion}/um/${m}"
+    export LIB
+
+    INCLUDE="${INCLUDE}:${VSPATH}/VC/include"
+    INCLUDE="${INCLUDE}:${VSPATH}/SDK/Include/${UCRTVersion}/ucrt"
+    INCLUDE="${INCLUDE}:${VSPATH}/SDK/Include/${UCRTVersion}/shared"
+    INCLUDE="${INCLUDE}:${VSPATH}/SDK/Include/${UCRTVersion}/um"
+    export INCLUDE
 
-if [ "$m" == "x86" ]; then
-    PATH="${PATH}:${VSPATH}/VC/bin/Hostx64/x86"
-    PATH="${PATH}:${VSPATH}/VC/bin/Hostx64/x64"
 fi
-PATH="${PATH}:${VSPATH}/VC/bin/Host${m}/${m}"
-PATH="${PATH}:${WIN32_REDIST_DIR}"
-PATH="${PATH}:${WIN_UCRT_REDIST_DIR}"
-PATH="${PATH}:${VSPATH}/SDK/bin/${UCRTVersion}/x64"
-export PATH
-
-LIB="${LIB}:${VSPATH}/VC/lib/${m}"
-LIB="${LIB}:${VSPATH}/SDK/lib/${UCRTVersion}/ucrt/${m}"
-LIB="${LIB}:${VSPATH}/SDK/lib/${UCRTVersion}/um/${m}"
-export LIB
-
-INCLUDE="${INCLUDE}:${VSPATH}/VC/include"
-INCLUDE="${INCLUDE}:${VSPATH}/SDK/Include/${UCRTVersion}/ucrt"
-INCLUDE="${INCLUDE}:${VSPATH}/SDK/Include/${UCRTVersion}/shared"
-INCLUDE="${INCLUDE}:${VSPATH}/SDK/Include/${UCRTVersion}/um"
-export INCLUDE

security/nss/build.sh

@@ -70,7 +70,7 @@ ninja_params=()
 
 # Assume that MSVC is wanted if this is running on windows.
 platform=$(uname -s)
-if [ "${platform%-*}" = "MINGW32_NT" -o "${platform%-*}" = "MINGW64_NT" ]; then
+if [ "${platform%-*}" = "MINGW32_NT" -o "${platform%-*}" = "MINGW64_NT" -o "${platform%%-*}" = "MSYS_NT" ]; then
     msvc=1
 fi
 

security/nss/coreconf/arch.mk

@@ -141,8 +141,8 @@ endif
 # If uname -s returns "MINGW*_NT-*", we assume that we are using
 # the uname.exe in the MSYS toolkit.
 #
-ifneq (,$(filter MINGW32_NT-% MINGW64_NT-%,$(OS_ARCH)))
-    OS_RELEASE := $(patsubst MINGW64_NT-%,%,$(patsubst MINGW32_NT-%,%,$(OS_ARCH)))
+ifneq (,$(filter MSYS_NT-% MINGW32_NT-% MINGW64_NT-%,$(OS_ARCH)))
+    OS_RELEASE := $(patsubst MSYS_NT-%,%,$(patsubst MINGW64_NT-%,%,$(patsubst MINGW32_NT-%,%,$(OS_ARCH))))
     OS_ARCH = WINNT
     USE_MSYS = 1
     ifndef CPU_ARCH

security/nss/coreconf/coreconf.dep

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