[Pkg-voip-commits] r10601 - in /stun/trunk/debian: changelog patches/series patches/stun-0.96.dfsg-xor-mapped-address.patch patches/timeout_increase.patch

[kilian at alioth.debian.org]

Author: kilian
Date: Sun Dec 21 21:00:13 2014
New Revision: 10601

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10601
Log:
* Increase timeout from 1 ms to 1s in stun.cxx (Closes: #645671)
* Ignore error in stop, i.e. daemon already shut down (Closes: #645948)

Added:
    stun/trunk/debian/patches/timeout_increase.patch
Modified:
    stun/trunk/debian/changelog
    stun/trunk/debian/patches/series
    stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch

Modified: stun/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/changelog?rev=10601&op=diff
==============================================================================
--- stun/trunk/debian/changelog	(original)
+++ stun/trunk/debian/changelog	Sun Dec 21 21:00:13 2014
@@ -9,8 +9,10 @@
   * debian/patches/fix_non_i386.patch: Disable - seems fixed upstream
   * Fix purge issue when no IPs are configured (Closes: #663682)
   * Pull apart server and client (Closes: #676933)
+  * Increase timeout from 1 ms to 1s in stun.cxx (Closes: #645671)
+  * Ignore error in stop, i.e. daemon already shut down (Closes: #645948)
 
- -- Kilian Krause <kilian at debian.org>  Sun, 21 Dec 2014 21:53:20 +0100
+ -- Kilian Krause <kilian at debian.org>  Sun, 21 Dec 2014 21:59:39 +0100
 
 stun (0.96.dfsg-6) unstable; urgency=low
 

Modified: stun/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/patches/series?rev=10601&op=diff
==============================================================================
--- stun/trunk/debian/patches/series	(original)
+++ stun/trunk/debian/patches/series	Sun Dec 21 21:00:13 2014
@@ -1 +1,2 @@
 stun-0.96.dfsg-xor-mapped-address.patch
+timeout_increase.patch

Modified: stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch?rev=10601&op=diff
==============================================================================
--- stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch	(original)
+++ stun/trunk/debian/patches/stun-0.96.dfsg-xor-mapped-address.patch	Sun Dec 21 21:00:13 2014
@@ -4,18 +4,18 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix return code according to newer RFC3489 update
 @DPATCH@
---- stun-0.96.dfsg/stun.h.orig	2014-10-10 14:04:06.450554203 +0200
-+++ stun-0.96.dfsg/stun.h	2014-10-10 14:11:05.381612948 +0200
-@@ -44,7 +44,11 @@
- const UInt16 ErrorCode        = 0x0009;
- const UInt16 UnknownAttribute = 0x000A;
- const UInt16 ReflectedFrom    = 0x000B;
--const UInt16 XorMappedAddress = 0x8020;
-+// attribute XOR-MAPPED-ADDRESS:
-+//    RFC 3489 : not defined
-+//    draft-ietf-behave-rfc3489bis-02 : 0x8020
-+//    draft-ietf-behave-rfc3489bis-03 ff. and RFC 5389 : 0x0020
-+const UInt16 XorMappedAddress = 0x0020;
- const UInt16 XorOnly          = 0x0021;
- const UInt16 ServerName       = 0x8022;
- const UInt16 SecondaryAddress = 0x8050; // Non standard extention
+--- a/stun.h
++++ b/stun.h
+@@ -44,7 +44,11 @@ const UInt16 MessageIntegrity = 0x0008;
+ const UInt16 ErrorCode        = 0x0009;
+ const UInt16 UnknownAttribute = 0x000A;
+ const UInt16 ReflectedFrom    = 0x000B;
+-const UInt16 XorMappedAddress = 0x8020;
++// attribute XOR-MAPPED-ADDRESS:
++//    RFC 3489 : not defined
++//    draft-ietf-behave-rfc3489bis-02 : 0x8020
++//    draft-ietf-behave-rfc3489bis-03 ff. and RFC 5389 : 0x0020
++const UInt16 XorMappedAddress = 0x0020;
+ const UInt16 XorOnly          = 0x0021;
+ const UInt16 ServerName       = 0x8022;
+ const UInt16 SecondaryAddress = 0x8050; // Non standard extention

Added: stun/trunk/debian/patches/timeout_increase.patch
URL: http://svn.debian.org/wsvn/pkg-voip/stun/trunk/debian/patches/timeout_increase.patch?rev=10601&op=file
==============================================================================
--- stun/trunk/debian/patches/timeout_increase.patch	(added)
+++ stun/trunk/debian/patches/timeout_increase.patch	Sun Dec 21 21:00:13 2014
@@ -0,0 +1,12 @@
+# increase timeout as recommended per #645671
+--- a/stun.cxx
++++ b/stun.cxx
+@@ -1405,7 +1405,7 @@ stunServerProcess(StunServerInfo& info,
+    
+    struct timeval tv;
+    tv.tv_sec = 0;
+-   tv.tv_usec = 1000;
++   tv.tv_usec = 1000000; // Debian: only run every second (#645671)
+ 	
+    int e = select( maxFd, &fdSet, NULL,NULL, &tv );
+    if (e < 0)