r13577 - in packages/trunk/warzone2100/debian: . patches

[Paul Wise]

Author: pabs
Date: 2012-05-15 05:33:29 +0000 (Tue, 15 May 2012)
New Revision: 13577

Added:
   packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/patches/series
   packages/trunk/warzone2100/debian/warzone2100-data.install
Log:
Fix FTBFS with hardening flags

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2012-05-15 05:31:58 UTC (rev 13576)
+++ packages/trunk/warzone2100/debian/changelog	2012-05-15 05:33:29 UTC (rev 13577)
@@ -12,6 +12,7 @@
   * miniupnpc copy moved around remove new location
   * Remove the quesoglc embedded code copy too
   * Update patch to use system quesoglc too
+  * Fix FTBFS with hardening flags
 
  -- Paul Wise <pabs at debian.org>  Mon, 24 Oct 2011 10:55:52 +0800
 

Added: packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch	                        (rev 0)
+++ packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch	2012-05-15 05:33:29 UTC (rev 13577)
@@ -0,0 +1,56 @@
+Author: Paul Wise <pabs at debian.org>
+Description: fix an FTBFS with -Werror=format-security
+Forwarded: no
+--- a/lib/netplay/netplay.cpp
++++ b/lib/netplay/netplay.cpp
+@@ -2505,7 +2505,7 @@
+ 
+ 					char buf[250] = {'\0'};
+ 					snprintf(buf, sizeof(buf), "Player %s has joined, IP is: %s", name, NetPlay.players[index].IPtextAddress);
+-					debug(LOG_INFO, buf);
++					debug(LOG_INFO, "%s", buf);
+ 					NETlogEntry(buf, SYNC_FLAG, index);
+ 
+ 					debug(LOG_NET, "Player, %s, with index of %u has joined using socket %p", name, (unsigned int)index, connected_bsocket[index]);
+@@ -3177,7 +3177,7 @@
+ 		{
+ 			switch (numInts)
+ 			{
+-				case  0: index += snprintf(buf + index, bufSize - index, string); break;
++				case  0: index += snprintf(buf + index, bufSize - index, "%s", string); break;
+ 				case  1: index += snprintf(buf + index, bufSize - index, string, ints[0]); break;
+ 				case  2: index += snprintf(buf + index, bufSize - index, string, ints[0], ints[1]); break;
+ 				case  3: index += snprintf(buf + index, bufSize - index, string, ints[0], ints[1], ints[2]); break;
+--- a/lib/script/script_parser.cpp
++++ b/lib/script/script_parser.cpp
+@@ -8625,7 +8625,7 @@
+ 	if (0 < yysize && yysize <= yymsg_alloc)
+ 	  {
+ 	    (void) yysyntax_error (yymsg, yystate, yychar);
+-	    yyerror (yymsg);
++	    yyerror ("%s", yymsg);
+ 	  }
+ 	else
+ 	  {
+--- a/src/qtscriptfuncs.cpp
++++ b/src/qtscriptfuncs.cpp
+@@ -1133,7 +1133,7 @@
+ 		}
+ 		result.append(s);
+ 	}
+-	qWarning(result.toAscii().constData());
++	qWarning("%s", result.toAscii().constData());
+ 	return QScriptValue();
+ }
+ 
+--- a/src/scriptvals_parser.cpp
++++ b/src/scriptvals_parser.cpp
+@@ -2206,7 +2206,7 @@
+ 	if (0 < yysize && yysize <= yymsg_alloc)
+ 	  {
+ 	    (void) yysyntax_error (yymsg, yystate, yychar);
+-	    yyerror (yymsg);
++	    yyerror ("%s", yymsg);
+ 	  }
+ 	else
+ 	  {

Modified: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series	2012-05-15 05:31:58 UTC (rev 13576)
+++ packages/trunk/warzone2100/debian/patches/series	2012-05-15 05:33:29 UTC (rev 13577)
@@ -1 +1,2 @@
 use-system-libraries.patch
+fix-FTBFS-with-hardening-flags.patch

Modified: packages/trunk/warzone2100/debian/warzone2100-data.install
===================================================================
--- packages/trunk/warzone2100/debian/warzone2100-data.install	2012-05-15 05:31:58 UTC (rev 13576)
+++ packages/trunk/warzone2100/debian/warzone2100-data.install	2012-05-15 05:33:29 UTC (rev 13577)
@@ -1,4 +1,3 @@
 usr/share/doc
 usr/share/locale
 usr/share/games/warzone2100/*.wz
-usr/share/games/warzone2100/mods/multiplay