[Pkg-voip-commits] r5118 - in /openser/trunk/debian: changelog patches/00list patches/01_fix_openser_cfg.dpatch patches/02_uac_fix_avp_parsing.dpatch patches/03_allow_empty_transformations.dpatch

jblache at alioth.debian.org jblache at alioth.debian.org
Sun Dec 23 13:42:45 UTC 2007


Author: jblache
Date: Sun Dec 23 13:42:45 2007
New Revision: 5118

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5118
Log:
Add a handful of patches from SVN branch 1.3.

Added:
    openser/trunk/debian/patches/01_fix_openser_cfg.dpatch   (with props)
    openser/trunk/debian/patches/02_uac_fix_avp_parsing.dpatch   (with props)
    openser/trunk/debian/patches/03_allow_empty_transformations.dpatch   (with props)
Modified:
    openser/trunk/debian/changelog
    openser/trunk/debian/patches/00list

Modified: openser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/changelog?rev=5118&op=diff
==============================================================================
--- openser/trunk/debian/changelog (original)
+++ openser/trunk/debian/changelog Sun Dec 23 13:42:45 2007
@@ -2,7 +2,15 @@
 
   * NOT RELEASED YET
 
- -- Julien BLACHE <jblache at debian.org>  Thu, 13 Dec 2007 18:20:08 +0100
+  * debian/patches/01_fix_openser_cfg.dpatch:
+    + Added; fix default openser.cfg, from rev 3376.
+  * debian/patches/02_uac_fix_avp_parsing.dpatch:
+    + Added; fix avp defintion parsing in the uac module, from rev 3414.
+  * debian/patches/03_allow_empty_transformations.dpatch:
+    + Added; allow some transformations to accept an empty buffer, from
+      rev 3436.
+
+ -- Julien BLACHE <jblache at debian.org>  Sun, 23 Dec 2007 14:39:45 +0100
 
 openser (1.3.0-1) experimental; urgency=low
 

Modified: openser/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/patches/00list?rev=5118&op=diff
==============================================================================
--- openser/trunk/debian/patches/00list (original)
+++ openser/trunk/debian/patches/00list Sun Dec 23 13:42:45 2007
@@ -1,3 +1,6 @@
+01_fix_openser_cfg
+02_uac_fix_avp_parsing
+03_allow_empty_transformations
 10_no_lib64_on_64_bits
 11_always_smp
 12_acc_enable_radius

Added: openser/trunk/debian/patches/01_fix_openser_cfg.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/patches/01_fix_openser_cfg.dpatch?rev=5118&op=file
==============================================================================
--- openser/trunk/debian/patches/01_fix_openser_cfg.dpatch (added)
+++ openser/trunk/debian/patches/01_fix_openser_cfg.dpatch Sun Dec 23 13:42:45 2007
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_fix_openser_cfg.dpatch by  <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix default openser.cfg, from rev 3376.
+
+ at DPATCH@
+diff -urNad openser-1.3.0~/etc/openser.cfg openser-1.3.0/etc/openser.cfg
+--- openser-1.3.0~/etc/openser.cfg	2007-12-13 14:39:06.000000000 +0100
++++ openser-1.3.0/etc/openser.cfg	2007-12-23 14:35:26.404298329 +0100
+@@ -371,9 +371,9 @@
+ ##		handle_subscribe();
+ ##		t_release();
+ ##	}
+-
+-	exit;
+-}
++##
++##	exit;
++##}
+ 
+ 
+ branch_route[2] {

Propchange: openser/trunk/debian/patches/01_fix_openser_cfg.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: openser/trunk/debian/patches/02_uac_fix_avp_parsing.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/patches/02_uac_fix_avp_parsing.dpatch?rev=5118&op=file
==============================================================================
--- openser/trunk/debian/patches/02_uac_fix_avp_parsing.dpatch (added)
+++ openser/trunk/debian/patches/02_uac_fix_avp_parsing.dpatch Sun Dec 23 13:42:45 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_uac_fix_avp_parsing.dpatch by  <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix avp definition parsing in the uac module, from rev 3414.
+
+ at DPATCH@
+diff -urNad openser-1.3.0~/modules/uac/uac.c openser-1.3.0/modules/uac/uac.c
+--- openser-1.3.0~/modules/uac/uac.c	2007-12-13 14:37:53.000000000 +0100
++++ openser-1.3.0/modules/uac/uac.c	2007-12-23 14:36:44.223299060 +0100
+@@ -127,7 +127,7 @@
+ {
+ 	str s;
+ 	s.s = avp_spec; s.len = strlen(s.s);
+-	if (pv_parse_spec(&s, avp)) {
++	if (pv_parse_spec(&s, avp)==NULL) {
+ 		LM_ERR("malformed or non AVP %s AVP definition\n",txt);
+ 		return -1;
+ 	}

Propchange: openser/trunk/debian/patches/02_uac_fix_avp_parsing.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: openser/trunk/debian/patches/03_allow_empty_transformations.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/patches/03_allow_empty_transformations.dpatch?rev=5118&op=file
==============================================================================
--- openser/trunk/debian/patches/03_allow_empty_transformations.dpatch (added)
+++ openser/trunk/debian/patches/03_allow_empty_transformations.dpatch Sun Dec 23 13:42:45 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_allow_empty_transformations.dpatch by  <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow some transformations to accept an empty buffer, from rev 3436.
+
+ at DPATCH@
+diff -urNad openser-1.3.0~/strcommon.c openser-1.3.0/strcommon.c
+--- openser-1.3.0~/strcommon.c	2007-12-13 14:39:06.000000000 +0100
++++ openser-1.3.0/strcommon.c	2007-12-23 14:37:33.469339748 +0100
+@@ -112,7 +112,7 @@
+ 	char *at, *p, c;
+ 
+ 	if(sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL
+-			|| sin->len<=0 || sout->len < sin->len+1)
++			|| sin->len<0 || sout->len < sin->len+1)
+ 		return -1;
+ 
+ 	at = sout->s;
+@@ -225,7 +225,7 @@
+ 	unsigned char x;
+ 
+ 	if(sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL
+-			|| sin->len<=0 || sout->len < 3*sin->len+1)
++			|| sin->len<0 || sout->len < 3*sin->len+1)
+ 		return -1;
+ 
+ 

Propchange: openser/trunk/debian/patches/03_allow_empty_transformations.dpatch
------------------------------------------------------------------------------
    svn:executable = *




More information about the Pkg-voip-commits mailing list