r754 - in packages/teg/trunk/debian: . patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-05-26 22:15:41 +0000 (Fri, 26 May 2006)
New Revision: 754

Added:
   packages/teg/trunk/debian/patches/10_teg-CAN-2006-1150-debian.diff
Modified:
   packages/teg/trunk/debian/changelog
   packages/teg/trunk/debian/control
   packages/teg/trunk/debian/copyright
   packages/teg/trunk/debian/rules
Log:
apply change from Justin Pryzby (#357645)


Modified: packages/teg/trunk/debian/changelog
===================================================================
--- packages/teg/trunk/debian/changelog	2006-05-26 22:01:10 UTC (rev 753)
+++ packages/teg/trunk/debian/changelog	2006-05-26 22:15:41 UTC (rev 754)
@@ -13,6 +13,14 @@
   * change icon location to /usr/share/pixmaps/teg.xpm
   * update rules file
 
+  [ Justin Pryzby ]
+  * Manually apply the changes made upstream to address remote DoS
+    patch teg-diff-CAN-2006-1150-debian
+    [CAN-2006-1150]; Closes: #357645.
+  * update copyright file
+  * Drop the README, which mostly duplicated the description
+  * add a homepage pseudofield in the Description entry
+
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Fri, 26 May 2006 23:15:47 +0200
 
 teg (0.11.1-2) unstable; urgency=low

Modified: packages/teg/trunk/debian/control
===================================================================
--- packages/teg/trunk/debian/control	2006-05-26 22:01:10 UTC (rev 753)
+++ packages/teg/trunk/debian/control	2006-05-26 22:15:41 UTC (rev 754)
@@ -16,3 +16,5 @@
  Teg is a multiplayer game (it can be played across the internet)
  and it comes with a server, a GNOME client and a robot.
  It has support for IPv6, too.
+ .
+  Homepage: http://teg.sourceforge.net

Modified: packages/teg/trunk/debian/copyright
===================================================================
--- packages/teg/trunk/debian/copyright	2006-05-26 22:01:10 UTC (rev 753)
+++ packages/teg/trunk/debian/copyright	2006-05-26 22:15:41 UTC (rev 754)
@@ -8,7 +8,44 @@
 
 Upstream Author: Ricardo Quesada <riq at core-sdi.com>
 
-Copyright: GPL
+See /usr/share/doc/teg/PEOPLE for a more complete list of
+contributors.
 
+Copyright (C) 2000-2002 Ricardo Quesada
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; only version 2 of the License
+
+./macros/ggz.m4
+dnl Copyright (C) 2001, 2002 Josef Spillner, dr_maux at users.sourceforge.net
+dnl This file has heavily been inspired by KDE's acinclude :)
+dnl It is published under the conditions of the GNU General Public License.
+
+./common/share.c
+./common/fcintl.h
+./common/support.c
+./common/support.h
+./client/gui-gnome/chatline.c
+./client/gui-gnome/chatline.h
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+         This program is free software; you can redistribute it and/or modify
+         it under the terms of the GNU General Public License as published by
+         the Free Software Foundation; either version 2, or (at your option)
+         any later version.
+
+./common/my_inet_ntop.c
+Copyright (c) 1996-1999 by Internet Software Consortium.
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+./client/gui-gnome/stock.c
+./client/gui-gnome/stock.h
+Author: Federico Mena-Quintero <federico at gimp.org>
+Copyright (C) 1999 The Free Software Foundation
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; only version 2 of the License
+
 On Debian GNU/Linux systems, the text of the GPL can be found in
 /usr/share/common-licenses/GPL.

Added: packages/teg/trunk/debian/patches/10_teg-CAN-2006-1150-debian.diff
===================================================================
--- packages/teg/trunk/debian/patches/10_teg-CAN-2006-1150-debian.diff	2006-05-26 22:01:10 UTC (rev 753)
+++ packages/teg/trunk/debian/patches/10_teg-CAN-2006-1150-debian.diff	2006-05-26 22:15:41 UTC (rev 754)
@@ -0,0 +1,18 @@
+# patch from Justin Pryzby <justinpryzby at users.sourceforge.net>
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357645
+--- teg-0.11.1.orig/server/player.c
++++ teg-0.11.1/server/player.c
+@@ -599,10 +599,10 @@
+ 			new_name[n] = '_';
+ 			player_fillname( pJ, new_name );
+ 		} else {
+-			if( new_name[n] < '0' || new_name[n] > '9' )
+-				new_name[n]='0';
++			if( new_name[n-1] < '0' || new_name[n-1] > '9' )
++				new_name[n-1]='0';
+ 			else
+-				new_name[n]++;
++				new_name[n-1]++;
+ 			player_fillname( pJ, new_name );
+ 		}
+ 	}

Modified: packages/teg/trunk/debian/rules
===================================================================
--- packages/teg/trunk/debian/rules	2006-05-26 22:01:10 UTC (rev 753)
+++ packages/teg/trunk/debian/rules	2006-05-26 22:15:41 UTC (rev 754)
@@ -59,7 +59,7 @@
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_installdocs README AUTHORS HACKING PEOPLE README.GGZ TODO
+	dh_installdocs AUTHORS HACKING PEOPLE README.GGZ TODO
 	dh_installmenu
 	dh_installman debian/tegserver.6 debian/tegclient.6 debian/tegrobot.6
 	dh_installchangelogs ChangeLog