[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.1-7-17-g7521e4f
Simon McVittie
smcv at debian.org
Wed Jul 21 22:46:32 UTC 2010
The following commit has been merged in the master branch:
commit 12d834a14f77c5a42acf30ebe23676e28bedc220
Author: Simon McVittie <smcv at debian.org>
Date: Sun Jul 18 00:13:41 2010 +0100
Refresh patches via gbp-pq, and add DEP-3 patch headers
diff --git a/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch b/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
new file mode 100644
index 0000000..f4afb14
--- /dev/null
+++ b/debian/patches/0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
@@ -0,0 +1,23 @@
+From: Guillaume Delacour <unknown>
+Date: Sun, 18 Jul 2010 00:00:18 +0100
+Subject: [PATCH] Fix segfault when deleting non-existent ban address 0
+
+Bug-Debian: http://bugs.debian.org/532212
+---
+ code/server/sv_ccmds.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/code/server/sv_ccmds.c b/code/server/sv_ccmds.c
+index 2cc19e2..435ca60 100644
+--- a/code/server/sv_ccmds.c
++++ b/code/server/sv_ccmds.c
+@@ -752,7 +752,7 @@ static void SV_DelBanFromList(qboolean isexception)
+
+ todel = atoi(Cmd_Argv(1));
+
+- if(todel < 0 || todel > serverBansCount)
++ if(todel <= 0 || todel > serverBansCount)
+ return;
+
+ for(index = count = 0; index < serverBansCount; index++)
+--
diff --git a/debian/patches/10_fix_build_and_binary_on_alpha.patch b/debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
similarity index 57%
rename from debian/patches/10_fix_build_and_binary_on_alpha.patch
rename to debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
index fd109ac..55a2250 100644
--- a/debian/patches/10_fix_build_and_binary_on_alpha.patch
+++ b/debian/patches/0002-Fix-build-and-resulting-binary-on-alpha.patch
@@ -1,15 +1,17 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_build_and_binary_on_alpha.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix compile options to make oa build and run on alpha.
+From: Steve Langasek <vorlon at debian.org>
+Date: Sun, 18 Jul 2010 00:00:27 +0100
+Subject: [PATCH] Fix build and resulting binary on alpha
- at DPATCH@
-Index: openarena-0.8.1/Makefile
-===================================================================
---- openarena-0.8.1.orig/Makefile 2008-11-19 22:09:18.000000000 +0100
-+++ openarena-0.8.1/Makefile 2008-11-19 22:11:01.000000000 +0100
-@@ -216,7 +216,7 @@
+Bug-Debian: http://bugs.debian.org/410555
+---
+ Makefile | 10 +++++++---
+ 1 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 979ab89..50e4118 100644
+--- a/Makefile
++++ b/Makefile
+@@ -216,7 +216,7 @@ MKDIR=mkdir
ifeq ($(PLATFORM),linux)
ifeq ($(ARCH),alpha)
@@ -18,7 +20,7 @@ Index: openarena-0.8.1/Makefile
else
ifeq ($(ARCH),x86_64)
LIB=lib64
-@@ -291,6 +291,10 @@
+@@ -291,6 +291,10 @@ ifeq ($(PLATFORM),linux)
ifneq ($(USE_OPENAL_DLOPEN),1)
CLIENT_LDFLAGS += -lopenal
endif
@@ -29,7 +31,7 @@ Index: openarena-0.8.1/Makefile
endif
ifeq ($(USE_CURL),1)
-@@ -516,7 +520,7 @@
+@@ -516,7 +520,7 @@ else # ifeq mingw32
ifeq ($(PLATFORM),freebsd)
ifneq (,$(findstring alpha,$(shell uname -m)))
@@ -38,7 +40,7 @@ Index: openarena-0.8.1/Makefile
else #default to i386
ARCH=i386
endif #alpha test
-@@ -536,7 +540,7 @@
+@@ -536,7 +540,7 @@ ifeq ($(PLATFORM),freebsd)
BASE_CFLAGS += -DUSE_CODEC_VORBIS
endif
@@ -47,3 +49,4 @@ Index: openarena-0.8.1/Makefile
BASE_CFLAGS += -DNO_VM_COMPILED
RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -ffast-math -funroll-loops \
-fomit-frame-pointer -fexpensive-optimizations
+--
diff --git a/debian/patches/0003-Remove-hard-wired-build-flags.patch b/debian/patches/0003-Remove-hard-wired-build-flags.patch
new file mode 100644
index 0000000..1cef9c6
--- /dev/null
+++ b/debian/patches/0003-Remove-hard-wired-build-flags.patch
@@ -0,0 +1,26 @@
+From: Bruno "Fuddl" Kleinert <fuddl at debian.org>
+Date: Sun, 18 Jul 2010 00:00:32 +0100
+Subject: [PATCH] Remove hard-wired build flags
+
+---
+ Makefile.local | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.local b/Makefile.local
+index 8285ec7..976f606 100644
+--- a/Makefile.local
++++ b/Makefile.local
+@@ -3,10 +3,10 @@
+ COPYDIR="/usr/local/games/openarena"
+
+ #We want openAL
+-USE_OPENAL=1
++#USE_OPENAL=1
+
+ #Next we want to bind openAL on runtime. SDL sound will be used if openAL is not installed
+-USE_OPENAL_DLOPEN=1
++#USE_OPENAL_DLOPEN=1
+
+ #We want vorbis support!
+ USE_CODEC_VORBIS=1
+--
diff --git a/debian/patches/30_link_against_local_libspeex.patch b/debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
similarity index 72%
rename from debian/patches/30_link_against_local_libspeex.patch
rename to debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
index 910c007..e6b6d3d 100644
--- a/debian/patches/30_link_against_local_libspeex.patch
+++ b/debian/patches/0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
@@ -1,15 +1,19 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_link_against_local_libspeex.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: Bruno "Fuddl" Kleinert <fuddl at debian.org>
+Date: Sun, 18 Jul 2010 00:00:36 +0100
+Subject: [PATCH] Build against (recent) system speex and speexdsp libraries
- at DPATCH@
-Index: openarena-0.8.1/Makefile
-===================================================================
---- openarena-0.8.1.orig/Makefile 2008-11-19 22:11:32.000000000 +0100
-+++ openarena-0.8.1/Makefile 2008-11-19 22:16:00.000000000 +0100
-@@ -134,7 +134,7 @@
+---
+ Makefile | 95 ++++++++++++++++++++++++------------------------
+ code/client/cl_cgame.c | 4 ++
+ code/client/cl_main.c | 5 +++
+ code/client/client.h | 4 +-
+ 4 files changed, 59 insertions(+), 49 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 50e4118..6cb0d41 100644
+--- a/Makefile
++++ b/Makefile
+@@ -134,7 +134,7 @@ USE_VOIP=1
endif
ifndef USE_INTERNAL_SPEEX
@@ -18,7 +22,7 @@ Index: openarena-0.8.1/Makefile
endif
ifndef USE_LOCAL_HEADERS
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ NDIR=$(MOUNT_DIR)/null
UIDIR=$(MOUNT_DIR)/ui
Q3UIDIR=$(MOUNT_DIR)/q3_ui
JPDIR=$(MOUNT_DIR)/jpeg-6
@@ -27,7 +31,7 @@ Index: openarena-0.8.1/Makefile
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp
-@@ -827,6 +827,7 @@
+@@ -827,6 +827,7 @@ ifeq ($(USE_VOIP),1)
BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
else
CLIENT_LDFLAGS += -lspeex
@@ -35,7 +39,7 @@ Index: openarena-0.8.1/Makefile
endif
endif
-@@ -1373,49 +1374,49 @@
+@@ -1373,49 +1374,49 @@ ifeq ($(ARCH),x86)
endif
ifeq ($(USE_VOIP),1)
@@ -128,7 +132,7 @@ Index: openarena-0.8.1/Makefile
endif
-@@ -1897,8 +1898,8 @@
+@@ -1897,8 +1898,8 @@ $(B)/client/%.o: $(BLIBDIR)/%.c
$(B)/client/%.o: $(JPDIR)/%.c
$(DO_CC)
@@ -139,11 +143,11 @@ Index: openarena-0.8.1/Makefile
$(B)/client/%.o: $(RDIR)/%.c
$(DO_CC)
-Index: openarena-0.8.1/code/client/cl_cgame.c
-===================================================================
---- openarena-0.8.1.orig/code/client/cl_cgame.c 2008-11-19 22:09:18.000000000 +0100
-+++ openarena-0.8.1/code/client/cl_cgame.c 2008-11-19 22:11:41.000000000 +0100
-@@ -26,6 +26,10 @@
+diff --git a/code/client/cl_cgame.c b/code/client/cl_cgame.c
+index 615884f..1e14037 100644
+--- a/code/client/cl_cgame.c
++++ b/code/client/cl_cgame.c
+@@ -26,6 +26,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../botlib/botlib.h"
#include "libmumblelink.h"
@@ -154,11 +158,11 @@ Index: openarena-0.8.1/code/client/cl_cgame.c
extern botlib_export_t *botlib_export;
-Index: openarena-0.8.1/code/client/cl_main.c
-===================================================================
---- openarena-0.8.1.orig/code/client/cl_main.c 2008-11-19 22:09:18.000000000 +0100
-+++ openarena-0.8.1/code/client/cl_main.c 2008-11-19 22:11:41.000000000 +0100
-@@ -28,6 +28,11 @@
+diff --git a/code/client/cl_main.c b/code/client/cl_main.c
+index 328fddd..98d9a54 100644
+--- a/code/client/cl_main.c
++++ b/code/client/cl_main.c
+@@ -28,6 +28,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "libmumblelink.h"
#endif
@@ -170,11 +174,11 @@ Index: openarena-0.8.1/code/client/cl_main.c
#ifdef USE_MUMBLE
cvar_t *cl_useMumble;
cvar_t *cl_mumbleScale;
-Index: openarena-0.8.1/code/client/client.h
-===================================================================
---- openarena-0.8.1.orig/code/client/client.h 2008-11-19 22:09:18.000000000 +0100
-+++ openarena-0.8.1/code/client/client.h 2008-11-19 22:11:41.000000000 +0100
-@@ -35,8 +35,8 @@
+diff --git a/code/client/client.h b/code/client/client.h
+index 4e5f9eb..9da1a29 100644
+--- a/code/client/client.h
++++ b/code/client/client.h
+@@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif /* USE_CURL */
#ifdef USE_VOIP
@@ -185,3 +189,4 @@ Index: openarena-0.8.1/code/client/client.h
#endif
// file full of random crap that gets used to create cl_guid
+--
diff --git a/debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch b/debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch
new file mode 100644
index 0000000..0f5dfb1
--- /dev/null
+++ b/debian/patches/0005-Fix-FTBFS-on-kFreeBSD.patch
@@ -0,0 +1,46 @@
+From: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
+Date: Sun, 18 Jul 2010 00:00:40 +0100
+Subject: [PATCH] Fix FTBFS on kFreeBSD
+
+Bug-Debian: http://bugs.debian.org/413617
+---
+ Makefile | 4 ++--
+ code/qcommon/q_platform.h | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 6cb0d41..eee4c96 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@
+ # GNU Make required
+ #
+
+-COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
++COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g')
+
+ COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
+
+@@ -213,7 +213,7 @@ LIB=lib
+ INSTALL=install
+ MKDIR=mkdir
+
+-ifeq ($(PLATFORM),linux)
++ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
+
+ ifeq ($(ARCH),alpha)
+ ARCH=alpha
+diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
+index 1152fdf..310ec32 100644
+--- a/code/qcommon/q_platform.h
++++ b/code/qcommon/q_platform.h
+@@ -120,7 +120,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ //================================================================= LINUX ===
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(__FreeBSD_kernel__)
+
+ #include <endian.h>
+
+--
diff --git a/debian/patches/0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch b/debian/patches/0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
new file mode 100644
index 0000000..72349f9
--- /dev/null
+++ b/debian/patches/0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
@@ -0,0 +1,48 @@
+From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
+Date: Sun, 18 Jul 2010 00:00:40 +0100
+Subject: [PATCH] Use memmove instead of strcpy for overlapping memory regions
+
+Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4331
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/openarena/+bug/554748
+Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=526338
+---
+ code/botlib/l_precomp.c | 2 +-
+ code/botlib/l_script.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c
+index 06e7877..4ec1092 100644
+--- a/code/botlib/l_precomp.c
++++ b/code/botlib/l_precomp.c
+@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
+ if ((*ptr == '\\' || *ptr == '/') &&
+ (*(ptr+1) == '\\' || *(ptr+1) == '/'))
+ {
+- strcpy(ptr, ptr+1);
++ memmove(ptr, ptr+1, strlen(ptr));
+ } //end if
+ else
+ {
+diff --git a/code/botlib/l_script.c b/code/botlib/l_script.c
+index c92481c..8652a99 100644
+--- a/code/botlib/l_script.c
++++ b/code/botlib/l_script.c
+@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
+ {
+ if (*string == '\"')
+ {
+- strcpy(string, string+1);
++ memmove(string, string+1, strlen(string));
+ } //end if
+ if (string[strlen(string)-1] == '\"')
+ {
+@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
+ {
+ if (*string == '\'')
+ {
+- strcpy(string, string+1);
++ memmove(string, string+1, strlen(string));
+ } //end if
+ if (string[strlen(string)-1] == '\'')
+ {
+--
diff --git a/debian/patches/spelling.patch b/debian/patches/0007-Fix-spelling-error.patch
similarity index 58%
rename from debian/patches/spelling.patch
rename to debian/patches/0007-Fix-spelling-error.patch
index fa85578..02ee014 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/0007-Fix-spelling-error.patch
@@ -1,10 +1,19 @@
From: Ansgar Burchardt <ansgar at 43-1.org>
-Date: Mon, 07 Jun 2010 12:55:35 +0900
-Subject: Fix spelling error
+Date: Mon, 7 Jun 2010 12:55:35 +0900
+Subject: [PATCH] Fix spelling error
---- openarena.orig/code/botlib/be_aas_main.c
-+++ openarena/code/botlib/be_aas_main.c
-@@ -216,7 +216,7 @@
+---
+ code/botlib/be_aas_main.c | 2 +-
+ code/botlib/be_ai_chat.c | 2 +-
+ code/botlib/l_precomp.c | 2 +-
+ code/botlib/l_script.c | 6 +++---
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/code/botlib/be_aas_main.c b/code/botlib/be_aas_main.c
+index 0296b1a..4b5e102 100644
+--- a/code/botlib/be_aas_main.c
++++ b/code/botlib/be_aas_main.c
+@@ -216,7 +216,7 @@ void AAS_ContinueInit(float time)
//save the AAS file
if (AAS_WriteAASFile(aasworld.filename))
{
@@ -13,9 +22,11 @@ Subject: Fix spelling error
} //end if
else
{
---- openarena.orig/code/botlib/be_ai_chat.c
-+++ openarena/code/botlib/be_ai_chat.c
-@@ -2198,7 +2198,7 @@
+diff --git a/code/botlib/be_ai_chat.c b/code/botlib/be_ai_chat.c
+index 6d64cf6..36c3496 100644
+--- a/code/botlib/be_ai_chat.c
++++ b/code/botlib/be_ai_chat.c
+@@ -2198,7 +2198,7 @@ bot_chat_t *BotLoadInitialChat(char *chatfile, char *chatname)
#ifdef DEBUG
botimport.Print(PRT_MESSAGE, "initial chats loaded in %d msec\n", Sys_MilliSeconds() - starttime);
#endif //DEBUG
@@ -24,9 +35,11 @@ Subject: Fix spelling error
return chat;
} //end of the function BotLoadInitialChat
//===========================================================================
---- openarena.orig/code/botlib/l_precomp.c
-+++ openarena/code/botlib/l_precomp.c
-@@ -1362,7 +1362,7 @@
+diff --git a/code/botlib/l_precomp.c b/code/botlib/l_precomp.c
+index 4ec1092..42c26b8 100644
+--- a/code/botlib/l_precomp.c
++++ b/code/botlib/l_precomp.c
+@@ -1362,7 +1362,7 @@ define_t *PC_DefineFromString(char *string)
#endif //DEFINEHASHING
//
FreeScript(script);
@@ -35,9 +48,11 @@ Subject: Fix spelling error
if (res > 0) return def;
//free the define is created
if (src.defines) PC_FreeDefine(def);
---- openarena.orig/code/botlib/l_script.c
-+++ openarena/code/botlib/l_script.c
-@@ -421,7 +421,7 @@
+diff --git a/code/botlib/l_script.c b/code/botlib/l_script.c
+index 8652a99..f467909 100644
+--- a/code/botlib/l_script.c
++++ b/code/botlib/l_script.c
+@@ -421,7 +421,7 @@ int PS_ReadEscapeCharacter(script_t *script, char *ch)
script->script_p++;
//store the escape character
*ch = c;
@@ -46,7 +61,7 @@ Subject: Fix spelling error
return 1;
} //end of the function PS_ReadEscapeCharacter
//============================================================================
-@@ -431,7 +431,7 @@
+@@ -431,7 +431,7 @@ int PS_ReadEscapeCharacter(script_t *script, char *ch)
//
// Parameter: script : script to read from
// token : buffer to store the string
@@ -55,7 +70,7 @@ Subject: Fix spelling error
// Changes Globals: -
//============================================================================
int PS_ReadString(script_t *script, token_t *token, int quote)
-@@ -912,7 +912,7 @@
+@@ -912,7 +912,7 @@ int PS_ReadToken(script_t *script, token_t *token)
} //end if
//copy the token into the script structure
Com_Memcpy(&script->token, token, sizeof(token_t));
@@ -64,3 +79,4 @@ Subject: Fix spelling error
return 1;
} //end of the function PS_ReadToken
//============================================================================
+--
diff --git a/debian/patches/10_remove_upstream_build_flags.patch b/debian/patches/10_remove_upstream_build_flags.patch
deleted file mode 100644
index e2119bb..0000000
--- a/debian/patches/10_remove_upstream_build_flags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_remove-upstream-build-flags.dpatch by Bruno "Fuddl" Kleinert <fuddl at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove parts of upstream's Makefile.local to avoid hard wirde build flags.
-
- at DPATCH@
-diff -urNad openarena-0.8.1~/Makefile.local openarena-0.8.1/Makefile.local
---- openarena-0.8.1~/Makefile.local 2008-11-07 17:29:20.000000000 +0100
-+++ openarena-0.8.1/Makefile.local 2008-11-07 17:29:27.000000000 +0100
-@@ -3,10 +3,10 @@
- COPYDIR="/usr/local/games/openarena"
-
- #We want openAL
--USE_OPENAL=1
-+#USE_OPENAL=1
-
- #Next we want to bind openAL on runtime. SDL sound will be used if openAL is not installed
--USE_OPENAL_DLOPEN=1
-+#USE_OPENAL_DLOPEN=1
-
- #We want vorbis support!
- USE_CODEC_VORBIS=1
diff --git a/debian/patches/40_kfreebsd.patch b/debian/patches/40_kfreebsd.patch
deleted file mode 100644
index 63ab852..0000000
--- a/debian/patches/40_kfreebsd.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- openarena-0.8.1.orig/Makefile
-+++ openarena-0.8.1/Makefile
-@@ -4,7 +4,7 @@
- # GNU Make required
- #
-
--COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
-+COMPILE_PLATFORM=$(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'|sed -e 's/\//_/g')
-
- COMPILE_ARCH=$(shell uname -m | sed -e s/i.86/i386/)
-
-@@ -213,7 +213,7 @@
- INSTALL=install
- MKDIR=mkdir
-
--ifeq ($(PLATFORM),linux)
-+ifneq (,findstring($(PLATFORM),linux gnu_kfreebsd kfreebsd-gnu))
-
- ifeq ($(ARCH),alpha)
- ARCH=alpha
---- openarena-0.8.1.orig/code/qcommon/q_platform.h
-+++ openarena-0.8.1/code/qcommon/q_platform.h
-@@ -120,7 +120,7 @@
-
- //================================================================= LINUX ===
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
-
- #include <endian.h>
-
diff --git a/debian/patches/delban_0_segfault.patch b/debian/patches/delban_0_segfault.patch
deleted file mode 100644
index 45b695a..0000000
--- a/debian/patches/delban_0_segfault.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# http://bugs.debian.org/532212
-# Patch by Guillaume Delacour
---- openarena-0.8.1.orig/code/server/sv_ccmds.c
-+++ openarena-0.8.1/code/server/sv_ccmds.c
-@@ -752,7 +752,7 @@
-
- todel = atoi(Cmd_Argv(1));
-
-- if(todel < 0 || todel > serverBansCount)
-+ if(todel <= 0 || todel > serverBansCount)
- return;
-
- for(index = count = 0; index < serverBansCount; index++)
diff --git a/debian/patches/memmove.patch b/debian/patches/memmove.patch
deleted file mode 100644
index 13b0d7b..0000000
--- a/debian/patches/memmove.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
-Bug: http://bugzilla.icculus.org/show_bug.cgi?id=4331
-Bug-Ubuntu: http://bugs.launchpad.net/bugs/554748
-Bug-Fedora: http://bugzilla.icculus.org/show_bug.cgi?id=4331
-Subject: Use memmove instead of strcpy for overlapping memory regions
-
---- openarena.orig/code/botlib/l_precomp.c
-+++ openarena/code/botlib/l_precomp.c
-@@ -948,7 +948,7 @@
- if ((*ptr == '\\' || *ptr == '/') &&
- (*(ptr+1) == '\\' || *(ptr+1) == '/'))
- {
-- strcpy(ptr, ptr+1);
-+ memmove(ptr, ptr+1, strlen(ptr));
- } //end if
- else
- {
---- openarena.orig/code/botlib/l_script.c
-+++ openarena/code/botlib/l_script.c
-@@ -1118,7 +1118,7 @@
- {
- if (*string == '\"')
- {
-- strcpy(string, string+1);
-+ memmove(string, string+1, strlen(string));
- } //end if
- if (string[strlen(string)-1] == '\"')
- {
-@@ -1135,7 +1135,7 @@
- {
- if (*string == '\'')
- {
-- strcpy(string, string+1);
-+ memmove(string, string+1, strlen(string));
- } //end if
- if (string[strlen(string)-1] == '\'')
- {
diff --git a/debian/patches/series b/debian/patches/series
index 94427b4..ff88d06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,7 @@
-delban_0_segfault.patch
-10_fix_build_and_binary_on_alpha.patch
-10_remove_upstream_build_flags.patch
-#20_dont_build_shipped_jpeg.patch
-30_link_against_local_libspeex.patch
-40_kfreebsd.patch
-memmove.patch
-spelling.patch
+0001-Fix-segfault-when-deleting-non-existent-ban-address-.patch
+0002-Fix-build-and-resulting-binary-on-alpha.patch
+0003-Remove-hard-wired-build-flags.patch
+0004-Build-against-recent-system-speex-and-speexdsp-libra.patch
+0005-Fix-FTBFS-on-kFreeBSD.patch
+0006-Use-memmove-instead-of-strcpy-for-overlapping-memory.patch
+0007-Fix-spelling-error.patch
--
Packaging for the OpenArena engine
More information about the Pkg-games-commits
mailing list