From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Feb 2018 11:55:28 +0000 (+0000)
Subject: asterisk: Do not depend on MySQL any more
X-Git-Tag: v2.19-core120~109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4713705d1e540fc5f977d33cb9aa14b875a930f;p=ipfire-2.x.git

asterisk: Do not depend on MySQL any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index 90a9a7c16a..20472ff86a 100644
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -254,7 +254,6 @@ usr/lib/asterisk/modules/app_minivm.so
 usr/lib/asterisk/modules/app_mixmonitor.so
 usr/lib/asterisk/modules/app_morsecode.so
 usr/lib/asterisk/modules/app_mp3.so
-usr/lib/asterisk/modules/app_mysql.so
 usr/lib/asterisk/modules/app_nbscat.so
 usr/lib/asterisk/modules/app_originate.so
 usr/lib/asterisk/modules/app_page.so
@@ -295,7 +294,6 @@ usr/lib/asterisk/modules/bridge_softmix.so
 usr/lib/asterisk/modules/cdr_csv.so
 usr/lib/asterisk/modules/cdr_custom.so
 usr/lib/asterisk/modules/cdr_manager.so
-usr/lib/asterisk/modules/cdr_mysql.so
 usr/lib/asterisk/modules/cdr_sqlite3_custom.so
 usr/lib/asterisk/modules/cdr_syslog.so
 usr/lib/asterisk/modules/cel_custom.so
@@ -410,7 +408,6 @@ usr/lib/asterisk/modules/res_clialiases.so
 usr/lib/asterisk/modules/res_clioriginate.so
 usr/lib/asterisk/modules/res_config_curl.so
 usr/lib/asterisk/modules/res_config_ldap.so
-usr/lib/asterisk/modules/res_config_mysql.so
 usr/lib/asterisk/modules/res_config_sqlite3.so
 usr/lib/asterisk/modules/res_convert.so
 usr/lib/asterisk/modules/res_crypto.so
@@ -484,7 +481,6 @@ var/ipfire/asterisk/agents.conf
 var/ipfire/asterisk/alarmreceiver.conf
 var/ipfire/asterisk/alsa.conf
 var/ipfire/asterisk/amd.conf
-var/ipfire/asterisk/app_mysql.conf
 var/ipfire/asterisk/app_skel.conf
 var/ipfire/asterisk/ari.conf
 var/ipfire/asterisk/ast_debug_tools.conf
@@ -497,7 +493,6 @@ var/ipfire/asterisk/cdr.conf
 var/ipfire/asterisk/cdr_adaptive_odbc.conf
 var/ipfire/asterisk/cdr_custom.conf
 var/ipfire/asterisk/cdr_manager.conf
-var/ipfire/asterisk/cdr_mysql.conf
 var/ipfire/asterisk/cdr_odbc.conf
 var/ipfire/asterisk/cdr_pgsql.conf
 var/ipfire/asterisk/cdr_sqlite3_custom.conf
@@ -558,7 +553,6 @@ var/ipfire/asterisk/pjsip_notify.conf
 var/ipfire/asterisk/pjsip_wizard.conf
 var/ipfire/asterisk/queuerules.conf
 var/ipfire/asterisk/queues.conf
-var/ipfire/asterisk/res_config_mysql.conf
 var/ipfire/asterisk/res_config_sqlite.conf
 var/ipfire/asterisk/res_config_sqlite3.conf
 var/ipfire/asterisk/res_corosync.conf
diff --git a/lfs/asterisk b/lfs/asterisk
index de2d3192e6..8b0da16486 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -28,7 +28,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 21
+PAK_VER    = 22
 
 DEPS       = "jansson libsrtp opus"
 
@@ -97,9 +97,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# enable additional features (include following sound-tars)
 	cd $(DIR_APP) && make menuselect.makeopts && menuselect/menuselect \
 		--enable res_srtp \
-		--enable app_mysql \
-		--enable cdr_mysql \
-		--enable res_config_mysql \
 		--enable EXTRA-SOUNDS-EN-GSM \
 		--enable MOH-OPSOUND-GSM  \
 		menuselect.makeopts