[SVN-Commit] r1590 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Sat May 31 14:38:03 UTC 2014 

Author: jbeich
Date: Sat May 31 14:37:47 2014
New Revision: 1590

Log:
sync and switch to arc4random_buf

Modified:
   trunk/mail/thunderbird/files/patch-bug1015547
   trunk/www/firefox-esr/files/patch-bug1015547
   trunk/www/firefox-nightly/files/patch-bug1015547
   trunk/www/firefox/files/patch-bug1015547
   trunk/www/libxul/files/patch-bug1015547
   trunk/www/seamonkey/files/patch-bug1015547

Modified: trunk/mail/thunderbird/files/patch-bug1015547
==============================================================================
--- trunk/mail/thunderbird/files/patch-bug1015547	Mon May 26 11:10:00 2014	(r1589)
+++ trunk/mail/thunderbird/files/patch-bug1015547	Sat May 31 14:37:47 2014	(r1590)
@@ -1,70 +1,94 @@
+diff --git configure.in configure.in
+index 7bed45f..053de17 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -3166,6 +3166,7 @@ AC_CHECK_FUNCS(random strerror lchown fc
+ AC_CHECK_FUNCS(statvfs64 statvfs statfs64 statfs)
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ AC_CHECK_FUNCS(localtime_r strtok_r)
++AC_CHECK_FUNCS(arc4random arc4random_buf)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
 diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
-index 0687344..8b594c3 100644
+index 0687344..ca3ff8b 100644
 --- mozilla/xpcom/base/nsUUIDGenerator.cpp
 +++ mozilla/xpcom/base/nsUUIDGenerator.cpp
-@@ -36,7 +36,9 @@ nsUUIDGenerator::Init()
+@@ -15,6 +15,10 @@
+ 
+ #include "nsUUIDGenerator.h"
+ 
++#ifdef ANDROID
++extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
++#endif
++
+ using namespace mozilla;
+ 
+ NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator)
+@@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
      // We're a service, so we're guaranteed that Init() is not going
      // to be reentered while we're inside Init().
      
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      /* initialize random number generator using NSPR random noise */
      unsigned int seed;
  
-@@ -69,7 +71,7 @@ nsUUIDGenerator::Init()
+@@ -67,7 +71,7 @@ nsUUIDGenerator::Init()
          return NS_ERROR_FAILURE;
  #endif
  
 -#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ANDROID and non BSDs */
++#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
  
      return NS_OK;
  }
-@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -114,13 +118,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
       * back to it; instead, we use the value returned when we called
       * initstate, since older glibc's have broken setstate() return values
       */
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      setstate(mState);
  #endif
  
++#ifdef HAVE_ARC4RANDOM_BUF
++    arc4random_buf(id, sizeof(nsID));
++#else /* HAVE_ARC4RANDOM_BUF */
      size_t bytesLeft = sizeof(nsID);
      while (bytesLeft > 0) {
 -#ifdef ANDROID
-+#if defined(ANDROID) \
-+ || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
++#ifdef HAVE_ARC4RANDOM
          long rval = arc4random();
          const size_t mRBytes = 4;
  #else
-@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -141,6 +148,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+ 
+         bytesLeft -= toWrite;
+     }
++#endif /* HAVE_ARC4RANDOM_BUF */
+ 
+     /* Put in the version */
+     id->m2 &= 0x0fff;
+@@ -150,7 +158,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
      id->m3[0] &= 0x3f;
      id->m3[0] |= 0x80;
  
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      /* Restore the previous RNG state */
      setstate(mSavedState);
  #endif
 diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
-index 6a24212..e7a548f 100644
+index 6a24212..68ed6f2 100644
 --- mozilla/xpcom/base/nsUUIDGenerator.h
 +++ mozilla/xpcom/base/nsUUIDGenerator.h
-@@ -27,7 +27,9 @@ private:
+@@ -27,7 +27,7 @@ private:
  protected:
  
      mozilla::Mutex mLock;
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      char mState[128];
      char *mSavedState;
      uint8_t mRBytes;

