[opensips] Ver. 1.10.3

Peter Lemenkov peter at fedoraproject.org
Mon Nov 3 17:36:38 UTC 2014


commit a0d9bac2c1e5f56c4711485b7a6ee53aa533f0bd
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Nov 3 20:36:24 2014 +0300

    Ver. 1.10.3
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 ...s-0001-Consistently-use-rtpproxy-switches.patch |    4 +-
 ...ps-0006-Don-t-modify-interim-return-value.patch |   28 ++++++++++----------
 ...al-payload-ID-in-case-of-a-dynamic-payloa.patch |    6 ++--
 ...ditional-auth-field-Sip-Source-IP-Address.patch |    2 +-
 opensips.spec                                      |    8 ++++-
 sources                                            |    2 +-
 7 files changed, 28 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3172b35..1c6e4df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ opensips-1.6.3-tls_src.tar.gz
 /opensips-1.9.1_src.tar.gz
 /opensips-1.10.0_src.tar.gz
 /opensips-1.10.1_src.tar.gz
+/opensips-1.10.3_src.tar.gz
diff --git a/opensips-0001-Consistently-use-rtpproxy-switches.patch b/opensips-0001-Consistently-use-rtpproxy-switches.patch
index e1328a9..18e6d66 100644
--- a/opensips-0001-Consistently-use-rtpproxy-switches.patch
+++ b/opensips-0001-Consistently-use-rtpproxy-switches.patch
@@ -18,10 +18,10 @@ index 27b66b0..f671e49 100644
  				</para></listitem>
  				<listitem><para>
 diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
-index 7abe6e2..0b1528e 100644
+index 7880513..bb3add5 100644
 --- a/modules/rtpproxy/rtpproxy.c
 +++ b/modules/rtpproxy/rtpproxy.c
-@@ -3145,8 +3145,6 @@ force_rtp_proxy_body(struct sip_msg* msg, struct force_rtpp_args *args)
+@@ -3153,8 +3153,6 @@ force_rtp_proxy_body(struct sip_msg* msg, struct force_rtpp_args *args)
  			enable_notification = 1;
  			break;
  
diff --git a/opensips-0006-Don-t-modify-interim-return-value.patch b/opensips-0006-Don-t-modify-interim-return-value.patch
index c501f00..2b73a20 100644
--- a/opensips-0006-Don-t-modify-interim-return-value.patch
+++ b/opensips-0006-Don-t-modify-interim-return-value.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Don't modify interim return value.
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 
 diff --git a/modules/sipmsgops/codecs.c b/modules/sipmsgops/codecs.c
-index e502140..159cf6a 100644
+index ac6b14f..274bff7 100644
 --- a/modules/sipmsgops/codecs.c
 +++ b/modules/sipmsgops/codecs.c
 @@ -349,8 +349,6 @@ static int do_for_all_streams(struct sip_msg* msg, str* str1,str * str2,
@@ -17,7 +17,7 @@ index e502140..159cf6a 100644
  	return rez;
  }
  
