Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4a89ca144e66c530f706cfaf4ff14a1b040f129a)

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 master grimoire by Vlad Glagolev (4a89ca144e66c530f706cfaf4ff14a1b040f129a)
  • Date: Sun, 6 Jul 2014 13:32:43 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

php-pear/php/HISTORY | 4 ---
php-pear/php/PRE_BUILD | 1
php-pear/php/libxml29.patch | 51
--------------------------------------------
3 files changed, 56 deletions(-)

New commits:
commit 4a89ca144e66c530f706cfaf4ff14a1b040f129a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "php: fixed 5.2 branch build"

Reason: erroneous commit fixed by previous update

This reverts commit af6dbae028c0e029a2f5eaff7cbd177aa4231858.

diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 3d0c091..5613066 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,7 +1,3 @@
-2014-07-06 Vlad Glagolev <stealth AT sourcemage.org>
- * PRE_BUILD: apply patch
- * libxml29.patch: added, to fix compiling for legacy branch
-
2014-06-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.4.30 (stable); SECUIRTY_PATCH++
(CVE-2014-3981, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479,
diff --git a/php-pear/php/PRE_BUILD b/php-pear/php/PRE_BUILD
index 3bbbd7b..96280bb 100755
--- a/php-pear/php/PRE_BUILD
+++ b/php-pear/php/PRE_BUILD
@@ -4,7 +4,6 @@ cd "${SOURCE_DIRECTORY}" &&
if [[ $PHP5_BRANCH == legacy ]]; then
unpack_file 4 &&
patch -p1 < "${SOURCE_CACHE}/${SOURCE4}" &&
- patch -p0 < "$SPELL_DIRECTORY/libxml29.patch" &&
patch -p0 < "$SPELL_DIRECTORY/pcre830.patch"
fi &&

diff --git a/php-pear/php/libxml29.patch b/php-pear/php/libxml29.patch
deleted file mode 100644
index e5dbab7..0000000
--- a/php-pear/php/libxml29.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- ext/dom/node.c 2012-08-06 17:49:48.826716692 +0800
-+++ ext/dom/node.c 2012-08-06 17:52:47.633484660 +0800
-@@ -1895,9 +1895,17 @@ static void dom_canonicalization(INTERNA
- RETVAL_FALSE;
- } else {
- if (mode == 0) {
-+#ifdef LIBXML2_NEW_BUFFER
-+ ret = xmlOutputBufferGetSize(buf);
-+#else
- ret = buf->buffer->use;
-+#endif
- if (ret > 0) {
-+#ifdef LIBXML2_NEW_BUFFER
-+ RETVAL_STRINGL((char *) xmlOutputBufferGetContent(buf),
ret, 1);
-+#else
- RETVAL_STRINGL((char *) buf->buffer->content,
ret, 1);
-+#endif
- } else {
- RETVAL_EMPTY_STRING();
- }
---- ext/dom/documenttype.c 2012-08-06 18:02:16.019640870 +0800
-+++ ext/dom/documenttype.c 2012-08-06 18:06:16.612228905 +0800
-@@ -205,7 +205,13 @@ int dom_documenttype_internal_subset_rea
- if (buff != NULL) {
- xmlNodeDumpOutput (buff, NULL, (xmlNodePtr)
intsubset, 0, 0, NULL);
- xmlOutputBufferFlush(buff);
-+
-+#ifdef LIBXML2_NEW_BUFFER
-+ ZVAL_STRINGL(*retval, xmlOutputBufferGetContent(buff),
-+ xmlOutputBufferGetSize(buff), 1);
-+#else
- ZVAL_STRINGL(*retval, buff->buffer->content,
buff->buffer->use, 1);
-+#endif
- (void)xmlOutputBufferClose(buff);
- return SUCCESS;
- }
---- ext/simplexml/simplexml.c 2012-08-06 18:10:44.621017026 +0800
-+++ ext/simplexml/simplexml.c 2012-08-06 18:12:48.016270419 +0800
-@@ -1417,7 +1417,12 @@ SXE_METHOD(asXML)
-
- xmlNodeDumpOutput(outbuf, (xmlDocPtr)
sxe->document->ptr, node, 0, 0, ((xmlDocPtr) sxe->document->ptr)->encoding);
- xmlOutputBufferFlush(outbuf);
-+#ifdef LIBXML2_NEW_BUFFER
-+ RETVAL_STRINGL((char
*)xmlOutputBufferGetContent(outbuf),
-+ xmlOutputBufferGetSize(outbuf), 1);
-+#else
- RETVAL_STRINGL((char *)outbuf->buffer->content,
outbuf->buffer->use, 1);
-+#endif
- xmlOutputBufferClose(outbuf);
- }
- } else {



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (4a89ca144e66c530f706cfaf4ff14a1b040f129a), Vlad Glagolev, 07/06/2014

Archive powered by MHonArc 2.6.24.

Top of Page