[Pkg-voip-commits] [asterisk] 03/03: update pjproject patch

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit b2039cf0a14a16a2ce834975c3b3b7c3419db570
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Jul 11 00:32:31 2014 +0200

    update pjproject patch
---
 debian/changelog         |  1 +
 debian/patches/pjproject | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 106fee5..f8ccc68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ asterisk (1:11.11.0~dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Drop safe_asterisk-config and safe_asterisk-nobg patches, fixed upstream
       in bug ASTERISK-23492.
+    - Update pjproject patch.
   * Remove svn-upgrade from watch file.
 
  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 11 Jul 2014 00:07:01 +0200
diff --git a/debian/patches/pjproject b/debian/patches/pjproject
index bafb86b..0d37f3c 100644
--- a/debian/patches/pjproject
+++ b/debian/patches/pjproject
@@ -28,7 +28,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
  AST_EXT_LIB_SETUP([POPT], [popt], [popt])
  AST_EXT_LIB_SETUP([PORTAUDIO], [PortAudio], [portaudio])
  AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri])
-@@ -1996,6 +1997,8 @@ if test "${PG_CONFIG}" != No; then
+@@ -2008,6 +2009,8 @@ if test "${PG_CONFIG}" != No; then
     fi
  fi
  
@@ -39,7 +39,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
  AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
 --- a/include/asterisk/autoconfig.h.in
 +++ b/include/asterisk/autoconfig.h.in
-@@ -551,6 +551,9 @@
+@@ -554,6 +554,9 @@
  /* Define to indicate presence of the pg_encoding_to_char API. */
  #undef HAVE_PGSQL_pg_encoding_to_char
  
@@ -106,7 +106,7 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
  	<support_level>core</support_level>
   ***/
  
-@@ -52,9 +52,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 409565 $")
+@@ -52,9 +52,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
   * here since it is used internally by pjlib. The only other option would be to modify pjlib... which won't happen. */
  #undef bzero
  #define bzero bzero
@@ -119,12 +119,12 @@ ICE/STUN/TURN support in res_rtp_asterisk is also now optional.
  #endif
  
  #include "asterisk/stun.h"
-@@ -1862,7 +1862,7 @@ static int ice_create(struct ast_rtp_instance *instance, struct ast_sockaddr *ad
+@@ -2067,7 +2067,7 @@ static int ice_create(struct ast_rtp_ins
  
  	/* Create an ICE session for ICE negotiation */
  	if (pj_ice_sess_create(&stun_config, NULL, PJ_ICE_SESS_ROLE_UNKNOWN, 2,
 -			&ast_rtp_ice_sess_cb, &ufrag, &passwd, &rtp->ice) == PJ_SUCCESS) {
 +			&ast_rtp_ice_sess_cb, &ufrag, &passwd, NULL, &rtp->ice) == PJ_SUCCESS) {
  		/* Make this available for the callbacks */
- 		rtp->ice->user_data = rtp;
+ 		rtp->ice->user_data = instance;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git