upnp.cgi und status.cgi von Maniac eingebaut

[people/pmueller/ipfire-2.x.git] / lfs / asterisk

diff --git a/lfs/asterisk b/lfs/asterisk
index 17454daa7d51f6537218944960ac60c8767f6c1d..040b3c56839fdd13040c2cc21b7e67791b662b6b 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 1.2.13
+VER        = 1.4.0
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -41,30 +41,21 @@ PAK_VER    = 1
 ###############################################################################
 
 objects = $(DL_FILE) \
-          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.2.5.tar.gz \
+          asterisk-addons-1.4.0.tar.gz \
           asterisk-perl-0.08.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-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
 asterisk-sounds-1.2.1.tar.gz = $(URL_IPFIRE)/asterisk-sounds-1.2.1.tar.gz
-asterisk-addons-1.2.5.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.2.5.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 = ad8fbe2198568f55c254045ecb3b7926
-app_rxfax.c_MD5 = ab6983b51c412883545b36993d704999
-app_txfax.c_MD5 = 8c8fcb263b76897022b4c28052a7b439
-apps_Makefile.patch_MD5 = 6b0faa7a7cf8613962b17c23ee5a1583
+$(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.2.5.tar.gz_MD5 = 2bc743cb622986873b5fd5be0f013034
+asterisk-addons-1.4.0.tar.gz_MD5 = 603de356bc330bf117c765ced6ede746
 asterisk-perl-0.08.tar.gz_MD5 = 73a47caaff8cafbf78053692f408ceb6
 
 install : $(TARGET)
@@ -100,21 +91,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @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
-       ### FAX geht noch nicht mit Asterisk
-       # 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 $(MAKETUNING) all ASTETCDIR=/var/ipfire/asterisk
-       cd $(DIR_APP) && make install ASTETCDIR=/var/ipfire/asterisk
-       cd $(DIR_APP) && make samples ASTETCDIR=/var/ipfire/asterisk
+       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.2.5.tar.gz
-       cd $(DIR_SRC)/asterisk-addons-1.2.5/ && make $(MAKETUNING) all install
-       rm -rf $(DIR_SRC)/asterisk-addons-1.2.5
+       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)