[packages/kino] - fix building with -Wformat-security - rel 8

baggins baggins at pld-linux.org
Fri Nov 16 14:49:31 CET 2012


commit 22e2619071d167cfe5c9821fe281b1f323a9728f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Nov 16 14:49:13 2012 +0100

    - fix building with -Wformat-security
    - rel 8

 kino-format-security.patch | 31 +++++++++++++++++++++++++++++++
 kino.spec                  |  4 +++-
 2 files changed, 34 insertions(+), 1 deletion(-)
---
diff --git a/kino.spec b/kino.spec
index 6bdb9c4..10b6c69 100644
--- a/kino.spec
+++ b/kino.spec
@@ -5,7 +5,7 @@ Summary:	DV editing utility
 Summary(pl.UTF-8):	Narzędzie do edycji DV
 Name:		kino
 Version:	1.3.4
-Release:	7
+Release:	8
 License:	GPL
 Group:		Applications/Multimedia
 Source0:	http://downloads.sourceforge.net/kino/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Source0:	http://downloads.sourceforge.net/kino/%{name}-%{version}.tar.gz
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-1.3.4-libav-0.7.patch
 Patch2:		%{name}-1.3.4-v4l1.patch
+Patch3:		%{name}-format-security.patch
 URL:		http://www.kinodv.org/
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -86,6 +87,7 @@ standard USB HID v1.10.
 %patch0 -p0
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # use lib64 when needed
 sed -i -e 's|lib/kino-gtk2|%{_lib}/kino-gtk2|' src/*/Makefile.am
diff --git a/kino-format-security.patch b/kino-format-security.patch
new file mode 100644
index 0000000..43feaa2
--- /dev/null
+++ b/kino-format-security.patch
@@ -0,0 +1,31 @@
+--- kino-1.3.4/src/dvtitler/superimpose.cc~	2007-11-08 05:22:53.000000000 +0100
++++ kino-1.3.4/src/dvtitler/superimpose.cc	2012-11-16 14:46:10.515686045 +0100
+@@ -125,7 +125,7 @@
+ 									GTK_DIALOG_DESTROY_WITH_PARENT,
+ 									GTK_MESSAGE_ERROR,
+ 									GTK_BUTTONS_CLOSE,
+-									gerror->message );
++									"%s", gerror->message );
+ 			gtk_dialog_run( GTK_DIALOG( dialog ) );
+ 			gtk_widget_destroy( dialog );
+ 			if ( fx.IsPreviewing() )
+--- kino-1.3.4/src/message.cc~	2007-11-13 06:51:24.000000000 +0100
++++ kino-1.3.4/src/message.cc	2012-11-16 14:46:49.892351322 +0100
+@@ -108,7 +108,7 @@
+ 								GTK_DIALOG_DESTROY_WITH_PARENT,
+ 								GTK_MESSAGE_WARNING,
+ 								GTK_BUTTONS_OK,
+-								msg );
++								"%s", msg );
+ 	gtk_window_set_resizable( GTK_WINDOW( dialog ), FALSE );
+ 
+ 	if(parent)
+@@ -193,7 +193,7 @@
+ 	                         GTK_DIALOG_DESTROY_WITH_PARENT,
+ 	                         GTK_MESSAGE_QUESTION,
+ 	                         GTK_BUTTONS_NONE,
+-	                         msg );
++	                         "%s", msg );
+ 	                         
+ 	if ( close_label != NULL )
+ 		gtk_dialog_add_button( GTK_DIALOG( dialog ), close_label, GTK_RESPONSE_CLOSE );
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kino.git/commitdiff/22e2619071d167cfe5c9821fe281b1f323a9728f



More information about the pld-cvs-commit mailing list