Changeset 13685


Ignore:
Timestamp:
2008-12-18T20:42:25+01:00 (8 years ago)
Author:
zandbelt
Message:

update Asterisk to 1.4.22

Location:
packages/net/asterisk-1.4.x
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • packages/net/asterisk-1.4.x/Makefile

    r12794 r13685  
    1010 
    1111PKG_NAME:=asterisk 
    12 PKG_VERSION:=1.4.21 
     12PKG_VERSION:=1.4.22 
    1313PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1616PKG_SOURCE_URL:=http://downloads.digium.com/pub/asterisk/releases/ 
    17 PKG_MD5SUM:=c4cf69eb6eae3105806b08d3efc28ec7 
     17#PKG_MD5SUM:=c4cf69eb6eae3105806b08d3efc28ec7 
     18PKG_MD5SUM:=7626febc4a01e16e012dfccb9e4ab9d2 
    1819 
    1920PKG_BUILD_DEPENDS:= libopenh323 pwlib 
     
    335336 
    336337 
     338#       --with-ltdl="$(STAGING_DIR)/usr" \ 
    337339CONFIGURE_ARGS+= \ 
    338340        --without-curl \ 
     
    342344        --without-isdnnet \ 
    343345        --without-kde \ 
    344         --with-ltdl="$(STAGING_DIR)/usr" \ 
    345346        --without-misdn \ 
    346347        --without-nbs \ 
     
    531532endef 
    532533 
    533 define Package/asterisk14/postinst 
    534 #!/bin/sh 
    535 ROOT=`echo $${PKG_ROOT} | sed 's:[\/]:\\\&:g' -` 
    536 /bin/sed -i 's/\ \/etc/\ '$${ROOT}'etc/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf 
    537 /bin/sed -i 's/\ \/var/\ '$${ROOT}'var/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf 
    538 /bin/sed -i 's/\ \/usr/\ '$${ROOT}'usr/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf 
    539 /bin/sed -i 's/^DEST=/DEST='$${ROOT}'/g' $${PKG_ROOT}/etc/init.d/asterisk 
    540 /bin/sed -i 's/OPTIONS=\"\"/OPTIONS=\"-C\ '$${ROOT}'etc\/asterisk\/asterisk.conf\"/g' $${PKG_ROOT}/etc/default/asterisk 
    541 endef 
     534#define Package/asterisk14/postinst 
     535##!/bin/sh 
     536#ROOT=`echo $${PKG_ROOT} | sed 's:[\/]:\\\&:g' -` 
     537#/bin/sed -i 's/\ \/etc/\ '$${ROOT}'etc/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf 
     538#/bin/sed -i 's/\ \/var/\ '$${ROOT}'var/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf 
     539#/bin/sed -i 's/\ \/usr/\ '$${ROOT}'usr/g' $${PKG_ROOT}/etc/asterisk/asterisk.conf 
     540#/bin/sed -i 's/^DEST=/DEST='$${ROOT}'/g' $${PKG_ROOT}/etc/init.d/asterisk 
     541#/bin/sed -i 's/OPTIONS=\"\"/OPTIONS=\"-C\ '$${ROOT}'etc\/asterisk\/asterisk.conf\"/g' $${PKG_ROOT}/etc/default/asterisk 
     542#endef 
    542543 
    543544define Package/asterisk14/install 
  • packages/net/asterisk-1.4.x/patches/011-Makefile-main.patch

    r12794 r13685  
    1 diff -Nru asterisk-1.4.18.org/main/Makefile asterisk-1.4.18/main/Makefile 
    2 --- asterisk-1.4.18.org/main/Makefile   2008-01-29 18:43:41.000000000 +0100 
    3 +++ asterisk-1.4.19.1/main/Makefile     2008-03-02 19:30:04.000000000 +0100 
     1diff -Nru asterisk-1.4.22.org/main/Makefile asterisk-1.4.22/main/Makefile 
     2--- asterisk-1.4.22.org/main/Makefile   2008-07-18 18:15:41.000000000 +0200 
     3+++ asterisk-1.4.22/main/Makefile       2008-11-29 14:58:13.000000000 +0100 
    44@@ -144,7 +144,7 @@ 
    55 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),) 
     
    99+       $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) 
    1010 endif 
    11         @$(ASTTOPDIR)/build_tools/strip_nonapi $@ 
     11        $(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@ 
    1212  
  • packages/net/asterisk-1.4.x/patches/013-chan_iax2-tmp_path.patch

    r12794 r13685  
    1 diff -Nru asterisk-1.4.18.org/channels/chan_iax2.c asterisk-1.4.18/channels/chan_iax2.c 
    2 --- asterisk-1.4.18.org/channels/chan_iax2.c    2008-01-31 20:52:49.000000000 +0100 
    3 +++ asterisk-1.4.19.1/channels/chan_iax2.c      2008-03-02 19:32:14.000000000 +0100 
    4 @@ -1554,7 +1554,7 @@ 
     1diff -Nru asterisk-1.4.22.org/channels/chan_iax2.c asterisk-1.4.22/channels/chan_iax2.c 
     2--- asterisk-1.4.22.org/channels/chan_iax2.c    2008-09-02 20:14:57.000000000 +0200 
     3+++ asterisk-1.4.22/channels/chan_iax2.c        2008-11-29 15:00:00.000000000 +0100 
     4@@ -1815,7 +1815,7 @@ 
    55                last++; 
    66        else 
  • packages/net/asterisk-1.4.x/patches/014-openssl-configure_ac.patch

    r12794 r13685  
    1 diff -Nru asterisk-1.4.18.org/configure.ac asterisk-1.4.18/configure.ac 
    2 --- asterisk-1.4.18.org/configure.ac    2008-01-16 02:13:27.000000000 +0100 
    3 +++ asterisk-1.4.19.1/configure.ac      2008-03-02 19:33:55.000000000 +0100 
    4 @@ -884,7 +884,7 @@ 
     1diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac 
     2--- asterisk-1.4.22.org/configure.ac    2008-09-08 18:26:00.000000000 +0200 
     3+++ asterisk-1.4.22/configure.ac        2008-11-29 15:01:13.000000000 +0100 
     4@@ -1319,7 +1319,7 @@ 
    55  
    66 AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h]) 
  • packages/net/asterisk-1.4.x/patches/015-spandsp-app_fax.patch

    r12794 r13685  
    1 diff -Nru asterisk-1.4.18.org/apps/app_rxfax.c asterisk-1.4.18/apps/app_rxfax.c 
    2 --- asterisk-1.4.18.org/apps/app_rxfax.c        1970-01-01 01:00:00.000000000 +0100 
    3 +++ asterisk-1.4.19.1/apps/app_rxfax.c  2008-03-02 19:35:45.000000000 +0100 
     1diff -Nru asterisk-1.4.22.org/apps/app_rxfax.c asterisk-1.4.22/apps/app_rxfax.c 
     2--- asterisk-1.4.22.org/apps/app_rxfax.c        1970-01-01 01:00:00.000000000 +0100 
     3+++ asterisk-1.4.22/apps/app_rxfax.c    2008-11-29 15:02:27.000000000 +0100 
    44@@ -0,0 +1,376 @@ 
    55+/* 
     
    379379+ 
    380380+/*- End of file ------------------------------------------------------------*/ 
    381 diff -Nru asterisk-1.4.18.org/apps/app_txfax.c asterisk-1.4.18/apps/app_txfax.c 
    382 --- asterisk-1.4.18.org/apps/app_txfax.c        1970-01-01 01:00:00.000000000 +0100 
    383 +++ asterisk-1.4.19.1/apps/app_txfax.c  2008-03-02 19:35:45.000000000 +0100 
     381diff -Nru asterisk-1.4.22.org/apps/app_txfax.c asterisk-1.4.22/apps/app_txfax.c 
     382--- asterisk-1.4.22.org/apps/app_txfax.c        1970-01-01 01:00:00.000000000 +0100 
     383+++ asterisk-1.4.22/apps/app_txfax.c    2008-11-29 15:02:27.000000000 +0100 
    384384@@ -0,0 +1,303 @@ 
    385385+/* 
     
    686686+ 
    687687+/*- End of file ------------------------------------------------------------*/ 
    688 diff -Nru asterisk-1.4.18.org/build_tools/menuselect-deps.in asterisk-1.4.18/build_tools/menuselect-deps.in 
    689 --- asterisk-1.4.18.org/build_tools/menuselect-deps.in  2008-01-16 02:13:27.000000000 +0100 
    690 +++ asterisk-1.4.19.1/build_tools/menuselect-deps.in    2008-03-02 19:35:45.000000000 +0100 
    691 @@ -21,6 +21,7 @@ 
     688diff -Nru asterisk-1.4.22.org/build_tools/menuselect-deps.in asterisk-1.4.22/build_tools/menuselect-deps.in 
     689--- asterisk-1.4.22.org/build_tools/menuselect-deps.in  2008-08-14 04:02:15.000000000 +0200 
     690+++ asterisk-1.4.22/build_tools/menuselect-deps.in      2008-11-29 15:02:27.000000000 +0100 
     691@@ -23,6 +23,7 @@ 
    692692 POPT=@PBX_POPT@ 
    693693 PRI=@PBX_PRI@ 
     
    696696 SPEEX=@PBX_SPEEX@ 
    697697 SPEEXDSP=@PBX_SPEEXDSP@ 
    698  SQLITE=@PBX_SQLITE@ 
    699 diff -Nru asterisk-1.4.18.org/configure.ac asterisk-1.4.18/configure.ac 
    700 --- asterisk-1.4.18.org/configure.ac    2008-01-16 02:13:27.000000000 +0100 
    701 +++ asterisk-1.4.19.1/configure.ac      2008-03-02 19:35:45.000000000 +0100 
    702 @@ -198,6 +198,7 @@ 
     698 SPEEX_PREPROCESS=@PBX_SPEEX_PREPROCESS@ 
     699diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac 
     700--- asterisk-1.4.22.org/configure.ac    2008-09-08 18:26:00.000000000 +0200 
     701+++ asterisk-1.4.22/configure.ac        2008-11-29 15:02:27.000000000 +0100 
     702@@ -201,6 +201,7 @@ 
    703703 AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) 
    704704 AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) 
     
    708708 AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp]) 
    709709 AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) 
    710 @@ -878,6 +879,8 @@ 
     710@@ -1302,6 +1303,8 @@ 
    711711  
    712712 AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) 
     
    716716 AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm]) 
    717717  
    718  AST_EXT_LIB_CHECK([SPEEXDSP], [speexdsp], [speex_preprocess_ctl], [speex/speex.h], [-lm]) 
    719 diff -Nru asterisk-1.4.18.org/include/asterisk/plc.h asterisk-1.4.18/include/asterisk/plc.h 
    720 --- asterisk-1.4.18.org/include/asterisk/plc.h  2006-06-14 16:12:56.000000000 +0200 
    721 +++ asterisk-1.4.19.1/include/asterisk/plc.h    2008-03-02 19:35:45.000000000 +0100 
     718 # See if the main speex library contains the preprocess functions 
     719diff -Nru asterisk-1.4.22.org/include/asterisk/plc.h asterisk-1.4.22/include/asterisk/plc.h 
     720--- asterisk-1.4.22.org/include/asterisk/plc.h  2006-06-14 16:12:56.000000000 +0200 
     721+++ asterisk-1.4.22/include/asterisk/plc.h      2008-11-29 15:02:27.000000000 +0100 
    722722@@ -1,18 +1,17 @@ 
    723723-/*! \file 
     
    861861 #endif 
    862862  
    863 diff -Nru asterisk-1.4.18.org/makeopts.in asterisk-1.4.18/makeopts.in 
    864 --- asterisk-1.4.18.org/makeopts.in     2008-01-16 02:13:27.000000000 +0100 
    865 +++ asterisk-1.4.19.1/makeopts.in       2008-03-02 19:35:45.000000000 +0100 
    866 @@ -137,6 +137,9 @@ 
     863diff -Nru asterisk-1.4.22.org/makeopts.in asterisk-1.4.22/makeopts.in 
     864--- asterisk-1.4.22.org/makeopts.in     2008-06-12 21:08:20.000000000 +0200 
     865+++ asterisk-1.4.22/makeopts.in 2008-11-29 15:02:27.000000000 +0100 
     866@@ -138,6 +138,9 @@ 
    867867 RADIUS_INCLUDE=@RADIUS_INCLUDE@ 
    868868 RADIUS_LIB=@RADIUS_LIB@ 
  • packages/net/asterisk-1.4.x/patches/016-iksemel-configure_ac.patch

    r12794 r13685  
    1 diff -Nru asterisk-1.4.18.org/configure.ac asterisk-1.4.18/configure.ac 
    2 --- asterisk-1.4.18.org/configure.ac    2008-01-16 02:13:27.000000000 +0100 
    3 +++ asterisk-1.4.19.1/configure.ac      2008-03-02 19:38:21.000000000 +0100 
    4 @@ -470,7 +470,7 @@ 
     1diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac 
     2--- asterisk-1.4.22.org/configure.ac    2008-09-08 18:26:00.000000000 +0200 
     3+++ asterisk-1.4.22/configure.ac        2008-11-29 15:04:09.000000000 +0100 
     4@@ -514,7 +514,7 @@ 
    55    fi 
    66 fi 
  • packages/net/asterisk-1.4.x/patches/017-Makefile-no_march.patch

    r12794 r13685  
    1 diff -Nru asterisk-1.4.18.org/Makefile asterisk-1.4.18/Makefile 
    2 --- asterisk-1.4.18.org/Makefile        2008-01-29 18:21:33.000000000 +0100 
    3 +++ asterisk-1.4.19.1/Makefile  2008-03-02 19:39:23.000000000 +0100 
     1diff -Nru asterisk-1.4.22.org/Makefile asterisk-1.4.22/Makefile 
     2--- asterisk-1.4.22.org/Makefile        2008-09-08 22:15:42.000000000 +0200 
     3+++ asterisk-1.4.22/Makefile    2008-11-29 15:05:12.000000000 +0100 
    44@@ -215,7 +215,7 @@ 
    55 endif 
  • packages/net/asterisk-1.4.x/patches/023-autoconf-chan_h323.patch

    r12794 r13685  
    1 diff -Nru asterisk-1.4.18.org/acinclude.m4 asterisk-1.4.18/acinclude.m4 
    2 --- asterisk-1.4.18.org/acinclude.m4    2007-07-25 19:14:14.000000000 +0200 
    3 +++ asterisk-1.4.19.1/acinclude.m4      2008-03-02 19:40:27.000000000 +0100 
    4 @@ -508,6 +508,7 @@ 
     1diff -Nru asterisk-1.4.22.org/acinclude.m4 asterisk-1.4.22/acinclude.m4 
     2--- asterisk-1.4.22.org/acinclude.m4    2008-07-22 22:49:41.000000000 +0200 
     3+++ asterisk-1.4.22/acinclude.m4        2008-11-29 15:06:28.000000000 +0100 
     4@@ -588,6 +588,7 @@ 
    55                                ;; 
    66                esac 
     
    1010                AC_SUBST([OPENH323_SUFFIX]) 
    1111                AC_SUBST([OPENH323_BUILD]) 
    12 diff -Nru asterisk-1.4.18.org/configure.ac asterisk-1.4.18/configure.ac 
    13 --- asterisk-1.4.18.org/configure.ac    2008-01-16 02:13:27.000000000 +0100 
    14 +++ asterisk-1.4.19.1/configure.ac      2008-03-02 19:40:27.000000000 +0100 
    15 @@ -835,7 +835,7 @@ 
     12diff -Nru asterisk-1.4.22.org/configure.ac asterisk-1.4.22/configure.ac 
     13--- asterisk-1.4.22.org/configure.ac    2008-09-08 18:26:00.000000000 +0200 
     14+++ asterisk-1.4.22/configure.ac        2008-11-29 15:06:28.000000000 +0100 
     15@@ -1259,7 +1259,7 @@ 
    1616        if test "${HAS_PWLIB:-unset}" != "unset"; then 
    1717                AST_CHECK_OPENH323_PLATFORM() 
  • packages/net/asterisk-1.4.x/patches/030-acinclude.patch

    r12587 r13685  
    1 diff -urN asterisk-1.4.11.orig/acinclude.m4 asterisk-1.4.11/acinclude.m4 
    2 --- asterisk-1.4.11.orig/acinclude.m4   2008-09-13 04:34:47.000000000 +0200 
    3 +++ asterisk-1.4.11/acinclude.m4        2008-09-13 04:35:19.000000000 +0200 
    4 @@ -585,7 +585,7 @@ 
     1diff -Nru asterisk-1.4.22.org/acinclude.m4 asterisk-1.4.22/acinclude.m4 
     2--- asterisk-1.4.22.org/acinclude.m4    2008-07-22 22:49:41.000000000 +0200 
     3+++ asterisk-1.4.22/acinclude.m4        2008-11-29 15:08:07.000000000 +0100 
     4@@ -664,7 +664,7 @@ 
    55        [assume the C compiler uses GNU ld @<:@default=no@:>@])], 
    66     [test "$withval" = no || with_gnu_ld=yes], 
     
    1111 AC_REQUIRE([AC_CANONICAL_HOST])dnl 
    1212 AC_REQUIRE([AC_CANONICAL_BUILD])dnl 
    13 @@ -690,28 +690,6 @@ 
     13@@ -769,28 +769,6 @@ 
    1414  AC_SUBST([EGREP]) 
    1515 ])]) # AST_PROG_EGREP 
Note: See TracChangeset for help on using the changeset viewer.