# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1357672112 -3600
# Node ID 192d78fefb972bc18d9a58affbabd09b17c730c2
# Parent  5a7d77eba1e78594c6bc54cae52d68aaa8213b88
Update to new vendor version (chan_capi as well) and adapt patch logic,
introducing a new variable to control build time SMS call centre channel.

diff -r 5a7d77eba1e7 -r 192d78fefb97 asterisk/asterisk.patch
--- a/asterisk/asterisk.patch	Sun Oct 28 23:53:41 2012 +0100
+++ b/asterisk/asterisk.patch	Tue Jan 08 20:08:32 2013 +0100
@@ -410,10 +410,10 @@
  
  	/* Unique ID */
  	if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0))
-Index: chan_capi-1.1.5.20120615/chan_capi20.h
-diff -Nau chan_capi-1.1.5.20120615/chan_capi20.h.orig chan_capi-1.1.5.20120615/chan_capi20.h
---- chan_capi-1.1.5.20120615/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
-+++ chan_capi-1.1.5.20120615/chan_capi20.h	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.6/chan_capi20.h
+diff -Nau chan_capi-1.1.6/chan_capi20.h.orig chan_capi-1.1.6/chan_capi20.h
+--- chan_capi-1.1.6/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
++++ chan_capi-1.1.6/chan_capi20.h	2012-03-18 17:47:07.888451260 +0100
 @@ -4,10 +4,13 @@
   * first. Else the checks below will fail.
   */
@@ -437,10 +437,10 @@
  #ifndef HEADER_CID
  #define HEADER_CID(x) ((x)->adr.adrNCCI)
  #endif
