Merge branch 'next' into initscripts-cleanup

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

diff --git a/lfs/asterisk b/lfs/asterisk
index 8896392aa6b88bda7d89c4d142d0f86a7e388478..31f6ec0fe83e32abd373939ec12720f705421fb3 100755 (executable)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -20,7 +20,7 @@
 
 include Config
 
-VER        = 11.10.0
+VER        = 11.23.1
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -28,9 +28,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 11
+PAK_VER    = 20
 
-DEPS       = "sqlite"
+DEPS       = "libsrtp"
 
 ###############################################################################
 # Top-level Rules
@@ -38,16 +38,16 @@ DEPS       = "sqlite"
 
 objects = $(DL_FILE) \
        asterisk-1.4-de-prompts.tar.gz \
-       asterisk-extra-sounds-en-gsm-1.4.14.tar.gz \
+       asterisk-extra-sounds-en-gsm-1.5.tar.gz \
        asterisk-moh-opsound-gsm-2.03.tar.gz 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-extra-sounds-en-gsm-1.4.14.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz
+asterisk-extra-sounds-en-gsm-1.5.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.5.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
 
-$(DL_FILE)_MD5 = 47384cd1ff48b306dca6e03027b023bd
-asterisk-extra-sounds-en-gsm-1.4.14.tar.gz_MD5 = ffc2e0ffd783c03fef5b75277dba0896
+$(DL_FILE)_MD5 = 8dadfcda24eac2f6df431c71f5f01947
+asterisk-extra-sounds-en-gsm-1.5.tar.gz_MD5 = 49f2baefc7aad424f30ff18d883501d2
 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
 
@@ -87,7 +87,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # patch asterisk
        cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/asterisk-no-ffmpeg.patch
-       cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/asterisk-ssl-reader-should-block.patch      
 
        # configure asterisk
        cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire \
@@ -112,7 +111,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                menuselect.makeopts
 
        # add additional sounds
-       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz $(DIR_APP)/sounds/
+       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.5.tar.gz $(DIR_APP)/sounds/
        cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/
 
        # Fix wrong cpu optimization (march=armv5tel)
@@ -140,7 +139,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown nobody:nobody -R /var/ipfire/asterisk
        chown nobody:nobody -R /var/lib/asterisk
 
-       # be sure all source is removed
+# be sure all source is removed
        @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/libsrtp*
 
        # remember backup-location
@@ -153,6 +152,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # generate softlink (or asterisk will not work properly)
        ln -sf /var/ipfire/asterisk /etc/asterisk
 
+       #install initscripts
+       $(call INSTALL_INITSCRIPT,asterisk)
+
        # make asterisk start with reboot
        ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc0.d/K30asterisk
        ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc6.d/K30asterisk