X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fasterisk;h=e57bb13cea28b25de757c5ef3210d79405b5d3af;hp=d22bd12a0a3c63ae8e5075420774d3651afb21b7;hb=5ac2da9f108762feda085aee7e3c9c16a74b766a;hpb=5f89267744bc0c4bafed04e8ea7f7353e4bad356

diff --git a/lfs/asterisk b/lfs/asterisk
index d22bd12a0a..e57bb13cea 100644
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -26,51 +26,37 @@
 
 include Config
 
-VER        = 1.2.7.1
+VER        = 1.2.9.1
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.asterisk-support.de/mirror/asterisk-1.2.7.1
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-
-ASTERISK   = $(THISAPP)
-ZAPTEL     = zaptel-1.2.5
-BRISTUFF   = bristuff-0.3.0-PRE-1o
-LIBPRI     = libpri-1.2.2
-SPANDSP    = spandsp-0.0.2pre25
-OH323      = asterisk-oh323-0.7.3
+PROG       = asterisk
+PAK_VER    = ipfire-beta1
 
 ###############################################################################
 # 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
+	   apps_Makefile.patch \
+	   asterisk-sounds-de-1.2.5.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 = 5c4b473eee2fbc2cb9e346f0564ef970
-$(ZAPTEL).tar.gz_MD5 = 8c8561259d29a314aa5a076050124697
-$(BRISTUFF).tar.gz_MD5 = 93bb8a5661aaf3022cf4a102ea061f83
-$(LIBPRI).tar.gz_MD5 = efce9c3699110588df5e4cf09eae01d9
+app_rxfax.c = $(URL_IPFIRE)/app_rxfax.c
+app_txfax.c = $(URL_IPFIRE)/app_txfax.c
+apps_Makefile.patch = $(URL_IPFIRE)/apps_Makefile.patch
+asterisk-sounds-de-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-sounds-de-1.2.5.tar.gz
+
+$(DL_FILE)_MD5 = d98fc3dc5ee8df691ca2b0bd309bb251
 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_MD5 = 3793735c44de899dbacb8c192501aa14
 
 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,91 +88,16 @@ $(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/zaptel.patch && \
-	make clean && \
-	make all KVERS=$(KVER)-smp && \
-	make install KVERS=$(KVER)-smp && \
-	make clean && \
-	make all KVERS=$(KVER) && \
-	make install KVERS=$(KVER)
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 zaptel.h /usr/include/linux/zaptel.h
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 zconfig.h /usr/include/linux/zconfig.h
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 ecdis.h /usr/include/linux/ecdis.h
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 fasthdlc.h /usr/include/linux/fasthdlc.h
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 kb1ec.h /usr/include/linux/kb1ec.h
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 kb1ec_const.h /usr/include/linux/kb1ec_const.h
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 biquad.h /usr/include/linux/biquad.h
-	cd $(DIR_SRC)/$(BRISTUFF)/$(ZAPTEL) && install -D -m 644 arith.h /usr/include/linux/arith.h
-	ln -nf -v /usr/include/linux/zaptel.h /usr/include/zaptel.h
-	ln -nf -v /usr/include/linux/zconfig.h /usr/include/zconfig.h
-	ln -nf -v /usr/include/linux/ecdis.h /usr/include/ecdis.h
-	ln -nf -v /usr/include/linux/fasthdlc.h /usr/include/fasthdlc.h
-	ln -nf -v /usr/include/linux/kb1ec.h /usr/include/kb1ec.h
-	ln -nf -v /usr/include/linux/kb1ec_const.h /usr/include/kb1ec_const.h
-	ln -nf -v /usr/include/linux/biquad.h /usr/include/biquad.h
-	ln -nf -v /usr/include/linux/arith.h /usr/include/arith.h
-
-	# Build Libpri
-	cd $(DIR_SRC)/$(BRISTUFF)/$(LIBPRI) && \
-	patch -Np1 < $(DIR_SRC)/src/patches/libpri.patch && \
-	make clean all KVERS=$(KVER) && \
-	make install KVERS=$(KVER)
-
-	# Build libgsmat
-	cd $(DIR_SRC)/$(BRISTUFF)/libgsmat-0.0.1 && \
-	make clean all && \
-	make install
-
-	# Build uno/duo/quad GSM PCI driver
-	cd $(DIR_SRC)/$(BRISTUFF)/ztgsm && \
-	make clean linux24 && \
-	install -D -m 644 ztgsm.o /lib/modules/$(KVER)/misc/ztgsm.o
-
-	# 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 && \
-	patch -Np1 < $(DIR_SRC)/src/patches/zaphfc_0.3.0-PRE-1o_florz-12.diff && \
-	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/asterisk.patch # && \
-	### FAX geht noch nicht mit Asterisk 1.2.7.1
-	# 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)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/asterisk.patch
+	### FAX geht noch nicht mit Asterisk 1.2.9.1
+	# cp -fv $(DIR_DL)/app_{r,t}xfax.c $(DIR_APP)/apps && \
+	# cd $(DIR_APP)/apps && patch < $(DIR_DL)/apps_Makefile.patch
+	cd $(DIR_APP) && make clean
+	cd $(DIR_APP) && make all ASTETCDIR=/var/ipfire/asterisk
+	cd $(DIR_APP) && make install ASTETCDIR=/var/ipfire/asterisk
+	cd $(DIR_APP) && make samples ASTETCDIR=/var/ipfire/asterisk
+	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
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-