From 6f61f8c6ba3bf1910426e0b17ba7fa80a53feefb Mon Sep 17 00:00:00 2001
From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Fri, 29 Dec 2006 16:22:29 +0000
Subject: [PATCH] Asterisk aktualisiert. --> 1.4.0 Hoffentlich gibt es endlich
 mal wieder nen Bristuff dafuer... PXE-Namen geaendert.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@370 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---
 doc/packages-list.txt |  3 +++
 lfs/asterisk          | 37 +++++++++++++------------------------
 lfs/libpri            |  8 ++------
 lfs/pxe               |  2 +-
 lfs/zaptel            | 12 +++++++-----
 5 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d6c2ccf166..dc1f0ef838 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -31,6 +31,7 @@
 * applejuice-0.30
 * arping-2.05
 * asterisk-1.2.13
+* asterisk-1.4.0
 * autoconf-2.59
 * automake-1.9.6
 * bash-3.1
@@ -123,6 +124,7 @@
 * libpcap-0.8.3
 * libpng-1.2.12
 * libpri-1.2.4
+* libpri-1.4.0
 * libsafe_2.0-16
 * libtool-1.5.22
 * libusb-0.1.12
@@ -237,4 +239,5 @@
 * xvidcore-1.1.0
 * yasuc-0.4.1
 * zaptel-1.2.10
+* zaptel-1.4.0
 * zlib-1.2.3
diff --git a/lfs/asterisk b/lfs/asterisk
index 17454daa7d..040b3c5683 100644
--- 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)
diff --git a/lfs/libpri b/lfs/libpri
index 946688c4b2..b3c597129b 100644
--- a/lfs/libpri
+++ b/lfs/libpri
@@ -26,15 +26,13 @@
 
 include Config
 
-VER        = 1.2.4
+VER        = 1.4.0
 
 THISAPP    = libpri-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libpri
-PAK_VER    = 1
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2bc348d8363027736ccbf5998d85d317
+$(DL_FILE)_MD5 = 09b039226e43a810d523bc076823c6a9
 
 install : $(TARGET)
 
@@ -80,7 +78,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 #	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libpri.patch
 	cd $(DIR_APP) && make $(MAKETUNING) clean all KVERS=$(KVER)
 	cd $(DIR_APP) && make install KVERS=$(KVER)
-#	find /lib/modules/$(KVER)/misc/ -name '*.o' -a -type f | xargs gzip -f9
-#	find /lib/modules/$(KVER)-smp/misc/ -name '*.o' -a -type f | xargs gzip -f9
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/pxe b/lfs/pxe
index 2ac5690294..66f33d3613 100644
--- a/lfs/pxe
+++ b/lfs/pxe
@@ -70,5 +70,5 @@ $(TARGET) :
 	ln -s $(SNAME)-pxe-$(VERSION).model /tmp/pxelinux.cfg/default
 	chmod 444 /tmp/$(VERSION)/instroot.gz
 	cd /tmp && tar cvzf \
-		/install/images/$(SNAME)-$(VERSION)-pxe-$(MACHINE).tgz *
+		/install/images/$(SNAME)-$(VERSION).$(MACHINE)-pxe.tgz *
 	rm -rf /tmp/*
diff --git a/lfs/zaptel b/lfs/zaptel
index e82b803665..90d47a7874 100644
--- a/lfs/zaptel
+++ b/lfs/zaptel
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 1.2.10
+VER        = 1.4.0
 
 THISAPP    = zaptel-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 25f9a78272104efdbd44261e33edb725
+$(DL_FILE)_MD5 = 27b43dfa3f1629f063a20779300f68c8
 
 install : $(TARGET)
 
@@ -82,12 +82,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	# Build Zaptel
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch
+#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/zaptel.patch
 ifeq "$(PASS)" "S"
-	cd $(DIR_APP) && make $(MAKETUNING) linux26 KVERS=$(KVER)-smp
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make linux26 KVERS=$(KVER)-smp
 	cd $(DIR_APP) && make install KVERS=$(KVER)-smp
 else
-	cd $(DIR_APP) && make $(MAKETUNING) linux26 KVERS=$(KVER)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make linux26 KVERS=$(KVER)
 	cd $(DIR_APP) && make install KVERS=$(KVER)
 endif
 	cd $(DIR_APP) && install -D -m 644 zaptel.h /usr/include/zaptel.h
-- 
2.39.2