r5373 - in packages/trunk/alien-arena/debian: . patches

Andres Mejia ceros-guest at alioth.debian.org
Tue Jan 15 18:35:42 UTC 2008


Author: ceros-guest
Date: 2008-01-15 18:35:41 +0000 (Tue, 15 Jan 2008)
New Revision: 5373

Modified:
   packages/trunk/alien-arena/debian/changelog
   packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch
   packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch
   packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch
   packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch
   packages/trunk/alien-arena/debian/patches/makefile_modifications.patch
   packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch
   packages/trunk/alien-arena/debian/patches/ruby_browser.patch
Log:
Switch from dpatch to quilt.

Modified: packages/trunk/alien-arena/debian/changelog
===================================================================
--- packages/trunk/alien-arena/debian/changelog	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/changelog	2008-01-15 18:35:41 UTC (rev 5373)
@@ -20,6 +20,7 @@
   * 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.
 
  -- Andres Mejia <mcitadel at gmail.com>  Mon, 14 Jan 2008 18:29:39 -0500
 

Modified: packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/patches/fix-CVE-2007-4754-CVE-2007-4755.patch	2008-01-15 18:35:41 UTC (rev 5373)
@@ -1,32 +1,7 @@
-#! /bin/sh -e
-## fix-CVE-2007-4754-CVE-2007-4755.dpatch by Nico Golde <nion at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: CVE-2007-4754 format string vulnerability, CVE-2007-4755 DoS fixes
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- source/game/acesrc/acebot_cmds.c.bak	2007-11-10 16:35:28.000000000 -0500
-+++ source/game/acesrc/acebot_cmds.c	2007-11-10 16:51:15.000000000 -0500
+Index: CVE-2007-4754 format string vulnerability, CVE-2007-4755 DoS fixes
+===================================================================
+--- ./source/game/acesrc/acebot_cmds.c.bak	2007-11-10 16:35:28.000000000 -0500
++++ ./source/game/acesrc/acebot_cmds.c	2007-11-10 16:51:15.000000000 -0500
 @@ -191,7 +191,7 @@
  	len = vsprintf (bigbuffer,fmt,argptr);
  	va_end (argptr);
@@ -36,8 +11,8 @@
  	
  }
  
---- source/server/sv_main.c.bak	2007-11-10 16:48:42.000000000 -0500
-+++ source/server/sv_main.c	2007-11-10 16:49:56.000000000 -0500
+--- ./source/server/sv_main.c.bak	2007-11-10 16:48:42.000000000 -0500
++++ ./source/server/sv_main.c	2007-11-10 16:49:56.000000000 -0500
 @@ -154,7 +154,7 @@
  			nametxt[k]=0;
  			//s = NET_AdrToString ( cl->netchan.remote_address); //fuck you Luigi

Modified: packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/patches/home_as_game_dir.patch	2008-01-15 18:35:41 UTC (rev 5373)
@@ -1,32 +1,7 @@
-#! /bin/sh -e
-## home_as_game_dir.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to set game directory used by client and server from $HOME/.codered to $HOME/.alien-arena
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- source/qcommon/files.c~ 2007-10-29 13:13:02.000000000 -0400
-+++ source/qcommon/files.c     2007-10-29 13:15:21.000000000 -0400
+Index: Patch to set game directory used by client and server from $HOME/.codered to $HOME/.alien-arena
+===================================================================
+--- ./source/qcommon/files.c~ 2007-10-29 13:13:02.000000000 -0400
++++ ./source/qcommon/files.c     2007-10-29 13:15:21.000000000 -0400
 @@ -591,7 +591,7 @@
  ================
  FS_AddHomeAsGameDirectory

Modified: packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/patches/kill-runaway-crded_tool_debianization.patch	2008-01-15 18:35:41 UTC (rev 5373)
@@ -1,32 +1,7 @@
-#! /bin/sh -e
-## kill-runaway-crded_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify Tools/LinuxScripts/kill-runaway-crded script for use in a Debian based distro.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/LinuxScripts/kill-runaway-crded~	2007-05-13 01:23:35.000000000 -0400
-+++ Tools/LinuxScripts/kill-runaway-crded	2007-05-13 01:23:35.000000000 -0400
+Index: Patch to modify Tools/LinuxScripts/kill-runaway-crded script for use in a Debian based distro.
+===================================================================
+--- ./Tools/LinuxScripts/kill-runaway-crded~	2007-05-13 01:23:35.000000000 -0400
++++ ./Tools/LinuxScripts/kill-runaway-crded	2007-05-13 01:23:35.000000000 -0400
 @@ -1,9 +1,9 @@
  #!/bin/sh
  

