update backport patch to 20130717, include it in release number

diff --git a/php-libxml.patch b/php-libxml.patch
deleted file mode 100644 (file)
index 9126282..0000000
--- a/php-libxml.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit c4b26cc1b0b0521c75e653fffec2a9e3b4bf8cbb
-Author: Daniel Veillard <veillard@redhat.com>
-Date:   Thu Aug 9 14:02:33 2012 -0400
-
-    Update to work with libxml 2.9.0
-
-diff --git a/ext/dom/documenttype.c b/ext/dom/documenttype.c
-index d61ba79..eee3b5f 100644
---- a/ext/dom/documenttype.c
-+++ b/ext/dom/documenttype.c
-@@ -205,7 +205,11 @@ int dom_documenttype_internal_subset_read(dom_object *obj, zval **retval TSRMLS_
-               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;
-               }
-diff --git a/ext/dom/node.c b/ext/dom/node.c
-index 5bcb234..727d1bc 100644
---- a/ext/dom/node.c
-+++ b/ext/dom/node.c
-@@ -1895,9 +1895,17 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{
-         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();
-                       }
-diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
-index a379111..2368596 100644
---- a/ext/simplexml/simplexml.c
-+++ b/ext/simplexml/simplexml.c
-@@ -1387,7 +1387,11 @@ 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 {

diff --git a/php.spec b/php.spec
index dafa44b69b32eaa2504ceb06d7fb138130fa6b27..a786f48faabf4097c7705ed229d90bbe47b0bb8e 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -113,6 +113,8 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %define                php_suffix %{nil}
 %endif
 
+%define        rel             1
+%define        backport_date   20130717
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -121,7 +123,7 @@ Summary(ru.UTF-8):  PHP Версии 5 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       5.2.17
-Release:       34
+Release:       %{backport_date}.%{rel}
 Epoch:         4
 License:       PHP
 Group:         Libraries
@@ -142,8 +144,8 @@ Source11:   %{orgname}-fpm.logrotate
 Source12:      %{orgname}-branch.sh
 Source13:      dep-tests.sh
 Source14:      skip-tests.sh
-Patch100:      https://php52-backports.googlecode.com/files/php52-backports-20130320.patch
-# Patch100-md5:        8428acfb94d5804e00333db01f7cd8dd
+Patch100:      https://php52-backports.googlecode.com/files/php52-backports-%{backport_date}.patch
+# Patch100-md5:        80014a8f7894d4e893a8b1292b8b3032
 Patch0:                %{orgname}-shared.patch
 Patch1:                %{orgname}-pldlogo.patch
 Patch2:                %{orgname}-mail.patch
@@ -208,7 +210,6 @@ Patch60:    bug-60986.patch
 Patch65:       system-libzip.patch
 Patch66:       bug-47930.patch
 Patch67:       php-db.patch
-Patch68:       php-libxml.patch
 Patch69:       bug-50563.patch
 Patch70:       php-crypt-null.patch
 Patch71:       php-apache24.patch
@@ -1922,7 +1923,6 @@ done
 %{?with_system_libzip:%patch65 -p1}
 %patch66 -p2
 %patch67 -p1
-%patch68 -p1
 %patch69 -p4
 %patch70 -p1
 %patch71 -p1