rebase

mozilla-central/patches/9999999-NSSgetentropy.patch

@@ -9,29 +9,29 @@ Bug 9999999 - Avoid use of getentropy in --enable-stdcxx-compat builds.
 diff --git a/security/moz.build b/security/moz.build
 --- a/security/moz.build
 +++ b/security/moz.build
-@@ -137,16 +137,18 @@ if CONFIG['OS_TARGET'] == 'WINNT':
- if CONFIG['OS_TARGET'] == 'Android':
-     sandbox_vars['CFLAGS'] = [
-         '-include', TOPSRCDIR + '/security/manager/android_stub.h',
-         # Setting sandbox_vars['DEFINES'] is broken currently.
-         '-DCHECK_FORK_GETPID',
+@@ -139,16 +139,18 @@ if CONFIG["OS_TARGET"] == "WINNT":
+         sandbox_vars["ASFLAGS"] = ["-safeseh"]
+ if CONFIG["OS_TARGET"] == "Android":
+     sandbox_vars["CFLAGS"] = [
+         "-include",
+         TOPSRCDIR + "/security/manager/android_stub.h",
      ]
-     if CONFIG['ANDROID_VERSION']:
-         sandbox_vars['CFLAGS'] += ['-DANDROID_VERSION=' + CONFIG['ANDROID_VERSION']]
+     if CONFIG["ANDROID_VERSION"]:
+         sandbox_vars["CFLAGS"] += ["-DANDROID_VERSION=" + CONFIG["ANDROID_VERSION"]]
 +if CONFIG["MOZ_LIBSTDCXX_TARGET_VERSION"] or CONFIG["MOZ_LIBSTDCXX_HOST_VERSION"]:
 +    sandbox_vars['CFLAGS'] = ['-DNSS_STDCXX_COMPAT']
- if CONFIG['MOZ_SYSTEM_NSS']:
-     sandbox_vars['CXXFLAGS'] = CONFIG['NSS_CFLAGS']
- GYP_DIRS['nss'].sandbox_vars = sandbox_vars
- GYP_DIRS['nss'].no_chromium = True
- GYP_DIRS['nss'].no_unified = True
+ if CONFIG["MOZ_SYSTEM_NSS"]:
+     sandbox_vars["CXXFLAGS"] = CONFIG["NSS_CFLAGS"]
+ GYP_DIRS["nss"].sandbox_vars = sandbox_vars
+ GYP_DIRS["nss"].no_chromium = True
+ GYP_DIRS["nss"].no_unified = True
  # This maps action names from gyp files to
  # Python scripts that can be used in moz.build GENERATED_FILES.
- GYP_DIRS['nss'].action_overrides = {
+ GYP_DIRS["nss"].action_overrides = {
 diff --git a/security/nss/lib/freebl/unix_urandom.c b/security/nss/lib/freebl/unix_urandom.c
 --- a/security/nss/lib/freebl/unix_urandom.c
 +++ b/security/nss/lib/freebl/unix_urandom.c
-@@ -27,17 +27,21 @@ RNG_SystemInfoForRNG(void)
+@@ -28,17 +28,21 @@ RNG_SystemInfoForRNG(void)
  size_t
  RNG_SystemRNG(void *dest, size_t maxLen)
  {