diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-08-04 04:26:20 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2011-08-04 04:26:20 +0000 |
commit | 5e3c1308c606876befb85731e1b7dbe71f12462f (patch) | |
tree | b29d2515c02cd0e59007ce881bd72355ac1783bc /games/teeworlds/files | |
parent | ade5e9ccd2fac713ef9d6a75c653360f08484f84 (diff) | |
download | ports-5e3c1308c606876befb85731e1b7dbe71f12462f.tar.gz ports-5e3c1308c606876befb85731e1b7dbe71f12462f.zip |
Notes
Diffstat (limited to 'games/teeworlds/files')
-rw-r--r-- | games/teeworlds/files/patch-bam.lua | 23 | ||||
-rw-r--r-- | games/teeworlds/files/patch-default.bam | 11 | ||||
-rw-r--r-- | games/teeworlds/files/patch-e_network.c | 15 | ||||
-rw-r--r-- | games/teeworlds/files/patch-es_server.c | 20 |
4 files changed, 23 insertions, 46 deletions
diff --git a/games/teeworlds/files/patch-bam.lua b/games/teeworlds/files/patch-bam.lua new file mode 100644 index 000000000000..bf8b4634e508 --- /dev/null +++ b/games/teeworlds/files/patch-bam.lua @@ -0,0 +1,23 @@ +--- bam.lua.orig 2011-04-09 23:15:25.000000000 +0400 ++++ bam.lua 2011-08-04 01:03:26.000000000 +0400 +@@ -154,7 +154,7 @@ + settings.link.frameworks:Add("Carbon") + settings.link.frameworks:Add("AppKit") + else +- settings.link.libs:Add("pthread") ++ settings.link.flags:Add("-pthread") + end + elseif family == "windows" then + settings.link.libs:Add("gdi32") +@@ -281,8 +281,10 @@ + release_settings.config_name = "release" + release_settings.config_ext = "" + release_settings.debug = 0 +-release_settings.optimize = 1 ++release_settings.optimize = 0 + release_settings.cc.defines:Add("CONF_RELEASE") ++release_settings.cc.flags_c:Add(os.getenv("CFLAGS")) ++release_settings.cc.flags_cxx:Add(os.getenv("CXXFLAGS")) + + if platform == "macosx" and arch == "ia32" then + debug_settings_ppc = debug_settings:Copy() diff --git a/games/teeworlds/files/patch-default.bam b/games/teeworlds/files/patch-default.bam deleted file mode 100644 index 3e2a59554b1b..000000000000 --- a/games/teeworlds/files/patch-default.bam +++ /dev/null @@ -1,11 +0,0 @@ ---- default.bam.orig 2009-01-25 13:50:33.000000000 +0000 -+++ default.bam 2009-01-26 18:11:46.000000000 +0000 -@@ -128,7 +128,7 @@ - settings.link.frameworks:Add("Carbon") - settings.link.frameworks:Add("AppKit") - else -- settings.link.libs:Add("pthread") -+ settings.link.flags:Add("-pthread") - end - elseif family == "windows" then - settings.link.libs:Add("gdi32") diff --git a/games/teeworlds/files/patch-e_network.c b/games/teeworlds/files/patch-e_network.c deleted file mode 100644 index d1f419d2e6dc..000000000000 --- a/games/teeworlds/files/patch-e_network.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/engine/e_network.c.orig 2010-06-23 09:39:36.000000000 +0200 -+++ src/engine/e_network.c 2010-06-23 09:41:29.000000000 +0200 -@@ -224,6 +224,12 @@ - - if(packet->flags&NET_PACKETFLAG_CONNLESS) - { -+ /* check the size of connless packet */ -+ if(size < 6) -+ { -+ dbg_msg("", "connless packet too small, %d", size); -+ return -1; -+ } - packet->flags = NET_PACKETFLAG_CONNLESS; - packet->ack = 0; - packet->num_chunks = 0; diff --git a/games/teeworlds/files/patch-es_server.c b/games/teeworlds/files/patch-es_server.c deleted file mode 100644 index 4af057af3cca..000000000000 --- a/games/teeworlds/files/patch-es_server.c +++ /dev/null @@ -1,20 +0,0 @@ ---- src/engine/server/es_server.c.orig 2010-06-23 09:41:50.000000000 +0200 -+++ src/engine/server/es_server.c 2010-06-23 09:42:21.000000000 +0200 -@@ -303,7 +303,7 @@ - - void server_kick(int client_id, const char *reason) - { -- if(client_id < 0 || client_id > MAX_CLIENTS) -+ if(client_id < 0 || client_id >= MAX_CLIENTS) - return; - - if(clients[client_id].state != SRVCLIENT_STATE_EMPTY) -@@ -1244,7 +1244,7 @@ - NETADDR addr; - int cid = atoi(str); - -- if(cid < 0 || cid > MAX_CLIENTS || clients[cid].state == SRVCLIENT_STATE_EMPTY) -+ if(cid < 0 || cid >= MAX_CLIENTS || clients[cid].state == SRVCLIENT_STATE_EMPTY) - { - dbg_msg("server", "invalid client id"); - return; |