Attachment 113147 Details for Bug 154689 – file.diff

[patch] file.diff

file.diff (text/plain), 3.58 KB, created by Panagiotis Christias on 2011-02-11 16:50:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Panagiotis Christias

Created: 2011-02-11 16:50:07 UTC

Size: 3.58 KB

patch

obsolete

>diff -r -u -N asterisk.orig/Makefile asterisk/Makefile
>--- asterisk.orig/Makefile	2011-01-27 12:20:47.000000000 +0200
>+++ asterisk/Makefile	2011-02-11 18:34:37.000000000 +0200
>@@ -47,6 +47,7 @@
> 		IODBC		"Enable iODBC support" off \
> 		UODBC		"Enable unixODBC support" on \
> 		POSTGRES	"Enable PostgreSQL support" on \
>+		MYSQL		"Enable MySQL support" off \
> 		RADIUS		"Enable RADIUS accounting support" on \
> 		SNMP		"Enable SNMP support" on \
> 		H323		"Enable H.323 support" on \
>@@ -153,6 +154,14 @@
> CONFIGURE_ARGS+=	--with-postgres
> .endif
> 
>+.if !defined(WITH_MYSQL)
>+PLIST_SUB+=	WITH_MYSQL="@comment "
>+.else
>+PLIST_SUB+=	WITH_MYSQL=""
>+USE_MYSQL=	yes
>+EXTRA_PATCHES+=	${PATCHDIR}/menuselect-tree.diff
>+.endif
>+
> .if !defined(WITH_OGGVORBIS)
> PLIST_SUB+=	WITH_OGGVORBIS="@comment "
> CONFIGURE_ARGS+=	--without-ogg
>diff -r -u -N asterisk.orig/files/menuselect-tree.diff asterisk/files/menuselect-tree.diff
>--- asterisk.orig/files/menuselect-tree.diff	1970-01-01 02:00:00.000000000 +0200
>+++ asterisk/files/menuselect-tree.diff	2011-02-11 17:34:39.000000000 +0200
>@@ -0,0 +1,25 @@
>+--- menuselect-tree.orig	2011-02-11 17:33:25.000000000 +0200
>++++ menuselect-tree	2011-02-11 17:33:52.000000000 +0200
>+@@ -4,14 +4,12 @@
>+ <category name="MENUSELECT_ADDONS" displayname="Add-ons (See README-addons.txt)" remove_on_change="addons/modules.link">
>+ <member name="app_mysql" displayname="Simple Mysql Interface" remove_on_change="addons/app_mysql.o addons/app_mysql.so">
>+ 	<depend>mysqlclient</depend>
>+-	<defaultenabled>no</defaultenabled>
>+ </member>
>+ <member name="app_saycountpl" displayname="Say polish counting words" remove_on_change="addons/app_saycountpl.o addons/app_saycountpl.so">
>+ 	<defaultenabled>no</defaultenabled>
>+ </member>
>+ <member name="cdr_mysql" displayname="MySQL CDR Backend" remove_on_change="addons/cdr_mysql.o addons/cdr_mysql.so">
>+ 	<depend>mysqlclient</depend>
>+-	<defaultenabled>no</defaultenabled>
>+ </member>
>+ <member name="chan_mobile" displayname="Bluetooth Mobile Device Channel Driver" remove_on_change="addons/chan_mobile.o addons/chan_mobile.so">
>+ 	<depend>bluetooth</depend>
>+@@ -25,7 +23,6 @@
>+ </member>
>+ <member name="res_config_mysql" displayname="MySQL RealTime Configuration Driver" remove_on_change="addons/res_config_mysql.o addons/res_config_mysql.so">
>+ 	<depend>mysqlclient</depend>
>+-	<defaultenabled>no</defaultenabled>
>+ </member>
>+ </category>
>+ <category name="MENUSELECT_APPS" displayname="Applications" remove_on_change="apps/modules.link">
>diff -r -u -N asterisk.orig/pkg-plist asterisk/pkg-plist
>--- asterisk.orig/pkg-plist	2010-12-29 14:47:09.000000000 +0200
>+++ asterisk/pkg-plist	2011-02-11 17:56:48.000000000 +0200
>@@ -426,6 +426,7 @@
> lib/asterisk/modules/app_celgenuserevent.so
> lib/asterisk/modules/app_confbridge.so
> lib/asterisk/modules/app_minivm.so
>+%%WITH_MYSQL%%lib/asterisk/modules/app_mysql.so
> lib/asterisk/modules/app_originate.so
> lib/asterisk/modules/app_playtones.so
> lib/asterisk/modules/app_readexten.so
>@@ -533,6 +534,7 @@
> lib/asterisk/modules/cdr_csv.so
> lib/asterisk/modules/cdr_custom.so
> lib/asterisk/modules/cdr_manager.so
>+%%WITH_MYSQL%%lib/asterisk/modules/cdr_mysql.so
> %%WITH_POSTGRES%%lib/asterisk/modules/cdr_pgsql.so
> %%WITH_RADIUS%%lib/asterisk/modules/cdr_radius.so
> %%WITH_SQLITE%%lib/asterisk/modules/cdr_sqlite.so
>@@ -613,6 +615,7 @@
> lib/asterisk/modules/res_calendar.so
> %%WITH_EXCHANGE%%lib/asterisk/modules/res_calendar_ews.so
> lib/asterisk/modules/res_clioriginate.so
>+%%WITH_MYSQL%%lib/asterisk/modules/res_config_mysql.so
> %%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
> lib/asterisk/modules/res_convert.so
> lib/asterisk/modules/res_crypto.so

Actions: View | Diff

Attachments on bug 154689: 113147