Asterisk: update to 1.4.42.

[ipfire-2.x.git] / lfs / asterisk

diff --git a/lfs/asterisk b/lfs/asterisk
index 496e47e406cffe9a2a80d04241a678a73f8d9f73..8b4a02f33450ea8cd859af57a6e6ec3c00246171 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.28
+VER        = 1.4.42
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 5
+PAK_VER    = 6
 
 CHAN_CAPI  = chan_capi-1.1.4
 
@@ -44,29 +44,26 @@ DEPS       = "libpri libtiff libvorbis libogg spandsp netsnmpd"
 
 objects = $(DL_FILE) \
        asterisk-1.4-de-prompts.tar.gz \
-       asterisk-core-sounds-en-gsm-1.4.16.tar.gz \
-       asterisk-extra-sounds-en-gsm-1.4.9.tar.gz \
-       asterisk-moh-opsound-gsm.tar.gz \
-       asterisk-addons-1.4.9.tar.gz \
-       agx-ast-addons-svn65.tgz \
+       asterisk-core-sounds-en-gsm-1.4.22.tar.gz \
+       asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \
+       asterisk-moh-opsound-gsm-2.03.tar.gz \
+       asterisk-addons-1.4.13.tar.gz \
        $(CHAN_CAPI).tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-core-sounds-en-gsm-1.4.16.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.16.tar.gz
-asterisk-extra-sounds-en-gsm-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.9.tar.gz
-asterisk-moh-opsound-gsm.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm.tar.gz
+asterisk-core-sounds-en-gsm-1.4.22.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz
+asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
+asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
 asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
-asterisk-addons-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.9.tar.gz
-agx-ast-addons-svn65.tgz = $(URL_IPFIRE)/agx-ast-addons-svn65.tgz
+asterisk-addons-1.4.13.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.13.tar.gz
 $(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz
 
-$(DL_FILE)_MD5 = e8006ce319e18ce07ce1335ad583330a
-asterisk-core-sounds-en-gsm-1.4.16.tar.gz_MD5 = 87145c1775141613d1471864dae12bdd
-asterisk-extra-sounds-en-gsm-1.4.9.tar.gz_MD5 = ffa11b9d0128735425c43b9ce445dedf
-asterisk-moh-opsound-gsm.tar.gz_MD5 = 1fa8246f532a08ecc359f5e428bd7f60
+$(DL_FILE)_MD5 = 332f2f67e0eefe84b1e55320eab45166
+asterisk-core-sounds-en-gsm-1.4.22.tar.gz_MD5 = 2a99a45c0675135255bc65796b12f7c6
+asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11
+asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
-asterisk-addons-1.4.9.tar.gz_MD5 = 0c0ddf2386a9541e416e122ca082e611
-agx-ast-addons-svn65.tgz_MD5 = 9372d818cc68337658110f793d0fd8e0
+asterisk-addons-1.4.13.tar.gz_MD5 = e59471b6f25901a82e45b9e5e0c73703
 $(CHAN_CAPI).tar.gz_MD5 = 18fa835e724b7814deafbfa5b8cb01eb
 
 install : $(TARGET)
@@ -110,12 +107,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts menuselect.makeopts
 
        # add additional sounds
-       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-gsm-1.4.16.tar.gz $(DIR_APP)/sounds/
-       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.9.tar.gz $(DIR_APP)/sounds/
-       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm.tar.gz $(DIR_APP)/sounds/
+       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-gsm-1.4.22.tar.gz $(DIR_APP)/sounds/
+       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz $(DIR_APP)/sounds/
+       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/
 
-       # Remove wrong cpu optimization (march=armv5tel)
-       cd $(DIR_APP) && sed -i -e "s|^PROC=.*||g" makeopts
+       # Fix wrong cpu optimization (march=armv5tel)
+       cd $(DIR_APP) && sed -i -e "s|^PROC=armv5te.*|PROC=armv5te|g" makeopts
+
+       # Add armv5te to gsm codecs
+       cd $(DIR_APP) && sed -i -e "s|armv5b |*armv5te |g" codecs/gsm/Makefile
 
        # compile and install
        cd $(DIR_APP) && make $(MAKETUNING) all
@@ -123,7 +123,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make samples
 
        # extract and configure asterisk-addons
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.9.tar.gz
+       cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.13.tar.gz
        cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr --sysconfdir=/var/ipfire
        # enable additional features (--> NOT NEEDED, DEFAULT CONFIG INCLUDES ALL)
        #cd $(DIR_SRC)/asterisk-addons-* && cp -f $(DIR_SRC)/config/asterisk/addons.makeopts menuselect.makeopts
@@ -152,16 +152,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/$(CHAN_CAPI) && make install
        @rm -rf $(DIR_SRC)/$(CHAN_CAPI)
 
-       # build FAX stuff (TODO: get newer version... where to download source?)
-       cd $(DIR_SRC) && tar zxf $(DIR_DL)/agx-ast-addons-svn65.tgz
-       # bugfix: disable app_confcall (not supported with dahdi, but we can take meetme)
-       cd $(DIR_SRC)/agx-ast-addons && echo "project (agx-ast-addons-zaptel)" > ./app-dahdi/CMakeLists.txt
-       cd $(DIR_SRC)/agx-ast-addons && echo >> ./app-dahdi/CMakeLists.txt
-       # end bugfix
-       cd $(DIR_SRC)/agx-ast-addons && ./configure.sh
-       cd $(DIR_SRC)/agx-ast-addons && ./build.sh
-       @rm -rf $(DIR_SRC)/agx-ast-addons
-
        # be sure all source is removed
        @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*