From 8315717d33df0a0051de4040249fa4784ae5db74 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 26 Mar 2018 10:50:30 +0000
Subject: testing/kannel: rebuild against mariadb-connector-c

---
 testing/kannel/APKBUILD      | 27 +++++++--------------------
 testing/kannel/mariadb.patch | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 testing/kannel/mariadb.patch

(limited to 'testing')

diff --git a/testing/kannel/APKBUILD b/testing/kannel/APKBUILD
index 89c8c0c368..cdb3cbc550 100644
--- a/testing/kannel/APKBUILD
+++ b/testing/kannel/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer:
 pkgname=kannel
 pkgver=1.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Opensource WAP/SMS Gateway"
 url="http://www.kannel.org"
 arch="all"
 license="custom"
 depends=""
-depends_dev="libxml2-dev mariadb-dev postgresql-dev pcre-dev sqlite-dev"
+depends_dev="libxml2-dev mariadb-connector-c-dev postgresql-dev pcre-dev sqlite-dev"
 makedepends="$depends_dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
@@ -19,7 +19,9 @@ source="http://www.kannel.org/download/$pkgver/gateway-$pkgver.tar.bz2
 	$pkgname.initd
 	$pkgname.confd
 	fix-arm-build.patch
-	kannel-1.5.0-custom-wap-ports.patch"
+	kannel-1.5.0-custom-wap-ports.patch
+	mariadb.patch
+	"
 
 builddir="$srcdir"/gateway-$pkgver
 
@@ -55,22 +57,6 @@ package() {
 	install -D -m 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums="7809cccaef27d1fad07618831e0ef4b5  gateway-1.5.0.tar.bz2
-6c6acbe564dab69b100230c486bca6bc  kannel-bearerbox.initd
-9eb19bf89c29648611a7aa8686d2c385  kannel-smsbox.initd
-3ed7268481e81b4af9602e45187d09da  kannel-wapbox.initd
-3c8b53c560edb5bb2372c146d752d15b  kannel.initd
-b77f55cded4c364d155c302e81eb07c6  kannel.confd
-291b6b0d99b4ff334ee7c07bab808d73  fix-arm-build.patch
-d17d349b71d5c59ebf25c1160e20178f  kannel-1.5.0-custom-wap-ports.patch"
-sha256sums="e882cd2641985922a6629788691f12deb3e1d36a96cc1091df9416825bb1506a  gateway-1.5.0.tar.bz2
-17bec60531f2f42468b392c3c35b783a6237ca6731116d915e648adf1fbea072  kannel-bearerbox.initd
-96acf214452733d41cdc564c209128b7f3b667ae00dda3720004708fb8960475  kannel-smsbox.initd
-700af491b04ebe5d4b0522211c165a6d0aa898f99098b89d90f790759cfec54f  kannel-wapbox.initd
-c1dc73405ddde6fd9ab3645298ee690c2e48b7bee19146eece711555e9e85aa8  kannel.initd
-78afde2b41edad9338894b2eab5968c2c93a2a657745d0bb8d2d1ba401d7cee0  kannel.confd
-3a91a795aa7315e5c8dc5f38bb9fb6234cf13b28794606cab27d7f664f8722cd  fix-arm-build.patch
-024874118ccb7ff2d0a4a42229b3639910bec6bbc02b6d251097303599392aa3  kannel-1.5.0-custom-wap-ports.patch"
 sha512sums="dff990a6856e23bd4c88f993f8a1973b35b02e7408410e228710611cb0fc4c70899bed3703e811c39af24e968fbe3b8e9c4eeac4f76dd68d8caa5287012fa289  gateway-1.5.0.tar.bz2
 aff82592ed5f5ef0af00e04a6f1013f1601141ce00d0c5c281d394661f9ffe332745bc825cc4873286ad69580ae6a8067c6ee0840e8683904e74defcf8cfa16e  kannel-bearerbox.initd
 673ea6a0c30474c94ca04b79b558a68c91a79510d7b31d380c206f3b283a73d5bbe188d62769d748247c708af5eee01ceba343db70d52718c8a035fdd5ea863a  kannel-smsbox.initd
@@ -78,4 +64,5 @@ a64dfbbb1382e0494354efcc4d549c186a5f0c492ea2a064a20355369972e00a023bdade4bcb3262
 e76c98a276953562ef05c23209270551fe431618ca83f90f557d510dd78f512e9844f9431f89ca7ad97af844af1536678a26395a4ebb438ec800ea35e3144032  kannel.initd
 042840638cc5166cf6a76d76c7b6c96aa3c77648a50f4e316195d564fde47a9ad3d6b66d5283175f8f2053171ae785772609b49f8db88579a0bfcda757ecbe0a  kannel.confd
 41a7e7ab2b28eff87dffe878da0c645c77dc5de53f8811db8800d8f243681cb02fbf653b1b467ce19740101760cdeb7132ed555af6c6803ef740f805b0d559eb  fix-arm-build.patch
-cd71a435feadb43533ed06cf0a1f9e556131f5339951cc1971c9ebf922a5e028b390af978441d7d3fde68022f9c67fe3af69be737d9952614486613f7ba29d23  kannel-1.5.0-custom-wap-ports.patch"
+cd71a435feadb43533ed06cf0a1f9e556131f5339951cc1971c9ebf922a5e028b390af978441d7d3fde68022f9c67fe3af69be737d9952614486613f7ba29d23  kannel-1.5.0-custom-wap-ports.patch
+5a77ff1424bfe9d23929c156a972d56b3f5bd1ad97b67ba096449916612375e3a80745b564664ed9b009555ffb4a21ce300aea63938a4c6564f758a1e1c69b05  mariadb.patch"
diff --git a/testing/kannel/mariadb.patch b/testing/kannel/mariadb.patch
new file mode 100644
index 0000000000..26f6cac15e
--- /dev/null
+++ b/testing/kannel/mariadb.patch
@@ -0,0 +1,17 @@
+diff --git a/gwlib/utils.c b/gwlib/utils.c
+index b772bfb..7afdcaf 100644
+--- a/gwlib/utils.c
++++ b/gwlib/utils.c
+@@ -513,8 +513,12 @@ Octstr *version_report_string(const char *boxname)
+              OPENSSL_VERSION_TEXT,
+ #endif
+ #ifdef HAVE_MYSQL
++#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION
++             MARIADB_CLIENT_VERSION_STR, mysql_get_client_info(),
++#else
+              MYSQL_SERVER_VERSION, mysql_get_client_info(),
+ #endif
++#endif
+ #ifdef HAVE_SDB
+              LIBSDB_VERSION,
+ #endif
-- 
cgit v1.2.3