[Pkg-voip-commits] r880 - in siproxd/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2005-10-30 12:59:42 +0000 (Sun, 30 Oct 2005)
New Revision: 880

Removed:
   siproxd/trunk/debian/patches/amd64.diff
Modified:
   siproxd/trunk/debian/changelog
Log:
* Temporarly remove adm64.patch as it doesn't apply cleanly to 
new upstream

Modified: siproxd/trunk/debian/changelog
===================================================================
--- siproxd/trunk/debian/changelog	2005-10-30 12:56:08 UTC (rev 879)
+++ siproxd/trunk/debian/changelog	2005-10-30 12:59:42 UTC (rev 880)
@@ -1,10 +1,12 @@
-siproxd (1:0.5.11-1) UNRELEASED; urgency=low
+siproxd (1:0.5.11-1) unstable; urgency=low
 
   * New upstream release
     - new upstream release 0.5.11 (Closes: #307848)
   * Minor comments on package description (Closes: #300704)
+  * Temporarly remove adm64.patch as it doesn't apply cleanly to 
+  new upstream
 
- -- Mark Purcell <msp at debian.org>  Sun, 30 Oct 2005 12:38:04 +0000
+ -- Mark Purcell <msp at debian.org>  Sun, 30 Oct 2005 12:58:59 +0000
 
 siproxd (1:0.5.10-3) UNRELEASED; urgency=low
 

Deleted: siproxd/trunk/debian/patches/amd64.diff
===================================================================
--- siproxd/trunk/debian/patches/amd64.diff	2005-10-30 12:56:08 UTC (rev 879)
+++ siproxd/trunk/debian/patches/amd64.diff	2005-10-30 12:59:42 UTC (rev 880)
@@ -1,93 +0,0 @@
-diff -urN ../tmp-orig/siproxd-0.5.10/src/proxy.c ./src/proxy.c
---- ../tmp-orig/siproxd-0.5.10/src/proxy.c      2005-01-24 20:12:40.000000000 +0100
-+++ ./src/proxy.c       2005-03-22 16:53:40.606097320 +0100
-@@ -516,7 +516,7 @@
-    * RFC 3261, Section 16.6 step 10
-    * Proxy Behavior - Forward the new request
-    */
--   sts = osip_message_to_str(request, &buffer);
-+   sts = osip_message_to_str(request, &buffer, strlen(buffer));
-    if (sts != 0) {
-       ERROR("proxy_request: osip_message_to_str failed");
-       return STS_FAILURE;
-@@ -910,7 +910,7 @@
-       }
-    }
- 
--   sts = osip_message_to_str(response, &buffer);
-+   sts = osip_message_to_str(response, &buffer, strlen(buffer));
-    if (sts != 0) {
-       ERROR("proxy_response: osip_message_to_str failed");
-       return STS_FAILURE;
-@@ -966,7 +966,7 @@
-       }
-    }
- 
--   sts = osip_body_to_str(body, &bodybuff);
-+   sts = osip_body_to_str(body, &bodybuff, strlen(&bodybuff));
-    sts = sdp_message_init(&sdp);
-    sts = sdp_message_parse (sdp, bodybuff);
-    osip_free(bodybuff);
-@@ -981,7 +981,7 @@
- { /* just dump the buffer */
-    char *tmp, *tmp2;
-    sts = osip_message_get_body(mymsg, 0, &body);
--   sts = osip_body_to_str(body, &tmp);
-+   sts = osip_body_to_str(body, &tmp, strlen(tmp));
-    osip_content_length_to_str(mymsg->content_length, &tmp2);
-    DEBUG("Body before rewrite (clen=%s, strlen=%i):\n%s\n----",
-          tmp2, strlen(tmp), tmp);
-@@ -1210,7 +1210,7 @@
-    sdp_message_free(sdp);
- 
-    /* include new body */
--   osip_message_set_body(mymsg, bodybuff);
-+   osip_message_set_body(mymsg, bodybuff, strlen(bodybuff));
- 
-    /* free content length resource and include new one*/
-    osip_content_length_free(mymsg->content_length);
-@@ -1225,7 +1225,7 @@
- { /* just dump the buffer */
-    char *tmp, *tmp2;
-    sts = osip_message_get_body(mymsg, 0, &body);
--   sts = osip_body_to_str(body, &tmp);
-+   sts = osip_body_to_str(body, &tmp, strlen(&tmp));
-    osip_content_length_to_str(mymsg->content_length, &tmp2);
-    DEBUG("Body after rewrite (clen=%s, strlen=%i):\n%s\n----",
-          tmp2, strlen(tmp), tmp);
-diff -urN ../tmp-orig/siproxd-0.5.10/src/register.c ./src/register.c
---- ../tmp-orig/siproxd-0.5.10/src/register.c   2005-01-08 11:05:12.000000000 +0100
-+++ ./src/register.c    2005-03-22 16:53:57.293874812 +0100
-@@ -550,7 +550,7 @@
-       }
-    }   
- 
--   sts = osip_message_to_str(response, &buffer);
-+   sts = osip_message_to_str(response, &buffer, strlen(&buffer));
-    if (sts != 0) {
-       ERROR("register_response: msg_2char failed");
-       return STS_FAILURE;
-diff -urN ../tmp-orig/siproxd-0.5.10/src/sip_utils.c ./src/sip_utils.c
---- ../tmp-orig/siproxd-0.5.10/src/sip_utils.c  2005-01-08 11:05:13.000000000 +0100
-+++ ./src/sip_utils.c   2005-03-22 16:54:44.297798071 +0100
-@@ -563,7 +563,7 @@
-       }
-    }   
- 
--   sts = osip_message_to_str(response, &buffer);
-+   sts = osip_message_to_str(response, &buffer, strlen(&buffer));
-    if (sts != 0) {
-       ERROR("sip_gen_response: msg_2char failed");
-       return STS_FAILURE;
-diff -urN ../tmp-orig/siproxd-0.5.10/src/siproxd.c ./src/siproxd.c
---- ../tmp-orig/siproxd-0.5.10/src/siproxd.c    2005-01-08 11:41:46.000000000 +0100
-+++ ./src/siproxd.c     2005-03-22 16:51:10.871011947 +0100
-@@ -321,7 +321,7 @@
-        * Proxy Behavior - Request Validation - Reasonable Syntax
-        * (parse the received message)
-        */
--      sts=osip_message_parse(ticket.sipmsg, buff);
-+      sts=osip_message_parse(ticket.sipmsg, buff, strlen(buff));
-       if (sts != 0) {
-          ERROR("osip_message_parse() failed... this is not good");
-          DUMP_BUFFER(-1, buff, i);