From owner-freebsd-gecko@FreeBSD.ORG Sat May 24 04:37:23 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E146587 for ; Sat, 24 May 2014 04:37:23 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C158427AE for ; Sat, 24 May 2014 04:37:21 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s4O4bINY071568 for ; Sat, 24 May 2014 04:37:18 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s4O4bDDX070017 for freebsd-gecko@freebsd.org; Sat, 24 May 2014 04:37:13 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 24 May 2014 04:37:13 GMT Message-Id: <201405240437.s4O4bDDX070017@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1587 - in trunk: mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2014 04:37:23 -0000 Author: jbeich Date: Sat May 24 04:37:11 2014 New Revision: 1587 Log: generate UUIDs version 4 via arc4random(3) Added: 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 Added: trunk/mail/thunderbird/files/patch-bug1015547 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-bug1015547 Sat May 24 04:37:11 2014 (r1587) @@ -0,0 +1,70 @@ +diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp +index 0687344..8b594c3 100644 +--- mozilla/xpcom/base/nsUUIDGenerator.cpp ++++ mozilla/xpcom/base/nsUUIDGenerator.cpp +@@ -36,7 +36,9 @@ 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__) + /* initialize random number generator using NSPR random noise */ + unsigned int seed; + +@@ -69,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 */ + + return NS_OK; + } +@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + * 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__) + setstate(mState); + #endif + + size_t bytesLeft = sizeof(nsID); + while (bytesLeft > 0) { +-#ifdef ANDROID ++#if defined(ANDROID) \ ++ || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + long rval = arc4random(); + const size_t mRBytes = 4; + #else +@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + id->m3[0] &= 0x3f; + id->m3[0] |= 0x80; + +-#ifndef ANDROID ++#if !defined(ANDROID) \ ++ && !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + /* Restore the previous RNG state */ + setstate(mSavedState); + #endif +diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h +index 6a24212..e7a548f 100644 +--- mozilla/xpcom/base/nsUUIDGenerator.h ++++ mozilla/xpcom/base/nsUUIDGenerator.h +@@ -27,7 +27,9 @@ 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__) + char mState[128]; + char *mSavedState; + uint8_t mRBytes; Added: trunk/www/firefox-esr/files/patch-bug1015547 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-esr/files/patch-bug1015547 Sat May 24 04:37:11 2014 (r1587) @@ -0,0 +1,70 @@ +diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp +index 0687344..8b594c3 100644 +--- xpcom/base/nsUUIDGenerator.cpp ++++ xpcom/base/nsUUIDGenerator.cpp +@@ -36,7 +36,9 @@ 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__) + /* initialize random number generator using NSPR random noise */ + unsigned int seed; + +@@ -69,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 */ + + return NS_OK; + } +@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + * 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__) + setstate(mState); + #endif + + size_t bytesLeft = sizeof(nsID); + while (bytesLeft > 0) { +-#ifdef ANDROID ++#if defined(ANDROID) \ ++ || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + long rval = arc4random(); + const size_t mRBytes = 4; + #else +@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + id->m3[0] &= 0x3f; + id->m3[0] |= 0x80; + +-#ifndef ANDROID ++#if !defined(ANDROID) \ ++ && !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + /* Restore the previous RNG state */ + setstate(mSavedState); + #endif +diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h +index 6a24212..e7a548f 100644 +--- xpcom/base/nsUUIDGenerator.h ++++ xpcom/base/nsUUIDGenerator.h +@@ -27,7 +27,9 @@ 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__) + char mState[128]; + char *mSavedState; + uint8_t mRBytes; Added: trunk/www/firefox-nightly/files/patch-bug1015547 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug1015547 Sat May 24 04:37:11 2014 (r1587) @@ -0,0 +1,70 @@ +diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp +index 0687344..8b594c3 100644 +--- xpcom/base/nsUUIDGenerator.cpp ++++ xpcom/base/nsUUIDGenerator.cpp +@@ -35,7 +35,9 @@ 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__) + /* initialize random number generator using NSPR random noise */ + unsigned int seed; + +@@ -72,7 +74,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 */ + + return NS_OK; + } +@@ -122,13 +124,17 @@ 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__) + setstate(mState); + #endif + + size_t bytesLeft = sizeof(nsID); + while (bytesLeft > 0) { +-#ifdef ANDROID ++#if defined(ANDROID) \ ++ || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + long rval = arc4random(); + const size_t mRBytes = 4; + #else +@@ -159,7 +165,9 @@ 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__) + /* Restore the previous RNG state */ + setstate(mSavedState); + #endif +diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h +index 6a24212..e7a548f 100644 +--- xpcom/base/nsUUIDGenerator.h ++++ xpcom/base/nsUUIDGenerator.h +@@ -29,7 +29,9 @@ 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__) + char mState[128]; + char* mSavedState; + uint8_t mRBytes; Added: trunk/www/firefox/files/patch-bug1015547 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox/files/patch-bug1015547 Sat May 24 04:37:11 2014 (r1587) @@ -0,0 +1,70 @@ +diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp +index 0687344..8b594c3 100644 +--- xpcom/base/nsUUIDGenerator.cpp ++++ xpcom/base/nsUUIDGenerator.cpp +@@ -36,7 +36,9 @@ 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__) + /* initialize random number generator using NSPR random noise */ + unsigned int seed; + +@@ -69,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 */ + + return NS_OK; + } +@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + * 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__) + setstate(mState); + #endif + + size_t bytesLeft = sizeof(nsID); + while (bytesLeft > 0) { +-#ifdef ANDROID ++#if defined(ANDROID) \ ++ || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + long rval = arc4random(); + const size_t mRBytes = 4; + #else +@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + id->m3[0] &= 0x3f; + id->m3[0] |= 0x80; + +-#ifndef ANDROID ++#if !defined(ANDROID) \ ++ && !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + /* Restore the previous RNG state */ + setstate(mSavedState); + #endif +diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h +index 6a24212..e7a548f 100644 +--- xpcom/base/nsUUIDGenerator.h ++++ xpcom/base/nsUUIDGenerator.h +@@ -27,7 +27,9 @@ 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__) + char mState[128]; + char *mSavedState; + uint8_t mRBytes; Added: trunk/www/libxul/files/patch-bug1015547 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/libxul/files/patch-bug1015547 Sat May 24 04:37:11 2014 (r1587) @@ -0,0 +1,70 @@ +diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp +index 0687344..8b594c3 100644 +--- xpcom/base/nsUUIDGenerator.cpp ++++ xpcom/base/nsUUIDGenerator.cpp +@@ -36,7 +36,9 @@ 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__) + /* initialize random number generator using NSPR random noise */ + unsigned int seed; + +@@ -69,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 */ + + return NS_OK; + } +@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + * 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__) + setstate(mState); + #endif + + size_t bytesLeft = sizeof(nsID); + while (bytesLeft > 0) { +-#ifdef ANDROID ++#if defined(ANDROID) \ ++ || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + long rval = arc4random(); + const size_t mRBytes = 4; + #else +@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + id->m3[0] &= 0x3f; + id->m3[0] |= 0x80; + +-#ifndef ANDROID ++#if !defined(ANDROID) \ ++ && !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + /* Restore the previous RNG state */ + setstate(mSavedState); + #endif +diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h +index 6a24212..e7a548f 100644 +--- xpcom/base/nsUUIDGenerator.h ++++ xpcom/base/nsUUIDGenerator.h +@@ -27,7 +27,9 @@ 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__) + char mState[128]; + char *mSavedState; + uint8_t mRBytes; Added: trunk/www/seamonkey/files/patch-bug1015547 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/patch-bug1015547 Sat May 24 04:37:11 2014 (r1587) @@ -0,0 +1,70 @@ +diff --git xpcom/base/nsUUIDGenerator.cpp xpcom/base/nsUUIDGenerator.cpp +index 0687344..8b594c3 100644 +--- mozilla/xpcom/base/nsUUIDGenerator.cpp ++++ mozilla/xpcom/base/nsUUIDGenerator.cpp +@@ -36,7 +36,9 @@ 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__) + /* initialize random number generator using NSPR random noise */ + unsigned int seed; + +@@ -69,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 */ + + return NS_OK; + } +@@ -116,13 +118,17 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + * 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__) + setstate(mState); + #endif + + size_t bytesLeft = sizeof(nsID); + while (bytesLeft > 0) { +-#ifdef ANDROID ++#if defined(ANDROID) \ ++ || defined(__DragonFly__) || defined(__FreeBSD__) \ ++ || defined(__NetBSD__) || defined(__OpenBSD__) + long rval = arc4random(); + const size_t mRBytes = 4; + #else +@@ -152,7 +158,9 @@ nsUUIDGenerator::GenerateUUIDInPlace(nsI + id->m3[0] &= 0x3f; + id->m3[0] |= 0x80; + +-#ifndef ANDROID ++#if !defined(ANDROID) \ ++ && !defined(__DragonFly__) && !defined(__FreeBSD__) \ ++ && !defined(__NetBSD__) && !defined(__OpenBSD__) + /* Restore the previous RNG state */ + setstate(mSavedState); + #endif +diff --git xpcom/base/nsUUIDGenerator.h xpcom/base/nsUUIDGenerator.h +index 6a24212..e7a548f 100644 +--- mozilla/xpcom/base/nsUUIDGenerator.h ++++ mozilla/xpcom/base/nsUUIDGenerator.h +@@ -27,7 +27,9 @@ 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__) + char mState[128]; + char *mSavedState; + uint8_t mRBytes;