Modified: trunk/www/firefox-esr/files/patch-bug1015547
==============================================================================
--- trunk/www/firefox-esr/files/patch-bug1015547	Mon May 26 11:10:00 2014	(r1589)
+++ trunk/www/firefox-esr/files/patch-bug1015547	Sat May 31 14:37:47 2014	(r1590)
@@ -1,70 +1,94 @@
+diff --git configure.in configure.in
+index 7bed45f..053de17 100644
+--- configure.in
++++ configure.in
+@@ -3166,6 +3166,7 @@ AC_CHECK_FUNCS(random strerror lchown fc
+ AC_CHECK_FUNCS(statvfs64 statvfs statfs64 statfs)
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ AC_CHECK_FUNCS(localtime_r strtok_r)
++AC_CHECK_FUNCS(arc4random arc4random_buf)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
 diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
-index 0687344..8b594c3 100644
+index 0687344..ca3ff8b 100644
 --- xpcom/base/nsUUIDGenerator.cpp
 +++ xpcom/base/nsUUIDGenerator.cpp
-@@ -36,7 +36,9 @@ nsUUIDGenerator::Init()
+@@ -15,6 +15,10 @@
+ 
+ #include "nsUUIDGenerator.h"
+ 
++#ifdef ANDROID
++extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
++#endif
++
+ using namespace mozilla;
+ 
+ NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator)
+@@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
      // We're a service, so we're guaranteed that Init() is not going
      // to be reentered while we're inside Init().
      
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      /* initialize random number generator using NSPR random noise */
      unsigned int seed;
  
-@@ -69,7 +71,7 @@ nsUUIDGenerator::Init()
+@@ -67,7 +71,7 @@ nsUUIDGenerator::Init()
          return NS_ERROR_FAILURE;
  #endif
  
 -#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ANDROID and non BSDs */
++#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
  
      return NS_OK;
  }
-@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -114,13 +118,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
       * back to it; instead, we use the value returned when we called
       * initstate, since older glibc's have broken setstate() return values
       */
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      setstate(mState);
  #endif
  
++#ifdef HAVE_ARC4RANDOM_BUF
++    arc4random_buf(id, sizeof(nsID));
++#else /* HAVE_ARC4RANDOM_BUF */
      size_t bytesLeft = sizeof(nsID);
      while (bytesLeft > 0) {
 -#ifdef ANDROID
-+#if defined(ANDROID) \
-+ || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
++#ifdef HAVE_ARC4RANDOM
          long rval = arc4random();
          const size_t mRBytes = 4;
  #else
-@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -141,6 +148,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+ 
+         bytesLeft -= toWrite;
+     }
++#endif /* HAVE_ARC4RANDOM_BUF */
+ 
+     /* Put in the version */
+     id->m2 &= 0x0fff;
+@@ -150,7 +158,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
      id->m3[0] &= 0x3f;
      id->m3[0] |= 0x80;
  
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      /* Restore the previous RNG state */
      setstate(mSavedState);
  #endif
 diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
-index 6a24212..e7a548f 100644
+index 6a24212..68ed6f2 100644
 --- xpcom/base/nsUUIDGenerator.h
 +++ xpcom/base/nsUUIDGenerator.h
-@@ -27,7 +27,9 @@ private:
+@@ -27,7 +27,7 @@ private:
  protected:
  
      mozilla::Mutex mLock;
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      char mState[128];
      char *mSavedState;
      uint8_t mRBytes;

Modified: trunk/www/firefox-nightly/files/patch-bug1015547
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug1015547	Mon May 26 11:10:00 2014	(r1589)
+++ trunk/www/firefox-nightly/files/patch-bug1015547	Sat May 31 14:37:47 2014	(r1590)
@@ -1,70 +1,95 @@
+diff --git configure.in configure.in
+index 7bed45f..053de17 100644
+--- configure.in
++++ configure.in
+@@ -2950,7 +2950,7 @@ dnl Checks for library functions.
+ dnl ========================================================
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
++AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
 diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
-index 0687344..8b594c3 100644
+index 0687344..ca3ff8b 100644
 --- xpcom/base/nsUUIDGenerator.cpp
 +++ xpcom/base/nsUUIDGenerator.cpp
-@@ -35,7 +35,9 @@ nsUUIDGenerator::Init()
+@@ -16,6 +16,10 @@
+ 
+ #include "nsUUIDGenerator.h"
+ 
++#ifdef ANDROID
++extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
++#endif
++
+ using namespace mozilla;
+ 
+ NS_IMPL_ISUPPORTS(nsUUIDGenerator, nsIUUIDGenerator)
+@@ -35,7 +39,7 @@ nsUUIDGenerator::Init()
    // We're a service, so we're guaranteed that Init() is not going
    // to be reentered while we're inside Init().
  
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
    /* initialize random number generator using NSPR random noise */
    unsigned int seed;
  
