X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fasterisk;h=040b3c56839fdd13040c2cc21b7e67791b662b6b;hb=a50d04ab1c6a37287afa8e3390dfb2da99236bb2;hp=7045408b88194544971cd2b7037f64eefa4c348b;hpb=180cd3beb8c8ec84520002aaf3c55e748dd89f9b;p=ipfire-2.x.git

diff --git a/lfs/asterisk b/lfs/asterisk
index 7045408b88..040b3c5683 100644
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -26,51 +26,37 @@
 
 include Config
 
-VER        = 1.2.4
+VER        = 1.4.0
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.asterisk-support.de/mirror/asterisk-1.2.4
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-
-ASTERISK   = $(THISAPP)
-ZAPTEL     = zaptel-1.2.3
-BRISTUFF   = bristuff-0.3.0-PRE-1l
-LIBPRI     = libpri-1.2.2
-SPANDSP    = spandsp-0.0.2pre25
-OH323      = asterisk-oh323-0.7.3
+PROG       = asterisk
+PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE) \
-	   $(ZAPTEL).tar.gz \
-	   $(BRISTUFF).tar.gz \
-          $(LIBPRI).tar.gz \
-	   $(OH323).tar.gz \
-	   app_rxfax.c \
-	   app_txfax.c \
-	   apps_Makefile.patch
+	   asterisk-sounds-de-1.2.5.tar.gz \
+	   asterisk-sounds-1.2.1.tar.gz \
+	   asterisk-addons-1.4.0.tar.gz \
+	   asterisk-perl-0.08.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(ZAPTEL).tar.gz = http://www.asterisk-support.de/mirror/zaptel/$(ZAPTEL).tar.gz
-$(BRISTUFF).tar.gz = http://www.junghanns.net/downloads/$(BRISTUFF).tar.gz
-$(LIBPRI).tar.gz = http://www.asterisk-support.de/mirror/libpri/$(LIBPRI).tar.gz
-app_rxfax.c = http://soft-switch.org/downloads/spandsp/$(SPANDSP)/asterisk-1.2.x/app_rxfax.c
-app_txfax.c = http://soft-switch.org/downloads/spandsp/$(SPANDSP)/asterisk-1.2.x/app_txfax.c
-apps_Makefile.patch = http://soft-switch.org/downloads/spandsp/$(SPANDSP)/asterisk-1.2.x/apps_Makefile.patch
-$(OH323).tar.gz = http://www.inaccessnetworks.com/projects/asterisk-oh323/download/$(OH323).tar.gz
-
-$(DL_FILE)_MD5 = 14721abdc85fc3381db275b61dffce2d
-$(ZAPTEL).tar.gz_MD5 = 9bcb705458f9b20a9644310298a9cd4d
-$(BRISTUFF).tar.gz_MD5 = 81941539b03b6ac8f193b33451e0a740
-$(LIBPRI).tar.gz_MD5 = efce9c3699110588df5e4cf09eae01d9
-app_rxfax.c_MD5 = ab6983b51c412883545b36993d704999
-app_txfax.c_MD5 = 8c8fcb263b76897022b4c28052a7b439
-apps_Makefile.patch_MD5 = 6b0faa7a7cf8613962b17c23ee5a1583
-$(OH323).tar.gz_MD5 = 66dc098a20ac11f098edbbaed307c085
+asterisk-sounds-de-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-sounds-de-1.2.5.tar.gz
+asterisk-sounds-1.2.1.tar.gz = $(URL_IPFIRE)/asterisk-sounds-1.2.1.tar.gz
+asterisk-addons-1.4.0.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.0.tar.gz
+asterisk-perl-0.08.tar.gz = $(URL_IPFIRE)/asterisk-perl-0.08.tar.gz
+
+$(DL_FILE)_MD5 = b4586be9bf00d438d6a53d408ba247d4
+asterisk-sounds-1.2.1.tar.gz_MD5 = bed4259905a7d7bc070c6319142b2075
+asterisk-sounds-de-1.2.5.tar.gz_MD5 = 3793735c44de899dbacb8c192501aa14
+asterisk-addons-1.4.0.tar.gz_MD5 = 603de356bc330bf117c765ced6ede746
+asterisk-perl-0.08.tar.gz_MD5 = 73a47caaff8cafbf78053692f408ceb6
 
 install : $(TARGET)
 
@@ -81,7 +67,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 md5 : $(subst %,%_MD5,$(objects))
 
 dist: 
