diff options
| author | Łukasz Jendrysik <scadu@yandex.com> | 2015-03-24 11:29:58 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-03-24 12:03:06 +0000 |
| commit | fc6329529c4a13c42dc9908ec324203503cd4a9a (patch) | |
| tree | 63e8806283f573b367205c494a76b7d372e1a851 /main/mariadb | |
| parent | 5ec8f06a218e87559209446614c0f118ee1d2749 (diff) | |
| download | aports-fc6329529c4a13c42dc9908ec324203503cd4a9a.tar.bz2 aports-fc6329529c4a13c42dc9908ec324203503cd4a9a.tar.xz | |
main/mariadb: upgrade to 5.5.42
Diffstat (limited to 'main/mariadb')
| -rw-r--r-- | main/mariadb/APKBUILD | 23 | ||||
| -rw-r--r-- | main/mariadb/fix-xtradb-storage.patch | 38 |
2 files changed, 9 insertions, 52 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 532cbc473f..6450886bdc 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb -pkgver=5.5.41 -pkgrel=2 +pkgver=5.5.42 +pkgrel=0 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -15,9 +15,7 @@ depends_dev="openssl-dev zlib-dev" makedepends="cmake openssl-dev zlib-dev readline-dev libaio-dev ncurses-dev linux-headers" source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz -$pkgname.initd -fix-xtradb-storage.patch -" +$pkgname.initd" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-common $pkgname-client $pkgname-bench $pkgname-test:mytest @@ -199,12 +197,9 @@ _compat_bench() { _compat mysql-bench; } -md5sums="d2415efc6a6d73d7a58f3c79bb42f2e8 mariadb-5.5.41.tar.gz -01fe0055305d8f974c35d0898245014b mariadb.initd -0bc35376a413719e77808ab778378517 fix-xtradb-storage.patch" -sha256sums="a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332 mariadb-5.5.41.tar.gz -cbf3c99c41310033ed092b38ae0f55bc74334ce4531a6c82f21feff26f25008d mariadb.initd -b83ee0bdf0f1c40f563dc227cb3fa1060ca859cb42222886f66550a3c2fe0b7a fix-xtradb-storage.patch" -sha512sums="727ce6994966a42602ea8f735f34b1b3c342d08b9dae2667e465805bff36e68bf69b582ec0b844b25fb7024f9b25a39280160c2935f639491a1c3654d3166953 mariadb-5.5.41.tar.gz -fccc31e8e67dc21087c4feb3a36d2ac129dccfe6d393172b58834b408faa85ab6f9f70ec423c88ab7613df9ae258a8db990f3c48d69ef2a1906f7e3b4e18c892 mariadb.initd -64505f8a65ceb4e3568b81ba4e58c8c92264f12c3d16a5bf3e9c26978ba6e4f120f653b74a9cabb252540559f1019647ab070a067d90e6cb75ccc4bfca0126bd fix-xtradb-storage.patch" +md5sums="34436f64fe71e8b9c540d43aca9baff1 mariadb-5.5.42.tar.gz +01fe0055305d8f974c35d0898245014b mariadb.initd" +sha256sums="3c868e768f4c24b4aa2f8f1725460d15a5485ed75e17b0755c6e604520e34439 mariadb-5.5.42.tar.gz +cbf3c99c41310033ed092b38ae0f55bc74334ce4531a6c82f21feff26f25008d mariadb.initd" +sha512sums="8fd9916e7ad225ea47936c34a14d37d0e4c9ac182b8791d46d158aa86151cbfe45e54e0b680d281223f175d492765aeadd7565e2a706d86b69696a51761e9769 mariadb-5.5.42.tar.gz +fccc31e8e67dc21087c4feb3a36d2ac129dccfe6d393172b58834b408faa85ab6f9f70ec423c88ab7613df9ae258a8db990f3c48d69ef2a1906f7e3b4e18c892 mariadb.initd" diff --git a/main/mariadb/fix-xtradb-storage.patch b/main/mariadb/fix-xtradb-storage.patch deleted file mode 100644 index 096e87afd0..0000000000 --- a/main/mariadb/fix-xtradb-storage.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- mariadb-5.5.41/storage/xtradb/include/os0stacktrace.h.orig 2014-12-19 11:57:31.000000000 +0100 -+++ mariadb-5.5.41/storage/xtradb/include/os0stacktrace.h 2014-12-27 12:41:11.952594278 +0100 -@@ -20,7 +20,7 @@ - #ifndef os0stacktrace_h - #define os0stacktrace_h - --#ifdef __linux__ -+#if defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS - #if HAVE_EXECINFO_H - #include <execinfo.h> - #endif -@@ -40,5 +40,5 @@ - siginfo_t* info, /*!< in: signal information */ - void* ucontext);/*!< in: signal context */ - --#endif /* __linux__ */ -+#endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */ - #endif /* os0stacktrace.h */ ---- mariadb-5.5.41/storage/xtradb/srv/srv0start.c.orig 2014-12-19 11:57:32.000000000 +0100 -+++ mariadb-5.5.41/storage/xtradb/srv/srv0start.c 2014-12-27 12:48:08.798016960 +0100 -@@ -1274,7 +1274,7 @@ - stacktrace feature. */ - - if (srv_use_stacktrace) { --#ifdef __linux__ -+#if defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS - struct sigaction sigact; - - sigact.sa_sigaction = os_stacktrace_print; -@@ -1287,7 +1287,7 @@ - srv_use_stacktrace = FALSE; - - } --#endif /* __linux__ */ -+#endif /* defined (__linux__) && HAVE_BACKTRACE && HAVE_BACKTRACE_SYMBOLS */ - } - - |