commit: 15748040522cd15211463340dbc20c3bc24c80dd
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 02:07:33 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 02:07:33 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=15748040
Version bumps
dev-db/mariadb/Manifest | 4 +-
...riadb-10.0.16.ebuild => mariadb-10.0.20.ebuild} | 16 +++-----
...ariadb-10.0.16.ebuild => mariadb-5.5.44.ebuild} | 45 ++++++++++------------
3 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 5a142e3..52ff954 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,5 +1,5 @@
-DIST mariadb-10.0.16.tar.gz 55656968 SHA256
44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512
8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3
WHIRLPOOL
916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
DIST mariadb-10.0.19.tar.gz 56224123 SHA256
2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132 SHA512
bfb2a3e9225b3dd7481c0240143346f38be80c426887e05ec2b8eeab251991e2a5f74788f421322342a0fa8f85294cf4c7f5d4fd10d7bc6b9da720f6168003f3
WHIRLPOOL
d08c53228c40df18793316dd0eddb160ce5b67a853f16c4ddcdcedb049833b35b9ae9d0763e1fcc1e447e3528ae9a7ab2e6587dd2e2c0a225224f28a951dc3dd
+DIST mariadb-10.0.20.tar.gz 56241178 SHA256
3a4f6963c794977af5d5fd9ec06a337a2ad556b3a287196fddbd2243c1388b7b SHA512
40214e29ec3fd6402b6e075644ab3fc3acd080e9e0d6e77db83c14d928f69a9af366c5df715d3d52692b90259c6b6d28160376a4d6e05811ed9973741a3ba445
WHIRLPOOL
5a5dfa7a53254a22fc4540aa78a6ac3704e17e90b22d1bae32f40bddd906e6e9409161c973e9229d48af27419df410c7214859bd979137221ba394d37cf1bbbb
DIST mariadb-10.1.3.tar.gz 52935207 SHA256
565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512
c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae
WHIRLPOOL
08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
DIST mariadb-10.1.4.tar.gz 53358393 SHA256
14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c SHA512
c8072cde370fe2f62e310dc0634fff2c177a4f5403461022e396a6a3f207334d4519e66c1f244713807e7cf1d47b0ce18e2f25a9ddc67b899aa5c24cc2a41d91
WHIRLPOOL
d2943df0a9acf65652b52147d9d11f75176469720cfb7f29a42909b152adecd814814aeee4f764a972b8e3da77c3a15c3817b738184299f3ef9f3fa2bab5d706
DIST mariadb-10.1.5.tar.gz 53573071 SHA256
af8788bfbb842338882e505612f86ef53a25968663a1519185ecf3de3b1efe83 SHA512
50f742be033c3ddb4399391aea6237269981baaf8018dbb646bebf10eec98b8519cea2df300d4abda3dc6ba21631b59ad48220e1028bb2cb113c911145d0913f
WHIRLPOOL
b7586e165f2c0372bdbbad49eb97f6877ab19118378ae8cc0166c3bc3a7a53d663eca606155f40c78dca7d672ddb9d9c005d929b1980c9230d709fca7f697c8e
@@ -7,5 +7,7 @@ DIST mariadb-5.1.67.tar.gz 25022999 SHA256
33471e9275c9b03919cabc38eb39f807d645a
DIST mariadb-5.2.14.tar.gz 25469828 SHA256
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
WHIRLPOOL
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
DIST mariadb-5.3.12.tar.gz 26880808 SHA256
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
WHIRLPOOL
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
DIST mariadb-5.5.42.tar.gz 45586372 SHA256
3c868e768f4c24b4aa2f8f1725460d15a5485ed75e17b0755c6e604520e34439 SHA512
8fd9916e7ad225ea47936c34a14d37d0e4c9ac182b8791d46d158aa86151cbfe45e54e0b680d281223f175d492765aeadd7565e2a706d86b69696a51761e9769
WHIRLPOOL
9adaa1006ddb736fce0bdcc6d8bbc8012f083d443cced67088efe5b7107082f3c6ce1e4ee1d40558ea90501c69a7db456723ad7cb6345affece3adbdddfccd29
+DIST mariadb-5.5.44.tar.gz 45672065 SHA256
7d425caf5f1e45de9e5eb72daa98ceb542e7b134a89bd01540b60fe9c5965e8f SHA512
34cde1a49055e4389b9b17a7d5ee8465a6213bf2b0e6a9c9ed327c1bcbe3abfa0023ee55755ac40940887315b7f7204960aed1328a767bd6b3129dee2b7a32d9
WHIRLPOOL
bbdfa58077b232e900140b9ffe26661f2d2865eecfdae0ad26ab70b0589ad8759b344c4f77e510ff25d3d6db11527c7e69ed8473a550207db02f335bc2b0d060
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256
4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512
7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed
WHIRLPOOL
99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
+DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256
de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512
f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4
WHIRLPOOL
f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild
b/dev-db/mariadb/mariadb-10.0.20.ebuild
similarity index 83%
copy from dev-db/mariadb/mariadb-10.0.16.ebuild
copy to dev-db/mariadb/mariadb-10.0.20.ebuild
index 0320067..0fd88bd 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v
1.12 2015/03/03 06:08:08 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.20.ebuild,v 1.1
2015/06/20 01:04:32 grknight Exp $
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
@@ -10,7 +10,7 @@ inherit toolchain-funcs mysql-multilib
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
@@ -19,7 +19,7 @@ DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0
)"
RDEPEND="${RDEPEND}"
# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
@@ -68,7 +68,7 @@ multilib_src_test() {
#
# main.information_schema,
binlog.binlog_statement_insert_delayed,
# main.mysqld--help, funcs_1.is_triggers,
funcs_1.is_tables_mysql,
- # funcs_1.is_columns_mysql
+ # funcs_1.is_columns_mysql main.bootstrap
# fails due to USE=-latin1 / utf8 default
#
# main.mysql_client_test, main.mysql_client_test_nonblock
@@ -79,17 +79,11 @@ multilib_src_test() {
for t in main.mysql_client_test main.mysql_client_test_nonblock
\
main.mysql_client_test_comp \
binlog.binlog_statement_insert_delayed
main.information_schema \
- main.mysqld--help \
+ main.mysqld--help main.bootstrap \
funcs_1.is_triggers funcs_1.is_tables_mysql
funcs_1.is_columns_mysql ; do
mysql-multilib_disable_test "$t" "False
positives in Gentoo"
done
- for t in rpl.rpl_heartbeat_ssl rpl.rpl_ssl rpl.rpl_ssl1
main.ssl_cipher \
- main.ssl_8k_key main.openssl_6975 main.openssl_1
main.ssl main.ssl_compress \
- main.ssl_connect; do
- mysql-multilib_disable_test "$t" "Disabled due to
expired certificate"
- done
-
# Run mysql tests
pushd "${TESTDIR}"
diff --git a/dev-db/mariadb/mariadb-10.0.16.ebuild
b/dev-db/mariadb/mariadb-5.5.44.ebuild
similarity index 72%
rename from dev-db/mariadb/mariadb-10.0.16.ebuild
rename to dev-db/mariadb/mariadb-5.5.44.ebuild
index 0320067..5cf1ddf 100644
--- a/dev-db/mariadb/mariadb-10.0.16.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.44.ebuild
@@ -1,16 +1,19 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-10.0.16.ebuild,v
1.12 2015/03/03 06:08:08 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.44.ebuild,v 1.1
2015/06/20 01:46:49 grknight Exp $
EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
+MY_EXTRAS_VER="20150509-1847Z"
-inherit toolchain-funcs mysql-multilib
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
@@ -18,17 +21,16 @@ EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
# Official test instructions:
-# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# USE='embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
-multilib_src_test() {
-
- if ! multilib_is_native_abi ; then
- einfo "Server tests not available on non-native abi".
- return 0;
- fi
+src_test() {
local TESTDIR="${BUILD_DIR}/mysql-test"
local retstatus_unit
@@ -63,7 +65,10 @@ multilib_src_test() {
# create directories because mysqladmin might right out of order
mkdir -p "${T}"/var-tests{,/log}
- # These are failing in MariaDB 10.0 for now and are believed to
be
+ # create symlink for the tests to find the replace util
+ ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
+
+ # These are failing in MariaDB 5.5 for now and are believed to
be
# false positives:
#
# main.information_schema,
binlog.binlog_statement_insert_delayed,
@@ -71,31 +76,23 @@ multilib_src_test() {
# funcs_1.is_columns_mysql
# fails due to USE=-latin1 / utf8 default
#
- # main.mysql_client_test, main.mysql_client_test_nonblock
- # main.mysql_client_test_comp:
+ # main.mysql_client_test, main.mysql_client_test_nonblock:
# segfaults at random under Portage only, suspect resource
limits.
#
for t in main.mysql_client_test main.mysql_client_test_nonblock
\
- main.mysql_client_test_comp \
binlog.binlog_statement_insert_delayed
main.information_schema \
main.mysqld--help \
funcs_1.is_triggers funcs_1.is_tables_mysql
funcs_1.is_columns_mysql ; do
- mysql-multilib_disable_test "$t" "False
positives in Gentoo"
- done
-
- for t in rpl.rpl_heartbeat_ssl rpl.rpl_ssl rpl.rpl_ssl1
main.ssl_cipher \
- main.ssl_8k_key main.openssl_6975 main.openssl_1
main.ssl main.ssl_compress \
- main.ssl_connect; do
- mysql-multilib_disable_test "$t" "Disabled due to
expired certificate"
+ mysql-v2_disable_test "$t" "False positives in
Gentoo"
done
# Run mysql tests
pushd "${TESTDIR}"
# run mysql-test tests
- perl mysql-test-run.pl --force --vardir="${T}/var-tests"
-
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+ --testcase-timeout=30
retstatus_tests=$?
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
has usersandbox $FEATURES && eerror "Some tests may fail with
FEATURES=usersandbox"
