diff options
Diffstat (limited to 'main/mariadb')
| -rw-r--r-- | main/mariadb/0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch | 37 | ||||
| -rw-r--r-- | main/mariadb/APKBUILD | 24 | ||||
| -rw-r--r-- | main/mariadb/musl-fix-inttype.patch | 22 |
3 files changed, 8 insertions, 75 deletions
diff --git a/main/mariadb/0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch b/main/mariadb/0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch deleted file mode 100644 index 219cddc52a..0000000000 --- a/main/mariadb/0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 790b56fcbce73e3335565eb1d8f0cdab5e596dba Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 24 Aug 2015 11:55:59 +0200 -Subject: [PATCH] Fix segfault with musl libc due to bad use of strerror_r - -The only known implementation that has the GNU variand of strerror_r is -GNU libc. Building with musl libc and _GNU_SOURCE enables some other gnu -extensions, but musl libc does not implement the broken strerror_r. - -We fix thsi by check explicitly for GNU libc in addition to _GNU_SOURCE -and if they both are not set, then fall back to standard. - -This fixes segfault with musl libc. ---- - strings/my_vsnprintf.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/strings/my_vsnprintf.c b/strings/my_vsnprintf.c -index 1584a9e..4a10413 100644 ---- a/strings/my_vsnprintf.c -+++ b/strings/my_vsnprintf.c -@@ -827,11 +827,7 @@ void my_strerror(char *buf, size_t len, int nr) - */ - #if defined(__WIN__) - strerror_s(buf, len, nr); --#elif ((defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE >= 200112L)) || \ -- (defined _XOPEN_SOURCE && (_XOPEN_SOURCE >= 600))) && \ -- ! defined _GNU_SOURCE -- strerror_r(nr, buf, len); /* I can build with or without GNU */ --#elif defined _GNU_SOURCE -+#elif defined(__GLIBC__) && defined(_GNU_SOURCE) - char *r= strerror_r(nr, buf, len); - if (r != buf) /* Want to help, GNU? */ - strmake(buf, r, len - 1); /* Then don't. */ --- -2.5.0 - diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 6b3b0ff244..4a31095756 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -3,8 +3,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=10.1.11 -pkgrel=1 +pkgver=10.1.12 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -18,9 +18,7 @@ makedepends="cmake openssl-dev zlib-dev readline-dev libaio-dev ncurses-dev install="$pkgname.pre-install" source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz $pkgname.initd - musl-fix-inttype.patch fix-mysql-install-db-path.patch - 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch " subpackages="$pkgname-doc $pkgname-dev $pkgname-common $pkgname-libs @@ -178,18 +176,12 @@ mysql() { _compat mysql mariadb; } _compat_client() { _compat mysql-client mariadb-client; } _compat_bench() { _compat mysql-bench mariadb-client; } -md5sums="c199608ae4282f16007dc8c270ff2439 mariadb-10.1.11.tar.gz +md5sums="a2c0809f27ec112139c2c50f03569b2b mariadb-10.1.12.tar.gz 2cf887d864e05947f5b831bd7ca06b74 mariadb.initd -14adb188bde2359d94a5d661ab793cee musl-fix-inttype.patch -b233fb7015a9659f5b825cd8010d2b52 fix-mysql-install-db-path.patch -b32eed97ab575140685eeae4a56205a2 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch" -sha256sums="cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce mariadb-10.1.11.tar.gz +b233fb7015a9659f5b825cd8010d2b52 fix-mysql-install-db-path.patch" +sha256sums="795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 mariadb-10.1.12.tar.gz 49bab0ec69432d5c56c53ff83488bfa5eb2859bc95a12e8fc7f12d1f0403f0c6 mariadb.initd -2a66efddb9c5e8076da3d9c602bbfb9413917ab4b5d1015459f550da8ac10c87 musl-fix-inttype.patch -0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904 fix-mysql-install-db-path.patch -2253fa4b0470d4bcfb183967f7658f04867a31b3ce1ffbe22926a52bf595c616 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch" -sha512sums="5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b mariadb-10.1.11.tar.gz +0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904 fix-mysql-install-db-path.patch" +sha512sums="c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 mariadb-10.1.12.tar.gz 53d28d688fc9b45684f8368971c01424e5388d39dfaad8b2c432c54d5fabadf2388786303e92c5ca734cb95b4618863c23f7be2a618efc97854536c3a9dc1240 mariadb.initd -17ee255222ec9d7601554e607586ac1d0a0b818a4547e30a2739e7163df0439357b011f6848fbff4d28e93830256165a29ce8b20f25256d493d4605f253061ef musl-fix-inttype.patch -f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch -ff1390b4718cfa6cd02947a82a404ea51483678a5cb52651c3b9d243dbc17c3b37df1013aeab618fa1077f930e75ac104168d7853880b0e2e95a32a9bcd5a2f2 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch" +f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch" diff --git a/main/mariadb/musl-fix-inttype.patch b/main/mariadb/musl-fix-inttype.patch deleted file mode 100644 index dd59df586e..0000000000 --- a/main/mariadb/musl-fix-inttype.patch +++ /dev/null @@ -1,22 +0,0 @@ -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; |