OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   22-Oct-2006 15:13:01
  Branch: HEAD                             Handle: 2006102214130000

  Modified files:
    openpkg-src/asterisk    asterisk.patch asterisk.spec asterisk.txt

  Log:
    first cut for ISDN/CAPI support under FreeBSD/NetBSD via the I4B
    CAPI20 API

  Summary:
    Revision    Changes     Path
    1.21        +87 -33     openpkg-src/asterisk/asterisk.patch
    1.28        +39 -4      openpkg-src/asterisk/asterisk.spec
    1.18        +36 -0      openpkg-src/asterisk/asterisk.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/asterisk/asterisk.patch
  ============================================================================
  $ cvs diff -u -r1.20 -r1.21 asterisk.patch
  --- openpkg-src/asterisk/asterisk.patch       19 Oct 2006 05:45:13 -0000      
1.20
  +++ openpkg-src/asterisk/asterisk.patch       22 Oct 2006 13:13:00 -0000      
1.21
  @@ -1,6 +1,6 @@
   Index: Makefile
   --- Makefile.orig    2006-09-06 22:09:10 +0200
  -+++ Makefile 2006-10-19 07:38:26 +0200
  ++++ Makefile 2006-10-22 14:07:55 +0200
   @@ -47,14 +47,14 @@
    #K6OPT  = -DK6OPT
    
  @@ -191,7 +191,7 @@
    
   Index: agi/Makefile
   --- agi/Makefile.orig        2006-03-28 22:22:05 +0200
  -+++ agi/Makefile     2006-10-19 07:38:26 +0200
  ++++ agi/Makefile     2006-10-22 14:07:55 +0200
   @@ -20,9 +20,7 @@
      LIBS=-lsocket -lnsl ../strcompat.o
    endif
  @@ -205,7 +205,7 @@
    
   Index: app_conference/Makefile
   --- app_conference/Makefile.orig     2005-10-27 19:53:35 +0200
  -+++ app_conference/Makefile  2006-10-19 07:38:26 +0200
  ++++ app_conference/Makefile  2006-10-22 14:07:55 +0200
   @@ -20,10 +20,10 @@
    INSTALL_PREFIX := /opt/horizon
    INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
  @@ -287,7 +287,7 @@
    #   cp conf.conf /etc/asterisk/
   Index: app_conference/app_conference.h
   --- app_conference/app_conference.h.orig     2005-12-16 23:31:58 +0100
  -+++ app_conference/app_conference.h  2006-10-19 07:38:26 +0200
  ++++ app_conference/app_conference.h  2006-10-22 14:07:55 +0200
   @@ -33,6 +33,7 @@
    #include <asterisk/channel.h>
    #include <asterisk/file.h>
  @@ -311,7 +311,7 @@
    //
   Index: app_conference/conference.c
   --- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
  -+++ app_conference/conference.c      2006-10-19 07:38:26 +0200
  ++++ app_conference/conference.c      2006-10-22 14:07:55 +0200
   @@ -568,7 +568,6 @@
        conf->memberlist = NULL ;
    
  @@ -340,7 +340,7 @@
    
   Index: apps/Makefile
   --- apps/Makefile.orig       2006-04-30 15:38:22 +0200
  -+++ apps/Makefile    2006-10-19 07:38:26 +0200
  ++++ apps/Makefile    2006-10-22 14:07:55 +0200
   @@ -54,16 +54,11 @@
    APPS+=app_osplookup.so
    endif
  @@ -364,7 +364,7 @@
    CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
   Index: asterisk-addons-1.2.5/Makefile
   --- asterisk-addons-1.2.5/Makefile.orig      2005-12-02 00:14:28 +0100
  -+++ asterisk-addons-1.2.5/Makefile   2006-10-19 07:38:26 +0200
  ++++ asterisk-addons-1.2.5/Makefile   2006-10-22 14:07:55 +0200
   @@ -27,17 +27,9 @@
    #
    # MySQL stuff...  Autoconf anyone??
  @@ -388,7 +388,7 @@
    
   Index: asterisk-sounds-1.2.1/Makefile
   --- asterisk-sounds-1.2.1/Makefile.orig      2005-12-02 00:20:51 +0100
  -+++ asterisk-sounds-1.2.1/Makefile   2006-10-19 07:38:26 +0200
  ++++ asterisk-sounds-1.2.1/Makefile   2006-10-22 14:07:55 +0200
   @@ -66,7 +66,7 @@
        mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/ha
        for x in sounds/letters/*.gsm; do \
  @@ -445,7 +445,7 @@
                        exit 1; \
   Index: asterisk.c
   --- asterisk.c.orig  2006-09-26 22:49:21 +0200
  -+++ asterisk.c       2006-10-19 07:38:26 +0200
  ++++ asterisk.c       2006-10-22 14:07:55 +0200
   @@ -1902,9 +1902,9 @@
                } else if (!strcasecmp(v->name, "astspooldir")) {
                        ast_copy_string(ast_config_AST_SPOOL_DIR, v->value, 
sizeof(ast_config_AST_SPOOL_DIR));
  @@ -459,7 +459,7 @@
                        ast_copy_string(ast_config_AST_LOG_DIR, v->value, 
sizeof(ast_config_AST_LOG_DIR));
   Index: build_tools/make_build_h
   --- build_tools/make_build_h.orig    2006-03-03 18:13:37 +0100
  -+++ build_tools/make_build_h 2006-10-19 07:38:26 +0200
  ++++ build_tools/make_build_h 2006-10-22 14:07:55 +0200
   @@ -4,7 +4,11 @@
    MACHINE=`uname -m`
    OS=`uname -s`
  @@ -474,7 +474,7 @@
    fi
   Index: build_tools/make_defaults_h
   --- build_tools/make_defaults_h.orig 2005-06-20 19:26:08 +0200
  -+++ build_tools/make_defaults_h      2006-10-19 07:38:26 +0200
  ++++ build_tools/make_defaults_h      2006-10-22 14:07:55 +0200
   @@ -14,7 +14,7 @@
    #define AST_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
    #define AST_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
  @@ -486,7 +486,7 @@
    #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
   Index: cdr/Makefile
   --- cdr/Makefile.orig        2006-09-21 18:18:19 +0200
  -+++ cdr/Makefile     2006-10-19 07:38:26 +0200
  ++++ cdr/Makefile     2006-10-22 14:07:55 +0200
   @@ -20,10 +20,8 @@
    CFLAGS+=-fPIC
    endif
  @@ -500,9 +500,63 @@
    
    #The problem with sparc is the best stuff is in newer versions of gcc (post 
3.0) only.
    #This works for even old (2.96) versions of gcc and provides a small boost 
either way.
  +Index: chan_capi_1_6_1/Makefile
  +--- chan_capi_1_6_1/Makefile.orig    2006-06-21 17:06:35 +0200
  ++++ chan_capi_1_6_1/Makefile 2006-10-22 14:10:15 +0200
  +@@ -10,38 +10,14 @@
  + 
  + INSTALL_PREFIX=
  + 
  +-ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/include
  ++ASTERISK_HEADER_DIR=../include
  + 
  +-ifeq (${OSNAME},FreeBSD)
  +-ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/local/include
  +-endif
  +-
  +-ifeq (${OSNAME},NetBSD)
  +-ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/pkg/include
  +-endif
  +-
  +-ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d 
CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date 
+"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi)
  +-
  +-MODULES_DIR=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
  +-
  +-ifeq (${OSNAME},FreeBSD)
  +-MODULES_DIR=$(INSTALL_PREFIX)/usr/local/lib/asterisk/modules
  +-endif
  ++ASTERISKVERSION=$(shell if [ -f ../.version ]; then cat ../.version; else 
if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' 
CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi)
  + 
  +-ifeq (${OSNAME},NetBSD)
  +-MODULES_DIR=$(INSTALL_PREFIX)/usr/pkg/lib/asterisk/modules
  +-endif
  ++MODULES_DIR=$(INSTALL_PREFIX)/lib/asterisk/modules
  + 
  + CONFIG_DIR=$(INSTALL_PREFIX)/etc/asterisk
  + 
  +-ifeq (${OSNAME},FreeBSD)
  +-CONFIG_DIR=$(INSTALL_PREFIX)/usr/local/etc/asterisk
  +-endif
  +-
  +-ifeq (${OSNAME},NetBSD)
  +-CONFIG_DIR=$(INSTALL_PREFIX)/usr/pkg/etc/asterisk
  +-endif
  +-
  + PROC=$(shell uname -m)
  + 
  + DEBUG=-g #-pg
  +@@ -56,7 +32,7 @@
  + endif
  + CFLAGS=-pipe -fPIC -Wall -Wmissing-prototypes -Wmissing-declarations 
$(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
  + CFLAGS+=$(OPTIMIZE)
  +-CFLAGS+=-O6
  ++CFLAGS+=-O2
  + CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null 
>/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  + CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
  + CFLAGS+=-Wformat
   Index: channels/Makefile
   --- channels/Makefile.orig   2006-08-17 23:57:19 +0200
  -+++ channels/Makefile        2006-10-19 07:38:26 +0200
  ++++ channels/Makefile        2006-10-22 14:07:55 +0200
   @@ -21,9 +21,7 @@
    #CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
    endif
  @@ -516,7 +570,7 @@
      PTLIB=-lpt_OpenBSD_x86_r
   Index: channels/chan_h323.c
   --- channels/chan_h323.c.orig        2006-08-30 20:59:44 +0200
  -+++ channels/chan_h323.c     2006-10-19 07:38:26 +0200
  ++++ channels/chan_h323.c     2006-10-22 14:07:55 +0200
   @@ -31,6 +31,7 @@
     * \ingroup channel_drivers
     */
  @@ -527,7 +581,7 @@
    #include <sys/param.h>
   Index: channels/chan_iax2.c
   --- channels/chan_iax2.c.orig        2006-10-13 18:18:08 +0200
  -+++ channels/chan_iax2.c     2006-10-19 07:38:26 +0200
  ++++ channels/chan_iax2.c     2006-10-22 14:07:55 +0200
   @@ -2607,7 +2607,7 @@
        struct ast_variable *var;
        struct ast_variable *tmp;
  @@ -552,7 +606,7 @@
                } else if (!strcasecmp(tmp->name, "port")) {
   Index: channels/chan_sip.c
   --- channels/chan_sip.c.orig 2006-10-17 22:37:17 +0200
  -+++ channels/chan_sip.c      2006-10-19 07:38:26 +0200
  ++++ channels/chan_sip.c      2006-10-22 14:07:55 +0200
   @@ -12298,7 +12298,7 @@
        int obproxyfound=0;
        int found=0;
  @@ -577,7 +631,7 @@
                } else if (realtime && !strcasecmp(v->name, "name"))
   Index: channels/chan_skinny.c
   --- channels/chan_skinny.c.orig      2006-10-17 19:50:36 +0200
  -+++ channels/chan_skinny.c   2006-10-19 07:38:26 +0200
  ++++ channels/chan_skinny.c   2006-10-22 14:07:55 +0200
   @@ -99,7 +99,7 @@
    #define htolel(x) (x)
    #define htoles(x) (x)
  @@ -589,7 +643,7 @@
          (((x) & 0x00ff) << 8))
   Index: codecs/Makefile
   --- codecs/Makefile.orig     2005-11-29 19:24:39 +0100
  -+++ codecs/Makefile  2006-10-19 07:38:26 +0200
  ++++ codecs/Makefile  2006-10-22 14:07:55 +0200
   @@ -28,45 +28,16 @@
      LIBG723B=g723.1b/libg723b.a
    endif
  @@ -642,7 +696,7 @@
            codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
   Index: codecs/gsm/src/short_term.c
   --- codecs/gsm/src/short_term.c.orig 2005-11-29 19:24:39 +0100
  -+++ codecs/gsm/src/short_term.c      2006-10-19 07:38:26 +0200
  ++++ codecs/gsm/src/short_term.c      2006-10-22 14:07:55 +0200
   @@ -373,7 +373,6 @@
        word            * LARpp_j_1     = S->LARpp[ S->j ^= 1 ];
    
  @@ -653,7 +707,7 @@
    #   define  FILTER  (* (S->fast                     \
   Index: codecs/lpc10/analys.c
   --- codecs/lpc10/analys.c.orig       2005-11-29 19:24:39 +0100
  -+++ codecs/lpc10/analys.c    2006-10-19 07:38:26 +0200
  ++++ codecs/lpc10/analys.c    2006-10-22 14:07:55 +0200
   @@ -32,7 +32,7 @@
    
    #include "f2c.h"
  @@ -665,7 +719,7 @@
    /*:ref: preemp_ 14 5 6 6 4 6 6 */
   Index: dns.c
   --- dns.c.orig       2005-11-29 19:24:39 +0100
  -+++ dns.c    2006-10-19 07:38:26 +0200
  ++++ dns.c    2006-10-22 14:07:55 +0200
   @@ -194,9 +194,7 @@
        int res, ret = -1;
    
  @@ -678,7 +732,7 @@
    #else
   Index: formats/Makefile
   --- formats/Makefile.orig    2005-11-29 19:24:39 +0100
  -+++ formats/Makefile 2006-10-19 07:38:26 +0200
  ++++ formats/Makefile 2006-10-22 14:07:55 +0200
   @@ -29,9 +29,7 @@
      FORMAT_LIBS+=format_ogg_vorbis.so
    endif
  @@ -692,7 +746,7 @@
    
   Index: formats/msgsm.h
   --- formats/msgsm.h.orig     2005-11-29 19:24:39 +0100
  -+++ formats/msgsm.h  2006-10-19 07:38:26 +0200
  ++++ formats/msgsm.h  2006-10-22 14:07:55 +0200
   @@ -562,6 +562,7 @@
                            xmc[46] = sr & 0x7;  sr >>= 3;
                            xmc[47] = sr & 0x7;  sr >>= 3;
  @@ -703,7 +757,7 @@
                            xmc[50] = sr & 0x7;  sr >>= 3;
   Index: frame.c
   --- frame.c.orig     2006-09-28 20:00:30 +0200
  -+++ frame.c  2006-10-19 07:38:26 +0200
  ++++ frame.c  2006-10-22 14:07:55 +0200
   @@ -1055,7 +1055,7 @@
    {
        switch(buf & TYPE_MASK) {
  @@ -715,7 +769,7 @@
                return 4;
   Index: funcs/Makefile
   --- funcs/Makefile.orig      2005-11-29 19:24:39 +0100
  -+++ funcs/Makefile   2006-10-19 07:38:26 +0200
  ++++ funcs/Makefile   2006-10-22 14:07:55 +0200
   @@ -40,9 +40,7 @@
    CFLAGS+=-fPIC
    endif
  @@ -729,7 +783,7 @@
    
   Index: funcs/func_strings.c
   --- funcs/func_strings.c.orig        2006-03-21 18:45:56 +0100
  -+++ funcs/func_strings.c     2006-10-19 07:38:26 +0200
  ++++ funcs/func_strings.c     2006-10-22 14:07:55 +0200
   @@ -169,7 +169,7 @@
                epochi = tv.tv_sec;
        }
  @@ -741,7 +795,7 @@
                format = "%c";
   Index: pbx/Makefile
   --- pbx/Makefile.orig        2005-11-29 19:24:39 +0100
  -+++ pbx/Makefile     2006-10-19 07:38:26 +0200
  ++++ pbx/Makefile     2006-10-22 14:07:55 +0200
   @@ -14,9 +14,7 @@
    PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so 
pbx_realtime.so \
             pbx_ael.so
  @@ -755,7 +809,7 @@
    #PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 
2>/dev/null && echo "pbx_gtkconsole.so")
   Index: res/Makefile
   --- res/Makefile.orig        2005-11-29 19:24:39 +0100
  -+++ res/Makefile     2006-10-19 07:38:26 +0200
  ++++ res/Makefile     2006-10-22 14:07:55 +0200
   @@ -36,10 +36,8 @@
      endif
    endif
  @@ -771,7 +825,7 @@
    CYGSOLINK=-Wl,[EMAIL PROTECTED] -Wl,--export-all-symbols
   Index: res/res_features.c
   --- res/res_features.c.orig  2006-09-28 20:00:30 +0200
  -+++ res/res_features.c       2006-10-19 07:38:26 +0200
  ++++ res/res_features.c       2006-10-22 14:07:55 +0200
   @@ -505,13 +505,13 @@
                if (touch_monitor) {
                        len = strlen(touch_monitor) + 50;
  @@ -790,7 +844,7 @@
                for( x = 0; x < strlen(args); x++)
   Index: rtp.c
   --- rtp.c.orig       2006-09-01 19:35:06 +0200
  -+++ rtp.c    2006-10-19 07:38:26 +0200
  ++++ rtp.c    2006-10-22 14:07:55 +0200
   @@ -962,8 +962,10 @@
                rtp->us.sin_port = htons(x);
                rtp->us.sin_addr = addr;
  @@ -805,7 +859,7 @@
                        (!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr 
*)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
   Index: say.c
   --- say.c.orig       2005-11-29 19:24:39 +0100
  -+++ say.c    2006-10-19 07:38:26 +0200
  ++++ say.c    2006-10-22 14:07:55 +0200
   @@ -3133,7 +3133,7 @@
                                        time_t beg_today;
    
  @@ -997,7 +1051,7 @@
                                beg_today = now.tv_sec - (tmnow.tm_hour * 3600) 
- (tmnow.tm_min * 60) - (tmnow.tm_sec);
   Index: utils.c
   --- utils.c.orig     2006-10-12 20:31:26 +0200
  -+++ utils.c  2006-10-19 07:38:26 +0200
  ++++ utils.c  2006-10-22 14:07:55 +0200
   @@ -63,6 +63,8 @@
    /* duh? ERANGE value copied from web... */
    #define ERANGE 34
  @@ -1009,7 +1063,7 @@
    
   Index: utils/Makefile
   --- utils/Makefile.orig      2005-11-29 19:24:39 +0100
  -+++ utils/Makefile   2006-10-19 07:38:26 +0200
  ++++ utils/Makefile   2006-10-22 14:07:55 +0200
   @@ -16,17 +16,15 @@
    #
    CFLAGS+=-DNO_AST_MM
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/asterisk/asterisk.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 asterisk.spec
  --- openpkg-src/asterisk/asterisk.spec        19 Oct 2006 05:45:14 -0000      
1.27
  +++ openpkg-src/asterisk/asterisk.spec        22 Oct 2006 13:13:00 -0000      
1.28
  @@ -28,6 +28,7 @@
   %define       V_asterisk_sounds  1.2.1
   %define       V_app_conference   20051216
   %define       V_asterisk_perl    0.09
  +%define       V_chan_capi        1_6_1
   
   #   package information
   Name:         asterisk
  @@ -40,10 +41,11 @@
   Group:        VoIP
   License:      GPL
   Version:      %{V_asterisk}
  -Release:      20061019
  +Release:      20061022
   
   #   package options
   %option       with_zaptel  no
  +%option       with_capi    no
   %option       with_mp3     no
   
   #   list of sources
  @@ -52,8 +54,9 @@
   Source2:      
ftp://ftp.digium.com/pub/asterisk/releases/asterisk-sounds-%{V_asterisk_sounds}.tar.gz
   Source3:      
ftp://ftp.openpkg.org/sources/CPY/VERSIONED/asterisk/app_conference-%{V_app_conference}.tar.gz
   Source4:      
http://asterisk.gnuinter.net/files/asterisk-perl-%{V_asterisk_perl}.tar.gz
  -Source5:      asterisk.txt
  -Source6:      rc.asterisk
  +Source5:      
http://www.turbocat.net/~hselasky/capi4pbx/releases/chan_capi_%{V_chan_capi}.tar.bz2
  +Source6:      asterisk.txt
  +Source7:      rc.asterisk
   Patch0:       asterisk.patch
   
   #   build information
  @@ -110,6 +113,11 @@
           url       = http://asterisk.gnuinter.net/files/
           regex     = asterisk-perl-(__VER__)\.tar\.gz
       }
  +    prog asterisk:chan_capi = {
  +        version   = %{V_chan_capi}
  +        url       = http://www.turbocat.net/~hselasky/capi4pbx/releases/
  +        regex     = chan_capi_(__VER__)\.tar\.bz2
  +    }
   
   %prep
       %setup -q
  @@ -117,6 +125,7 @@
       %setup -q -D -T -a 2
       %setup -q -D -T -a 3
       %setup -q -D -T -a 4
  +    %setup -q -D -T -a 5
       %patch -p0
   %if "%{with_mp3}" == "yes"
       mpg123="%{l_prefix}/bin/mpg123"
  @@ -145,6 +154,16 @@
           * ) echo "option \"with_zaptel\" supported under Linux and FreeBSD 
