X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fasterisk;h=d2b1976cdeecef89a86b074ceffc1ebda276c5a0;hp=91ebf98bbc2cb74d3fc396217b1fe0810d7c2928;hb=015e243b0dba4fb493fc92068eea3e97f37d3a0c;hpb=ef3002bea6c0a5fbb23b95966eca097f6bfd2cb2

diff --git a/lfs/asterisk b/lfs/asterisk
index 91ebf98bb..d2b1976cd 100644
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.18
+VER        = 1.8.19.0
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,39 +32,33 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 2
+PAK_VER    = 8
 
-CHAN_CAPI  = chan_capi-1.0.2
+CHAN_CAPI  = chan_capi-20120614
 
-DEPS       = "sox zaptel libpri spandsp libmad"
+DEPS       = "libpri libtiff libvorbis libogg spandsp netsnmpd"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE) \
-	   asterisk-1.4-de-prompts.tar.gz \
-	   asterisk-core-sounds-en-alaw-1.4.8.tar.gz \
-	   asterisk-extra-sounds-en-alaw-1.4.7.tar.gz \
-	   asterisk-addons-1.4.5.tar.gz \
-	   agx-ast-addons-1.4.5.tar.bz2 \
-	   $(CHAN_CAPI).tar.gz
+	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
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-core-sounds-en-alaw-1.4.8.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-alaw-1.4.8.tar.gz
-asterisk-extra-sounds-en-alaw-1.4.7.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-alaw-1.4.7.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.5.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.5.tar.gz
-agx-ast-addons-1.4.5.tar.bz2 = $(URL_IPFIRE)/agx-ast-addons-1.4.5.tar.bz2
-$(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz
+$(CHAN_CAPI).tgz = $(URL_IPFIRE)/$(CHAN_CAPI).tgz
 
-$(DL_FILE)_MD5 = 3d8b2b2ef4f202901771663b40f19c3d
-asterisk-core-sounds-en-alaw-1.4.8.tar.gz_MD5 = e708a5510a61217725b6ad663287dfa0
-asterisk-extra-sounds-en-alaw-1.4.7.tar.gz_MD5 = ecc50bd2b9b29d8237911272248c5d35
+$(DL_FILE)_MD5 = dc98436846cc2de57100d78747b1bdd1
+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.5.tar.gz_MD5 = 8de9922c0a93321941f29a77a2f1bf13
-agx-ast-addons-1.4.5.tar.bz2_MD5 = a28f73d041769ea103e59b7f96c13d5e
-$(CHAN_CAPI).tar.gz_MD5 = d4732ecc008e8ef45c38bd2f4d70ef44
+$(CHAN_CAPI).tgz_MD5 = c190f44eb362bf258b27f92c3458e4bf
 
 install : $(TARGET)
 
@@ -96,41 +90,65 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@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)
+
+	# 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
-	cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts \
-		menuselect.makeopts
-	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-alaw-1.4.8.tar.gz \
-		$(DIR_APP)/sounds/asterisk-core-sounds-en-alaw-1.4.8.tar.gz
-	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-alaw-1.4.7.tar.gz \
-		$(DIR_APP)/sounds/asterisk-extra-sounds-en-alaw-1.4.7.tar.gz
+
+	# enable additional features (include following sound-tars)
+	cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts 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-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/
+
+	# 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
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && make samples
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.5.tar.gz
-	cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr \
-		--sysconfdir=/var/ipfire
-	cd $(DIR_SRC)/asterisk-addons-* && cp -f $(DIR_SRC)/config/asterisk/addons.makeopts \
-		menuselect.makeopts
-	cd $(DIR_SRC)/asterisk-addons-* && make $(MAKETUNING) all install
+
+	# add german sounds and remove README.txt
 	tar xfz $(DIR_DL)/asterisk-1.4-de-prompts.tar.gz -C /var/lib/asterisk/sounds/
 	-rm -f /var/lib/asterisk/sounds/README.txt
+
+	# remove build directories
 	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*
+
+	# copy additional ipfire scripts for asterisk
 	-mkdir -p /var/ipfire/asterisk
 	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
-	
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tar.gz
-	cd $(DIR_SRC)/$(CHAN_CAPI) && make $(MAKETUNING)
-	cd $(DIR_SRC)/$(CHAN_CAPI) && make install
-	
-	cd $(DIR_SRC) && tar jxf $(DIR_DL)/agx-ast-addons-1.4.5.tar.bz2
-	cd $(DIR_SRC)/agx-ast-addons && ./build.sh
-	
-	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*  $(DIR_SRC)/$(CHAN_CAPI) \
-		$(DIR_SRC)/agx-ast-addons
+
+	# 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
+
+	# be sure all source is removed
+	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*
+
+	# remember backup-location
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/asterisk /var/ipfire/backup/addons/includes/asterisk
+
+	# generate softlink (or asterisk will not work properly)
+	ln -sf /var/ipfire/asterisk /etc/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
+	ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc3.d/S30asterisk
+
+	# all done
 	@$(POSTBUILD)