diff options
| -rw-r--r-- | main/asterisk/APKBUILD | 6 | ||||
| -rw-r--r-- | main/asterisk/asterisk-mariadb.patch | 33 |
2 files changed, 37 insertions, 2 deletions
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index aefb75d76d..1f3ee04ed1 100644 --- a/main/asterisk/APKBUILD +++ b/main/asterisk/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Timo Teras <timo.teras@iki.fi> pkgname=asterisk pkgver=15.3.0 -pkgrel=0 +pkgrel=1 pkgdesc="Asterisk: A Module Open Source PBX System" pkgusers="asterisk" pkggroups="asterisk" @@ -15,7 +15,7 @@ options="!check" # Test suite is separate, and require separate build makedepends="findutils tar wget bsd-compat-headers libtool ncurses-dev popt-dev newt-dev zlib-dev libedit-dev tiff-dev curl-dev libressl-dev lua-dev libcap-dev jansson-dev util-linux-dev - sqlite-dev postgresql-dev unixodbc-dev freetds-dev mariadb-dev + sqlite-dev postgresql-dev unixodbc-dev freetds-dev mariadb-connector-c-dev alsa-lib-dev pjproject-dev dahdi-tools-dev libpri-dev libsrtp-dev spandsp-dev libresample speex-dev speexdsp-dev libogg-dev bluez-dev libxml2-dev imap-dev" @@ -30,6 +30,7 @@ _download="http://downloads.asterisk.org/pub/telephony/asterisk/releases" source="$_download/asterisk-$pkgver.tar.gz http://dev.alpinelinux.org/~tteras/asterisk-addon-mp3-r201.patch.gz musl-mutex-init.patch + asterisk-mariadb.patch asterisk.initd asterisk.confd @@ -225,6 +226,7 @@ sound_en() { sha512sums="6e4d1d8196cdcdb7ced36682cda86de882cd1d3aa30994434cdedb6f176cd8d4e92cad3abb75ab005affb8b005c135f165abeb9fa50a124d89bd213882929b22 asterisk-15.3.0.tar.gz aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b asterisk-addon-mp3-r201.patch.gz f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e638316d439c68b38ee05362c87503fca1f36343976a01af9d6eb1 musl-mutex-init.patch +c76a882588194372d0c45a2bd1a9a946543f2dc07fde9240b3e600682e9737337c7602da35bfaeddb4d9fe568daa668016237c6f7986e7c44cf5a8dbba291e1f asterisk-mariadb.patch 0044c5db468ec8f2385d18d476f89976f6d036448583a4ef8017ce7a6f8f72105337e6b20037ffe47f561d2877fc9c86720aef23ab037df89b36dc140a5924c4 asterisk.initd ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed asterisk.confd 7591d2faf539d05d9ee4e431c78a5e20686721fd79221ad94dffeeaff9282220b09cb9aec214bd7a8d12affaec0276c9c91e6e21af8b6712c0a9502b60b02f2b asterisk.logrotate" diff --git a/main/asterisk/asterisk-mariadb.patch b/main/asterisk/asterisk-mariadb.patch new file mode 100644 index 0000000000..dab4d988a7 --- /dev/null +++ b/main/asterisk/asterisk-mariadb.patch @@ -0,0 +1,33 @@ +diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c +index 00c75dd..bc405bb 100644 +--- a/addons/cdr_mysql.c ++++ b/addons/cdr_mysql.c +@@ -43,6 +43,7 @@ + #include "asterisk.h" + + #include <mysql/mysql.h> ++#include <mysql/mariadb_version.h> + #include <mysql/errmsg.h> + + #include "asterisk/config.h" +@@ -501,7 +502,7 @@ static int my_load_module(int reload) + res |= my_load_config_string(cfg, "global", "ssl_cert", &ssl_cert, ""); + res |= my_load_config_string(cfg, "global", "ssl_key", &ssl_key, ""); + +- res |= my_load_config_number(cfg, "global", "port", &dbport, MYSQL_PORT); ++ res |= my_load_config_number(cfg, "global", "port", &dbport, MARIADB_PORT); + res |= my_load_config_number(cfg, "global", "timeout", &timeout, 0); + res |= my_load_config_string(cfg, "global", "compat", &compat, "no"); + res |= my_load_config_string(cfg, "global", "cdrzone", &cdrzone, ""); +diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c +index ae43485..94d3b35 100644 +--- a/addons/res_config_mysql.c ++++ b/addons/res_config_mysql.c +@@ -33,6 +33,7 @@ + #include <sys/stat.h> + + #include <mysql/mysql.h> ++#include <mysql/mariadb_version.h> + #include <mysql/errmsg.h> + + #include "asterisk/channel.h" |