-@@ -72,7 +74,7 @@ nsUUIDGenerator::Init()
+@@ -72,7 +76,7 @@ nsUUIDGenerator::Init()
    }
  #endif
  
 -#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ANDROID and non BSDs */
++#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
  
    return NS_OK;
  }
-@@ -122,13 +124,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
+@@ -122,13 +126,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
     * back to it; instead, we use the value returned when we called
     * initstate, since older glibc's have broken setstate() return values
     */
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
    setstate(mState);
  #endif
  
++#ifdef HAVE_ARC4RANDOM_BUF
++  arc4random_buf(aId, sizeof(nsID));
++#else /* HAVE_ARC4RANDOM_BUF */
    size_t bytesLeft = sizeof(nsID);
    while (bytesLeft > 0) {
 -#ifdef ANDROID
-+#if defined(ANDROID) \
-+ || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
++#ifdef HAVE_ARC4RANDOM
      long rval = arc4random();
      const size_t mRBytes = 4;
  #else
-@@ -159,7 +165,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
+@@ -150,6 +157,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
+ 
+     bytesLeft -= toWrite;
+   }
++#endif /* HAVE_ARC4RANDOM_BUF */
+ 
+   /* Put in the version */
+   aId->m2 &= 0x0fff;
+@@ -159,7 +167,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* aId)
    aId->m3[0] &= 0x3f;
    aId->m3[0] |= 0x80;
  
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
    /* Restore the previous RNG state */
    setstate(mSavedState);
  #endif
 diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
-index 6a24212..e7a548f 100644
+index 6a24212..68ed6f2 100644
 --- xpcom/base/nsUUIDGenerator.h
 +++ xpcom/base/nsUUIDGenerator.h
-@@ -29,7 +29,9 @@ private:
+@@ -29,7 +29,7 @@ private:
  protected:
  
    mozilla::Mutex mLock;
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
    char mState[128];
    char* mSavedState;
    uint8_t mRBytes;

Modified: trunk/www/firefox/files/patch-bug1015547
==============================================================================
--- trunk/www/firefox/files/patch-bug1015547	Mon May 26 11:10:00 2014	(r1589)
+++ trunk/www/firefox/files/patch-bug1015547	Sat May 31 14:37:47 2014	(r1590)
@@ -1,70 +1,95 @@
+diff --git configure.in configure.in
+index 7bed45f..053de17 100644
+--- configure.in
++++ configure.in
+@@ -2950,7 +2950,7 @@ dnl Checks for library functions.
+ dnl ========================================================
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
++AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
 diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
-index 0687344..8b594c3 100644
+index 0687344..ca3ff8b 100644
 --- xpcom/base/nsUUIDGenerator.cpp
 +++ xpcom/base/nsUUIDGenerator.cpp
-@@ -36,7 +36,9 @@ nsUUIDGenerator::Init()
+@@ -15,6 +15,10 @@
+ 
+ #include "nsUUIDGenerator.h"
+ 
++#ifdef ANDROID
++extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
++#endif
++
+ using namespace mozilla;
+ 
+ NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator)
+@@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
      // We're a service, so we're guaranteed that Init() is not going
      // to be reentered while we're inside Init().
      
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      /* initialize random number generator using NSPR random noise */
      unsigned int seed;
  
-@@ -69,7 +71,7 @@ nsUUIDGenerator::Init()
+@@ -67,7 +71,7 @@ nsUUIDGenerator::Init()
          return NS_ERROR_FAILURE;
  #endif
  
 -#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ANDROID and non BSDs */
++#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
  
      return NS_OK;
  }
-@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -114,13 +118,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
       * back to it; instead, we use the value returned when we called
       * initstate, since older glibc's have broken setstate() return values
       */
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      setstate(mState);
  #endif
  
++#ifdef HAVE_ARC4RANDOM_BUF
++    arc4random_buf(id, sizeof(nsID));
++#else /* HAVE_ARC4RANDOM_BUF */
      size_t bytesLeft = sizeof(nsID);
      while (bytesLeft > 0) {
 -#ifdef ANDROID
-+#if defined(ANDROID) \
-+ || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
++#ifdef HAVE_ARC4RANDOM
          long rval = arc4random();
          const size_t mRBytes = 4;
  #else
-@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -141,6 +148,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+ 
+         bytesLeft -= toWrite;
+     }
++#endif /* HAVE_ARC4RANDOM_BUF */
+ 
+     /* Put in the version */
+     id->m2 &= 0x0fff;
+@@ -150,7 +158,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
      id->m3[0] &= 0x3f;
      id->m3[0] |= 0x80;
  
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      /* Restore the previous RNG state */
      setstate(mSavedState);
  #endif
 diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
