[php-pecl-mysqlnd-ms] add upstream patch for -Werror=format-security #1037246

[Remi Collet]

commit ebfe1605cf61212ebd7f0e7b0632dece3655a0ab
Author: Remi Collet <remi at fedoraproject.org>
Date:   Thu Dec 5 17:23:50 2013 +0100

    add upstream patch for -Werror=format-security #1037246

 mysqlnd_ms-svn.patch     |   11 +++++++++++
 php-pecl-mysqlnd-ms.spec |   20 +++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/mysqlnd_ms-svn.patch b/mysqlnd_ms-svn.patch
new file mode 100644
index 0000000..867112d
--- /dev/null
+++ b/mysqlnd_ms-svn.patch
@@ -0,0 +1,11 @@
+--- pecl/mysqlnd_ms/trunk/mysqlnd_ms_config_json.c	2013/12/05 15:05:24	332281
++++ pecl/mysqlnd_ms/trunk/mysqlnd_ms_config_json.c	2013/12/05 16:13:02	332282
+@@ -248,7 +248,7 @@
+ 				mnd_sprintf(&(MYSQLND_MS_G(config_startup_error)), 0, MYSQLND_MS_ERROR_PREFIX
+ 								" Failed to open server list config file [%s]", json_file_name);
+ 				/* The only one to bark in RINIT as otherwise no specific warning/error appears */
+-				php_error_docref(NULL TSRMLS_CC, E_WARNING, MYSQLND_MS_G(config_startup_error));
++				php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", MYSQLND_MS_G(config_startup_error));
+ 				break;
+ 			}
+ 			str_data_len = php_stream_copy_to_mem(stream, &str_data, PHP_STREAM_COPY_ALL, 0);
diff --git a/php-pecl-mysqlnd-ms.spec b/php-pecl-mysqlnd-ms.spec
index 8a462e8..33d94a8 100644
--- a/php-pecl-mysqlnd-ms.spec
+++ b/php-pecl-mysqlnd-ms.spec
@@ -12,7 +12,7 @@
 Summary:      A replication and load balancing plugin for mysqlnd
 Name:         php-pecl-mysqlnd-ms
 Version:      1.5.1
-Release:      2%{?dist}
+Release:      3%{?dist}
 
 License:      PHP
 Group:        Development/Languages
@@ -23,6 +23,9 @@ Source0:      http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 # From http://www.php.net/manual/en/mysqlnd-ms.configuration.php
 Source1:      %{pecl_name}.ini
 
+# http://svn.php.net/viewvc?view=revision&revision=332282
+Patch0:        %{pecl_name}-svn.patch
+
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: php-devel >= 5.3.6
 BuildRequires: php-mysqlnd
@@ -74,19 +77,23 @@ These are the files needed to compile programs using mysqlnd_ms extension.
 
 cp %{SOURCE1} %{pecl_name}.ini
 
+pushd %{pecl_name}-%{version}
+%patch0 -p3 -b .format
+
 # fix version
 sed -e '/MYSQLND_MS_VERSION/s/1.5.0-alpha/%{version}/' \
-    -i %{pecl_name}-%{version}/mysqlnd_ms.h
+    -i mysqlnd_ms.h
 sed -e '/MYSQLND_MS_VERSION_ID/s/10500/10501/' \
-    -i %{pecl_name}-%{version}/mysqlnd_ms.h
-grep MYSQLND_MS_VERSION %{pecl_name}-%{version}/mysqlnd_ms.h
+    -i mysqlnd_ms.h
+grep MYSQLND_MS_VERSION mysqlnd_ms.h
 
 # check version, so often broken
-extver=$(sed -n '/#define MYSQLND_MS_VERSION /{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/mysqlnd_ms.h)
+extver=$(sed -n '/#define MYSQLND_MS_VERSION /{s/.* "//;s/".*$//;p}' mysqlnd_ms.h)
 if test "x${extver}" != "x%{version}"; then
    : Error: Upstream version is ${extver}, expecting %{version}.
    exit 1
 fi
+popd
 
 %if 0%{?__ztsphp:1}
 # Build ZTS extension if ZTS devel available (fedora >= 17)
@@ -206,6 +213,9 @@ ln -sf %{php_ztsextdir}/json.so modules/
 
 
 %changelog
+* Thu Dec  5 2013 Remi Collet <remi at fedoraproject.org> - 1.5.1-3
+- add upstream patch for -Werror=format-security #1037246
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild