[gnomad2] Fix FTBFS with -Werror=format-security (#1037091, #1106666)

Yaakov Selkowitz yselkowitz at fedoraproject.org
Tue Jul 8 05:18:59 UTC 2014


commit dc280f17590e61bfe3d09f16b1f282371673a92f
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date:   Thu Jul 3 17:40:07 2014 -0500

    Fix FTBFS with -Werror=format-security (#1037091, #1106666)

 gnomad2-2.9.6-format-security.patch |   20 ++++++++++++++++++++
 gnomad2.spec                        |   14 +++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/gnomad2-2.9.6-format-security.patch b/gnomad2-2.9.6-format-security.patch
new file mode 100644
index 0000000..bcb08c8
--- /dev/null
+++ b/gnomad2-2.9.6-format-security.patch
@@ -0,0 +1,20 @@
+--- a/src/util.c
++++ b/src/util.c
+@@ -210,7 +210,7 @@ void create_error_dialog(gchar *errorstring)
+ 				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				   GTK_MESSAGE_ERROR,
+ 				   GTK_BUTTONS_CLOSE,
+-				   errorstring);
++				   "%s", errorstring);
+   g_signal_connect_object(GTK_OBJECT(dialog),
+ 			  "delete_event",
+ 			  G_CALLBACK(gtk_widget_destroy),
+@@ -234,7 +234,7 @@ gboolean request_confirmation_dialog(gchar *confirmstring)
+ 				   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				   GTK_MESSAGE_QUESTION,
+ 				   GTK_BUTTONS_YES_NO,
+-				   confirmstring);
++				   "%s", confirmstring);
+   i = gtk_dialog_run(GTK_DIALOG(dialog));
+   gtk_widget_destroy(dialog);
+   if (i == GTK_RESPONSE_YES) {
diff --git a/gnomad2.spec b/gnomad2.spec
index e37133c..29e28c1 100644
--- a/gnomad2.spec
+++ b/gnomad2.spec
@@ -2,7 +2,7 @@
 
 Name:		gnomad2
 Version:    	2.9.6
-Release:	8%{?dist}
+Release:	9%{?dist}
 
 Summary:	A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs
 License:	GPLv2+
@@ -10,7 +10,7 @@ URL:		http://gnomad2.sourceforge.net
 
 Group:		Applications/Multimedia
 Source:		http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		gnomad2-2.9.6-format-security.patch
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -36,13 +36,13 @@ Creative EAX sound processor on older jukebox devices.
 
 %prep
 %setup
+%patch0 -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %makeinstall
 # Rename this so it matches the distribution
 desktop-file-install --delete-original  \
@@ -52,9 +52,6 @@ desktop-file-install --delete-original  \
 # Generate a list of all available translations
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 update-desktop-database -q
 
@@ -62,7 +59,6 @@ update-desktop-database -q
 update-desktop-database -q
 
 %files -f %{name}.lang
-%defattr(-,root,root)
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
@@ -71,6 +67,10 @@ update-desktop-database -q
 %doc AUTHORS NEWS README COPYING ChangeLog
 
 %changelog
+* Thu Jul 03 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 2.9.6-9
+- Fix FTBFS with -Werror=format-security (#1037091, #1106666)
+- Cleanup spec
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list