Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (322a512e354d73931ea1d7fff1ace5257e7dddfd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (322a512e354d73931ea1d7fff1ace5257e7dddfd)
  • Date: Wed, 23 May 2012 16:15:04 -0500

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

kernels/virtualbox-module/DETAILS | 2
kernels/virtualbox-module/HISTORY | 3
libs/libffi/DETAILS | 4
libs/libffi/HISTORY | 3
libs/libxml2/CVE-2011-0216.patch | 31 +
libs/libxml2/CVE-2011-1944.patch | 100
++++
libs/libxml2/CVE-2011-2834.patch | 61 ++
libs/libxml2/CVE-2011-3102.patch | 42 +
libs/libxml2/CVE-2011-3905.patch | 61 ++
libs/libxml2/CVE-2011-3919.patch | 19
libs/libxml2/DETAILS | 2
libs/libxml2/HISTORY | 12
libs/libxml2/PRE_BUILD | 11
libs/libxml2/libxml2-2.7.8-xpath-freeing.patch | 30 +
libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch | 26 +
libs/libxml2/libxml2-2.7.8-xpath-hardening.patch | 223
++++++++++
security/wireshark/DETAILS | 6
security/wireshark/HISTORY | 3
utils/virtualbox/DETAILS | 4
utils/virtualbox/HISTORY | 3
video-libs/libvpx/DETAILS | 4
video-libs/libvpx/HISTORY | 3
x11-toolkits/qt4/DETAILS | 7
x11-toolkits/qt4/HISTORY | 4
x11-toolkits/qt4/PRE_BUILD | 1
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch | 33 -
26 files changed, 645 insertions(+), 53 deletions(-)

New commits:
commit 74df71120e4d2db56d7331ec804fb3a2482ad820
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "libffi: => 3.0.11"

This reverts commit ab5f18498125ec3cb342a9a0eb5d72cbc3fa279c.

This one brakes almost the whole system, while leaving it unusable
even for primitive tasks, and is not ready for pre-production.

It must have a proper procedure a the clean upgrade from previous
version, cause even rebuilding glib2+friends didn't help much.

commit b5e35286eb0b804c0468bf0c3e7525bbb57d0395
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

virtualbox-module 4.1.16

commit 0ed666ff07bda6b3e39e3e733060d737fa095727
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

virtualbox 4.1.16

commit 38d09057bafd3bcbf062935b5ecebafc1247498e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

libvpx 1.1.0

commit 0ef3da6812caf38bcfda2df637e310b9b746c73d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

qt4 4.8.2

commit 27992eef42ca1a83a3a855665e94729263c9408a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libxml2: fix CVE-2011-3102

commit 808d88272ece7e71993f492ef0c652dc1129b702
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/libxml2: fixed CVE-2011-0216, CVE-2011-1944, CVE-2011-2834,
CVE-2011-3102, CVE-2011-3905 and CVE-2011-3919

commit e4910a63019a869e4413f714a26168f609f0b7d1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wireshark 1.6.8, SECURITY_PATCH=36

diff --git a/kernels/virtualbox-module/DETAILS
b/kernels/virtualbox-module/DETAILS
index b40c2bf..679304e 100755
--- a/kernels/virtualbox-module/DETAILS
+++ b/kernels/virtualbox-module/DETAILS
@@ -1,5 +1,5 @@
SPELL=virtualbox-module
- VERSION=4.1.14
+ VERSION=4.1.16
SOURCE=virtualbox-module-$VERSION.tar.gz
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/vboxdrv
diff --git a/kernels/virtualbox-module/HISTORY
b/kernels/virtualbox-module/HISTORY
index 8e121b5..f1fb092 100644
--- a/kernels/virtualbox-module/HISTORY
+++ b/kernels/virtualbox-module/HISTORY
@@ -1,3 +1,6 @@
+2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.1.16
+
2012-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 4.1.14

diff --git a/libs/libffi/DETAILS b/libs/libffi/DETAILS
index bc9945c..c4448be 100755
--- a/libs/libffi/DETAILS
+++ b/libs/libffi/DETAILS
@@ -1,6 +1,6 @@
SPELL=libffi
- VERSION=3.0.11
-
SOURCE_HASH=sha512:0049388d16207078a3d6dce97c877f1d9647aa9d908a9372a3f67ca064b70d8c8b23ee458be4a15a6344a5d39ea3e6292be728dfbcc73e1efc0b1db03be874f3
+ VERSION=3.0.10
+
SOURCE_HASH=sha512:56076fe3c1556970fbbb9c8398101583492471de00d58fa3b87a18c9c01c276fc5bf429e49da0196e840126e8fef59d231734739c673c636f6be7a798b081cf7
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=ftp://sourceware.org/pub/${SPELL}/${SOURCE}
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/libs/libffi/HISTORY b/libs/libffi/HISTORY
index 04752de..cbb6e4a 100644
--- a/libs/libffi/HISTORY
+++ b/libs/libffi/HISTORY
@@ -1,6 +1,3 @@
-2012-05-16 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 3.0.11
-
2011-10-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.10

diff --git a/libs/libxml2/CVE-2011-0216.patch
b/libs/libxml2/CVE-2011-0216.patch
new file mode 100644
index 0000000..dfc99d4
--- /dev/null
+++ b/libs/libxml2/CVE-2011-0216.patch
@@ -0,0 +1,31 @@
+commit 69f04562f75212bfcabecd190ea8b06ace28ece2
+Author: Daniel Veillard <veillard AT redhat.com>
+Date: Fri Aug 19 11:05:04 2011 +0800
+
+ Fix an off by one error in encoding
+
+ this off by one error doesn't seems to reproduce on linux
+ but the error is real.
+
+diff --git a/encoding.c b/encoding.c
+index d1140bf..fb0c38a 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler
*handler, xmlBufferPtr out,
+ if (in == NULL) return(-1);
+
+ /* calculate space available */
+- written = out->size - out->use;
++ written = out->size - out->use - 1; /* count '\0' */
+ toconv = in->use;
+ /*
+ * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38
+@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler,
xmlBufferPtr out,
+ toconv = in->use;
+ if (toconv == 0)
+ return (0);
+- written = out->size - out->use;
++ written = out->size - out->use -1; /* count '\0' */
+ if (toconv * 2 >= written) {
+ xmlBufferGrow(out, out->size + toconv * 2);
+ written = out->size - out->use - 1;
diff --git a/libs/libxml2/CVE-2011-1944.patch
b/libs/libxml2/CVE-2011-1944.patch
new file mode 100644
index 0000000..62dd5d2
--- /dev/null
+++ b/libs/libxml2/CVE-2011-1944.patch
@@ -0,0 +1,100 @@
+commit d7958b21e7f8c447a26bb2436f08402b2c308be4
+Author: Chris Evans <scarybeasts AT gmail.com>
+Date: Wed Mar 23 08:13:06 2011 +0800
+
+ Fix some potential problems on reallocation failures
+
+ The count was incremented before the allocation
+ and not fixed in case of failure
+ * xpath.c: corrects a few instances where the available count of some
+ structure is updated before we know the allocation actually
+ succeeds
+
+diff --git a/xpath.c b/xpath.c
+index 8b56189..608fe00 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr
node, xmlNsPtr ns) {
+ } else if (cur->nodeNr == cur->nodeMax) {
+ xmlNodePtr *temp;
+
+- cur->nodeMax *= 2;
+- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
+ sizeof(xmlNodePtr));
+ if (temp == NULL) {
+ xmlXPathErrMemory(NULL, "growing nodeset\n");
+ return;
+ }
++ cur->nodeMax *= 2;
+ cur->nodeTab = temp;
+ }
+ cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns);
+@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur,
xmlNodePtr val) {
+ } else if (cur->nodeNr == cur->nodeMax) {
+ xmlNodePtr *temp;
+
+- cur->nodeMax *= 2;
+- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax *
++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 *
+ sizeof(xmlNodePtr));
+ if (temp == NULL) {
+ xmlXPathErrMemory(NULL, "growing nodeset\n");
+ return;
+ }
+ cur->nodeTab = temp;
++ cur->nodeMax *= 2;
+ }
+ if (val->type == XML_NAMESPACE_DECL) {
+ xmlNsPtr ns = (xmlNsPtr) val;
+@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1,
xmlNodeSetPtr val2) {
+ } else if (val1->nodeNr == val1->nodeMax) {
+ xmlNodePtr *temp;
+
+- val1->nodeMax *= 2;
+- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax *
++ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2
*
+ sizeof(xmlNodePtr));
+ if (temp == NULL) {
+ xmlXPathErrMemory(NULL, "merging nodeset\n");
+ return(NULL);
+ }
+ val1->nodeTab = temp;
++ val1->nodeMax *= 2;
+ }
+ if (n2->type == XML_NAMESPACE_DECL) {
+ xmlNsPtr ns = (xmlNsPtr) n2;
+@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1,
xmlNodeSetPtr set2,
+ } else if (set1->nodeNr >= set1->nodeMax) {
+ xmlNodePtr *temp;
+
+- set1->nodeMax *= 2;
+ temp = (xmlNodePtr *) xmlRealloc(
+- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
+ if (temp == NULL) {
+ xmlXPathErrMemory(NULL, "merging nodeset\n");
+ return(NULL);
+ }
+ set1->nodeTab = temp;
++ set1->nodeMax *= 2;
+ }
+ if (n2->type == XML_NAMESPACE_DECL) {
+ xmlNsPtr ns = (xmlNsPtr) n2;
+@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr
set1, xmlNodeSetPtr set2,
+ } else if (set1->nodeNr >= set1->nodeMax) {
+ xmlNodePtr *temp;
+
+- set1->nodeMax *= 2;
+ temp = (xmlNodePtr *) xmlRealloc(
+- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr));
++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr));
+ if (temp == NULL) {
+ xmlXPathErrMemory(NULL, "merging nodeset\n");
+ return(NULL);
+ }
+ set1->nodeTab = temp;
++ set1->nodeMax *= 2;
+ }
+ set1->nodeTab[set1->nodeNr++] = n2;
+ }
diff --git a/libs/libxml2/CVE-2011-2834.patch
b/libs/libxml2/CVE-2011-2834.patch
new file mode 100644
index 0000000..cfc61e0
--- /dev/null
+++ b/libs/libxml2/CVE-2011-2834.patch
@@ -0,0 +1,61 @@
+commit 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd
+Author: Daniel Veillard <veillard AT redhat.com>
+Date: Tue Oct 11 16:34:34 2011 +0800
+
+ Fix missing error status in XPath evaluation
+
+ Started by Chris Evans, I added a few more place where the
+ error should have been set in the evaluation context.
+
+diff --git a/xpath.c b/xpath.c
+index bcee2ea..d9d902c 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt,
xmlXPathObjectPtr value)
+ sizeof(ctxt->valueTab[0]));
+ if (tmp == NULL) {
+ xmlGenericError(xmlGenericErrorContext, "realloc failed !\n");
++ ctxt->error = XPATH_MEMORY_ERROR;
+ return (0);
+ }
+ ctxt->valueMax *= 2;
+@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr
ctxt, int nargs) {
+ if ( (ch & 0xc0) != 0xc0 ) {
+ xmlGenericError(xmlGenericErrorContext,
+ "xmlXPathTranslateFunction: Invalid UTF8 string\n");
++ /* not asserting an XPath error is probably better */
+ break;
+ }
+ /* then skip over remaining bytes for this char */
+@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr
ctxt, int nargs) {
+ if ( (*cptr++ & 0xc0) != 0x80 ) {
+ xmlGenericError(xmlGenericErrorContext,
+ "xmlXPathTranslateFunction: Invalid UTF8
string\n");
++ /* not asserting an XPath error is probably better
*/
+ break;
+ }
+ if (ch & 0x80) /* must have had error encountered */
+@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ xmlGenericError(xmlGenericErrorContext,
+ "xmlXPathCompOpEval: variable %s bound to undefined prefix
%s\n",
+ (char *) op->value4, (char
*)op->value5);
++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
+ return (total);
+ }
+ val = xmlXPathVariableLookupNS(ctxt->context,
+@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ "xmlXPathCompOpEval: function %s bound to undefined prefix
%s\n",
+ (char *)op->value4, (char *)op->value5);
+ xmlXPathPopFrame(ctxt, frame);
++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR;
+ return (total);
+ }
+ func = xmlXPathFunctionLookupNS(ctxt->context,
+@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ }
+ xmlGenericError(xmlGenericErrorContext,
+ "XPath: unknown precompiled operation %d\n", op->op);
++ ctxt->error = XPATH_INVALID_OPERAND;
+ return (total);
+ }
+
diff --git a/libs/libxml2/CVE-2011-3102.patch
b/libs/libxml2/CVE-2011-3102.patch
new file mode 100644
index 0000000..ca3715c
--- /dev/null
+++ b/libs/libxml2/CVE-2011-3102.patch
@@ -0,0 +1,42 @@
+From 39ef0e0c0a73d19d63a731525ce1f9de0c4a7d92 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 23 May 2012 09:57:06 +0200
+Subject: [PATCH] fix CVE-2011-3102
+
+---
+ xpointer.c | 15 ++++-----------
+ 1 file changed, 4 insertions(+), 11 deletions(-)
+
+diff --git a/xpointer.c b/xpointer.c
+index 37afa3a..d37f0b1 100644
+--- a/xpointer.c
++++ b/xpointer.c
+@@ -1007,21 +1007,14 @@ xmlXPtrEvalXPtrPart(xmlXPathParserContextPtr ctxt,
xmlChar *name) {
+ NEXT;
+ break;
+ }
+- *cur++ = CUR;
+ } else if (CUR == '(') {
+ level++;
+- *cur++ = CUR;
+ } else if (CUR == '^') {
+- NEXT;
+- if ((CUR == ')') || (CUR == '(') || (CUR == '^')) {
+- *cur++ = CUR;
+- } else {
+- *cur++ = '^';
+- *cur++ = CUR;
+- }
+- } else {
+- *cur++ = CUR;
++ if ((NXT(1) == ')') || (NXT(1) == '(') || (NXT(1) == '^')) {
++ NEXT;
++ }
+ }
++ *cur++ = CUR;
+ NEXT;
+ }
+ *cur = 0;
+--
+1.7.10.1
+
diff --git a/libs/libxml2/CVE-2011-3905.patch
b/libs/libxml2/CVE-2011-3905.patch
new file mode 100644
index 0000000..53373b7
--- /dev/null
+++ b/libs/libxml2/CVE-2011-3905.patch
@@ -0,0 +1,61 @@
+commit 77404b8b69bc122d12231807abf1a837d121b551
+Author: Chris Evans <scarybeasts AT gmail.com>
+Date: Wed Dec 14 16:18:25 2011 +0800
+
+ Make sure the parser returns when getting a Stop order
+
+ patch backported from chromiun bug fixes, assuming author is Chris
+
+diff --git a/parser.c b/parser.c
+index 21d7aa3..4e5dcb9 100644
+--- a/parser.c
++++ b/parser.c
+@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
+ (ctxt->sax->processingInstruction != NULL))
+ ctxt->sax->processingInstruction(ctxt->userData,
+ target, NULL);
+- ctxt->instate = state;
++ if (ctxt->instate != XML_PARSER_EOF)
++ ctxt->instate = state;
+ return;
+ }
+ buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar));
+@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) {
+ } else {
+ xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL);
+ }
+- ctxt->instate = state;
++ if (ctxt->instate != XML_PARSER_EOF)
++ ctxt->instate = state;
+ }
+ }
+
+@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
+ else
+ name = xmlParseStartTag(ctxt);
+ #endif /* LIBXML_SAX1_ENABLED */
++ if (ctxt->instate == XML_PARSER_EOF)
++ return;
+ if (name == NULL) {
+ spacePop(ctxt);
+ return;
+@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int
terminate) {
+ else
+ name = xmlParseStartTag(ctxt);
+ #endif /* LIBXML_SAX1_ENABLED */
++ if (ctxt->instate == XML_PARSER_EOF)
++ goto done;
+ if (name == NULL) {
+ spacePop(ctxt);
+ ctxt->instate = XML_PARSER_EOF;
+@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int
terminate) {
+ else
+ xmlParseEndTag1(ctxt, 0);
+ #endif /* LIBXML_SAX1_ENABLED */
+- if (ctxt->nameNr == 0) {
++ if (ctxt->instate == XML_PARSER_EOF) {
++ /* Nothing */
++ } else if (ctxt->nameNr == 0) {
+ ctxt->instate = XML_PARSER_EPILOG;
+ } else {
+ ctxt->instate = XML_PARSER_CONTENT;
diff --git a/libs/libxml2/CVE-2011-3919.patch
b/libs/libxml2/CVE-2011-3919.patch
new file mode 100644
index 0000000..b307e57
--- /dev/null
+++ b/libs/libxml2/CVE-2011-3919.patch
@@ -0,0 +1,19 @@
+commit 5bd3c061823a8499b27422aee04ea20aae24f03e
+Author: Daniel Veillard <veillard AT redhat.com>
+Date: Fri Dec 16 18:53:35 2011 +0800
+
+ Fix an allocation error when copying entities
+
+diff --git a/parser.c b/parser.c
+index 4e5dcb9..c55e41d 100644
+--- a/parser.c
++++ b/parser.c
+@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt,
const xmlChar *str, int len,
+
+ buffer[nbchars++] = '&';
+ if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
+- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
+ }
+ for (;i > 0;i--)
+ buffer[nbchars++] = *cur++;
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index b32f76c..c3837e7 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,7 +1,7 @@
SPELL=libxml2
VERSION=2.7.8
PATCHLEVEL=1
- SECURITY_PATCH=1
+ SECURITY_PATCH=7

SOURCE_HASH=sha512:cb5d88f95feffde6a805a7583306864ad9cc909e958a1044afc6d5864ec480da545343f25c10bba99be59c2344e98d4cd2dcc8a152407a0ce581a51ce214d6bc
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 2faea05..c6f9c6f 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,15 @@
+2012-05-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, CVE-2011-0216.patch, CVE-2011-1944.patch,
+ CVE-2011-2834.patch,
+ CVE-2011-3905.patch, CVE-2011-3919.patch,
+ libxml2-2.7.8-xpath-freeing2.patch,
+ libxml2-2.7.8-xpath-freeing.patch,
+ libxml2-2.7.8-xpath-hardening.patch: added patches from archlinux
+ to fix CVE-2011-1944, CVE-2011-0216, CVE-2011-2834, CVE-2011-3905
+ and CVE-2011-3919
+ * PRE_BUILD, CVE-2011-3102.patch: adapted patch from Ubuntu to fix
CVE-2011-3102
+ * DETAILS: SECURITY_PATCH+=6
+
2012-02-23 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: add optional icu

diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
index 2929c05..bc044af 100755
--- a/libs/libxml2/PRE_BUILD
+++ b/libs/libxml2/PRE_BUILD
@@ -1,3 +1,12 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8.patch
+patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8.patch &&
+patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-freeing.patch &&
+patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-freeing2.patch &&
+patch -p1 < $SPELL_DIRECTORY/CVE-2011-1944.patch &&
+patch -p1 < $SPELL_DIRECTORY/libxml2-2.7.8-xpath-hardening.patch &&
+patch -p1 < $SPELL_DIRECTORY/CVE-2011-0216.patch &&
+patch -p1 < $SPELL_DIRECTORY/CVE-2011-2834.patch &&
+patch -p1 < $SPELL_DIRECTORY/CVE-2011-3905.patch &&
+patch -p1 < $SPELL_DIRECTORY/CVE-2011-3919.patch &&
+patch -p1 < $SPELL_DIRECTORY/CVE-2011-3102.patch
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
b/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
new file mode 100644
index 0000000..2844f4a
--- /dev/null
+++ b/libs/libxml2/libxml2-2.7.8-xpath-freeing.patch
@@ -0,0 +1,30 @@
+commit df83c17e5a2646bd923f75e5e507bc80d73c9722
+Author: Daniel Veillard <veillard AT redhat.com>
+Date: Wed Nov 17 14:12:14 2010 +0100
+
+ Fix a potential freeing error in XPath
+
+diff --git a/xpath.c b/xpath.c
+index 81e33f6..1447be5 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -11763,11 +11763,15 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+
+ if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
+ xmlXPathObjectPtr tmp;
+- /* pop the result */
++ /* pop the result if any */
+ tmp = valuePop(ctxt);
+- xmlXPathReleaseObject(xpctxt, tmp);
+- /* then pop off contextObj, which will be freed later */
+- valuePop(ctxt);
++ if (tmp != contextObj)
++ /*
++ * Free up the result
++ * then pop off contextObj, which will be freed later
++ */
++ xmlXPathReleaseObject(xpctxt, tmp);
++ valuePop(ctxt);
+ goto evaluation_error;
+ }
+
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
b/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
new file mode 100644
index 0000000..714954d
--- /dev/null
+++ b/libs/libxml2/libxml2-2.7.8-xpath-freeing2.patch
@@ -0,0 +1,26 @@
+commit fec31bcd452e77c10579467ca87a785b41115de6
+Author: Daniel Veillard <veillard AT redhat.com>
+Date: Thu Nov 18 11:07:24 2010 +0100
+
+ Small fix for previous commit
+
+diff --git a/xpath.c b/xpath.c
+index 1447be5..8b56189 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -11765,13 +11765,14 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ xmlXPathObjectPtr tmp;
+ /* pop the result if any */
+ tmp = valuePop(ctxt);
+- if (tmp != contextObj)
++ if (tmp != contextObj) {
+ /*
+ * Free up the result
+ * then pop off contextObj, which will be freed later
+ */
+ xmlXPathReleaseObject(xpctxt, tmp);
+ valuePop(ctxt);
++ }
+ goto evaluation_error;
+ }
+
diff --git a/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
b/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
new file mode 100644
index 0000000..7a4ad86
--- /dev/null
+++ b/libs/libxml2/libxml2-2.7.8-xpath-hardening.patch
@@ -0,0 +1,223 @@
+commit 0f136dcd18c287073a4d67b03fdb9696d7010940
+Author: Daniel Veillard <veillard AT redhat.com>
+Date: Thu Aug 18 17:10:13 2011 +0800
+
+ Hardening of XPath evaluation
+
+ Add a mechanism of frame for XPath evaluation when entering a function
+ or a scoped evaluation, also fix a potential problem in predicate
+ evaluation.
+
+diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
+index 1a9e30e..ddd9dd8 100644
+--- a/include/libxml/xpath.h
++++ b/include/libxml/xpath.h
+@@ -68,7 +68,8 @@ typedef enum {
+ XPATH_UNDEF_PREFIX_ERROR,
+ XPATH_ENCODING_ERROR,
+ XPATH_INVALID_CHAR_ERROR,
+- XPATH_INVALID_CTXT
++ XPATH_INVALID_CTXT,
++ XPATH_STACK_ERROR
+ } xmlXPathError;
+
+ /*
+@@ -380,6 +381,8 @@ struct _xmlXPathParserContext {
+ xmlXPathCompExprPtr comp; /* the precompiled expression */
+ int xptr; /* it this an XPointer expression */
+ xmlNodePtr ancestor; /* used for walking preceding axis */
++
++ int valueFrame; /* used to limit Pop on the stack */
+ };
+
+ /************************************************************************
+diff --git a/xpath.c b/xpath.c
+index b59ac5a..bcee2ea 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = {
+ "Encoding error\n",
+ "Char out of XML range\n",
+ "Invalid or incomplete context\n",
++ "Stack usage errror\n",
+ "?? Unknown error ??\n" /* Must be last in the list! */
+ };
+ #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \
+@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt,
xmlXPathObjectPtr val) {
+ ************************************************************************/
+
+ /**
++ * xmlXPathSetFrame:
++ * @ctxt: an XPath parser context
++ *
++ * Set the callee evaluation frame
++ *
++ * Returns the previous frame value to be restored once done
++ */
++static int
++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) {
++ int ret;
++
++ if (ctxt == NULL)
++ return(0);
++ ret = ctxt->valueFrame;
++ ctxt->valueFrame = ctxt->valueNr;
++ return(ret);
++}
++
++/**
++ * xmlXPathPopFrame:
++ * @ctxt: an XPath parser context
++ * @frame: the previous frame value
++ *
++ * Remove the callee evaluation frame
++ */
++static void
++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) {
++ if (ctxt == NULL)
++ return;
++ if (ctxt->valueNr < ctxt->valueFrame) {
++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
++ }
++ ctxt->valueFrame = frame;
++}
++
++/**
+ * valuePop:
+ * @ctxt: an XPath evaluation context
+ *
+@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt)
+
+ if ((ctxt == NULL) || (ctxt->valueNr <= 0))
+ return (NULL);
++
++ if (ctxt->valueNr <= ctxt->valueFrame) {
++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR);
++ return (NULL);
++ }
++
+ ctxt->valueNr--;
+ if (ctxt->valueNr > 0)
+ ctxt->value = ctxt->valueTab[ctxt->valueNr - 1];
+@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp,
xmlXPathContextPtr ctxt) {
+ ret->valueNr = 0;
+ ret->valueMax = 10;
+ ret->value = NULL;
++ ret->valueFrame = 0;
+
+ ret->context = ctxt;
+ ret->comp = comp;
+@@ -11711,6 +11755,7 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ xmlXPathObjectPtr contextObj = NULL, exprRes = NULL;
+ xmlNodePtr oldContextNode, contextNode = NULL;
+ xmlXPathContextPtr xpctxt = ctxt->context;
++ int frame;
+
+ #ifdef LIBXML_XPTR_ENABLED
+ /*
+@@ -11730,6 +11775,8 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ */
+ exprOp = &ctxt->comp->steps[op->ch2];
+ for (i = 0; i < set->nodeNr; i++) {
++ xmlXPathObjectPtr tmp;
++
+ if (set->nodeTab[i] == NULL)
+ continue;
+
+@@ -11757,23 +11804,25 @@
xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt,
+ xmlXPathNodeSetAddUnique(contextObj->nodesetval,
+ contextNode);
+
++ frame = xmlXPathSetFrame(ctxt);
+ valuePush(ctxt, contextObj);
+ res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1);
++ tmp = valuePop(ctxt);
++ xmlXPathPopFrame(ctxt, frame);
+
+ if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) {
+- xmlXPathObjectPtr tmp;
+- /* pop the result if any */
+- tmp = valuePop(ctxt);
+- if (tmp != contextObj) {
++ while (tmp != contextObj) {
+ /*
+ * Free up the result
+ * then pop off contextObj, which will be freed later
+ */
+ xmlXPathReleaseObject(xpctxt, tmp);
+- valuePop(ctxt);
++ tmp = valuePop(ctxt);
+ }
+ goto evaluation_error;
+ }
++ /* push the result back onto the stack */
++ valuePush(ctxt, tmp);
+
+ if (res)
+ pos++;
+@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ xmlXPathFunction func;
+ const xmlChar *oldFunc, *oldFuncURI;
+ int i;
++ int frame;
+
++ frame = xmlXPathSetFrame(ctxt);
+ if (op->ch1 != -1)
+ total +=
+ xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
+@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ xmlGenericError(xmlGenericErrorContext,
+ "xmlXPathCompOpEval: parameter error\n");
+ ctxt->error = XPATH_INVALID_OPERAND;
++ xmlXPathPopFrame(ctxt, frame);
+ return (total);
+ }
+- for (i = 0; i < op->value; i++)
++ for (i = 0; i < op->value; i++) {
+ if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) {
+ xmlGenericError(xmlGenericErrorContext,
+ "xmlXPathCompOpEval: parameter error\n");
+ ctxt->error = XPATH_INVALID_OPERAND;
++ xmlXPathPopFrame(ctxt, frame);
+ return (total);
+ }
++ }
+ if (op->cache != NULL)
+ XML_CAST_FPTR(func) = op->cache;
+ else {
+@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ xmlGenericError(xmlGenericErrorContext,
+ "xmlXPathCompOpEval: function %s bound to undefined prefix
%s\n",
+ (char *)op->value4, (char *)op->value5);
++ xmlXPathPopFrame(ctxt, frame);
+ return (total);
+ }
+ func = xmlXPathFunctionLookupNS(ctxt->context,
+@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt,
xmlXPathStepOpPtr op)
+ func(ctxt, op->value);
+ ctxt->context->function = oldFunc;
+ ctxt->context->functionURI = oldFuncURI;
++ xmlXPathPopFrame(ctxt, frame);
+ return (total);
+ }
+ case XPATH_OP_ARG:
+@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int
toBool)
+ ctxt->valueNr = 0;
+ ctxt->valueMax = 10;
+ ctxt->value = NULL;
++ ctxt->valueFrame = 0;
+ }
+ #ifdef XPATH_STREAMING
+ if (ctxt->comp->stream) {
+diff --git a/xpointer.c b/xpointer.c
+index 7a42d02..37afa3a 100644
+--- a/xpointer.c
++++ b/xpointer.c
+@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) {
+ ctxt->valueNr = 0;
+ ctxt->valueMax = 10;
+ ctxt->value = NULL;
++ ctxt->valueFrame = 0;
+ }
+ SKIP_BLANKS;
+ if (CUR == '/') {
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 66dc97a..651eb8e 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.6.7
- SECURITY_PATCH=35
+ VERSION=1.6.8
+ SECURITY_PATCH=36
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:6c96fc6bd32d5fc8888fdee54ae42d202155603b288210bfb2a764171dde5d73d6c39bae1258c6ffa45fc0e40fd456d5dd340415bb4900d6e7175a69f2727b48
+
SOURCE_HASH=sha512:1f2eae0b94632f0bc37dbab16afdba711e1b3c8b059390645c38523d114b2c2908ccd0c396fc0c3b89be8b6fb8a314fee7b1e16c57ce05e98bf88d923b55fc78
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index cc71c6b..8d7a10a 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.6.8, SECURITY_PATCH=36
+
2012-04-07 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.7

diff --git a/utils/virtualbox/DETAILS b/utils/virtualbox/DETAILS
index 772ae06..366bb0f 100755
--- a/utils/virtualbox/DETAILS
+++ b/utils/virtualbox/DETAILS
@@ -1,10 +1,10 @@
SPELL=virtualbox
- VERSION=4.1.14
+ VERSION=4.1.16
PATCHLEVEL=0
SOURCE=VirtualBox-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VirtualBox-${VERSION%-*}

SOURCE_URL[0]=http://download.virtualbox.org/virtualbox/${VERSION%-*}/$SOURCE
-
SOURCE_HASH=sha512:a1d1859cda2ccf204e2cd403d3427ea7c256ce4687c2e48768f0f5fed6d8ff40263fc99e44af1ba4400363910f0981041196ca04bcb045431d41d757dc1c0373
+
SOURCE_HASH=sha512:7d7c76026c78d6b59b5d1ab387394f78e7203355183ec40e4ec3374183fd75ef5e6327b8525f401516f6337a56f27fdd401e081ed0edb3e8ed12a08e0007d8b0
LICENSE[0]=GPL
WEB_SITE=http://www.virtualbox.org/
ENTERED=20070612
diff --git a/utils/virtualbox/HISTORY b/utils/virtualbox/HISTORY
index 4a20828..46226a0 100644
--- a/utils/virtualbox/HISTORY
+++ b/utils/virtualbox/HISTORY
@@ -1,3 +1,6 @@
+2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.1.16
+
2012-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* LocalConfig.kmk: disabled -Werror
* DEPENDS: added dependency on READCD
diff --git a/video-libs/libvpx/DETAILS b/video-libs/libvpx/DETAILS
index f2b2bb8..ff96c3b 100755
--- a/video-libs/libvpx/DETAILS
+++ b/video-libs/libvpx/DETAILS
@@ -1,6 +1,6 @@
SPELL=libvpx
- VERSION=1.0.0
-
SOURCE_HASH=sha512:a54f594fd37f96a693b5377236cad0834581f189fbb8d55c7e3418cd72e217e0eda34b07c14744c7c0d34c0d5c8a19c7ca402146855d7163e3578b5fd2b075cc
+ VERSION=1.1.0
+
SOURCE_HASH=sha512:5c165a1a171143f7c406ef899914a353d35f6dec0e3c49eec9a4f3311fd4072dea2e0da8ceb80651ad23e24cdbf2d6da328805bda8be042bbea2c65c9e53eaaa
SOURCE=$SPELL-v$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-v$VERSION
SOURCE_URL[0]=http://webm.googlecode.com/files/$SOURCE
diff --git a/video-libs/libvpx/HISTORY b/video-libs/libvpx/HISTORY
index d10bfcb..11dec10 100644
--- a/video-libs/libvpx/HISTORY
+++ b/video-libs/libvpx/HISTORY
@@ -1,3 +1,6 @@
+2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.0
+
2012-02-14 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.0.0
* DEPENDS: git removed
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 1d03fed..cca3b81 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -2,13 +2,12 @@ persistent_remove QT_VER
SPELL=qt4
TMPFS=off
SPELLX=qt-everywhere-opensource-src
- VERSION=4.8.1
-
SOURCE_HASH=sha512:a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90
+ VERSION=4.8.2
+
SOURCE_HASH=sha512:42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62
SOURCE=$SPELLX-$VERSION.tar.gz
- URI=qt/source/$SOURCE
SECURITY_PATCH=4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
- SOURCE_URL[0]=http://download.qt.nokia.com/$URI
+ SOURCE_URL[0]=http://releases.qt-project.org/qt4/source/$SOURCE
WEB_SITE=http://www.qtsoftware.com/products
ENTERED=20020410
LICENSE[0]=LGPL
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 0ef0938..6215f28 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,7 @@
+2012-05-23 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 4.8.2, URI removed, SOURCE_URL[0] updated
+ * qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch: removed
+
2012-04-09 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, qt-4.8-glib-2.32.patch: patch removed
* PRE_BUILD: sed added
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index 93950b5..9ed4608 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -2,7 +2,6 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&

sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
-patch -p1 <
${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch &&
patch -p1 <
${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch &&

# fix bad .pro file for 4.6.0-beta1
diff --git
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
deleted file mode 100644
index 6f4985c..0000000
--- a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Submitted By: Ragnar Thomsen
<rthomsen_at_linuxfromscratch_dot_org>
-Date: 2012-04-04
-Initial Package Version: 4.8.1
-Origin: OpenSUSE
-Description: Fixes building with GCC 4.7
-
-diff -rupN
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-03-14 15:01:30.000000000 +0100
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
2012-04-04 21:40:41.287652897 +0200
-@@ -57,9 +57,7 @@ namespace JSC {
-
- class JSGlobalObject : public JSVariableObject {
- protected:
-- using JSVariableObject::JSVariableObjectData;
--
-- struct JSGlobalObjectData : public JSVariableObjectData {
-+ struct JSGlobalObjectData : public
JSVariableObject::JSVariableObjectData {
- // We use an explicit destructor function pointer instead of a
- // virtual destructor because we want to avoid adding a vtable
- // pointer to this struct. Adding a vtable pointer would force
the
-diff -rupN
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
----
a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-03-14 15:01:30.000000000 +0100
-+++
b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
2012-04-04 21:40:41.287652897 +0200
-@@ -32,8 +32,7 @@ namespace JSC{
-
- class JSStaticScopeObject : public JSVariableObject {
- protected:
-- using JSVariableObject::JSVariableObjectData;
-- struct JSStaticScopeObjectData : public JSVariableObjectData {
-+ struct JSStaticScopeObjectData : public
JSVariableObject::JSVariableObjectData {
- JSStaticScopeObjectData()
- : JSVariableObjectData(&symbolTable, &registerStore + 1)
- {



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (322a512e354d73931ea1d7fff1ace5257e7dddfd), Vlad Glagolev, 05/23/2012

Archive powered by MHonArc 2.6.24.

Top of Page