[packages/obexftp] - fix format string errors - fix building with automake 1.13 - rel 9

[baggins]

commit 76a3b59b1d24a9a67b70eb23db9a820b70fcd773
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Jun 11 14:15:29 2013 +0200

    - fix format string errors
    - fix building with automake 1.13
    - rel 9

 am.patch              | 11 +++++++++++
 format-security.patch | 22 ++++++++++++++++++++++
 obexftp.spec          |  6 +++++-
 3 files changed, 38 insertions(+), 1 deletion(-)
---
diff --git a/obexftp.spec b/obexftp.spec
index 3cfbbb9..14d03c2 100644
--- a/obexftp.spec
+++ b/obexftp.spec
@@ -3,7 +3,7 @@ Summary:	File copying over the Object Exchange (OBEX) protocol
 Summary(pl.UTF-8):	Kopiowanie plików z wykorzystaniem protokołu Object Exchange (OBEX)
 Name:		obexftp
 Version:	0.23
-Release:	8
+Release:	9
 License:	GPL v2+ (server, bindings), LGPL v2+ (libraries)
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/openobex/%{name}-%{version}.tar.bz2
@@ -12,6 +12,8 @@ Patch0:		%{name}-no_server.patch
 Patch1:		%{name}-perl.patch
 Patch2:		%{name}-nostress.patch
 Patch3:		%{name}-ruby1.9.patch
+Patch4:		am.patch
+Patch5:		format-security.patch
 URL:		http://triq.net/obex/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -145,6 +147,8 @@ Wiązanie Tcl-a dla biblioteki ObexFTP.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 # hack for -L/usr/%{_lib} before -L../../obexftp/.libs
 ln -sf ../../obexftp/.libs/libobexftp.so swig/ruby
diff --git a/am.patch b/am.patch
new file mode 100644
index 0000000..bc4f208
--- /dev/null
+++ b/am.patch
@@ -0,0 +1,11 @@
+--- obexftp-0.23/configure.in~	2009-02-17 19:27:48.000000000 +0100
++++ obexftp-0.23/configure.in	2013-06-11 14:04:59.540638730 +0200
+@@ -3,7 +3,7 @@
+ AC_INIT(ObexFTP, 0.23, zany at triq.net)
+ #AC_CONFIG_SRCDIR(src/foo.c)
+ AM_INIT_AUTOMAKE(dist-bzip2)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ 
+ # note: AC_HELP_STRING is deprecated in autoconf 2.59 and later but
+ # AS_HELP_STRING is not available in autoconf 2.57 or earlier.
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..84fc80d
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,22 @@
+--- obexftp-0.23/swig/python/python_wrap.c~	2009-02-17 19:30:39.000000000 +0100
++++ obexftp-0.23/swig/python/python_wrap.c	2013-06-11 14:09:21.223422870 +0200
+@@ -856,7 +856,7 @@
+     Py_DECREF(old_str);
+     Py_DECREF(value);
+   } else {
+-    PyErr_Format(PyExc_RuntimeError, mesg);
++    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
+   }
+ }
+ 
+--- obexftp-0.23/swig/ruby/ruby_wrap.c~	2013-06-11 14:12:06.515179342 +0200
++++ obexftp-0.23/swig/ruby/ruby_wrap.c	2013-06-11 14:13:37.342810517 +0200
+@@ -1309,7 +1309,7 @@
+ /* Error manipulation */
+ 
+ #define SWIG_ErrorType(code)                            SWIG_Ruby_ErrorType(code)               
+-#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), msg)
++#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), "%s", msg)
+ #define SWIG_fail                        		goto fail				 
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/obexftp.git/commitdiff/76a3b59b1d24a9a67b70eb23db9a820b70fcd773