only" 1>&2; exit 1 ;;
       esac
   %endif
  +%if "%{with_capi}" == "yes"
  +    case "%{l_platform -t}" in
  +        *-freebsd* | *-netbsd* )
  +            if [ ! -f /usr/include/i4b/include/capi20.h ]; then
  +                echo "option \"with_chan_capi\" requires I4B 1.6 or newer 
installed" 1>&2; exit 1
  +            fi
  +            ;;
  +        * ) echo "option \"with_capi\" supported under FreeBSD and NetBSD 
only" 1>&2; exit 1 ;;
  +    esac
  +%endif
   
       #   build program
       %{l_make} %{l_mflags} \
  @@ -157,8 +176,14 @@
       #   build addon modules
       ( cd app_conference
         %{l_make} %{l_mflags} \
  -          INSTALL_PREFIX=%{l_prefix} \
  +          INSTALL_PREFIX=%{l_prefix}
  +    ) || exit $?
  +%if "%{with_capi}" == "yes"
  +    ( cd chan_capi_*
  +      %{l_make} %{l_mflags} \
  +          INSTALL_PREFIX=%{l_prefix}
       ) || exit $?
  +%endif
   
       #   build Perl API
       %{l_prefix}/bin/perl-openpkg prepare
  @@ -189,6 +214,13 @@
             INSTALL_PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
             INSTALL="%{l_shtool} install -c"
       ) || exit $?
  +%if "%{with_capi}" == "yes"
  +    ( cd chan_capi_*
  +      %{l_make} %{l_mflags} install \
  +          INSTALL_PREFIX=$RPM_BUILD_ROOT%{l_prefix} \
  +          INSTALL="%{l_shtool} install -c"
  +    ) || exit $?
  +%endif
   
       #   install Perl API
       %{l_prefix}/bin/perl-openpkg -d asterisk-perl-%{V_asterisk_perl} install
  @@ -217,6 +249,9 @@
   %if "%{with_zaptel}" == "no"
           [ ".$name" = ".zapata.conf" ] && continue
   %endif
  +%if "%{with_capi}" == "no"
  +        [ ".$name" = ".capi.conf" ] && continue
  +%endif
           (echo ""; cat %{SOURCE asterisk.txt}; echo "") |\
               sed -e "1,/^<file name=\"$name\">/d" -e "/<\/file>/,\$d" >$name
           %{l_shtool} install -c -m 644 %{l_value -s -a} \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/asterisk/asterisk.txt
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 asterisk.txt
  --- openpkg-src/asterisk/asterisk.txt 20 Sep 2006 10:39:12 -0000      1.17
  +++ openpkg-src/asterisk/asterisk.txt 22 Oct 2006 13:13:00 -0000      1.18
  @@ -469,3 +469,39 @@
   
   ;   (an empty configuration is ok, but required even for dummy Zaptel 
support)
   </file>
  +<file name="capi.conf">
  +;;
  +;;  capi.conf -- Asterisk ISDN/CAPI channel configuration
  +;;
  +
  +[general]
  +nationalprefix        = 0
  +internationalprefix   = 00
  +rxgain                = 1.0
  +txgain                = 1.0
  +ulaw                  = no
  +debug                 = yes
  +
  +[ISDN1]
  +isdnmode              = msn
  +incomingmsn           = *
  +controller            = 0
  +group                 = 1
  +;prefix               = 0
  +softdtmf              = off
  +relaxdtmf             = off
  +accountcode           =
  +context               = external
  +holdtype              = local
  +;immediate            = yes
  +echocancel            = no
  +echosquelch           = no
  +;echotail             = 64
  +;bridge               = yes
  +;callgroup            = 1
  +;deflect              = 1234567
  +devices               = 2
  +;wait_silence_samples = 1000
  +;dtmf_generate        = yes
  +
  +</file>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to