-index 6a24212..e7a548f 100644
+index 6a24212..68ed6f2 100644
 --- xpcom/base/nsUUIDGenerator.h
 +++ xpcom/base/nsUUIDGenerator.h
-@@ -27,7 +27,9 @@ private:
+@@ -27,7 +27,7 @@ private:
  protected:
  
      mozilla::Mutex mLock;
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      char mState[128];
      char *mSavedState;
      uint8_t mRBytes;

Modified: trunk/www/libxul/files/patch-bug1015547
==============================================================================
--- trunk/www/libxul/files/patch-bug1015547	Mon May 26 11:10:00 2014	(r1589)
+++ trunk/www/libxul/files/patch-bug1015547	Sat May 31 14:37:47 2014	(r1590)
@@ -1,70 +1,94 @@
+diff --git configure.in configure.in
+index 7bed45f..053de17 100644
+--- configure.in
++++ configure.in
+@@ -3166,6 +3166,7 @@ AC_CHECK_FUNCS(random strerror lchown fc
+ AC_CHECK_FUNCS(statvfs64 statvfs statfs64 statfs)
+ AC_CHECK_FUNCS(flockfile getpagesize)
+ AC_CHECK_FUNCS(localtime_r strtok_r)
++AC_CHECK_FUNCS(arc4random arc4random_buf)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
 diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
-index 0687344..8b594c3 100644
+index 0687344..ca3ff8b 100644
 --- xpcom/base/nsUUIDGenerator.cpp
 +++ xpcom/base/nsUUIDGenerator.cpp
-@@ -36,7 +36,9 @@ nsUUIDGenerator::Init()
+@@ -15,6 +15,10 @@
+ 
+ #include "nsUUIDGenerator.h"
+ 
++#ifdef ANDROID
++extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
++#endif
++
+ using namespace mozilla;
+ 
+ NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator)
+@@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
      // We're a service, so we're guaranteed that Init() is not going
      // to be reentered while we're inside Init().
      
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      /* initialize random number generator using NSPR random noise */
      unsigned int seed;
  
-@@ -69,7 +71,7 @@ nsUUIDGenerator::Init()
+@@ -67,7 +71,7 @@ nsUUIDGenerator::Init()
          return NS_ERROR_FAILURE;
  #endif
  
 -#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ANDROID and non BSDs */
++#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
  
      return NS_OK;
  }
-@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -114,13 +118,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
       * back to it; instead, we use the value returned when we called
       * initstate, since older glibc's have broken setstate() return values
       */
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      setstate(mState);
  #endif
  
++#ifdef HAVE_ARC4RANDOM_BUF
++    arc4random_buf(id, sizeof(nsID));
++#else /* HAVE_ARC4RANDOM_BUF */
      size_t bytesLeft = sizeof(nsID);
      while (bytesLeft > 0) {
 -#ifdef ANDROID
-+#if defined(ANDROID) \
-+ || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
++#ifdef HAVE_ARC4RANDOM
          long rval = arc4random();
          const size_t mRBytes = 4;
  #else
-@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -141,6 +148,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+ 
+         bytesLeft -= toWrite;
+     }
++#endif /* HAVE_ARC4RANDOM_BUF */
+ 
+     /* Put in the version */
+     id->m2 &= 0x0fff;
+@@ -150,7 +158,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
      id->m3[0] &= 0x3f;
      id->m3[0] |= 0x80;
  
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      /* Restore the previous RNG state */
      setstate(mSavedState);
  #endif
 diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
-index 6a24212..e7a548f 100644
+index 6a24212..68ed6f2 100644
 --- xpcom/base/nsUUIDGenerator.h
 +++ xpcom/base/nsUUIDGenerator.h
-@@ -27,7 +27,9 @@ private:
+@@ -27,7 +27,7 @@ private:
  protected:
  
      mozilla::Mutex mLock;
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      char mState[128];
      char *mSavedState;
      uint8_t mRBytes;