-@@ -679,7 +677,7 @@ int codec_find (struct sip_msg* msg, char* str1 )
+@@ -688,7 +686,7 @@ int codec_find (struct sip_msg* msg, char* str1 )
  	LM_DBG("searching for codec <%.*s> \n",res.len,res.s);
  
  	if( do_for_all_streams( msg, &res, NULL, NULL,
@@ -26,7 +26,7 @@ index e502140..159cf6a 100644
  		return -1;
  
  	return 1;
-@@ -690,7 +688,7 @@ int codec_find_re (struct sip_msg* msg, char* str1 )
+@@ -699,7 +697,7 @@ int codec_find_re (struct sip_msg* msg, char* str1 )
  {
  
  	if( do_for_all_streams(msg, NULL, NULL, (regex_t*)str1,
@@ -35,7 +35,7 @@ index e502140..159cf6a 100644
  		return -1;
  
  	return 1;
-@@ -717,7 +715,7 @@ int codec_find_clock (struct sip_msg* msg, char* str1,char * str2 )
+@@ -726,7 +724,7 @@ int codec_find_clock (struct sip_msg* msg, char* str1,char * str2 )
  		codec.len,codec.s,clock.len,clock.s);
  
  	if( do_for_all_streams( msg, &codec, &clock, NULL,
@@ -44,7 +44,7 @@ index e502140..159cf6a 100644
  		return -1;
  
  	return 1;
-@@ -737,7 +735,7 @@ int codec_delete (struct sip_msg* msg, char* str1 )
+@@ -746,7 +744,7 @@ int codec_delete (struct sip_msg* msg, char* str1 )
  	LM_DBG("deleting codec <%.*s> \n",res.len,res.s);
  
  	if( do_for_all_streams( msg, &res, NULL, NULL,
@@ -53,7 +53,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -746,7 +744,7 @@ int codec_delete (struct sip_msg* msg, char* str1 )
+@@ -755,7 +753,7 @@ int codec_delete (struct sip_msg* msg, char* str1 )
  int codec_delete_re (struct sip_msg* msg, char* str1 )
  {
  	if( do_for_all_streams( msg, NULL, NULL, (regex_t*) str1,
@@ -62,7 +62,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -755,7 +753,7 @@ int codec_delete_re (struct sip_msg* msg, char* str1 )
+@@ -764,7 +762,7 @@ int codec_delete_re (struct sip_msg* msg, char* str1 )
  int codec_delete_except_re (struct sip_msg* msg, char* str1 )
  {
  	if( do_for_all_streams( msg, NULL, NULL, (regex_t*) str1,
@@ -71,7 +71,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -781,7 +779,7 @@ int codec_delete_clock (struct sip_msg* msg, char* str1 ,char * str2)
+@@ -790,7 +788,7 @@ int codec_delete_clock (struct sip_msg* msg, char* str1 ,char * str2)
  		codec.len,codec.s,clock.len,clock.s);
  
  	if( do_for_all_streams( msg, &codec, &clock, NULL,
@@ -80,7 +80,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -800,7 +798,7 @@ int codec_move_up (struct sip_msg* msg, char* str1)
+@@ -809,7 +807,7 @@ int codec_move_up (struct sip_msg* msg, char* str1)
  	LM_DBG("moving up codec <%.*s> \n",res.len,res.s);
  
  	if( do_for_all_streams( msg, &res, NULL, NULL,
@@ -89,7 +89,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -809,7 +807,7 @@ int codec_move_up (struct sip_msg* msg, char* str1)
+@@ -818,7 +816,7 @@ int codec_move_up (struct sip_msg* msg, char* str1)
  int codec_move_up_re (struct sip_msg* msg, char* str1)
  {
  	if( do_for_all_streams( msg, NULL, NULL, (regex_t*)str1,
@@ -98,7 +98,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -835,7 +833,7 @@ int codec_move_up_clock (struct sip_msg* msg, char* str1 ,char * str2)
+@@ -844,7 +842,7 @@ int codec_move_up_clock (struct sip_msg* msg, char* str1 ,char * str2)
  		codec.len,codec.s,clock.len,clock.s);
  
  	if( do_for_all_streams( msg, &codec, &clock, NULL,
@@ -107,7 +107,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -854,7 +852,7 @@ int codec_move_down (struct sip_msg* msg, char* str1)
+@@ -863,7 +861,7 @@ int codec_move_down (struct sip_msg* msg, char* str1)
  	LM_DBG("moving down codec <%.*s> \n",res.len,res.s);
  
  	if( do_for_all_streams( msg, &res, NULL, NULL,
@@ -116,7 +116,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -863,7 +861,7 @@ int codec_move_down (struct sip_msg* msg, char* str1)
+@@ -872,7 +870,7 @@ int codec_move_down (struct sip_msg* msg, char* str1)
  int codec_move_down_re (struct sip_msg* msg, char* str1)
  {
  	if( do_for_all_streams( msg, NULL, NULL, (regex_t*)str1,
@@ -125,7 +125,7 @@ index e502140..159cf6a 100644
  		return -1;
  	return 1;
  }
-@@ -889,7 +887,7 @@ int codec_move_down_clock (struct sip_msg* msg, char* str1 ,char * str2)
+@@ -898,7 +896,7 @@ int codec_move_down_clock (struct sip_msg* msg, char* str1 ,char * str2)
  		codec.len,codec.s,clock.len,clock.s);
  
  	if( do_for_all_streams( msg, &codec, &clock, NULL,
diff --git a/opensips-0007-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch b/opensips-0007-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch
index 17bbba4..4a7ef4d 100644
--- a/opensips-0007-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch
+++ b/opensips-0007-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Return actual payload ID in case of a dynamic payload
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 
 diff --git a/modules/sipmsgops/codecs.c b/modules/sipmsgops/codecs.c
-index 159cf6a..7d1203f 100644
+index 274bff7..de48765 100644
 --- a/modules/sipmsgops/codecs.c
 +++ b/modules/sipmsgops/codecs.c
 @@ -34,6 +34,7 @@
@@ -27,7 +27,7 @@ index 159cf6a..7d1203f 100644
  					goto end;
  				}
  
-@@ -676,22 +679,12 @@ int codec_find (struct sip_msg* msg, char* str1 )
+@@ -685,22 +688,12 @@ int codec_find (struct sip_msg* msg, char* str1 )
  
  	LM_DBG("searching for codec <%.*s> \n",res.len,res.s);
  
@@ -52,7 +52,7 @@ index 159cf6a..7d1203f 100644
  }
  
  
-@@ -714,11 +707,7 @@ int codec_find_clock (struct sip_msg* msg, char* str1,char * str2 )
+@@ -723,11 +716,7 @@ int codec_find_clock (struct sip_msg* msg, char* str1,char * str2 )
  	LM_DBG("searching for codec <%.*s> with clock <%.*s> \n",
  		codec.len,codec.s,clock.len,clock.s);
  
diff --git a/opensips-0008-Use-additional-auth-field-Sip-Source-IP-Address.patch b/opensips-0008-Use-additional-auth-field-Sip-Source-IP-Address.patch
index b0fff5d..d94901c 100644
--- a/opensips-0008-Use-additional-auth-field-Sip-Source-IP-Address.patch
+++ b/opensips-0008-Use-additional-auth-field-Sip-Source-IP-Address.patch
@@ -19,7 +19,7 @@ index 1211c26..6d95c72 100644
  #define	V_STATUS_START			0
  #define	V_STATUS_STOP			1
 diff --git a/modules/auth_aaa/authaaa_mod.c b/modules/auth_aaa/authaaa_mod.c
-index 9c5a01d..5c4b77b 100644
+index f63a485..c0a7235 100644
 --- a/modules/auth_aaa/authaaa_mod.c
 +++ b/modules/auth_aaa/authaaa_mod.c
 @@ -126,6 +126,7 @@ static int mod_init(void)
diff --git a/opensips.spec b/opensips.spec
index efd021a..1421e53 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -20,8 +20,8 @@
 
 Summary:  Open Source SIP Server
 Name:     opensips
-Version:  1.10.1
-Release:  4%{?dist}
+Version:  1.10.3
+Release:  1%{?dist}
 License:  GPLv2+
 Group:    System Environment/Daemons
 Source0:  https://opensips.org/pub/%{name}/%{version}/src/%{name}-%{version}_src.tar.gz
@@ -1251,6 +1251,10 @@ fi
 %doc docdir/README.xmpp
 
 %changelog
+* Mon Nov 03 2014 Peter Lemenkov <lemenkov at gmail.com> - 1.10.3-1
+- Ver. 1.10.3
+- Fixed FTBFS in F22 (see rhbz #1124390)
+
 * Fri Aug 29 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.10.1-4
 - Perl 5.20 rebuild
 
diff --git a/sources b/sources
index 034b068..3eafafc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-168d005f6c8706665877aa82f01afbae  opensips-1.10.1_src.tar.gz
+23218093c6cfb0e9f50e323a2e222c49  opensips-1.10.3_src.tar.gz


More information about the scm-commits mailing list