1.1 --- a/asterisk/asterisk.patch Sat Mar 24 21:00:00 2012 +0100 1.2 +++ b/asterisk/asterisk.patch Sat Mar 24 21:40:49 2012 +0100 1.3 @@ -379,10 +379,10 @@ 1.4 1.5 /* Unique ID */ 1.6 if (!rc_avpair_add(rh, tosend, PW_ACCT_SESSION_ID, &cdr->uniqueid, strlen(cdr->uniqueid), 0)) 1.7 -Index: chan_capi-1.1.5.20110914/chan_capi20.h 1.8 -diff -Nau chan_capi-1.1.5.20110914/chan_capi20.h.orig chan_capi-1.1.5.20110914/chan_capi20.h 1.9 ---- chan_capi-1.1.5.20110914/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200 1.10 -+++ chan_capi-1.1.5.20110914/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100 1.11 +Index: chan_capi-1.1.5.20120324/chan_capi20.h 1.12 +diff -Nau chan_capi-1.1.5.20120324/chan_capi20.h.orig chan_capi-1.1.5.20120324/chan_capi20.h 1.13 +--- chan_capi-1.1.5.20120324/chan_capi20.h.orig 2005-09-20 20:33:40.000000000 +0200 1.14 ++++ chan_capi-1.1.5.20120324/chan_capi20.h 2012-03-18 17:47:07.888451260 +0100 1.15 @@ -4,10 +4,13 @@ 1.16 * first. Else the checks below will fail. 1.17 */ 1.18 @@ -406,11 +406,11 @@ 1.19 #ifndef HEADER_CID 1.20 #define HEADER_CID(x) ((x)->adr.adrNCCI) 1.21 #endif 1.22 -Index: chan_capi-1.1.5.20110914/chan_capi_utils.c 1.23 -diff -Nau chan_capi-1.1.5.20110914/chan_capi_utils.c.orig chan_capi-1.1.5.20110914/chan_capi_utils.c 1.24 ---- chan_capi-1.1.5.20110914/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200 1.25 -+++ chan_capi-1.1.5.20110914/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100 1.26 -@@ -1158,6 +1158,9 @@ 1.27 +Index: chan_capi-1.1.5.20120324/chan_capi_utils.c 1.28 +diff -Nau chan_capi-1.1.5.20120324/chan_capi_utils.c.orig chan_capi-1.1.5.20120324/chan_capi_utils.c 1.29 +--- chan_capi-1.1.5.20120324/chan_capi_utils.c.orig 2011-08-07 16:31:05.000000000 +0200 1.30 ++++ chan_capi-1.1.5.20120324/chan_capi_utils.c 2012-03-18 17:47:07.888451260 +0100 1.31 +@@ -1160,6 +1160,9 @@ 1.32 { 1.33 MESSAGE_EXCHANGE_ERROR error; 1.34 int waitcount = 50; 1.35 @@ -420,10 +420,10 @@ 1.36 unsigned char manbuf[CAPI_MANUFACTURER_LEN]; 1.37 _cmsg CMSG; 1.38 1.39 -Index: chan_capi-1.1.5.20110914/libcapi20/capi20.c 1.40 -diff -Nau chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig chan_capi-1.1.5.20110914/libcapi20/capi20.c 1.41 ---- chan_capi-1.1.5.20110914/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100 1.42 -+++ chan_capi-1.1.5.20110914/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100 1.43 +Index: chan_capi-1.1.5.20120324/libcapi20/capi20.c 1.44 +diff -Nau chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig chan_capi-1.1.5.20120324/libcapi20/capi20.c 1.45 +--- chan_capi-1.1.5.20120324/libcapi20/capi20.c.orig 2010-02-17 20:10:53.000000000 +0100 1.46 ++++ chan_capi-1.1.5.20120324/libcapi20/capi20.c 2012-03-18 17:47:07.888451260 +0100 1.47 @@ -19,8 +19,10 @@ 1.48 #include <stdio.h> 1.49 #include <ctype.h> 1.50 @@ -717,10 +717,10 @@ 1.51 } 1.52 /* 1.53 * functions added to the CAPI2.0 spec 1.54 -Index: chan_capi-1.1.5.20110914/libcapi20/convert.c 1.55 -diff -Nau chan_capi-1.1.5.20110914/libcapi20/convert.c.orig chan_capi-1.1.5.20110914/libcapi20/convert.c 1.56 ---- chan_capi-1.1.5.20110914/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200 1.57 -+++ chan_capi-1.1.5.20110914/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100 1.58 +Index: chan_capi-1.1.5.20120324/libcapi20/convert.c 1.59 +diff -Nau chan_capi-1.1.5.20120324/libcapi20/convert.c.orig chan_capi-1.1.5.20120324/libcapi20/convert.c 1.60 +--- chan_capi-1.1.5.20120324/libcapi20/convert.c.orig 2010-09-14 21:54:25.000000000 +0200 1.61 ++++ chan_capi-1.1.5.20120324/libcapi20/convert.c 2012-03-18 17:47:07.888451260 +0100 1.62 @@ -11,7 +11,14 @@ 1.63 #include <stddef.h> 1.64 #include <time.h> 1.65 @@ -736,10 +736,10 @@ 1.66 1.67 #include "capi20.h" 1.68 1.69 -Index: chan_capi-1.1.5.20110914/Makefile 1.70 -diff -Nau chan_capi-1.1.5.20110914/Makefile.orig chan_capi-1.1.5.20110914/Makefile 1.71 ---- chan_capi-1.1.5.20110914/Makefile.orig 2011-02-04 18:41:46.000000000 +0100 1.72 -+++ chan_capi-1.1.5.20110914/Makefile 2012-03-18 17:47:07.888451260 +0100 1.73 +Index: chan_capi-1.1.5.20120324/Makefile 1.74 +diff -Nau chan_capi-1.1.5.20120324/Makefile.orig chan_capi-1.1.5.20120324/Makefile 1.75 +--- chan_capi-1.1.5.20120324/Makefile.orig 2011-02-04 18:41:46.000000000 +0100 1.76 ++++ chan_capi-1.1.5.20120324/Makefile 2012-03-18 17:47:07.888451260 +0100 1.77 @@ -114,6 +114,9 @@ 1.78 CFLAGS+=-O2 1.79 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)