pjproject_bundled: Add 3 upstream patches

0035-r5572-svn-backport-dialog-transaction-deadlock.patch
0036-r5573-svn-backport-ua-pjsua-transaction-deadlock.patch
0037-r5576-svn-backport-session-timer-crash.patch

Also removed the progress bar from wget download to stdout.

ASTERISK-26905 #close
Reported-by: Ross Beer

Change-Id: I268fb3cf71a3bb24283ff0d24bd8b03239d81256
This commit is contained in:
George Joseph
2017-04-04 15:20:22 -06:00
parent 6906765381
commit 4e6e069491
7 changed files with 355 additions and 2 deletions

125
configure vendored
View File

@@ -921,6 +921,10 @@ PBX_POPT
POPT_DIR
POPT_INCLUDE
POPT_LIB
PBX_PJSIP_TSX_LAYER_FIND_TSX2
PJSIP_TSX_LAYER_FIND_TSX2_DIR
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE
PJSIP_TSX_LAYER_FIND_TSX2_LIB
PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT
PJSIP_EVSUB_SET_UAS_TIMEOUT_DIR
PJSIP_EVSUB_SET_UAS_TIMEOUT_INCLUDE
@@ -7873,7 +7877,7 @@ fi
if test "${WGET}" != ":" ; then
DOWNLOAD=${WGET}
DOWNLOAD_TO_STDOUT="${WGET} -O-"
DOWNLOAD_TO_STDOUT="${WGET} -q -O-"
DOWNLOAD_TIMEOUT='--timeout=$1'
else if test "${CURL}" != ":" ; then
DOWNLOAD="${CURL} -O --progress-bar -w \"%{url_effective}\n\""
@@ -9317,6 +9321,9 @@ $as_echo "#define HAVE_PJSIP_AUTH_CLT_DEINIT 1" >>confdefs.h
$as_echo "#define HAVE_PJSIP_EVSUB_SET_UAS_TIMEOUT 1" >>confdefs.h
$as_echo "#define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1" >>confdefs.h
@@ -11491,6 +11498,18 @@ PBX_PJSIP_EVSUB_SET_UAS_TIMEOUT=0
PJSIP_TSX_LAYER_FIND_TSX2_DESCRIP="pjsip_tsx_layer_find_tsx2 support"
PJSIP_TSX_LAYER_FIND_TSX2_OPTION=pjsip
PJSIP_TSX_LAYER_FIND_TSX2_DIR=${PJPROJECT_DIR}
PBX_PJSIP_TSX_LAYER_FIND_TSX2=0
fi
@@ -26394,6 +26413,110 @@ _ACEOF
fi
if test "x${PBX_PJSIP_TSX_LAYER_FIND_TSX2}" != "x1" -a "${USE_PJSIP_TSX_LAYER_FIND_TSX2}" != "no"; then
pbxlibdir=""
# if --with-PJSIP_TSX_LAYER_FIND_TSX2=DIR has been specified, use it.
if test "x${PJSIP_TSX_LAYER_FIND_TSX2_DIR}" != "x"; then
if test -d ${PJSIP_TSX_LAYER_FIND_TSX2_DIR}/lib; then
pbxlibdir="-L${PJSIP_TSX_LAYER_FIND_TSX2_DIR}/lib"
else
pbxlibdir="-L${PJSIP_TSX_LAYER_FIND_TSX2_DIR}"
fi
fi
pbxfuncname="pjsip_tsx_layer_find_tsx2"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=yes
else
ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} $PJPROJECT_CFLAGS"
as_ac_Lib=`$as_echo "ac_cv_lib_pjsip_${pbxfuncname}" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${pbxfuncname} in -lpjsip" >&5
$as_echo_n "checking for ${pbxfuncname} in -lpjsip... " >&6; }
if eval \${$as_ac_Lib+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lpjsip ${pbxlibdir} $PJPROJECT_LIB $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char ${pbxfuncname} ();
int
main ()
{
return ${pbxfuncname} ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
eval "$as_ac_Lib=yes"
else
eval "$as_ac_Lib=no"
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
eval ac_res=\$$as_ac_Lib
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=yes
else
AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND=no
fi
CFLAGS="${ast_ext_lib_check_save_CFLAGS}"
fi
# now check for the header.
if test "${AST_PJSIP_TSX_LAYER_FIND_TSX2_FOUND}" = "yes"; then
PJSIP_TSX_LAYER_FIND_TSX2_LIB="${pbxlibdir} -lpjsip $PJPROJECT_LIB"
# if --with-PJSIP_TSX_LAYER_FIND_TSX2=DIR has been specified, use it.
if test "x${PJSIP_TSX_LAYER_FIND_TSX2_DIR}" != "x"; then
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE="-I${PJSIP_TSX_LAYER_FIND_TSX2_DIR}/include"
fi
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE="${PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE} $PJPROJECT_CFLAGS"
if test "xpjsip.h" = "x" ; then # no header, assume found
PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND="1"
else # check for the header
ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE}"
ac_fn_c_check_header_mongrel "$LINENO" "pjsip.h" "ac_cv_header_pjsip_h" "$ac_includes_default"
if test "x$ac_cv_header_pjsip_h" = xyes; then :
PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND=1
else
PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND=0
fi
CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}"
fi
if test "x${PJSIP_TSX_LAYER_FIND_TSX2_HEADER_FOUND}" = "x0" ; then
PJSIP_TSX_LAYER_FIND_TSX2_LIB=""
PJSIP_TSX_LAYER_FIND_TSX2_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
PJSIP_TSX_LAYER_FIND_TSX2_LIB=""
fi
PBX_PJSIP_TSX_LAYER_FIND_TSX2=1
cat >>confdefs.h <<_ACEOF
#define HAVE_PJSIP_TSX_LAYER_FIND_TSX2 1
_ACEOF
fi
fi
fi
fi
fi