[svn-commits] pcadach: branch pcadach/chan_h323-live r41045 - in /team/pcadach/chan_h323-li...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Fri Aug 25 02:58:44 MST 2006 

Author: pcadach
Date: Fri Aug 25 04:58:43 2006
New Revision: 41045

URL: http://svn.digium.com/view/asterisk?rev=41045&view=rev
Log:
Merged revisions 41023,41026,41034 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r41023 | russell | 2006-08-25 06:13:03 +0600 (Птн, 25 Авг 2006) | 2 lines

get cflags for libcurl as well as libs (patch from qwell)

........
r41026 | qwell | 2006-08-25 06:52:19 +0600 (Птн, 25 Авг 2006) | 2 lines

This is a bit safer on some versions of sed.

........
r41034 | russell | 2006-08-25 08:55:00 +0600 (Птн, 25 Авг 2006) | 2 lines

don't seg fault when using dbsecret

........

Modified:
    team/pcadach/chan_h323-live/   (props changed)
    team/pcadach/chan_h323-live/build_tools/make_buildopts_h
    team/pcadach/chan_h323-live/channels/chan_iax2.c
    team/pcadach/chan_h323-live/configure
    team/pcadach/chan_h323-live/configure.ac
    team/pcadach/chan_h323-live/makeopts.in

Propchange: team/pcadach/chan_h323-live/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 25 04:58:43 2006
@@ -1,1 +1,1 @@
-/trunk:1-41018
+/trunk:1-41044

Modified: team/pcadach/chan_h323-live/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/build_tools/make_buildopts_h?rev=41045&r1=41044&r2=41045&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/build_tools/make_buildopts_h (original)
+++ team/pcadach/chan_h323-live/build_tools/make_buildopts_h Fri Aug 25 04:58:43 2006
@@ -7,7 +7,7 @@
  */
 
 END
-TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed s/MENUSELECT_CFLAGS\=//g | sed s/-D//g`
+TMP=`grep MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
      echo "#define ${x} 1"
 done

Modified: team/pcadach/chan_h323-live/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/channels/chan_iax2.c?rev=41045&r1=41044&r2=41045&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/channels/chan_iax2.c (original)
+++ team/pcadach/chan_h323-live/channels/chan_iax2.c Fri Aug 25 04:58:43 2006
@@ -4743,19 +4743,21 @@
 		/* Keep this check last */
 		if (!ast_strlen_zero(user->dbsecret)) {
 			char *family, *key=NULL;
+			char buf[80];
 			family = ast_strdupa(user->dbsecret);
 			key = strchr(family, '/');
 			if (key) {
 				*key = '\0';
 				key++;
 			}
-			if (!key || ast_db_get(family, key, (char*)iaxs[callno]->secret, sizeof(iaxs[callno]->secret))) {
+			if (!key || ast_db_get(family, key, buf, sizeof(buf))) {
 				ast_log(LOG_WARNING, "Unable to retrieve database password for family/key '%s'!\n", user->dbsecret);
 				if (ast_test_flag(user, IAX_TEMPONLY)) {
 					destroy_user(user);
 					user = NULL;
 				}
-			}
+			} else
+				ast_string_field_set(iaxs[callno], secret, buf);
 		} else
 			ast_string_field_set(iaxs[callno], secret, user->secret);
 		res = 0;

Modified: team/pcadach/chan_h323-live/configure
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure?rev=41045&r1=41044&r2=41045&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure (original)
+++ team/pcadach/chan_h323-live/configure Fri Aug 25 04:58:43 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 40834 .
+# From configure.ac Revision: 40954 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -313,7 +313,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os BUILD_PLATFORM BUILD_CPU BUILD_VENDOR BUILD_OS HOST_PLATFORM HOST_CPU HOST_VENDOR HOST_OS UNAME ac_pt_UNAME PBX_OSREV CC ac_ct_CC CXX ac_ct_CXX LD ac_ct_LD RANLIB ac_ct_RANLIB AR ac_ct_AR CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT CXXFLAGS CPP CXXCPP AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S GNU_MAKE GREP FIND COMPRESS BASENAME DIRNAME LN DOT AST_DEVMODE ALSA_LIB ALSA_INCLUDE PBX_ALSA CURSES_LIB CURSES_INCLUDE PBX_CURSES GNUTLS_LIB GNUTLS_INCLUDE PBX_GNUTLS GSM_LIB GSM_INCLUDE PBX_GSM IKSEMEL_LIB IKSEMEL_INCLUDE PBX_IKSEMEL IMAP_TK_LIB IMAP_TK_INCLUDE PBX_IMAP_TK ISDNNET_LIB ISDNNET_INCLUDE PBX_ISDNNET KDE_LIB KDE_INCLUDE PBX_KDE MISDN_LIB MISDN_INCLUDE PBX_MISDN NBS_LIB NBS_INCLUDE PBX_NBS NCURSES_LIB NCURSES_INCLUDE PBX_NCURSES NETSNMP_LIB NETSNMP_INCLUDE PBX_NETSNMP NEWT_LIB NEWT_INCLUDE PBX_NEWT UNIXODBC_LIB UNIXODBC_INCLUDE PBX_UNIXODBC OGG_LIB OGG_INCLUDE PBX_OGG OSPTK_LIB OSPTK_INCLUDE PBX_OSPTK OSS_LIB OSS_INCLUDE PBX_OSS POPT_LIB POPT_INCLUDE PBX_POPT PGSQL_LIB PGSQL_INCLUDE PBX_PGSQL PRI_LIB PRI_INCLUDE PBX_PRI PWLIB_LIB PWLIB_INCLUDE PBX_PWLIB OPENH323_LIB OPENH323_INCLUDE PBX_OPENH323 QT_LIB QT_INCLUDE PBX_QT RADIUS_LIB RADIUS_INCLUDE PBX_RADIUS SPEEX_LIB SPEEX_INCLUDE PBX_SPEEX SQLITE_LIB SQLITE_INCLUDE PBX_SQLITE SUPPSERV_LIB SUPPSERV_INCLUDE PBX_SUPPSERV OPENSSL_LIB OPENSSL_INCLUDE PBX_OPENSSL FREETDS_LIB FREETDS_INCLUDE PBX_FREETDS TERMCAP_LIB TERMCAP_INCLUDE PBX_TERMCAP TINFO_LIB TINFO_INCLUDE PBX_TINFO TONEZONE_LIB TONEZONE_INCLUDE PBX_TONEZONE VORBIS_LIB VORBIS_INCLUDE PBX_VORBIS VPB_LIB VPB_INCLUDE PBX_VPB ZLIB_LIB ZLIB_INCLUDE PBX_ZLIB ZAPTEL_LIB ZAPTEL_INCLUDE PBX_ZAPTEL ALLOCA EGREP LIBOBJS POW_LIB GSM_INTERNAL KDEINIT ac_pt_KDEINIT KDEDIR NETSNMP_CONFIG ac_pt_NETSNMP_CONFIG PG_CONFIG ac_pt_PG_CONFIG PTLIB_CONFIG PWLIBDIR PWLIB_INCDIR PWLIB_LIBDIR PWLIB_PLATFORM OPENH323DIR OPENH323_INCDIR OPENH323_LIBDIR OPENH323_SUFFIX OPENH323_BUILD QTMOC ac_pt_QTMOC EDITLINE_LIB PBX_H323 PBX_IXJUSER GTKCONFIG ac_ct_GTKCONFIG PBX_GTK GTK_INCLUDE GTK_LIB CURL ac_pt_CURL PBX_CURL CURLLIB LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os BUILD_PLATFORM BUILD_CPU BUILD_VENDOR BUILD_OS HOST_PLATFORM HOST_CPU HOST_VENDOR HOST_OS UNAME ac_pt_UNAME PBX_OSREV CC ac_ct_CC CXX ac_ct_CXX LD ac_ct_LD RANLIB ac_ct_RANLIB AR ac_ct_AR CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT CXXFLAGS CPP CXXCPP AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S GNU_MAKE GREP FIND COMPRESS BASENAME DIRNAME LN DOT AST_DEVMODE ALSA_LIB ALSA_INCLUDE PBX_ALSA CURSES_LIB CURSES_INCLUDE PBX_CURSES GNUTLS_LIB GNUTLS_INCLUDE PBX_GNUTLS GSM_LIB GSM_INCLUDE PBX_GSM IKSEMEL_LIB IKSEMEL_INCLUDE PBX_IKSEMEL IMAP_TK_LIB IMAP_TK_INCLUDE PBX_IMAP_TK ISDNNET_LIB ISDNNET_INCLUDE PBX_ISDNNET KDE_LIB KDE_INCLUDE PBX_KDE MISDN_LIB MISDN_INCLUDE PBX_MISDN NBS_LIB NBS_INCLUDE PBX_NBS NCURSES_LIB NCURSES_INCLUDE PBX_NCURSES NETSNMP_LIB NETSNMP_INCLUDE PBX_NETSNMP NEWT_LIB NEWT_INCLUDE PBX_NEWT UNIXODBC_LIB UNIXODBC_INCLUDE PBX_UNIXODBC OGG_LIB OGG_INCLUDE PBX_OGG OSPTK_LIB OSPTK_INCLUDE PBX_OSPTK OSS_LIB OSS_INCLUDE PBX_OSS POPT_LIB POPT_INCLUDE PBX_POPT PGSQL_LIB PGSQL_INCLUDE PBX_PGSQL PRI_LIB PRI_INCLUDE PBX_PRI PWLIB_LIB PWLIB_INCLUDE PBX_PWLIB OPENH323_LIB OPENH323_INCLUDE PBX_OPENH323 QT_LIB QT_INCLUDE PBX_QT RADIUS_LIB RADIUS_INCLUDE PBX_RADIUS SPEEX_LIB SPEEX_INCLUDE PBX_SPEEX SQLITE_LIB SQLITE_INCLUDE PBX_SQLITE SUPPSERV_LIB SUPPSERV_INCLUDE PBX_SUPPSERV OPENSSL_LIB OPENSSL_INCLUDE PBX_OPENSSL FREETDS_LIB FREETDS_INCLUDE PBX_FREETDS TERMCAP_LIB TERMCAP_INCLUDE PBX_TERMCAP TINFO_LIB TINFO_INCLUDE PBX_TINFO TONEZONE_LIB TONEZONE_INCLUDE PBX_TONEZONE VORBIS_LIB VORBIS_INCLUDE PBX_VORBIS VPB_LIB VPB_INCLUDE PBX_VPB ZLIB_LIB ZLIB_INCLUDE PBX_ZLIB ZAPTEL_LIB ZAPTEL_INCLUDE PBX_ZAPTEL ALLOCA EGREP LIBOBJS POW_LIB GSM_INTERNAL KDEINIT ac_pt_KDEINIT KDEDIR NETSNMP_CONFIG ac_pt_NETSNMP_CONFIG PG_CONFIG ac_pt_PG_CONFIG PTLIB_CONFIG PWLIBDIR PWLIB_INCDIR PWLIB_LIBDIR PWLIB_PLATFORM OPENH323DIR OPENH323_INCDIR OPENH323_LIBDIR OPENH323_SUFFIX OPENH323_BUILD QTMOC ac_pt_QTMOC EDITLINE_LIB PBX_H323 PBX_IXJUSER GTKCONFIG ac_ct_GTKCONFIG PBX_GTK GTK_INCLUDE GTK_LIB CURL ac_pt_CURL PBX_CURL CURL_INCLUDE CURL_LIB LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -26566,7 +26566,8 @@
 # check for version
    if test "${host_os}" = "SunOS"; then
       if [ 0x`curl-config --vernum` -ge 0x70907 ]; then
-         CURLLIB=$(${CURL} --libs)
+         CURL_INCLUDE=$(${CURL} --cflags)
+         CURL_LIB=$(${CURL} --libs)
          PBX_CURL=1
 
 cat >>confdefs.h <<\_ACEOF
@@ -26576,7 +26577,8 @@
       fi
    else
       if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
-         CURLLIB=$(${CURL} --libs)
+         CURL_INCLUDE=$(${CURL} --cflags)
+         CURL_LIB=$(${CURL} --libs)
          PBX_CURL=1
 
 cat >>confdefs.h <<\_ACEOF
@@ -26586,6 +26588,7 @@
       fi
    fi
 fi
+
 
 
 
@@ -27398,7 +27401,8 @@
 s, at CURL@,$CURL,;t t
 s, at ac_pt_CURL@,$ac_pt_CURL,;t t
 s, at PBX_CURL@,$PBX_CURL,;t t
-s, at CURLLIB@,$CURLLIB,;t t
+s, at CURL_INCLUDE@,$CURL_INCLUDE,;t t
+s, at CURL_LIB@,$CURL_LIB,;t t
 s, at LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 

Modified: team/pcadach/chan_h323-live/configure.ac
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/configure.ac?rev=41045&r1=41044&r2=41045&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/configure.ac (original)
+++ team/pcadach/chan_h323-live/configure.ac Fri Aug 25 04:58:43 2006
@@ -927,20 +927,23 @@
 # check for version
    if test "${host_os}" = "SunOS"; then
       if [[ 0x`curl-config --vernum` -ge 0x70907 ]]; then
-         CURLLIB=$(${CURL} --libs)
+         CURL_INCLUDE=$(${CURL} --cflags)
+         CURL_LIB=$(${CURL} --libs)
          PBX_CURL=1
          AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
       fi
    else
       if [[[ 0x`curl-config --vernum` -ge 0x70907 ]]]; then
-         CURLLIB=$(${CURL} --libs)
+         CURL_INCLUDE=$(${CURL} --cflags)
+         CURL_LIB=$(${CURL} --libs)
          PBX_CURL=1
          AC_DEFINE([HAVE_CURL], 1, [Define if your system has the curl libraries.])
       fi
    fi
 fi
 AC_SUBST(PBX_CURL)
-AC_SUBST(CURLLIB)
+AC_SUBST(CURL_INCLUDE)
+AC_SUBST(CURL_LIB)
 
 AC_CONFIG_FILES([build_tools/menuselect-deps makeopts channels/h323/Makefile])
 AC_OUTPUT

Modified: team/pcadach/chan_h323-live/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/pcadach/chan_h323-live/makeopts.in?rev=41045&r1=41044&r2=41045&view=diff
==============================================================================
--- team/pcadach/chan_h323-live/makeopts.in (original)
+++ team/pcadach/chan_h323-live/makeopts.in Fri Aug 25 04:58:43 2006
@@ -53,7 +53,8 @@
 ASOUND_INCLUDE=@ALSA_INCLUDE@
 ASOUND_LIB=@ALSA_LIB@
 
-CURL_LIB=@CURLLIB@
+CURL_INCLUDE=@CURL_INCLUDE@
+CURL_LIB=@CURL_LIB@
 
 CURSES_INCLUDE=@CURSES_INCLUDE@
 CURSES_LIB=@CURSES_LIB@

More information about the svn-commits mailing list