Modified: trunk/www/seamonkey/files/patch-bug1015547
==============================================================================
--- trunk/www/seamonkey/files/patch-bug1015547	Mon May 26 11:10:00 2014	(r1589)
+++ trunk/www/seamonkey/files/patch-bug1015547	Sat May 31 14:37:47 2014	(r1590)
@@ -1,70 +1,95 @@
+diff --git configure.in configure.in
+index 7bed45f..053de17 100644
+--- mozilla/configure.in
++++ mozilla/configure.in
+@@ -2950,7 +2950,7 @@ dnl Checks for library functions.
+ dnl ========================================================
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+-AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r)
++AC_CHECK_FUNCS(stat64 lstat64 truncate64 statvfs64 statvfs statfs64 statfs getpagesize localtime_r arc4random arc4random_buf)
+ 
+ dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+ AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
 diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp
-index 0687344..8b594c3 100644
+index 0687344..ca3ff8b 100644
 --- mozilla/xpcom/base/nsUUIDGenerator.cpp
 +++ mozilla/xpcom/base/nsUUIDGenerator.cpp
-@@ -36,7 +36,9 @@ nsUUIDGenerator::Init()
+@@ -15,6 +15,10 @@
+ 
+ #include "nsUUIDGenerator.h"
+ 
++#ifdef ANDROID
++extern "C" NS_EXPORT void arc4random_buf(void *, size_t);
++#endif
++
+ using namespace mozilla;
+ 
+ NS_IMPL_ISUPPORTS1(nsUUIDGenerator, nsIUUIDGenerator)
+@@ -34,7 +38,7 @@ nsUUIDGenerator::Init()
      // We're a service, so we're guaranteed that Init() is not going
      // to be reentered while we're inside Init().
      
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      /* initialize random number generator using NSPR random noise */
      unsigned int seed;
  
-@@ -69,7 +71,7 @@ nsUUIDGenerator::Init()
+@@ -67,7 +71,7 @@ nsUUIDGenerator::Init()
          return NS_ERROR_FAILURE;
  #endif
  
 -#endif /* non XP_WIN and non XP_MACOSX */
-+#endif /* non XP_WIN and non XP_MACOSX and non ANDROID and non BSDs */
++#endif /* non XP_WIN and non XP_MACOSX and non ARC4RANDOM */
  
      return NS_OK;
  }
-@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -114,13 +118,16 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
       * back to it; instead, we use the value returned when we called
       * initstate, since older glibc's have broken setstate() return values
       */
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      setstate(mState);
  #endif
  
++#ifdef HAVE_ARC4RANDOM_BUF
++    arc4random_buf(id, sizeof(nsID));
++#else /* HAVE_ARC4RANDOM_BUF */
      size_t bytesLeft = sizeof(nsID);
      while (bytesLeft > 0) {
 -#ifdef ANDROID
-+#if defined(ANDROID) \
-+ || defined(__DragonFly__) || defined(__FreeBSD__) \
-+ || defined(__NetBSD__) || defined(__OpenBSD__)
++#ifdef HAVE_ARC4RANDOM
          long rval = arc4random();
          const size_t mRBytes = 4;
  #else
-@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI
+@@ -141,6 +148,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
+ 
+         bytesLeft -= toWrite;
+     }
++#endif /* HAVE_ARC4RANDOM_BUF */
+ 
+     /* Put in the version */
+     id->m2 &= 0x0fff;
+@@ -150,7 +158,7 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsID* id)
      id->m3[0] &= 0x3f;
      id->m3[0] |= 0x80;
  
 -#ifndef ANDROID
-+#if !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#ifndef HAVE_ARC4RANDOM
      /* Restore the previous RNG state */
      setstate(mSavedState);
  #endif
 diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h
-index 6a24212..e7a548f 100644
+index 6a24212..68ed6f2 100644
 --- mozilla/xpcom/base/nsUUIDGenerator.h
 +++ mozilla/xpcom/base/nsUUIDGenerator.h
-@@ -27,7 +27,9 @@ private:
+@@ -27,7 +27,7 @@ private:
  protected:
  
      mozilla::Mutex mLock;
 -#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID)
-+#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(ANDROID) \
-+ && !defined(__DragonFly__) && !defined(__FreeBSD__) \
-+ && !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(XP_WIN) && !defined(XP_MACOSX) && !defined(HAVE_ARC4RANDOM)
      char mState[128];
      char *mSavedState;
      uint8_t mRBytes;

More information about the freebsd-gecko mailing list