Modified: packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/patches/launch-server_tool_debianization.patch	2008-01-15 18:35:41 UTC (rev 5373)
@@ -1,33 +1,8 @@
-#! /bin/sh -e
-## launch-server_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify Tools/LinuxScripts/launch-server script for use in a Debian based distro.
-## DP: Patch also allows for server config files to be placed under any directory.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/LinuxScripts/launch-server~	2007-05-17 00:38:52.000000000 -0400
-+++ Tools/LinuxScripts/launch-server	2007-05-17 01:40:07.000000000 -0400
+Index: Patch to modify Tools/LinuxScripts/launch-server script for use in a Debian based distro.
+Patch also allows for server config files to be placed under any directory.
+===================================================================
+--- ./Tools/LinuxScripts/launch-server~	2007-05-17 00:38:52.000000000 -0400
++++ ./Tools/LinuxScripts/launch-server	2007-05-17 01:40:07.000000000 -0400
 @@ -1,14 +1,20 @@
  #! /bin/sh
  #

Modified: packages/trunk/alien-arena/debian/patches/makefile_modifications.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/patches/makefile_modifications.patch	2008-01-15 18:35:41 UTC (rev 5373)
@@ -1,33 +1,8 @@
-#! /bin/sh -e
-## makefile_modifications.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch that modifies the upstream Makefile making it more useful in
-## DP: building Debian packages.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- source/Makefile.bak	2008-01-15 02:25:58.000000000 -0500
-+++ source/Makefile	2008-01-15 02:33:31.000000000 -0500
+Index: Patch that modifies the upstream Makefile making it more useful in
+building Debian packages.
+===================================================================
+--- ./source/Makefile.bak	2008-01-15 02:25:58.000000000 -0500
++++ ./source/Makefile	2008-01-15 02:33:31.000000000 -0500
 @@ -14,7 +14,7 @@
  OPTIM_LVL?=2
  

Modified: packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/patches/rcon_tool_debianization.patch	2008-01-15 18:35:41 UTC (rev 5373)
@@ -1,32 +1,7 @@
-#! /bin/sh -e
-## rcon_tool_debianization.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify Tools/LinuxScripts/rcon script for use in a Debian based distro.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/LinuxScripts/rcon~	2007-05-14 23:37:17.000000000 -0400
-+++ Tools/LinuxScripts/rcon	2007-05-14 23:37:17.000000000 -0400
+Index: Patch to modify Tools/LinuxScripts/rcon script for use in a Debian based distro.
+===================================================================
+--- ./Tools/LinuxScripts/rcon~	2007-05-14 23:37:17.000000000 -0400
++++ ./Tools/LinuxScripts/rcon	2007-05-14 23:37:17.000000000 -0400
 @@ -22,6 +22,10 @@
      Tony Jackson can be contacted at tonyj at cooldark.com
  	

Modified: packages/trunk/alien-arena/debian/patches/ruby_browser.patch
===================================================================
--- packages/trunk/alien-arena/debian/patches/ruby_browser.patch	2008-01-15 18:16:56 UTC (rev 5372)
+++ packages/trunk/alien-arena/debian/patches/ruby_browser.patch	2008-01-15 18:35:41 UTC (rev 5373)
@@ -1,32 +1,7 @@
-#! /bin/sh -e
-## ruby_browser.dpatch by Andres Mejia <mcitadel at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to modify ruby browser script for use with this Debian package.
-
-dir=
-if [ $# -eq 3 -a "$2" = '-d' ]; then
-    pdir="-d $3"
-    dir="$3/"
-elif [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch)
-        patch $pdir -f --no-backup-if-mismatch -p0 < $0
-        ;;
-    -unpatch)
-        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
-        ;;
-    *)
-        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-        exit 1
-esac
-exit 0
-
---- Tools/RubyBrowser/browser.rbw.bak	2007-11-10 21:54:03.000000000 -0500
-+++ Tools/RubyBrowser/browser.rbw	2007-11-10 22:35:10.000000000 -0500
+Index: Patch to modify ruby browser script for use with this Debian package.
+===================================================================
+--- ./Tools/RubyBrowser/browser.rbw.bak	2007-11-10 21:54:03.000000000 -0500
++++ ./Tools/RubyBrowser/browser.rbw	2007-11-10 22:35:10.000000000 -0500
 @@ -519,7 +519,7 @@
  			shell.Run("cmd /K cd \"#{@config['gamedir']}\" & #{@config['gameexe']} +set game arena +connect #{@selectedserver}", 0, FALSE)
  		else




More information about the Pkg-games-commits mailing list