r13426 - in packages/trunk/gnome-breakout/debian: . patches

[Vincent Legout]

Author: vlegout
Date: 2012-03-24 15:01:30 +0000 (Sat, 24 Mar 2012)
New Revision: 13426

Added:
   packages/trunk/gnome-breakout/debian/patches/07_fix_wformat_warnings.patch
Modified:
   packages/trunk/gnome-breakout/debian/changelog
   packages/trunk/gnome-breakout/debian/patches/series
   packages/trunk/gnome-breakout/debian/rules
Log:
Add 07_fix_wformat_warnings.patch

Modified: packages/trunk/gnome-breakout/debian/changelog
===================================================================
--- packages/trunk/gnome-breakout/debian/changelog	2012-03-24 14:53:47 UTC (rev 13425)
+++ packages/trunk/gnome-breakout/debian/changelog	2012-03-24 15:01:30 UTC (rev 13426)
@@ -1,6 +1,9 @@
 gnome-breakout (0.5.3-4) UNRELEASED; urgency=low
 
   * debhelper 9 has been released, Build-Depends on debhelper (>= 9)
+  * 07_fix_wformat_warnings.patch: Added, fix ftbfs with -Wformat-security.
+    Patch from Simon Ruderich (Closes: #665273). Thus enable all hardening
+    flags in debian/rules.
 
  -- Vincent Legout <vlegout at debian.org>  Sat, 24 Mar 2012 15:52:32 +0100
 

Added: packages/trunk/gnome-breakout/debian/patches/07_fix_wformat_warnings.patch
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/07_fix_wformat_warnings.patch	                        (rev 0)
+++ packages/trunk/gnome-breakout/debian/patches/07_fix_wformat_warnings.patch	2012-03-24 15:01:30 UTC (rev 13426)
@@ -0,0 +1,38 @@
+Description: Fix -Wformat-security errors.
+Author: Simon Ruderich <simon at ruderich.org>
+Last-Update: 2012-03-22
+
+Index: gnome-breakout-0.5.3/src/gui.c
+===================================================================
+--- gnome-breakout-0.5.3.orig/src/gui.c	2012-03-22 18:55:55.000000000 +0100
++++ gnome-breakout-0.5.3/src/gui.c	2012-03-22 18:55:55.000000000 +0100
+@@ -362,7 +362,7 @@
+ 				GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				GTK_MESSAGE_WARNING,
+ 				GTK_BUTTONS_CLOSE,
+-				buffer);
++				"%s", buffer);
+ 		gtk_dialog_run(GTK_DIALOG(mbox));
+ 		gtk_widget_destroy(mbox);
+ 	} else {
+@@ -386,7 +386,7 @@
+ 				GTK_DIALOG_DESTROY_WITH_PARENT,
+ 				GTK_MESSAGE_ERROR,
+ 				GTK_BUTTONS_CLOSE,
+-				buffer);
++				"%s", buffer);
+ 		gtk_dialog_run(GTK_DIALOG(mbox));
+ 		gtk_widget_destroy(mbox);
+ 	} else {
+Index: gnome-breakout-0.5.3/src/util.c
+===================================================================
+--- gnome-breakout-0.5.3.orig/src/util.c	2004-05-11 00:35:32.000000000 +0200
++++ gnome-breakout-0.5.3/src/util.c	2012-03-22 18:58:40.889774594 +0100
+@@ -41,6 +41,6 @@
+ 	message = g_strdup_vprintf(format, ap);
+ 	va_end(ap);
+ 
+-	g_warning(message);
++	g_warning("%s", message);
+ 	g_free(message);
+ }

Modified: packages/trunk/gnome-breakout/debian/patches/series
===================================================================
--- packages/trunk/gnome-breakout/debian/patches/series	2012-03-24 14:53:47 UTC (rev 13425)
+++ packages/trunk/gnome-breakout/debian/patches/series	2012-03-24 15:01:30 UTC (rev 13426)
@@ -4,3 +4,4 @@
 04_po_config.patch
 05_fix_ftbfs_binutils_gold.patch
 06_fix_pixmaps_makefile.patch
+07_fix_wformat_warnings.patch

Modified: packages/trunk/gnome-breakout/debian/rules
===================================================================
--- packages/trunk/gnome-breakout/debian/rules	2012-03-24 14:53:47 UTC (rev 13425)
+++ packages/trunk/gnome-breakout/debian/rules	2012-03-24 15:01:30 UTC (rev 13426)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_MAINT_OPTIONS := hardening=-format,+pie,+bindnow
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
 
 %:
 	dh $@ --with autoreconf --with autotools-dev