From 20aab3bf93e67dea45c5658149f77ee6fd00110f Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sat, 17 Aug 2019 21:44:46 +0000 Subject: user/mariadb: bump to 10.4.7 --- user/mariadb/APKBUILD | 6 ++++-- user/mariadb/types.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 user/mariadb/types.patch diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index 0b211f2ce..aca78406b 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Dan Theisen # Maintainer: Dan Theisen pkgname=mariadb -pkgver=10.4.6 +pkgver=10.4.7 pkgrel=0 pkgdesc="Open source database server" url="https://mariadb.org/" @@ -29,6 +29,7 @@ source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariad gcc_builtins_ppc.h libedit.patch ppchax.patch + types.patch mariadb.initd mariadb-server.limits " @@ -262,10 +263,11 @@ doc() { default_doc } -sha512sums="b04c47f72de2473d7b5edd04b4785a1d7179bb1f429f30ba53ae6cfbbb413200d9803eff1072949b2e81fd7d2164ea34c68620d621d4181b913daa2293ae140c mariadb-10.4.6.tar.gz +sha512sums="cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce mariadb-10.4.7.tar.gz 03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch 15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h 41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch 0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch +8dda61a8e0bc3d1712de36bc53e39dc348bc5bc9e37de37b644977df6144f8ee588e55674466dc8d45624d0cad91cc1e3d15e3951214d6d4fe783465592b1a2e types.patch 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" diff --git a/user/mariadb/types.patch b/user/mariadb/types.patch new file mode 100644 index 000000000..7f2917b47 --- /dev/null +++ b/user/mariadb/types.patch @@ -0,0 +1,11 @@ +--- mariadb-10.4.7/plugin/auth_pam/testing/pam_mariadb_mtr.c.old 2019-07-30 11:32:16.000000000 +0000 ++++ mariadb-10.4.7/plugin/auth_pam/testing/pam_mariadb_mtr.c 2019-08-17 21:37:59.264353123 +0000 +@@ -56,7 +56,7 @@ + if (strcmp(r1, "crash pam module") == 0 && atoi(r2) == 616) + abort(); + +- if (strlen(r1) == (uint)atoi(r2) % 100) ++ if (strlen(r1) == (unsigned int)atoi(r2) % 100) + retval = PAM_SUCCESS; + else + retval = PAM_AUTH_ERR; -- cgit v1.2.3-70-g09d2