diff options
author | Mark H Weaver <mhw@netris.org> | 2015-01-30 02:37:44 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2015-01-30 10:54:41 -0500 |
commit | 582100a0c07a245abd1580e9caaf9896e0d0e67f (patch) | |
tree | b9291dec4d035f299461baa75c4852a25365c533 /gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch | |
parent | 686e025d79e9747adb96c1d328c799539a2ec8c3 (diff) | |
download | guix-patches-582100a0c07a245abd1580e9caaf9896e0d0e67f.tar guix-patches-582100a0c07a245abd1580e9caaf9896e0d0e67f.tar.gz |
gnu: icecat: Update to 31.4.0.
* gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1072847.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1079729.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1080312.patch,
gnu/packages/patches/icecat-CVE-2014-1587-bug-1089207.patch,
gnu/packages/patches/icecat-CVE-2014-1590.patch,
gnu/packages/patches/icecat-CVE-2014-1592.patch,
gnu/packages/patches/icecat-CVE-2014-1593.patch,
gnu/packages/patches/icecat-CVE-2014-1594.patch,
gnu/packages/patches/icecat-CVE-2014-8634-pt1.patch,
gnu/packages/patches/icecat-CVE-2014-8634-pt2.patch,
gnu/packages/patches/icecat-CVE-2014-8638-pt1.patch,
gnu/packages/patches/icecat-CVE-2014-8638-pt2.patch,
gnu/packages/patches/icecat-CVE-2014-8639.patch,
gnu/packages/patches/icecat-CVE-2014-8641.patch,
gnu/packages/patches/icecat-armhf-xpcom.patch: Remove files.
* gnu-system.am (dist_patch_DATA): Remove them.
* gnu/packages/gnuzilla.scm: Update to 31.4.0. Remove patches.
Diffstat (limited to 'gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch')
-rw-r--r-- | gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch b/gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch deleted file mode 100644 index 4e45e3062f..0000000000 --- a/gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 60529fc02cf10482d8fecd699eea271ddc22bcb9 -Author: Jason Orendorff <jorendorff@mozilla.com> -Date: Thu Aug 28 15:43:57 2014 -0500 - - Bug 1042567 - Reflect JSPropertyOp properties more consistently as data properties. r=efaust, a=lmandel - - Modified js/src/jsobj.cpp -diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp -index 2745509..ad336f3 100644 ---- a/js/src/jsobj.cpp -+++ b/js/src/jsobj.cpp -@@ -235,11 +235,18 @@ js::GetOwnPropertyDescriptor(JSContext *cx, HandleObject obj, HandleId id, - if (pobj->isNative()) { - desc.setAttributes(GetShapeAttributes(pobj, shape)); - if (desc.hasGetterOrSetterObject()) { -+ MOZ_ASSERT(desc.isShared()); - doGet = false; - if (desc.hasGetterObject()) - desc.setGetterObject(shape->getterObject()); - if (desc.hasSetterObject()) - desc.setSetterObject(shape->setterObject()); -+ } else { -+ // This is either a straight-up data property or (rarely) a -+ // property with a JSPropertyOp getter/setter. The latter must be -+ // reported to the caller as a plain data property, so don't -+ // populate desc.getter/setter, and mask away the SHARED bit. -+ desc.attributesRef() &= ~JSPROP_SHARED; - } - } else { - if (!JSObject::getGenericAttributes(cx, pobj, id, &desc.attributesRef())) |