diff options
| -rw-r--r-- | main/mariadb/APKBUILD | 19 | ||||
| -rw-r--r-- | main/mariadb/musl-fix-inttype.patch | 22 |
2 files changed, 32 insertions, 9 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index cc08004b21..fe8bc44b39 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -3,8 +3,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=5.5.43 -pkgrel=5 +pkgver=10.0.21 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -18,7 +18,8 @@ makedepends="cmake openssl-dev zlib-dev readline-dev libaio-dev ncurses-dev source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz $pkgname.initd fix-mysql-install-db-path.patch - mariadb-10.0.18-MDEV-8115.patch" + musl-fix-inttype.patch + " subpackages="$pkgname-doc $pkgname-dev $pkgname-common $pkgname-libs $pkgname-client $pkgname-bench $pkgname-test:mytest @@ -178,15 +179,15 @@ mysql() { _compat mysql mariadb; } _compat_client() { _compat mysql-client mariadb-client; } _compat_bench() { _compat mysql-bench mariadb-client; } -md5sums="c8760d6b5890fc1de76c07af48092c88 mariadb-5.5.43.tar.gz +md5sums="956561f3798d1fe8dfbe4b665287a87a mariadb-10.0.21.tar.gz 62fb1ce5bad87bb15cf8e289ce686885 mariadb.initd bcaee4dbbf77f4432ecd9796714be75b fix-mysql-install-db-path.patch -4be445c305df3cca61aa9a40a1886964 mariadb-10.0.18-MDEV-8115.patch" -sha256sums="a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01 mariadb-5.5.43.tar.gz +14adb188bde2359d94a5d661ab793cee musl-fix-inttype.patch" +sha256sums="4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 mariadb-10.0.21.tar.gz 696fa87b87f37b6c310da6c1ef5f8759bd5b4b1654fbcf0561c9f0592bfa8dd9 mariadb.initd 52e3827529b53c02a9ba263bd395bde773d2666853b252a131e824bb256f36d5 fix-mysql-install-db-path.patch -fee272aaaf1f3c427e986a4fa4c4c9362b45181ce4799e60f3ba856aedf2efa7 mariadb-10.0.18-MDEV-8115.patch" -sha512sums="fa9b463843ebf70e3a462ee5fdfa34aedd35194f3593f7ec1fc5f17663e798610ade46925b31f9f96e06503508ae840bfed54ae7b6661affa4d5b630d475f1db mariadb-5.5.43.tar.gz +2a66efddb9c5e8076da3d9c602bbfb9413917ab4b5d1015459f550da8ac10c87 musl-fix-inttype.patch" +sha512sums="75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f mariadb-10.0.21.tar.gz 510207ba29ef40e017840fb39bc51285374d2e2ed0d70eb65916e5415e6a993af19b4fd3b579af89173b1e3b0d7c5115d8f43b22c16596b4a83a9f8353154400 mariadb.initd 4aca6e42f4dec9d7122388b1d1bc40762a4677a1beafcf448b900d443a2f778a8fd52bc7f1b5c9697e0ad13473e6d01eb29607a40de195ac07857cd4dfc2a1fe fix-mysql-install-db-path.patch -e8e370bb0d09151ea718a5e09c4f92c4d9d2e05e59699e1a0fb2003bc161f16a0397cd1bc4ebca2a7e74595ad159bb225e559192658b1bdeb7534d8f80558d35 mariadb-10.0.18-MDEV-8115.patch" +17ee255222ec9d7601554e607586ac1d0a0b818a4547e30a2739e7163df0439357b011f6848fbff4d28e93830256165a29ce8b20f25256d493d4605f253061ef musl-fix-inttype.patch" diff --git a/main/mariadb/musl-fix-inttype.patch b/main/mariadb/musl-fix-inttype.patch new file mode 100644 index 0000000000..dd59df586e --- /dev/null +++ b/main/mariadb/musl-fix-inttype.patch @@ -0,0 +1,22 @@ +diff --git a/storage/mroonga/vendor/groonga/lib/com.c b/storage/mroonga/vendor/groonga/lib/com.c +index eb1cacf..d26741e 100644 +--- a/storage/mroonga/vendor/groonga/lib/com.c ++++ b/storage/mroonga/vendor/groonga/lib/com.c +@@ -351,7 +351,7 @@ grn_com_event_add(grn_ctx *ctx, grn_com_event *ev, grn_sock fd, int events, grn_ + struct epoll_event e; + memset(&e, 0, sizeof(struct epoll_event)); + e.data.fd = (fd); +- e.events = (__uint32_t) events; ++ e.events = (uint32_t) events; + if (epoll_ctl(ev->epfd, EPOLL_CTL_ADD, (fd), &e) == -1) { + SERR("epoll_ctl"); + return ctx->rc; +@@ -399,7 +399,7 @@ grn_com_event_mod(grn_ctx *ctx, grn_com_event *ev, grn_sock fd, int events, grn_ + struct epoll_event e; + memset(&e, 0, sizeof(struct epoll_event)); + e.data.fd = (fd); +- e.events = (__uint32_t) events; ++ e.events = (uint32_t) events; + if (epoll_ctl(ev->epfd, EPOLL_CTL_MOD, (fd), &e) == -1) { + SERR("epoll_ctl"); + return ctx->rc; |