asterisk addon: Fixed srtp buildroblems, disabled snmp, sdl and oss support.

diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index 107a92109286ba9bd13f18adcaf933d4fc235f78..5140c90e4c4506c584c0316cd947a834da08caf7 100755 (executable)
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -1,3 +1,4 @@
+#usr/lib/libsrtp.a
 etc/asterisk
 etc/fcron.minutely/wakeup.sh
 etc/rc.d/rc0.d/K30asterisk
@@ -155,6 +156,38 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/xml.h
 #usr/include/asterisk/xmldoc.h
 #usr/include/asterisk/xmpp.h
+#usr/include/srtp
+#usr/include/srtp/aes.h
+#usr/include/srtp/aes_cbc.h
+#usr/include/srtp/aes_icm.h
+#usr/include/srtp/alloc.h
+#usr/include/srtp/auth.h
+#usr/include/srtp/cipher.h
+#usr/include/srtp/config.h
+#usr/include/srtp/crypto.h
+#usr/include/srtp/crypto_kernel.h
+#usr/include/srtp/crypto_math.h
+#usr/include/srtp/crypto_types.h
+#usr/include/srtp/cryptoalg.h
+#usr/include/srtp/datatypes.h
+#usr/include/srtp/err.h
+#usr/include/srtp/gf2_8.h
+#usr/include/srtp/hmac.h
+#usr/include/srtp/integers.h
+#usr/include/srtp/kernel_compat.h
+#usr/include/srtp/key.h
+#usr/include/srtp/null_auth.h
+#usr/include/srtp/null_cipher.h
+#usr/include/srtp/prng.h
+#usr/include/srtp/rand_source.h
+#usr/include/srtp/rdb.h
+#usr/include/srtp/rdbx.h
+#usr/include/srtp/rtp.h
+#usr/include/srtp/sha1.h
+#usr/include/srtp/srtp.h
+#usr/include/srtp/stat.h
+#usr/include/srtp/ut_sim.h
+#usr/include/srtp/xfm.h
 #usr/lib/asterisk
 #usr/lib/asterisk/modules
 usr/lib/asterisk/modules/app_adsiprog.so
@@ -242,7 +275,6 @@ usr/lib/asterisk/modules/chan_iax2.so
 usr/lib/asterisk/modules/chan_local.so
 usr/lib/asterisk/modules/chan_mgcp.so
 usr/lib/asterisk/modules/chan_multicast_rtp.so
-usr/lib/asterisk/modules/chan_oss.so
 usr/lib/asterisk/modules/chan_phone.so
 usr/lib/asterisk/modules/chan_sip.so
 usr/lib/asterisk/modules/chan_skinny.so
@@ -354,7 +386,6 @@ usr/lib/asterisk/modules/res_rtp_asterisk.so
 usr/lib/asterisk/modules/res_rtp_multicast.so
 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
@@ -362,6 +393,7 @@ usr/lib/asterisk/modules/res_timing_pthread.so
 usr/lib/asterisk/modules/res_timing_timerfd.so
 usr/lib/libasteriskssl.so
 usr/lib/libasteriskssl.so.1
+#usr/lib/libsrtp.a
 #usr/lib/pkgconfig/asterisk.pc
 usr/sbin/astcanary
 usr/sbin/astdb2bdb

diff --git a/lfs/asterisk b/lfs/asterisk
old mode 100644 (file)
new mode 100755 (executable)
index 38182d1..1706ba0
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -30,7 +30,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
 PAK_VER    = 9
 
-DEPS       = "sqlite libpri libtiff libvorbis libogg spandsp netsnmpd mysql"
+DEPS       = "sqlite ffmpeg spandsp"
 
 ###############################################################################
 # Top-level Rules
@@ -87,16 +87,28 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # 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
+       cd $(DIR_SRC)/srtp && ./configure --prefix=/usr && make uninstall && make && 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 --disable-xmldoc
+       cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire \
+               --without-oss \
+               --without-sdl \
+               --without-SDL_image \
+               --without-netsnmp \
+               --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
+       cd $(DIR_APP) && make menuselect.makeopts && menuselect/menuselect \
+               --enable res_srtp \
+               --enable app_mysql \
+               --enable cdr_mysql \
+               --enable res_config_mysql \
+               --enable EXTRA-SOUNDS-EN-GSM \
+               --enable MOH-OPSOUND-GSM  \
+               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/