← Back to branch summary

~ubuntu-branches/ubuntu/natty/alien-arena/natty

« back to all changes in this revision

Viewing changes to debian/patches/fix-CVE-2007-4754-CVE-2007-4755.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Andres Mejia, Barry deFreese, Ansgar Burchardt, Gonéri Le Bouder, Andres Mejia
  • Date: 2008-04-18 17:43:24 UTC
  • mfrom: (1.1.2 upstream) (3.1.1 hardy)
  • Revision ID: james.westby@ubuntu.com-20080418174324-si1umi8dngglaha4
Tags: 7.0-1
http://bugs.debian.org/453555
http://bugs.debian.org/457700
[ Barry deFreese ]
* Escape - in alien-arena-server.6.
* Add myself to uploaders.

[ Ansgar Burchardt ]
* Remove deprecated Encoding key from .desktop file.

[ Gonéri Le Bouder ]
* Remove Homepage from package description.

[ Andres Mejia ]
* New upstream release.
* Removing XS- part for Vcs-* lines.
* Removing +ssh part of Vcs-Svn line.
* Bumped to Standards-Version 3.7.3.
* Test for existence of *-stamp stamps before removing them.
* Removed Encoding field in desktop file.
* Modify patch for upstream Makefile to make Makefile more useful in building
  Debian packages.
  + Also fixes problem not detecting the existence of libcurl.
* Remove debug packages for release. Will support nostrip option instead.
* Add description for fix-CVE-2007-4754-CVE-2007-4755.dpatch, silences
  lintian warning.
* Add new link for watchfile.
  + Closes: #453555
* Moved debian/scripts/alien-arena-tarball.sh to
  debian/alien-arena-get-orig-source.
* Modified alien-arena-data-get-orig-source to make it easier to maintain.
* Switched from dpatch to quilt.
* Cut down package description.
* Closing bug about mouse constantly looking up. The submitter could not
  reproduce the bug after deleting the ~/.alien-arena directory.
  + Closes: #457700
* Updated copyright file for new release.
* Updated README.Debian files.
* Adding new images for icons. Need build dependency on sharutils.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-CVE-2007-4754-CVE-2007-4755.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## fix-CVE-2007-4754-CVE-2007-4755.dpatch by Nico Golde <nion@debian.org>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad alien-arena-6.05~/source/game/acesrc/acebot_cmds.c alien-arena-6.05/source/game/acesrc/acebot_cmds.c
9
 
--- alien-arena-6.05~/source/game/acesrc/acebot_cmds.c  2007-03-24 03:28:55.000000000 +0100
10
 
+++ alien-arena-6.05/source/game/acesrc/acebot_cmds.c   2007-09-16 17:47:52.000000000 +0200
11
 
@@ -142,7 +142,7 @@
12
 
        va_end (argptr);
13
 
 
14
 
        if (dedicated->value)
15
 
-               gi.cprintf(NULL, PRINT_MEDIUM, bigbuffer);
16
 
+               gi.cprintf(NULL, PRINT_MEDIUM, "%s", bigbuffer);
17
 
 
18
 
        for (i=0 ; i<maxclients->value ; i++)
19
 
        {
20
 
@@ -150,7 +150,7 @@
21
 
                if (!cl_ent->inuse || cl_ent->is_bot)
22
 
                        continue;
23
 
 
24
 
-               gi.cprintf(cl_ent,  PRINT_MEDIUM, bigbuffer);
25
 
+               gi.cprintf(cl_ent,  PRINT_MEDIUM, "%s", bigbuffer);
26
 
        }
27
 
 
28
 
 }
29
 
@@ -171,7 +171,7 @@
30
 
        len = vsprintf (bigbuffer,fmt,argptr);
31
 
        va_end (argptr);
32
 
 
33
 
-       gi.cprintf(ent, printlevel, bigbuffer);
34
 
+       gi.cprintf(ent, printlevel, "%s", bigbuffer);
35
 
        
36
 
 }
37
 
 
38
 
@@ -191,7 +191,7 @@
39
 
        len = vsprintf (bigbuffer,fmt,argptr);
40
 
        va_end (argptr);
41
 
        
42
 
-       gi.centerprintf(ent, bigbuffer);
43
 
+       gi.centerprintf(ent,"%s", bigbuffer);
44
 
        
45
 
 }
46
 
 
47
 
@@ -211,7 +211,7 @@
48
 
        va_end (argptr);
49
 
 
50
 
        if (dedicated->value)
51
 
-               gi.cprintf(NULL, printlevel, bigbuffer);
52
 
+               gi.cprintf(NULL, printlevel, "%s", bigbuffer);
53
 
 
54
 
        for (i=0 ; i<maxclients->value ; i++)
55
 
        {
56
 
@@ -219,7 +219,7 @@
57
 
                if (!cl_ent->inuse || cl_ent->is_bot)
58
 
                        continue;
59
 
 
60
 
-               gi.cprintf(cl_ent, printlevel, bigbuffer);
61
 
+               gi.cprintf(cl_ent, printlevel, "%s", bigbuffer);
62
 
        }
63
 
 }
64
 
 
65
 
diff -urNad alien-arena-6.05~/source/server/sv_main.c alien-arena-6.05/source/server/sv_main.c
66
 
--- alien-arena-6.05~/source/server/sv_main.c   2007-04-17 12:05:03.000000000 +0200
67
 
+++ alien-arena-6.05/source/server/sv_main.c    2007-09-16 17:49:40.000000000 +0200
68
 
@@ -152,7 +152,7 @@
69
 
                        nametxt[k]=0;
70
 
                        s = NET_AdrToString ( cl->netchan.remote_address);
71
 
                        Com_sprintf (player, sizeof(player), "%i %i \"%s\" \"%s\"\n", 
72
 
-                               cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, s);
73
 
+                               cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, "suppressed");
74
 
                        playerLength = strlen(player);
75
 
                        if (statusLength + playerLength >= sizeof(status) )
76
 
                                break;          // can't hold any more