OpenPKG Specs / changeset

     1.1 --- a/asterisk/asterisk.patch	Sun Oct 28 23:53:41 2012 +0100
     1.2 +++ b/asterisk/asterisk.patch	Tue Jan 08 20:08:32 2013 +0100
     1.3 @@ -410,10 +410,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.20120615/chan_capi20.h
     1.8 -diff -Nau chan_capi-1.1.5.20120615/chan_capi20.h.orig chan_capi-1.1.5.20120615/chan_capi20.h
     1.9 ---- chan_capi-1.1.5.20120615/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
    1.10 -+++ chan_capi-1.1.5.20120615/chan_capi20.h	2012-03-18 17:47:07.888451260 +0100
    1.11 +Index: chan_capi-1.1.6/chan_capi20.h
    1.12 +diff -Nau chan_capi-1.1.6/chan_capi20.h.orig chan_capi-1.1.6/chan_capi20.h
    1.13 +--- chan_capi-1.1.6/chan_capi20.h.orig	2005-09-20 20:33:40.000000000 +0200
    1.14 ++++ chan_capi-1.1.6/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 @@ -437,10 +437,10 @@
    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.20120615/chan_capi_utils.c
    1.23 -diff -Nau chan_capi-1.1.5.20120615/chan_capi_utils.c.orig chan_capi-1.1.5.20120615/chan_capi_utils.c
    1.24 ---- chan_capi-1.1.5.20120615/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
    1.25 -+++ chan_capi-1.1.5.20120615/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
    1.26 +Index: chan_capi-1.1.6/chan_capi_utils.c
    1.27 +diff -Nau chan_capi-1.1.6/chan_capi_utils.c.orig chan_capi-1.1.6/chan_capi_utils.c
    1.28 +--- chan_capi-1.1.6/chan_capi_utils.c.orig	2011-08-07 16:31:05.000000000 +0200
    1.29 ++++ chan_capi-1.1.6/chan_capi_utils.c	2012-03-18 17:47:07.888451260 +0100
    1.30  @@ -1160,6 +1160,9 @@
    1.31   {
    1.32   	MESSAGE_EXCHANGE_ERROR error;
    1.33 @@ -451,10 +451,10 @@
    1.34   	unsigned char manbuf[CAPI_MANUFACTURER_LEN];
    1.35   	_cmsg CMSG;
    1.36   
    1.37 -Index: chan_capi-1.1.5.20120615/libcapi20/capi20.c
    1.38 -diff -Nau chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig chan_capi-1.1.5.20120615/libcapi20/capi20.c
    1.39 ---- chan_capi-1.1.5.20120615/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
    1.40 -+++ chan_capi-1.1.5.20120615/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
    1.41 +Index: chan_capi-1.1.6/libcapi20/capi20.c
    1.42 +diff -Nau chan_capi-1.1.6/libcapi20/capi20.c.orig chan_capi-1.1.6/libcapi20/capi20.c
    1.43 +--- chan_capi-1.1.6/libcapi20/capi20.c.orig	2010-02-17 20:10:53.000000000 +0100
    1.44 ++++ chan_capi-1.1.6/libcapi20/capi20.c	2012-03-18 17:47:07.888451260 +0100
    1.45  @@ -19,8 +19,10 @@
    1.46   #include <stdio.h>
    1.47   #include <ctype.h>
    1.48 @@ -748,10 +748,10 @@
    1.49   }
    1.50   /*
    1.51    * functions added to the CAPI2.0 spec
    1.52 -Index: chan_capi-1.1.5.20120615/libcapi20/convert.c
    1.53 -diff -Nau chan_capi-1.1.5.20120615/libcapi20/convert.c.orig chan_capi-1.1.5.20120615/libcapi20/convert.c
    1.54 ---- chan_capi-1.1.5.20120615/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
    1.55 -+++ chan_capi-1.1.5.20120615/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
    1.56 +Index: chan_capi-1.1.6/libcapi20/convert.c
    1.57 +diff -Nau chan_capi-1.1.6/libcapi20/convert.c.orig chan_capi-1.1.6/libcapi20/convert.c
    1.58 +--- chan_capi-1.1.6/libcapi20/convert.c.orig	2010-09-14 21:54:25.000000000 +0200
    1.59 ++++ chan_capi-1.1.6/libcapi20/convert.c	2012-03-18 17:47:07.888451260 +0100
    1.60  @@ -11,7 +11,14 @@
    1.61   #include <stddef.h>
    1.62   #include <time.h>
    1.63 @@ -767,10 +767,10 @@
    1.64   
    1.65   #include "capi20.h"
    1.66   
    1.67 -Index: chan_capi-1.1.5.20120615/Makefile
    1.68 -diff -Nau chan_capi-1.1.5.20120615/Makefile.orig chan_capi-1.1.5.20120615/Makefile
    1.69 ---- chan_capi-1.1.5.20120615/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
    1.70 -+++ chan_capi-1.1.5.20120615/Makefile	2012-03-18 17:47:07.888451260 +0100
    1.71 +Index: chan_capi-1.1.6/Makefile
    1.72 +diff -Nau chan_capi-1.1.6/Makefile.orig chan_capi-1.1.6/Makefile
    1.73 +--- chan_capi-1.1.6/Makefile.orig	2011-02-04 18:41:46.000000000 +0100
    1.74 ++++ chan_capi-1.1.6/Makefile	2012-03-18 17:47:07.888451260 +0100
    1.75  @@ -115,6 +115,9 @@
    1.76   CFLAGS+=-O2
    1.77   CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)

     2.1 --- a/asterisk/asterisk.spec	Sun Oct 28 23:53:41 2012 +0100
     2.2 +++ b/asterisk/asterisk.spec	Tue Jan 08 20:08:32 2013 +0100
     2.3 @@ -22,8 +22,8 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_opkg                     1.8.16.0
     2.8 -%define       V_asterisk                 1.8.16.0
     2.9 +%define       V_opkg                     1.8.19.1
    2.10 +%define       V_asterisk                 1.8.19.1
    2.11  %define       V_asterisk_fax_subdir      1.8.4
    2.12  %define       V_asterisk_fax_digium      1.8.4_1.3.1
    2.13  %define       V_asterisk_sounds_core     1.4.22
    2.14 @@ -39,7 +39,7 @@
    2.15  %define       V_fswitch_sounds_ru        1.0.13
    2.16  %define       V_fswitch_music            1.0.8
    2.17  %define       V_asterisk_codecs_ilbc     20110104
    2.18 -%define       V_chan_capi                1.1.5.20120615
    2.19 +%define       V_chan_capi                1.1.6
    2.20  
    2.21  #   package information
    2.22  Name:         asterisk
    2.23 @@ -76,6 +76,13 @@
    2.24  %option       with_xfersips yes
    2.25  %option       with_proxymwi yes
    2.26  %option       with_smdipoll 10
    2.27 +%option       with_motxchan Local/17094009
    2.28 +
    2.29 +#   correct implicit interdependencies
    2.30 +%if "%{with_capi}" == "yes"
    2.31 +#%define       with_motxchan CAPI/ISDN1/090032669002  # Materna (Anny Way)
    2.32 +%define       with_motxchan CAPI/ISDN1/17094009
    2.33 +%endif
    2.34  
    2.35  #   list of sources
    2.36  Source0:      http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
    2.37 @@ -339,6 +346,10 @@
    2.38          utils/utils.xml \
    2.39          agi/agi.xml
    2.40      %{l_shtool} subst \
    2.41 +        -e 's;\(\*motxchannel = "\)[^"][^"]*",;\1%{with_motxchan}",;' \
    2.42 +        -e 's;\(\*spooldir = "\)[^"][^"]*",;\1%{l_prefix}/var/asterisk/spool",;' \
    2.43 +        utils/smsq.c
    2.44 +    %{l_shtool} subst \
    2.45          -e 's;\(-DSOLARIS\);\1 -D__EXTENSIONS__=1;g' \
    2.46          main/editline/Makefile.in \
    2.47          main/db1-ast/Makefile
    2.48 @@ -379,6 +390,9 @@
    2.49          -e 's;\${CONFIG_DIR};$(DESTDIR)$(CONFIG_DIR);g' \
    2.50          -e 's;^\(USE_OWN_LIBCAPI\)=yes;\1=no;' \
    2.51          chan_capi-%{V_chan_capi}/Makefile
    2.52 +    %{l_shtool} subst \
    2.53 +        -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' \
    2.54 +        chan_capi-%{V_chan_capi}/chan_capi_devstate.c
    2.55      case "%{l_platform -t}" in
    2.56          *-sunos* )
    2.57              %{l_shtool} subst \
    2.58 @@ -596,7 +610,7 @@
    2.59        ln -s ../include/asterisk.h .
    2.60        %{l_make} %{l_mflags -O} V=1 \
    2.61            INSTALL_PREFIX=%{l_prefix} \
    2.62 -          ASTERISK_HEADER_DIR="`pwd`" \
    2.63 +          ASTERISK_HEADER_DIR="`pwd`"
    2.64      ) || exit $?
    2.65  %endif
    2.66