-Index: chan_capi-1.1.5.20120615/chan_capi_utils.c
-diff -Nau chan_capi-1.1.5.20120615/chan_capi_utils.c.orig chan_capi-1.1.5.20120615/chan_capi_utils.c
---- chan_capi-1.1.5.20120615/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
-+++ chan_capi-1.1.5.20120615/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.6/chan_capi_utils.c
+diff -Nau chan_capi-1.1.6/chan_capi_utils.c.orig chan_capi-1.1.6/chan_capi_utils.c
+--- chan_capi-1.1.6/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
++++ chan_capi-1.1.6/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
 @@ -1160,6 +1160,9 @@
  {
  	MESSAGE_EXCHANGE_ERROR error;
@@ -451,10 +451,10 @@
  	unsigned char manbuf[CAPI_MANUFACTURER_LEN];
  	_cmsg CMSG;
  
-Index: chan_capi-1.1.5.20120615/libcapi20/capi20.c
-diff -Nau chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig chan_capi-1.1.5.20120615/libcapi20/capi20.c
---- chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
-+++ chan_capi-1.1.5.20120615/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.6/libcapi20/capi20.c
+diff -Nau chan_capi-1.1.6/libcapi20/capi20.c.orig chan_capi-1.1.6/libcapi20/capi20.c
+--- chan_capi-1.1.6/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
++++ chan_capi-1.1.6/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
 @@ -19,8 +19,10 @@
  #include <stdio.h>
  #include <ctype.h>
@@ -748,10 +748,10 @@
  }
  /*
   * functions added to the CAPI2.0 spec
-Index: chan_capi-1.1.5.20120615/libcapi20/convert.c
-diff -Nau chan_capi-1.1.5.20120615/libcapi20/convert.c.orig chan_capi-1.1.5.20120615/libcapi20/convert.c
---- chan_capi-1.1.5.20120615/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
-+++ chan_capi-1.1.5.20120615/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.6/libcapi20/convert.c
+diff -Nau chan_capi-1.1.6/libcapi20/convert.c.orig chan_capi-1.1.6/libcapi20/convert.c
+--- chan_capi-1.1.6/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
++++ chan_capi-1.1.6/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
 @@ -11,7 +11,14 @@
  #include <stddef.h>
  #include <time.h>
@@ -767,10 +767,10 @@
  
  #include "capi20.h"
  
-Index: chan_capi-1.1.5.20120615/Makefile
-diff -Nau chan_capi-1.1.5.20120615/Makefile.orig chan_capi-1.1.5.20120615/Makefile
---- chan_capi-1.1.5.20120615/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
-+++ chan_capi-1.1.5.20120615/Makefile	2012-03-18 17:47:07.888451260 +0100
+Index: chan_capi-1.1.6/Makefile
+diff -Nau chan_capi-1.1.6/Makefile.orig chan_capi-1.1.6/Makefile
+--- chan_capi-1.1.6/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
++++ chan_capi-1.1.6/Makefile	2012-03-18 17:47:07.888451260 +0100
 @@ -115,6 +115,9 @@
  CFLAGS+=-O2
  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
diff -r 5a7d77eba1e7 -r 192d78fefb97 asterisk/asterisk.spec
--- a/asterisk/asterisk.spec	Sun Oct 28 23:53:41 2012 +0100
+++ b/asterisk/asterisk.spec	Tue Jan 08 20:08:32 2013 +0100
@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_opkg                     1.8.16.0
-%define       V_asterisk                 1.8.16.0
+%define       V_opkg                     1.8.19.1
+%define       V_asterisk                 1.8.19.1
 %define       V_asterisk_fax_subdir      1.8.4
 %define       V_asterisk_fax_digium      1.8.4_1.3.1
 %define       V_asterisk_sounds_core     1.4.22
@@ -39,7 +39,7 @@
 %define       V_fswitch_sounds_ru        1.0.13
 %define       V_fswitch_music            1.0.8
 %define       V_asterisk_codecs_ilbc     20110104
-%define       V_chan_capi                1.1.5.20120615
+%define       V_chan_capi                1.1.6
 
 #   package information
 Name:         asterisk
@@ -76,6 +76,13 @@
 %option       with_xfersips yes
 %option       with_proxymwi yes
 %option       with_smdipoll 10
+%option       with_motxchan Local/17094009
+
+#   correct implicit interdependencies
+%if "%{with_capi}" == "yes"
+#%define       with_motxchan CAPI/ISDN1/090032669002  # Materna (Anny Way)
+%define       with_motxchan CAPI/ISDN1/17094009
+%endif
 
 #   list of sources
 Source0:      http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
@@ -339,6 +346,10 @@
         utils/utils.xml \
         agi/agi.xml
     %{l_shtool} subst \
+        -e 's;\(\*motxchannel = "\)[^"][^"]*",;\1%{with_motxchan}",;' \
+        -e 's;\(\*spooldir = "\)[^"][^"]*",;\1%{l_prefix}/var/asterisk/spool",;' \
+        utils/smsq.c
+    %{l_shtool} subst \
         -e 's;\(-DSOLARIS\);\1 -D__EXTENSIONS__=1;g' \
         main/editline/Makefile.in \
         main/db1-ast/Makefile
@@ -379,6 +390,9 @@
         -e 's;\${CONFIG_DIR};$(DESTDIR)$(CONFIG_DIR);g' \
         -e 's;^\(USE_OWN_LIBCAPI\)=yes;\1=no;' \
         chan_capi-%{V_chan_capi}/Makefile
+    %{l_shtool} subst \
+        -e 's;#ifdef CC_AST_HAS_VERSION_1_6$;#if (defined(CC_AST_HAS_VERSION_1_6) \&\& !defined(CC_AST_HAS_VERSION_1_8));g' \
+        chan_capi-%{V_chan_capi}/chan_capi_devstate.c
     case "%{l_platform -t}" in
         *-sunos* )
             %{l_shtool} subst \
@@ -596,7 +610,7 @@
       ln -s ../include/asterisk.h .
       %{l_make} %{l_mflags -O} V=1 \
           INSTALL_PREFIX=%{l_prefix} \
-          ASTERISK_HEADER_DIR="`pwd`" \
+          ASTERISK_HEADER_DIR="`pwd`"
     ) || exit $?
 %endif