Bug 1787505 - land NSS NSS_3_83_BETA2 UPGRADE_NSS_RELEASE, r=nss-revi…

…ewers,djackson

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

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.82", when="--with-system-nss", config=False
+    "NSS", "nss >= 3.83", when="--with-system-nss", config=False
 )
 
 set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")

security/nss/TAG-INFO

@@ -1 +1 @@
-e5c1e1a0eaff
+NSS_3_83_BETA2

security/nss/cmd/lib/secpwd.c

@@ -13,9 +13,6 @@
 
 #ifdef XP_UNIX
 #include <termios.h>
-#endif
-
-#if defined(XP_UNIX) || defined(XP_BEOS)
 #include <unistd.h> /* for isatty() */
 #endif
 

security/nss/cmd/modutil/install.c

@@ -252,23 +252,10 @@ Pk11Install_Release()
  * and sends the string to the handler function if it exists.
  */
 
-#ifdef OSF1
-/* stdarg has already been pulled in from NSPR */
-#undef va_start
-#undef va_end
-#undef va_arg
-#include <varargs.h>
-#else
 #include <stdarg.h>
-#endif
 
-#ifdef OSF1
-static void
-error(long va_alist, ...)
-#else
 static void
 error(PRErrorCode errcode, ...)
-#endif
 {
 
     va_list ap;
@@ -286,13 +273,8 @@ error(PRErrorCode errcode, ...)
     PR_Unlock(errorHandlerLock);
 
     if (handler) {
-#ifdef OSF1
-        va_start(ap);
-        errstr = PR_vsmprintf(errorString[va_arg(ap, Pk11Install_Error)], ap);
-#else
         va_start(ap, errcode);
         errstr = PR_vsmprintf(errorString[errcode], ap);
-#endif
         handler(errstr);
         PR_smprintf_free(errstr);
         va_end(ap);