diff options
author | Mark H Weaver <mhw@netris.org> | 2015-10-13 15:56:32 -0400 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-10-14 01:41:56 -0400 |
commit | 9f7ae77fe287d7856718c5dfd60891be9b561b1d (patch) | |
tree | be9b00c7f6110d41c5e3450bc784ffe81ef1805b /gnu/packages/patches/icecat-CVE-2015-4492.patch | |
parent | 837294b7a431eaecbaf9336e574fe23d55d40d42 (diff) | |
download | guix-9f7ae77fe287d7856718c5dfd60891be9b561b1d.tar guix-9f7ae77fe287d7856718c5dfd60891be9b561b1d.tar.gz |
gnu: icecat: Update to 38.3.0-gnu1.
* gnu/packages/patches/icecat-CVE-2015-4473-partial.patch,
gnu/packages/patches/icecat-CVE-2015-4482.patch,
gnu/packages/patches/icecat-CVE-2015-4488.patch,
gnu/packages/patches/icecat-CVE-2015-4489.patch,
gnu/packages/patches/icecat-CVE-2015-4491.patch,
gnu/packages/patches/icecat-CVE-2015-4492.patch,
gnu/packages/patches/icecat-CVE-2015-4495.patch,
gnu/packages/patches/icecat-enable-acceleration-and-webgl.patch,
gnu/packages/patches/icecat-libvpx-1.4.patch: Delete files.
* gnu/packages/patches/icecat-avoid-bundled-includes.patch: New file.
* gnu-system.am (dist_patch_DATA): Add new patch. Remove the deleted ones.
* gnu/packages/gnuzilla.scm (icecat): Update to 38.3.0-gnu1.
[source]: Add new patch. Remove the deleted ones.
[inputs]: Add libxcomposite.
[arguments]: Add 'ensure-no-mtimes-pre-1980' phase. Adapt
'remove-h264parse-from-blacklist' and
'arrange-to-link-libxul-with-libraries-it-might-dlopen' phases to the
new version.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2015-4492.patch')
-rw-r--r-- | gnu/packages/patches/icecat-CVE-2015-4492.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2015-4492.patch b/gnu/packages/patches/icecat-CVE-2015-4492.patch deleted file mode 100644 index 5d401f5a32..0000000000 --- a/gnu/packages/patches/icecat-CVE-2015-4492.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 9d5f21ee3a754d20bca4513f55553ea6694a7b25 Mon Sep 17 00:00:00 2001 -From: Andrea Marchesini <amarchesini@mozilla.com> -Date: Wed, 29 Jul 2015 16:10:15 -0400 -Subject: [PATCH] Bug 1185820 - XMLHttpRequest::Open() in worker should count - the recursion using a uint32_t and not a boolean. r=khuey, a=lmandel - ---HG-- -extra : transplant_source : %8F%89%24%FF%A1%F7d%5B%BE%E9%FC3%C6%E1%AC%27r%5Eq%16 -extra : histedit_source : 5857f0cedf1cfb5361e6f404a094719814a2b415 ---- - dom/workers/XMLHttpRequest.cpp | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp -index aac97ab..7099279 100644 ---- a/dom/workers/XMLHttpRequest.cpp -+++ b/dom/workers/XMLHttpRequest.cpp -@@ -100,6 +100,7 @@ public: - // Only touched on the worker thread. - uint32_t mOuterEventStreamId; - uint32_t mOuterChannelId; -+ uint32_t mOpenCount; - uint64_t mLastLoaded; - uint64_t mLastTotal; - uint64_t mLastUploadLoaded; -@@ -109,7 +110,6 @@ public: - bool mLastUploadLengthComputable; - bool mSeenLoadStart; - bool mSeenUploadLoadStart; -- bool mOpening; - - // Only touched on the main thread. - bool mUploadEventListenersAttached; -@@ -122,10 +122,10 @@ public: - : mWorkerPrivate(nullptr), mXMLHttpRequestPrivate(aXHRPrivate), - mMozAnon(aMozAnon), mMozSystem(aMozSystem), - mInnerEventStreamId(0), mInnerChannelId(0), mOutstandingSendCount(0), -- mOuterEventStreamId(0), mOuterChannelId(0), mLastLoaded(0), mLastTotal(0), -- mLastUploadLoaded(0), mLastUploadTotal(0), mIsSyncXHR(false), -+ mOuterEventStreamId(0), mOuterChannelId(0), mOpenCount(0), mLastLoaded(0), -+ mLastTotal(0), mLastUploadLoaded(0), mLastUploadTotal(0), mIsSyncXHR(false), - mLastLengthComputable(false), mLastUploadLengthComputable(false), -- mSeenLoadStart(false), mSeenUploadLoadStart(false), mOpening(false), -+ mSeenLoadStart(false), mSeenUploadLoadStart(false), - mUploadEventListenersAttached(false), mMainThreadSeenLoadStart(false), - mInOpen(false), mArrayBufferResponseWasTransferred(false) - { } -@@ -1850,7 +1850,7 @@ XMLHttpRequest::SendInternal(const nsAString& aStringBody, - mWorkerPrivate->AssertIsOnWorkerThread(); - - // No send() calls when open is running. -- if (mProxy->mOpening) { -+ if (mProxy->mOpenCount) { - aRv.Throw(NS_ERROR_FAILURE); - return; - } -@@ -1945,15 +1945,17 @@ XMLHttpRequest::Open(const nsACString& aMethod, const nsAString& aUrl, - mBackgroundRequest, mWithCredentials, - mTimeout); - -- mProxy->mOpening = true; -+ ++mProxy->mOpenCount; - if (!runnable->Dispatch(mWorkerPrivate->GetJSContext())) { -- mProxy->mOpening = false; -- ReleaseProxy(); -+ if (!--mProxy->mOpenCount) { -+ ReleaseProxy(); -+ } -+ - aRv.Throw(NS_ERROR_FAILURE); - return; - } - -- mProxy->mOpening = false; -+ --mProxy->mOpenCount; - mProxy->mIsSyncXHR = !aAsync; - } - --- -2.4.3 - |