| 1 |
commit: 912b2cf39807f29cb4428dfd09e42e2d7f40a246 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 18 02:40:34 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 18 02:40:34 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=912b2cf3 |
| 7 |
|
| 8 |
dev-db/mariadb: Version bump for 10.3.11 |
| 9 |
|
| 10 |
Includes fixes for dangling symlink QA report |
| 11 |
and pkg_config path for my_print_defaults |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/673348 |
| 14 |
Closes: https://bugs.gentoo.org/673298 |
| 15 |
Closes: https://bugs.gentoo.org/660972 |
| 16 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 17 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-db/mariadb/Manifest | 1 + |
| 20 |
.../mariadb/{mariadb-10.3.10-r1.ebuild => mariadb-10.3.11.ebuild} | 6 +++++- |
| 21 |
2 files changed, 6 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
| 24 |
index d0c6ab87360..fea9c282420 100644 |
| 25 |
--- a/dev-db/mariadb/Manifest |
| 26 |
+++ b/dev-db/mariadb/Manifest |
| 27 |
@@ -4,6 +4,7 @@ DIST mariadb-10.1.34.tar.gz 65298561 BLAKE2B 3f3af7b8bad68a08f69befd3f3e7bd88b8c |
| 28 |
DIST mariadb-10.1.37.tar.gz 63492946 BLAKE2B 0f19b402c597443ef970cbe2a2d85d51743cc2d05ab741897efb150f007d7be8b645706a2d0dc5a9f91c7a380d2313840f77d6e9b15f3335495f275b415e5a33 SHA512 b7c35cd67ad265ce2e3a4db20a2ae2b78745db96dc70a211f027a39b6dbb3dc900991c2ee1021ee6a97d12489c3e2a70252e2adf348a458af38b99c3de5a4f25 |
| 29 |
DIST mariadb-10.2.19.tar.gz 71856357 BLAKE2B 7e55760b85d7b8b19f9d1afe22e7cf5c3001ab03d64062bd702442cb771b2c76f62cf8794b027098b6fb4ade5bf3de39d68dbede65c72fc9e1482083fb19a9c9 SHA512 7bfd65687c923d50b04d598fccea60a23a3fafc3e57b803b2a06c2f25ae68bd25206e18bd71af4797492792d821f4be05cef19e8075080b82b539afdd8af9f46 |
| 30 |
DIST mariadb-10.3.10.tar.gz 70493771 BLAKE2B 03540ed111405febb46c27422f957fb6c533ffe7502c56d6eb4fe8a3bc45bfd18fb2b12a16a01780c0bc291ff139132666741df00d4be068fb99e2a63c543cc2 SHA512 dee7789dff359a6352ceacb2db6bcb4730940e9458adda4e23894f9bfa0a7ff8c238060bffca58a60b662275e52a31ea1784d51fae114312b003c024e9412b31 |
| 31 |
+DIST mariadb-10.3.11.tar.gz 70669435 BLAKE2B e16346519b60aa11a0ffd2c19254ef888c44c054d55b7f98a8d696e3df2c0801c6141adddfb9169098ad5efa5d881c83681c3c5741f68b10c9ce4d15def34254 SHA512 1adc1f9bbabf848726c669a7a0ab01257ba31882758b53fbf3b1316f2295670dba1c3d1f3292d7c1a749c701504588694a55d020839e690595897b0e20435298 |
| 32 |
DIST mariadb-5.5.62.tar.gz 45938380 BLAKE2B aa17d0e5740805d74f7f74f54605e04c4e29c4208a2efa6da2dde5855dfdc13e3225fe349e2146b11a6cbf5a0ac82a9e6c3e4f31e62afa71fc7ab1381040c68f SHA512 136668a54b404a303ee8f87e736bd14463b2323f0a517e7161c8729f4534bc1d653241d6b79f8cb7ad66ea09cf4190f9b95eceaa209b18a46822a68d9580ba5a |
| 33 |
DIST mysql-extras-20180809-1700Z.tar.bz2 322999 BLAKE2B 8b5feb32085dc35b2f68dae985b2d266c4eaa0e956b490050a2df04bbff99bf8623b67e75af9326d84e3ad625c4d86b0d21d23c9a96df5a0c9cd5ed730958970 SHA512 fbd7af9284bbf09d55f128361e7cc52d94f24ac491aac800cd6d61f2e444aeca66a4d5e6ae94c2fb4044e00cec9b232bae9a76a229f87f19d90b7aecf70792ec |
| 34 |
DIST mysql-extras-20181104-2252Z.tar.bz2 328613 BLAKE2B c869dbdd8eb8ab6706b52815fae88e0789b955b9d3e89eac305e6de6e1bc9e78ea10ac58efeac0d6478c7f83587910834e9b4c44e3621224f006daae44dc2bf3 SHA512 e0dff23aa6420a9cfcf2f60464381d4b08194759dcd96910cdf94075fa71e90b74fa3dae700f279f421fee68315af37e47054c9422adeb6cc757fa968a1b65bf |
| 35 |
|
| 36 |
diff --git a/dev-db/mariadb/mariadb-10.3.10-r1.ebuild b/dev-db/mariadb/mariadb-10.3.11.ebuild |
| 37 |
similarity index 99% |
| 38 |
rename from dev-db/mariadb/mariadb-10.3.10-r1.ebuild |
| 39 |
rename to dev-db/mariadb/mariadb-10.3.11.ebuild |
| 40 |
index aef8625f9e5..449df242335 100644 |
| 41 |
--- a/dev-db/mariadb/mariadb-10.3.10-r1.ebuild |
| 42 |
+++ b/dev-db/mariadb/mariadb-10.3.11.ebuild |
| 43 |
@@ -575,6 +575,10 @@ src_install() { |
| 44 |
|
| 45 |
#Remove mytop if perl is not selected |
| 46 |
[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" |
| 47 |
+ |
| 48 |
+ # Fix a dangling symlink when galera is not built |
| 49 |
+ [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera \ |
| 50 |
+ && rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die |
| 51 |
} |
| 52 |
|
| 53 |
# Official test instructions: |
| 54 |
@@ -727,7 +731,7 @@ mysql_init_vars() { |
| 55 |
|
| 56 |
pkg_config() { |
| 57 |
_getoptval() { |
| 58 |
- local mypd="${EROOT}"/usr/bin/my_print_defaults |
| 59 |
+ local mypd="${EROOT}"usr/libexec/mariadb/my_print_defaults |
| 60 |
local section="$1" |
| 61 |
local flag="--${2}=" |
| 62 |
local extra_options="${3}" |
Archives