1 |
commit: 68e4116c24dd0d63628eed6e8cf4b43156817190 |
2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
3 |
AuthorDate: Tue Feb 25 14:05:03 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Tue Feb 25 14:05:03 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=68e4116c |
7 |
|
8 |
[mariadb] Bump to 5.5.36. All tests pass |
9 |
|
10 |
--- |
11 |
dev-db/mariadb/Manifest | 1 + |
12 |
dev-db/mariadb/mariadb-5.5.36.ebuild | 113 +++++++++++++++++++++++++++++++++++ |
13 |
2 files changed, 114 insertions(+) |
14 |
|
15 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
16 |
index 28bfa2f..fe182ff 100644 |
17 |
--- a/dev-db/mariadb/Manifest |
18 |
+++ b/dev-db/mariadb/Manifest |
19 |
@@ -5,5 +5,6 @@ DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff |
20 |
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 |
21 |
DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88 |
22 |
DIST mariadb-5.5.35.tar.gz 45723697 SHA256 b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e SHA512 fe456d3bd63d78ec65ff4a9db182d18f02e6a04f5513d911d525743f0bb8bef74a5c3d058845eb6c5e9195c901c6afef51f453a9b836e8d432d12e62da041d8d WHIRLPOOL b58c1d979083bcc0e5f16dc1277c25fbc83ef33bee891e15216d8363496b7e488334d4dd40cae1763a53f09690b639df845ac23b4c8008330f76e12d58d0d407 |
23 |
+DIST mariadb-5.5.36.tar.gz 45761732 SHA256 9eb5dc8b717773821c11dc2580028093908dc2073c3df3044d54f083ac85fcf9 SHA512 c8e60fbc474b19974d690d750287ce0a2e4d630c0e21fc47185ff6e48a5cbe03ae00af09d7e64cb1f616d7b3b085b95b24997ca8a42b9d1341f6b8f654e3ceda WHIRLPOOL 20ba056bd19ad48b0682f26e0ebeb62e55d69cd360d953e2293e73e0de2cbb6f84bf49736a226b7b835647656846ad2d477ef4cdf74b4784a33668d7a55d17e8 |
24 |
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc |
25 |
DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a |
26 |
|
27 |
diff --git a/dev-db/mariadb/mariadb-5.5.36.ebuild b/dev-db/mariadb/mariadb-5.5.36.ebuild |
28 |
new file mode 100644 |
29 |
index 0000000..0e7fbaa |
30 |
--- /dev/null |
31 |
+++ b/dev-db/mariadb/mariadb-5.5.36.ebuild |
32 |
@@ -0,0 +1,113 @@ |
33 |
+# Copyright 1999-2013 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+# $Header: $ |
36 |
+ |
37 |
+EAPI="4" |
38 |
+MY_EXTRAS_VER="20140121-1138Z" |
39 |
+ |
40 |
+# Build system |
41 |
+BUILD="cmake" |
42 |
+ |
43 |
+inherit toolchain-funcs mysql-v2 |
44 |
+# only to make repoman happy. it is really set in the eclass |
45 |
+IUSE="$IUSE" |
46 |
+ |
47 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
48 |
+KEYWORDS="~alpha ~amd64 ~arm ~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" |
49 |
+ |
50 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
51 |
+EPATCH_EXCLUDE='' |
52 |
+ |
53 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
54 |
+RDEPEND="${RDEPEND}" |
55 |
+ |
56 |
+# Please do not add a naive src_unpack to this ebuild |
57 |
+# If you want to add a single patch, copy the ebuild to an overlay |
58 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
59 |
+ |
60 |
+# Official test instructions: |
61 |
+# USE='-cluster embedded extraengine perl ssl community' \ |
62 |
+# FEATURES='test userpriv -usersandbox' \ |
63 |
+# ebuild mariadb-X.X.XX.ebuild \ |
64 |
+# digest clean package |
65 |
+src_test() { |
66 |
+ |
67 |
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" |
68 |
+ local retstatus_unit |
69 |
+ local retstatus_tests |
70 |
+ |
71 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
72 |
+ # localhost. Also causes weird failures. |
73 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
74 |
+ |
75 |
+ if ! use "minimal" ; then |
76 |
+ |
77 |
+ if [[ $UID -eq 0 ]]; then |
78 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
79 |
+ fi |
80 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
81 |
+ |
82 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
83 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
84 |
+ |
85 |
+ # Run CTest (test-units) |
86 |
+ cmake-utils_src_test |
87 |
+ retstatus_unit=$? |
88 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
89 |
+ |
90 |
+ # Ensure that parallel runs don't die |
91 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
92 |
+ |
93 |
+ # create directories because mysqladmin might right out of order |
94 |
+ mkdir -p "${S}"/mysql-test/var-tests{,/log} |
95 |
+ |
96 |
+ # create symlink for the tests to find mysql_tzinfo_to_sql |
97 |
+ ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
98 |
+ |
99 |
+ # These are failing in MySQL 5.5 for now and are believed to be |
100 |
+ # false positives: |
101 |
+ # |
102 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
103 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
104 |
+ # funcs_1.is_columns_mysql |
105 |
+ # fails due to USE=-latin1 / utf8 default |
106 |
+ # |
107 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock: |
108 |
+ # segfaults at random under Portage only, suspect resource limits. |
109 |
+ # |
110 |
+ |
111 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
112 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
113 |
+ main.mysqld--help \ |
114 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
115 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
116 |
+ done |
117 |
+ |
118 |
+ # Run mysql tests |
119 |
+ pushd "${TESTDIR}" |
120 |
+ |
121 |
+ # run mysql-test tests |
122 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" |
123 |
+ retstatus_tests=$? |
124 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
125 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
126 |
+ |
127 |
+ popd |
128 |
+ |
129 |
+ # Cleanup is important for these testcases. |
130 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
131 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
132 |
+ |
133 |
+ failures="" |
134 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
135 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
136 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
137 |
+ |
138 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
139 |
+ einfo "Tests successfully completed" |
140 |
+ |
141 |
+ else |
142 |
+ |
143 |
+ einfo "Skipping server tests due to minimal build." |
144 |
+ fi |
145 |
+} |