[SCM] Packaging for the OpenArena engine branch, debian-squeeze, updated. debian/0.8.5-5+squeeze2-3-g1b76f3e

[Simon McVittie]

The following commit has been merged in the debian-squeeze branch:
commit 1b76f3e0e010f49f8acc1005ae2809a754d4669c
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 27 10:58:46 2012 +0100

    Apply ioquake3 r1898 to fix a regression caused by rate-limiting, in which the server would stop responding to getstatus after an uptime of 2**32 milliseconds (approximately 50 days)

diff --git a/debian/changelog b/debian/changelog
index fefd398..917237e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ openarena (0.8.5-5+squeeze3) UNRELEASED; urgency=low
   * Incorporate ioquake3 r1763 into the patch for rate-limiting, to fix
     potential use of uninitialized variables if the network address family
     is unexpected
+  * Apply ioquake3 r1898 to fix a regression caused by rate-limiting,
+    in which the server would stop responding to getstatus after an uptime
+    of 2**32 milliseconds (approximately 50 days)
 
  -- Simon McVittie <smcv at debian.org>  Tue, 27 Mar 2012 10:02:30 +0100
 
diff --git a/debian/patches/0044-Fix-Sys_Milliseconds-wrapping-causing-the-flood-prot.patch b/debian/patches/0044-Fix-Sys_Milliseconds-wrapping-causing-the-flood-prot.patch
new file mode 100644
index 0000000..dfc0645
--- /dev/null
+++ b/debian/patches/0044-Fix-Sys_Milliseconds-wrapping-causing-the-flood-prot.patch
@@ -0,0 +1,28 @@
+From: Tim Angus <tma>
+Date: Fri, 18 Feb 2011 23:46:02 +0000
+Subject: Fix Sys_Milliseconds wrapping causing the flood protection
+ code to malfunction and block all traffic (reported by bubu^)
+
+Origin: upstream (ioquake3), commit:1898
+Bug-Debian: FIXME
+---
+ code/server/sv_main.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/engine/code/server/sv_main.c b/engine/code/server/sv_main.c
+index 3cb9f4f..01411cb 100644
+--- a/engine/code/server/sv_main.c
++++ b/engine/code/server/sv_main.c
+@@ -444,7 +444,8 @@ static leakyBucket_t *SVC_BucketForAddress( netadr_t address, int burst, int per
+ 		interval = now - bucket->lastTime;
+ 
+ 		// Reclaim expired buckets
+-		if ( bucket->lastTime > 0 && interval > ( burst * period ) ) {
++		if ( bucket->lastTime > 0 && ( interval > ( burst * period ) ||
++					interval < 0 ) ) {
+ 			if ( bucket->prev != NULL ) {
+ 				bucket->prev->next = bucket->next;
+ 			} else {
+-- 
+1.7.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 5e83306..9cbc87b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,4 @@
 0041-If-a-QVM-starts-with-NTVE-followed-by-a-nonempty-str.patch
 0042-G_Damage-check-before-dereferencing-targ-client-whic.patch
 0043-Rate-limit-getstatus-and-rcon-connectionless-request.patch
+0044-Fix-Sys_Milliseconds-wrapping-causing-the-flood-prot.patch

-- 
Packaging for the OpenArena engine