Correct DB path, add gtalk config and build logic, note CAPI header problem.

Fri, 02 Dec 2011 19:22:01 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 02 Dec 2011 19:22:01 +0100
changeset 399
9360a38b5c9f
parent 398
08f5eb82b58f
child 400
73145e959722

Correct DB path, add gtalk config and build logic, note CAPI header problem.

asterisk/asterisk.spec file | annotate | diff | comparison | revisions
asterisk/asterisk.txt file | annotate | diff | comparison | revisions
     1.1 --- a/asterisk/asterisk.spec	Fri Dec 02 16:12:09 2011 +0100
     1.2 +++ b/asterisk/asterisk.spec	Fri Dec 02 19:22:01 2011 +0100
     1.3 @@ -51,7 +51,7 @@
     1.4  Group:        VoIP
     1.5  License:      GPL
     1.6  Version:      %{V_opkg}
     1.7 -Release:      20111100
     1.8 +Release:      20111104
     1.9  
    1.10  #   package options
    1.11  %option       with_dahdi   no
    1.12 @@ -66,6 +66,7 @@
    1.13  %option       with_srtp    no
    1.14  %option       with_pgsql   no
    1.15  %option       with_lua     no
    1.16 +%option       with_gtalk   no
    1.17  %option       with_jabber  no
    1.18  %option       with_imap    no
    1.19  %option       with_odbc    no
    1.20 @@ -163,6 +164,9 @@
    1.21  BuildPreReq:  radiusclient
    1.22  PreReq:       radiusclient
    1.23  %endif
    1.24 +%if "%{with_gtalk}" == "yes"
    1.25 +%define       with_jabber yes
    1.26 +%endif
    1.27  %if "%{with_jabber}" == "yes"
    1.28  BuildPreReq:  iksemel
    1.29  PreReq:       iksemel
    1.30 @@ -261,6 +265,11 @@
    1.31      }
    1.32  
    1.33  %prep
    1.34 +%if "%{with_capi}" == "yes"
    1.35 +    ( echo "Note that the system header files capi20.h, capicmd.h, and capiutils.h might"
    1.36 +      echo "need adjusting in accordance withthe CAPI hardware vendor's kernel driver."
    1.37 +    ) | %{l_rpmtool} msg -b -t warn
    1.38 +%endif
    1.39      %setup -q -n asterisk-%{V_asterisk}
    1.40      %setup -q -n asterisk-%{V_asterisk} -D -T -a 1
    1.41      %setup -q -n asterisk-%{V_asterisk} -D -T -a 2
    1.42 @@ -286,6 +295,7 @@
    1.43      %{l_shtool} subst \
    1.44          -e 's;\(astdatadir=.*\)\${astvarlibdir};\1${datadir};' \
    1.45          -e 's;\(astvarlibdir=.*\)/lib/asterisk;\1/asterisk/lib;' \
    1.46 +        -e 's;\(astdbdir=.*\)\${astvarlibdir};\1${localstatedir}/asterisk/db;' \
    1.47          -e 's;\(dir=.*{localstatedir}\)/\([^/][^/]*\)/asterisk;\1/asterisk/\2;g' \
    1.48          configure
    1.49      %{l_shtool} subst \
    1.50 @@ -762,6 +772,12 @@
    1.51  %if "%{with_capi}" == "no"
    1.52          [ ".$name" = ".capi.conf" ] && continue
    1.53  %endif
    1.54 +%if "%{with_gtalk}" == "no"
    1.55 +        [ ".$name" = ".gtalk.conf" ] && continue
    1.56 +%endif
    1.57 +%if "%{with_jabber}" == "no"
    1.58 +        [ ".$name" = ".jabber.conf" ] && continue
    1.59 +%endif
    1.60  %if "%{with_sqlite}" == "no"
    1.61          [ ".$name" = ".cdr_sqlite3_custom.conf" ] && continue
    1.62  %endif
     2.1 --- a/asterisk/asterisk.txt	Fri Dec 02 16:12:09 2011 +0100
     2.2 +++ b/asterisk/asterisk.txt	Fri Dec 02 19:22:01 2011 +0100
     2.3 @@ -82,7 +82,7 @@
     2.4  
     2.5  ; You can open a TLS connection to this socket with:
     2.6  ;
     2.7 -;	openssl s_client -connect my_host:5039
     2.8 +;   openssl s_client -connect my_host:5039
     2.9  ;
    2.10  tlsenable          = no
    2.11  tlsbindaddr        = 127.0.0.1
    2.12 @@ -238,7 +238,7 @@
    2.13  
    2.14  ;; This configuration is reread at reload
    2.15  ;; or with the CLI command
    2.16 -;; 	reload chan_iax2.so
    2.17 +;;   reload chan_iax2.so
    2.18  ;;
    2.19  ;; General settings, like port number to bind to, and
    2.20  ;; an option address (the default is to bind to all
    2.21 @@ -251,7 +251,7 @@
    2.22  ;                    ; bindaddr if followed by colon and port
    2.23  ;                    ; (e.g. bindaddr=192.168.0.1:4569)
    2.24  ;bindaddr=127.0.0.1  ; more than once to bind to multiple
    2.25 -;                    ; addresses, but the first will be the 
    2.26 +;                    ; addresses, but the first will be the
    2.27  ;                    ; default
    2.28  
    2.29  </file>
    2.30 @@ -710,6 +710,35 @@
    2.31  ;context           = parkedcalls
    2.32  
    2.33  </file>
    2.34 +<file name="gtalk.conf">
    2.35 +;;
    2.36 +;;  gtalk.conf -- Asterisk GTalk configuration
    2.37 +;;
    2.38 +
    2.39 +[general]
    2.40 +;context     = default     ; Context to dump call into
    2.41 +;bindaddr    = 0.0.0.0     ; Address to bind to
    2.42 +;externip    = 127.0.0.1   ; Set your external ip if you are behind a NAT.
    2.43 +;stunaddr    = <hostname>  ; Get your external ip from a STUN server.
    2.44 +;                          ; Note, if the STUN query is successful, this
    2.45 +;                          ; will replace any value placed in externip;
    2.46 +;allowguest  = yes         ; Allow calls from people not in list of peers
    2.47 +
    2.48 +[guest]                   ; special account for options on guest account
    2.49 +;disallow    = all
    2.50 +;allow       = ulaw
    2.51 +;context     = guest
    2.52 +
    2.53 +[ogorman]
    2.54 +;username    = <person>@gmail.com  ; username of the peer you're
    2.55 +;                                  ; calling or accepting calls from
    2.56 +;disallow    = all
    2.57 +;allow       = ulaw
    2.58 +;context     = default
    2.59 +;connection  = asterisk            ; client or component in jabber.conf
    2.60 +;                                  ; for the call to leave on.
    2.61 +
    2.62 +</file>
    2.63  <file name="jabber.conf">
    2.64  ;;
    2.65  ;;  jabber.conf -- Asterisk Jabber configuration

mercurial