Updated Asterisk and added chan_capi + capi4k-utils.

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1208 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/lfs/asterisk b/lfs/asterisk
index b02a6e62a8b0997855e7986057b28d8d77ca8012..bc614dd838606c7a9caf7fbb71b207ff947b6bf8 100644 (file)
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.8
+VER        = 1.4.18
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -34,6 +34,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
 PAK_VER    = 2
 
+CHAN_CAPI  = chan_capi-1.0.2
+
 DEPS       = "sox zaptel libpri spandsp libmad"
 
 ###############################################################################
@@ -42,21 +44,24 @@ DEPS       = "sox zaptel libpri spandsp libmad"
 
 objects = $(DL_FILE) \
           asterisk-1.4-de-prompts.tar.gz \
-          asterisk-core-sounds-en-alaw-current.tar.gz \
-          asterisk-extra-sounds-en-alaw-current.tar.gz \
-          asterisk-addons-1.4.2.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 \
+          $(CHAN_CAPI).tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-core-sounds-en-alaw-current.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-alaw-current.tar.gz
-asterisk-extra-sounds-en-alaw-current.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-alaw-current.tar.gz
+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-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
-asterisk-addons-1.4.2.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.2.tar.gz
+asterisk-addons-1.4.5.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.5.tar.gz
+$(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz
 
-$(DL_FILE)_MD5 = 7263ff56ad93cbb5efb971a536ee6a51
-asterisk-core-sounds-en-alaw-current.tar.gz_MD5 = e9446bee485d1b4fca6e8b05457dda25
-asterisk-extra-sounds-en-alaw-current.tar.gz_MD5 = 89bca77c9bb91abd9e87447b3a9d3b07
+$(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
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
-asterisk-addons-1.4.2.tar.gz_MD5 = c080b02e6ddc81dab6a64691af890805
+asterisk-addons-1.4.5.tar.gz_MD5 = 8de9922c0a93321941f29a77a2f1bf13
+$(CHAN_CAPI).tar.gz_MD5 = d4732ecc008e8ef45c38bd2f4d70ef44
 
 install : $(TARGET)
 
@@ -88,19 +93,19 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* && \
+       @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*  $(DIR_SRC)/$(CHAN_CAPI) && \
                cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        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-current.tar.gz \
-               $(DIR_APP)/sounds/asterisk-core-sounds-en-alaw-1.4.7.tar.gz
-       cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-alaw-current.tar.gz \
-               $(DIR_APP)/sounds/asterisk-extra-sounds-en-alaw-1.4.6.tar.gz
+       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
        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.2.tar.gz
+       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 \
@@ -114,4 +119,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        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
+       
+       @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*  $(DIR_SRC)/$(CHAN_CAPI)
        @$(POSTBUILD)

diff --git a/lfs/capi4k-utils b/lfs/capi4k-utils
new file mode 100644 (file)
index 0000000..9546c43
--- /dev/null
+++ b/lfs/capi4k-utils
@@ -0,0 +1,88 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# 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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2005-07-18
+
+THISAPP    = capi4k-utils-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/capi4k-utils
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = c745759b6b3d64e19763727176648cdf
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP)/capiinit && sed -i -e 's/-O2/$(CFLAGS)/' configure
+       cd $(DIR_APP)/capiinit && ./configure
+       cd $(DIR_APP)/capiinit && make $(MAKETUNING)
+       cd $(DIR_APP)/capiinit && make install
+       cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capidyn.c
+       cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capi20.c
+       cd $(DIR_APP)/capi20 && sed -i -e 's/-O2/$(CFLAGS)/' configure
+       cd $(DIR_APP)/capi20 && SED=sed ./configure
+       cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
+       cd $(DIR_APP)/capi20 && make install
+       cd $(DIR_APP)/capiinfo && sed -i -e 's/-O2/$(CFLAGS)/' configure
+       cd $(DIR_APP)/capiinfo && ./configure
+       cd $(DIR_APP)/capiinfo && make $(MAKETUNING)
+       cd $(DIR_APP)/capiinfo && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index 0f50b7019b68c12abf1452c5804fac7e722e1cd1..30e3c84cb5dc3ea7cdd1ba14b0a7aaed8578163d 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -406,6 +406,7 @@ buildipfire() {
   ipfiremake iputils
   ipfiremake l7-protocols
   ipfiremake mISDN
+  ipfiremake capi4k-utils
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate