[packages/ice] - fix errors caused by -Wformat-security - rel 4

[baggins]

commit d5f32c29b2bc22148c9c2e9a83d11350b31809db
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 19 01:16:04 2012 +0100

    - fix errors caused by -Wformat-security
    - rel 4

 ice-format-security.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 ice.spec                  |  4 +++-
 2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/ice.spec b/ice.spec
index 09946b4..27e89e3 100644
--- a/ice.spec
+++ b/ice.spec
@@ -17,7 +17,7 @@
 Summary:	The Ice base runtime and services
 Name:		ice
 Version:	3.4.2
-Release:	3
+Release:	4
 License:	GPL v2 with exceptions (see ICE_LICENSE)
 Group:		Applications
 URL:		http://www.zeroc.com/
@@ -38,6 +38,7 @@ Patch3:		jgoodies.patch
 Patch4:		ice-gcc46.patch
 Patch5:		ice-gcc47.patch
 Patch6:		ice-db.patch
+Patch7:		ice-format-security.patch
 BuildRequires:	bzip2-devel
 BuildRequires:	db-cxx-devel
 BuildRequires:	expat-devel
@@ -174,6 +175,7 @@ The Ice runtime for PHP applications.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # no longer included in 3.4
 rm -f *man-pages/slice2docbook.1
diff --git a/ice-format-security.patch b/ice-format-security.patch
new file mode 100644
index 0000000..7c78528
--- /dev/null
+++ b/ice-format-security.patch
@@ -0,0 +1,40 @@
+--- Ice-3.4.2/py/modules/IcePy/Operation.cpp.orig	2012-11-19 01:04:19.920721630 +0100
++++ Ice-3.4.2/py/modules/IcePy/Operation.cpp	2012-11-19 01:05:20.854052813 +0100
+@@ -1872,7 +1872,7 @@
+         // IllegalArgumentException can propagate directly.
+         // (Raised by checkAsyncTwowayOnly)
+         //
+-        PyErr_Format(PyExc_RuntimeError, STRCAST(ex.reason().c_str()));
++        PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str()));
+         return 0;
+     }
+     catch(const Ice::Exception&)
+@@ -1957,7 +1957,7 @@
+     }
+     catch(const IceUtil::IllegalArgumentException& ex)
+     {
+-        PyErr_Format(PyExc_RuntimeError, STRCAST(ex.reason().c_str()));
++        PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str()));
+     }
+     catch(const Ice::Exception& ex)
+     {
+@@ -2604,7 +2604,7 @@
+     }
+     catch(const IceUtil::IllegalArgumentException& ex)
+     {
+-        PyErr_Format(PyExc_RuntimeError, STRCAST(ex.reason().c_str()));
++        PyErr_Format(PyExc_RuntimeError, "%s", STRCAST(ex.reason().c_str()));
+     }
+     catch(const Ice::Exception& ex)
+     {
+--- Ice-3.4.2/rb/src/IceRuby/Operation.cpp~	2011-06-15 21:44:00.000000000 +0200
++++ Ice-3.4.2/rb/src/IceRuby/Operation.cpp	2012-11-19 01:14:40.380699743 +0100
+@@ -240,7 +240,7 @@
+ 
+     if(!_deprecateMessage.empty())
+     {
+-        rb_warning(_deprecateMessage.c_str());
++        rb_warning("%s", _deprecateMessage.c_str());
+         _deprecateMessage.clear(); // Only show the warning once.
+     }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ice.git/commitdiff/d5f32c29b2bc22148c9c2e9a83d11350b31809db