From 65418d1d211b9425013b0f8dcefa9b944a62d1bb Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Thu, 10 Jul 2014 10:38:03 +0200 Subject: [PATCH] asterisk addon: moved libsrtp to seperate lfs. --- config/rootfiles/packages/asterisk | 2 +- lfs/asterisk | 7 --- lfs/libsrtp | 78 ++++++++++++++++++++++++++++++ make.sh | 1 + 4 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 lfs/libsrtp diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 32f8aafe39..f7869f1f64 100755 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -1,4 +1,4 @@ -#usr/lib/libsrtp.a +usr/lib/libsrtp.so etc/asterisk etc/logrotate.d/asterisk etc/rc.d/rc0.d/K30asterisk diff --git a/lfs/asterisk b/lfs/asterisk index b52c680e3b..8896392aa6 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -37,19 +37,16 @@ DEPS = "sqlite" ############################################################################### objects = $(DL_FILE) \ - libsrtp-1.4.5-99426a54.tar.gz \ asterisk-1.4-de-prompts.tar.gz \ asterisk-extra-sounds-en-gsm-1.4.14.tar.gz \ asterisk-moh-opsound-gsm-2.03.tar.gz $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -libsrtp-1.4.5-99426a54.tar.gz = $(URL_IPFIRE)/libsrtp-1.4.5-99426a54.tar.gz asterisk-extra-sounds-en-gsm-1.4.14.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.14.tar.gz asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz $(DL_FILE)_MD5 = 47384cd1ff48b306dca6e03027b023bd -libsrtp-1.4.5-99426a54.tar.gz_MD5 = 05bfbe63a2a27343889c2436c836110a asterisk-extra-sounds-en-gsm-1.4.14.tar.gz_MD5 = ffc2e0ffd783c03fef5b75277dba0896 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c @@ -85,10 +82,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - # build srtp - @rm -rf $(DIR_SRC)/srtp && cd $(DIR_SRC) && tar zxf $(DIR_DL)/libsrtp-1.4.5-99426a54.tar.gz - cd $(DIR_SRC)/libsrtp-1.4.5 && ./configure --prefix=/usr && make uninstall && make && make install - # remove old directories and extract asterisk @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) diff --git a/lfs/libsrtp b/lfs/libsrtp new file mode 100644 index 0000000000..9eb0cd2a2f --- /dev/null +++ b/lfs/libsrtp @@ -0,0 +1,78 @@ +############################################################################### +# # +# 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 . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.4.5 +SUBVER = 99426a54 +THISAPP = libsrtp-$(VER) +DL_FILE = $(THISAPP)-$(SUBVER).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 05bfbe63a2a27343889c2436c836110a + +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 axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make uninstall && make $(MAKETUNING) libsrtp.so + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index f756033c6a..a76f216343 100755 --- a/make.sh +++ b/make.sh @@ -738,6 +738,7 @@ buildipfire() { ipfiremake nut ipfiremake watchdog ipfiremake libpri + ipfiremake libsrtp ipfiremake asterisk ipfiremake lcr ipfiremake usb_modeswitch -- 2.39.2