X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fasterisk;h=7575246c50f057e9b521ebdbdc546dd34d6fa65b;hp=d2b1976cdeecef89a86b074ceffc1ebda276c5a0;hb=c8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b;hpb=11b5b85cb8c4e937137e84efceefbef3373a47f8

diff --git a/lfs/asterisk b/lfs/asterisk
old mode 100644
new mode 100755
index d2b1976cde..7575246c50
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -18,13 +18,9 @@
 #                                                                             #
 ###############################################################################
 
-###############################################################################
-# Definitions
-###############################################################################
-
 include Config
 
-VER        = 1.8.19.0
+VER        = 11.17.1
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,11 +28,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 8
-
-CHAN_CAPI  = chan_capi-20120614
+PAK_VER    = 16
 
-DEPS       = "libpri libtiff libvorbis libogg spandsp netsnmpd"
+DEPS       = "libsrtp"
 
 ###############################################################################
 # Top-level Rules
@@ -44,21 +38,18 @@ DEPS       = "libpri libtiff libvorbis libogg spandsp netsnmpd"
 
 objects = $(DL_FILE) \
 	asterisk-1.4-de-prompts.tar.gz \
-	asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \
-	asterisk-moh-opsound-gsm-2.03.tar.gz \
-	$(CHAN_CAPI).tgz
+	asterisk-extra-sounds-en-gsm-1.4.15.tar.gz \
+	asterisk-moh-opsound-gsm-2.03.tar.gz 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
+asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.15.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
-$(CHAN_CAPI).tgz = $(URL_IPFIRE)/$(CHAN_CAPI).tgz
 
-$(DL_FILE)_MD5 = dc98436846cc2de57100d78747b1bdd1
-asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11
+$(DL_FILE)_MD5 = 2c6cd0f499152d0d5ff32f36e274fc2e
+asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995
 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
-$(CHAN_CAPI).tgz_MD5 = c190f44eb362bf258b27f92c3458e4bf
 
 install : $(TARGET)
 
@@ -92,16 +83,35 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 
 	# remove old directories and extract asterisk
-	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/$(CHAN_CAPI) $(DIR_SRC)/agx-ast-addons && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-	# confiure asterisk
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+	# patch asterisk
+	cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/asterisk-no-ffmpeg.patch
+
+	# configure asterisk
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire \
+		--without-oss \
+		--without-sdl \
+		--without-SDL_image \
+		--without-netsnmp \
+		--without-avcodec \
+		--without-vorbis \
+		--without-ogg \
+		--without-spandsp \
+		--disable-xmldoc
 
 	# enable additional features (include following sound-tars)
-	cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts 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.11.tar.gz $(DIR_APP)/sounds/
+	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.15.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)
@@ -127,21 +137,18 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp -vrf $(DIR_SRC)/config/asterisk/* /var/ipfire/asterisk/
 	chmod o+w /var/ipfire/asterisk
 	chown nobody:nobody -R /var/ipfire/asterisk
-	ln -f -s /var/ipfire/asterisk/wakeup/wakeup.sh /etc/fcron.minutely/wakeup.sh
-
-	# build and install chan capi (needed for isdn)
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tgz
-	cd $(DIR_SRC)/chan-capi-HEAD && sed -i -e 's/^CFLAGS+=-Wno-unused-but-set-variable$$//' Makefile
-	cd $(DIR_SRC)/chan-capi-HEAD && make $(MAKETUNING)
-	cd $(DIR_SRC)/chan-capi-HEAD && make install
-	@rm -rf $(DIR_SRC)/chan-capi-HEAD
+	chown nobody:nobody -R /var/lib/asterisk
 
-	# be sure all source is removed
-	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*
+# be sure all source is removed
+	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/libsrtp*
 
 	# remember backup-location
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/asterisk /var/ipfire/backup/addons/includes/asterisk
 
+	# Logrotate                                                                                                                                                                           
+	mkdir -pv /etc/logrotate.d                                                                                                                                                            
+	install -v -m 644 $(DIR_SRC)/config/asterisk/asterisk.logrotate /etc/logrotate.d/asterisk   
+
 	# generate softlink (or asterisk will not work properly)
 	ln -sf /var/ipfire/asterisk /etc/asterisk