asterisk addon: Enabled SRTP and disabled xml-doc.

diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index 67e192145752d1b19e8c3e737dc1bf766e0ba282..107a92109286ba9bd13f18adcaf933d4fc235f78 100755 (executable)
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -356,6 +356,7 @@ usr/lib/asterisk/modules/res_security_log.so
 usr/lib/asterisk/modules/res_smdi.so
 usr/lib/asterisk/modules/res_snmp.so
 usr/lib/asterisk/modules/res_speech.so
+usr/lib/asterisk/modules/res_srtp.so
 usr/lib/asterisk/modules/res_stun_monitor.so
 usr/lib/asterisk/modules/res_timing_pthread.so
 usr/lib/asterisk/modules/res_timing_timerfd.so
@@ -493,7 +494,7 @@ var/ipfire/backup/addons/includes/asterisk
 #var/lib/asterisk/documentation/core-en_US.xml
 #var/lib/asterisk/documentation/thirdparty
 #var/lib/asterisk/firmware
-#var/lib/asterisk/firmware/iax
+var/lib/asterisk/firmware/iax
 #var/lib/asterisk/images
 var/lib/asterisk/images/asterisk-intro.jpg
 var/lib/asterisk/images/kpad2.jpg

diff --git a/lfs/asterisk b/lfs/asterisk
index d81f99c94d28000d978b3746ee8a54dabb59beff..38182d17e107bbe2d81a96a00c7b5207420636f4 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -18,10 +18,6 @@
 #                                                                             #
 ###############################################################################
 
-###############################################################################
-# Definitions
-###############################################################################
-
 include Config
 
 VER        = 11.8.1
@@ -41,16 +37,19 @@ DEPS       = "sqlite libpri libtiff libvorbis libogg spandsp netsnmpd mysql"
 ###############################################################################
 
 objects = $(DL_FILE) \
+       srtp-1.4.2.tar.gz \
        asterisk-1.4-de-prompts.tar.gz \
        asterisk-extra-sounds-en-gsm-1.4.14.tar.gz \
        asterisk-moh-opsound-gsm-2.03.tar.gz 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+srtp-1.4.2.tar.gz = $(URL_IPFIRE)/srtp-1.4.2.tar.gz
 asterisk-extra-sounds-en-gsm-1.4.14.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.14.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 = 7bace8e6845188ca68b8d682d71cb1cc
+srtp-1.4.2.tar.gz_MD5 = 7b0ffbfad9bbaf33d397027e031cb35a
 asterisk-extra-sounds-en-gsm-1.4.14.tar.gz_MD5 = ffc2e0ffd783c03fef5b75277dba0896
 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
@@ -86,11 +85,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
 
+       # build srtp
+       @rm -rf $(DIR_SRC)/srtp && cd $(DIR_SRC) && tar zxf $(DIR_DL)/srtp-1.4.2.tar.gz
+       cd $(DIR_SRC)/srtp && ./configure --prefix=/usr && make uninstall && make install
+
        # remove old directories and extract asterisk
        @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/agx-ast-addons && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
        # configure asterisk
-       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire --disable-xmldoc
 
        # enable additional features (include following sound-tars)
        cd $(DIR_APP) && make menuselect.makeopts && menuselect/menuselect --enable app_mysql --enable cdr_mysql --enable res_config_mysql --enable EXTRA-SOUNDS-EN-GSM --enable MOH-OPSOUND-GSM  menuselect.makeopts