r13257 - packages/trunk/rott/debian/patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2012-02-15 12:34:48 +0000 (Wed, 15 Feb 2012)
New Revision: 13257

Modified:
   packages/trunk/rott/debian/patches/01-demo-datadir.patch
   packages/trunk/rott/debian/patches/02-persistent-typo.patch
   packages/trunk/rott/debian/patches/03-parameter-typo.patch
   packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch
   packages/trunk/rott/debian/patches/format-security.patch
   packages/trunk/rott/debian/patches/series
Log:
Update patches and header information.

Modified: packages/trunk/rott/debian/patches/01-demo-datadir.patch
===================================================================
--- packages/trunk/rott/debian/patches/01-demo-datadir.patch	2012-02-15 12:25:43 UTC (rev 13256)
+++ packages/trunk/rott/debian/patches/01-demo-datadir.patch	2012-02-15 12:34:48 UTC (rev 13257)
@@ -1,4 +1,7 @@
-Enable playback of demo files in DATADIR.
+Description: Enable playback of demo files in DATADIR.
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Applied-Upstream: http://svn.icculus.org/rott?view=rev&revision=254,
+ http://svn.icculus.org/rott?view=rev&revision=261
 
 --- rott-1.1.1.orig/rott/rt_net.c
 +++ rott-1.1.1/rott/rt_net.c
@@ -11,8 +14,8 @@
  
 -   filename[4] = (char)('0' + (byte)demonumber);
 -   filename[6] = (char)('0' + (byte)gamestate.violence);
-+   filename[3 + sizeof(DATADIR)] = (char)('0' + (byte)demonumber);
-+   filename[5 + sizeof(DATADIR)] = (char)('0' + (byte)gamestate.violence);
++   filename[4 + strlen(DATADIR)] = (char)('0' + (byte)demonumber);
++   filename[6 + strlen(DATADIR)] = (char)('0' + (byte)gamestate.violence);
     FixFilePath(filename);
  }
  //****************************************************************************

Modified: packages/trunk/rott/debian/patches/02-persistent-typo.patch
===================================================================
--- packages/trunk/rott/debian/patches/02-persistent-typo.patch	2012-02-15 12:25:43 UTC (rev 13256)
+++ packages/trunk/rott/debian/patches/02-persistent-typo.patch	2012-02-15 12:34:48 UTC (rev 13257)
@@ -1,6 +1,6 @@
 Description: persistant -> persistent
-Forwarded: no
 Author: Evgeni Golov <evgeni at debian.org>
+Applied-Upstream: http://svn.icculus.org/rott?view=rev&revision=252
 Last-Update: 2009-12-21
 
 Index: rott-1.1.1/rott/rt_cfg.c

Modified: packages/trunk/rott/debian/patches/03-parameter-typo.patch
===================================================================
--- packages/trunk/rott/debian/patches/03-parameter-typo.patch	2012-02-15 12:25:43 UTC (rev 13256)
+++ packages/trunk/rott/debian/patches/03-parameter-typo.patch	2012-02-15 12:34:48 UTC (rev 13257)
@@ -1,5 +1,6 @@
 Description: paramater -> parameter
 Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Applied-Upstream: http://svn.icculus.org/rott?view=rev&revision=255
 
 --- rott-1.1.1.orig/doc/rott.6
 +++ rott-1.1.1/doc/rott.6

Modified: packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch
===================================================================
--- packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch	2012-02-15 12:25:43 UTC (rev 13256)
+++ packages/trunk/rott/debian/patches/04-objs-depend-on-develop_h.patch	2012-02-15 12:34:48 UTC (rev 13257)
@@ -1,5 +1,6 @@
 Description: Make sure object files get rebuilt whenever develop.h is changed.
 Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Applied-Upstream: http://svn.icculus.org/rott?view=rev&revision=256
 
 --- rott-1.1.1.orig/rott/Makefile
 +++ rott-1.1.1/rott/Makefile

Modified: packages/trunk/rott/debian/patches/format-security.patch
===================================================================
--- packages/trunk/rott/debian/patches/format-security.patch	2012-02-15 12:25:43 UTC (rev 13256)
+++ packages/trunk/rott/debian/patches/format-security.patch	2012-02-15 12:34:48 UTC (rev 13257)
@@ -1,3 +1,7 @@
+Description: Fix format string vulnerabilities.
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Applied-Upstream: http://svn.icculus.org/rott?view=rev&revision=263
+
 --- rott.orig/rott/rt_build.c
 +++ rott/rott/rt_build.c
 @@ -543,7 +543,7 @@ void PositionMenuBuf( int angle, int dis

Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series	2012-02-15 12:25:43 UTC (rev 13256)
+++ packages/trunk/rott/debian/patches/series	2012-02-15 12:34:48 UTC (rev 13257)
@@ -1,5 +1,3 @@
-#00-disable-audiolib.patch
-#00-ludicrous-gibs.patch
 01-demo-datadir.patch
 02-persistent-typo.patch
 03-parameter-typo.patch