-	make-packages.sh asterisk $(THISAPP)
+	@$(PAK)
 
 ###############################################################################
 # Downloading, checking, md5sum
@@ -102,53 +88,26 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_SRC)/$(BRISTUFF)
-	# Decompress the source-code
-	cd $(DIR_SRC) && \
-	tar zxf $(DIR_DL)/$(BRISTUFF).tar.gz -C $(DIR_SRC) && \
-	cd $(DIR_SRC)/$(BRISTUFF) && \
-	tar xfz $(DIR_DL)/$(ZAPTEL).tar.gz && \
-	tar xfz $(DIR_DL)/$(LIBPRI).tar.gz && \
-	tar xfz $(DIR_DL)/$(ASTERISK).tar.gz && \
-	tar xfz $(DIR_DL)/$(OH323).tar.gz
-	# Build Zaptel
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && \
-	patch -Np1 < $(DIR_SRC)/src/patches/asterisk-1.2.4-zaptel-$(BRISTUFF).patch && \
-	make clean all KVERS=$(KVER) && \
-	make install KVERS=$(KVER)
-	# Build Libpri
-	cd $(DIR_SRC)/$(BRISTUFF)/$(LIBPRI) && \
-	patch -Np1 < $(DIR_SRC)/src/patches/asterisk-1.2.4-libpri-$(BRISTUFF).patch && \
-	make clean all KVERS=$(KVER) && \
-	make install KVERS=$(KVER)
-	# Build qozap
-	cd $(DIR_SRC)/$(BRISTUFF)/qozap && \
-	make clean linux24 && \
-	install -D -m 644 qozap.o /lib/modules/$(KVER)/misc/qozap.o
-	# Build cwain
-	cd $(DIR_SRC)/$(BRISTUFF)/cwain && \
-	make clean linux24 && \
-	install -D -m 644 cwain.o /lib/modules/$(KVER)/misc/cwain.o
-	# Build zaphfc
-	cd $(DIR_SRC)/$(BRISTUFF)/zaphfc && \
-	make clean linux24 && \
-	install -D -m 644 zaphfc.o /lib/modules/$(KVER)/misc/zaphfc.o
-	# Build Asterisk
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && \
-	patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-ipfire-$(BRISTUFF).patch && \
-	patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-iax2-$(BRISTUFF).patch && \
-	cp -fv $(DIR_DL)/app_{r,t}xfax.c $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/apps && \
-	patch < $(DIR_DL)/apps_Makefile.patch && \
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ASTERISK) && \
-	make clean && \
-	make all && \
-	make install && \
-	make samples
-	# Build OH323
-	cd $(DIR_SRC)/$(BRISTUFF)/$(OH323) && \
-	make ASTERISKINCDIR=$(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/include OH323WRAPLIBDIR=/usr/lib && \
-	make install ASTERISKINCDIR=$(DIR_SRC)/$(BRISTUFF)/$(ASTERISK)/include OH323WRAPLIBDIR=/usr/lib
-	@rm -rf $(DIR_SRC)/$(BRISTUFF) $(DIR_SRC)/{pwlib,openh323}
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+###### We have to wait for a new bristuff ######
+###### cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire
+	cd $(DIR_APP) && make $(MAKETUNING) all
+	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && make samples
+	tar xfz $(DIR_DL)/asterisk-sounds-de-1.2.5.tar.gz -C /var/lib/asterisk/sounds/
+	rm -f /var/lib/asterisk/sounds/README.txt
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-sounds-1.2.1.tar.gz
+	cd $(DIR_SRC)/asterisk-sounds-1.2.1/ && make all install
+	rm -rf $(DIR_SRC)/asterisk-sounds-1.2.1
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.0.tar.gz
+	cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr --sysconfdir=/var/ipfire
+	cd $(DIR_SRC)/asterisk-addons-* && make $(MAKETUNING) all install
+	rm -rf $(DIR_SRC)/asterisk-addons-*
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-perl-0.08.tar.gz
+	cd $(DIR_SRC)/asterisk-perl-0.08/ && perl Makefile.PL
+	cd $(DIR_SRC)/asterisk-perl-0.08/ && make $(MAKETUNING)
+	cd $(DIR_SRC)/asterisk-perl-0.08/ && make install
+	rm -rf $(DIR_SRC)/asterisk-perl-0.08
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-