| 1 |
commit: e3af7cb2d89613c364c165de3c288486871a03da |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 5 16:26:54 2014 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 5 16:26:54 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e3af7cb2 |
| 7 |
|
| 8 |
Restore mysql-5.5.34 per regression reported on bug 490580 by Vasilis Lourdas. |
| 9 |
|
| 10 |
--- |
| 11 |
dev-db/mariadb/Manifest | 4 -- |
| 12 |
dev-db/mariadb/mariadb-5.5.34.ebuild | 131 +++++++++++++++++++++++++++++++++++ |
| 13 |
2 files changed, 131 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
| 16 |
index 9104a44..79661f2 100644 |
| 17 |
--- a/dev-db/mariadb/Manifest |
| 18 |
+++ b/dev-db/mariadb/Manifest |
| 19 |
@@ -1,12 +1,8 @@ |
| 20 |
-DIST mariadb-10.0.6.tar.gz 50375294 SHA256 da382b3acf90b05f5bdc1e4a7cd57e9903182d8247f1f48c4d5afe9e4211c174 SHA512 97a86c0611a5ae4e8ea28b4879f67682d5100db9e2f9340e7e2aad60e638e9f34164740c4259cf0c2bb701aef0b80181fea1923e8401e61039c159783db8cfcf WHIRLPOOL c3ec49d5106ac0bc011275a944acba93ecec9c3e37f01f0e1be73f133405d213423a5d3c1619986fa60d6272bf39e4a29bc4f464d4a2205e0a526e477a6387a3 |
| 21 |
DIST mariadb-10.0.7.tar.gz 51365829 SHA256 71422d8106c038fa4723e6e040fa149030e193545078402f661d793f81e3fe7b SHA512 e5e827ae42594a9b071bc01864a3ab3de2e873baeacb4364e08e4e27e7dc6214fa63e481cf0521426b9a2b0899311ff8cc95682cf3dd5161c466a290921b8314 WHIRLPOOL 740453867f03286687e0ad381793e5c254285a574398a2f2003993fa554e077d1ef2b126d90ea47e39e99bb298a1f9e495ada1b99adfb82c5531dcfe8cfc0d31 |
| 22 |
DIST mariadb-5.1.67.tar.gz 25022999 SHA256 33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d WHIRLPOOL 22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff |
| 23 |
DIST mariadb-5.2.14.tar.gz 25469828 SHA256 8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869 WHIRLPOOL 8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607 |
| 24 |
DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94 WHIRLPOOL b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460 |
| 25 |
-DIST mariadb-5.5.32.tar.gz 27929231 SHA256 cc76d143c60d9f24b551adaf80f694ef9beb4a6a9032c115a06f7b5c5d0ee468 SHA512 246ab7740cfdf5e9908ec437c226102e373824894813345cef7431e7ddc681b3b8081ec22d2c61bbc3e67dbe22a34b08096ffee6952f86c046b5d9fadfd79ba3 WHIRLPOOL 955098e9ea6c8cc23243e6deaef570979d201b504d20e680cf92dc11071373bf0650f6dcd455b9cbd66607659642ab2d20997b39e31d526bf691cf7ed2332742 |
| 26 |
-DIST mariadb-5.5.33a.tar.gz 45226492 SHA256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b SHA512 22b786f5646ca21f84404ccda233ce66e175fb791b0c0d03b0233b566c3584b96d8d7886eccf6f25605f9bee237a7422bf6a96389fe465aa3317ea3aa1a85ec6 WHIRLPOOL 12881339e1e2a37d58ed46bb647a0c51a2ae07b4bcf51bac0020f62620b038895e875f995156c9fb62b6a3cf80f13e8616e5173dcb1de9d909f8c48d02e7771b |
| 27 |
DIST mariadb-5.5.34.tar.gz 45683350 SHA256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89 SHA512 9e5ed4631d5041ff6ff6f5336f90f6d9bee36a7b4d14a994d98c0e9aac4ca60b41b9cec588e737714973a91f600f1cf9190165f74c0e906893aff88451bc82ee WHIRLPOOL d0aa652f3cddf9d59be68f0b254f0976d70212602dbb91749e6ca942524a4c32a04d0fd01a5e5d33f99291c7ba1dbfed514a0975785507172b76a8b60ae54f88 |
| 28 |
DIST mariadb-5.5.35.tar.gz 45723697 SHA256 b47391e5da8ea1a09585411b2a892e2070d097bec6102b0f13640176a1746a4e SHA512 fe456d3bd63d78ec65ff4a9db182d18f02e6a04f5513d911d525743f0bb8bef74a5c3d058845eb6c5e9195c901c6afef51f453a9b836e8d432d12e62da041d8d WHIRLPOOL b58c1d979083bcc0e5f16dc1277c25fbc83ef33bee891e15216d8363496b7e488334d4dd40cae1763a53f09690b639df845ac23b4c8008330f76e12d58d0d407 |
| 29 |
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc |
| 30 |
-DIST mysql-extras-20130120-0100Z.tar.bz2 1899297 SHA256 56db6daa26070cb10b220cb06e7b4d4a84214932a5a04500ed0e76b938c01776 SHA512 9fc9b21e547ec0e1ae37b288a1ade28b11c03a89129302226c36018cf69842fda95665799ded84f04cccffaf54555acde40bf2ae6e2ea39ec63b3876382af1ba WHIRLPOOL 25f31d91d6004e7472ef6f2ff0d02b9dde9915f56fc84da600145ac09d1d56751c2ef85c897d3b7bacd29b1010b304445517452254a1e9208bc7bfa9c2e9bf2e |
| 31 |
DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a |
| 32 |
|
| 33 |
diff --git a/dev-db/mariadb/mariadb-5.5.34.ebuild b/dev-db/mariadb/mariadb-5.5.34.ebuild |
| 34 |
new file mode 100644 |
| 35 |
index 0000000..580a6ac |
| 36 |
--- /dev/null |
| 37 |
+++ b/dev-db/mariadb/mariadb-5.5.34.ebuild |
| 38 |
@@ -0,0 +1,131 @@ |
| 39 |
+# Copyright 1999-2013 Gentoo Foundation |
| 40 |
+# Distributed under the terms of the GNU General Public License v2 |
| 41 |
+# $Header: $ |
| 42 |
+ |
| 43 |
+EAPI="4" |
| 44 |
+MY_EXTRAS_VER="20140121-1138Z" |
| 45 |
+ |
| 46 |
+# Build system |
| 47 |
+BUILD="cmake" |
| 48 |
+ |
| 49 |
+inherit toolchain-funcs mysql-v2 |
| 50 |
+# only to make repoman happy. it is really set in the eclass |
| 51 |
+IUSE="$IUSE" |
| 52 |
+ |
| 53 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
| 54 |
+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" |
| 55 |
+ |
| 56 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
| 57 |
+EPATCH_EXCLUDE='' |
| 58 |
+ |
| 59 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
| 60 |
+RDEPEND="${RDEPEND}" |
| 61 |
+ |
| 62 |
+# Please do not add a naive src_unpack to this ebuild |
| 63 |
+# If you want to add a single patch, copy the ebuild to an overlay |
| 64 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
| 65 |
+ |
| 66 |
+# Official test instructions: |
| 67 |
+# USE='-cluster embedded extraengine perl ssl community' \ |
| 68 |
+# FEATURES='test userpriv -usersandbox' \ |
| 69 |
+# ebuild mariadb-X.X.XX.ebuild \ |
| 70 |
+# digest clean package |
| 71 |
+src_test() { |
| 72 |
+ |
| 73 |
+ local TESTDIR="${CMAKE_BUILD_DIR}/mysql-test" |
| 74 |
+ local retstatus_unit |
| 75 |
+ local retstatus_tests |
| 76 |
+ |
| 77 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
| 78 |
+ # localhost. Also causes weird failures. |
| 79 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
| 80 |
+ |
| 81 |
+ if ! use "minimal" ; then |
| 82 |
+ |
| 83 |
+ if [[ $UID -eq 0 ]]; then |
| 84 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
| 85 |
+ fi |
| 86 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 87 |
+ |
| 88 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
| 89 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
| 90 |
+ |
| 91 |
+ # Run CTest (test-units) |
| 92 |
+ cmake-utils_src_test |
| 93 |
+ retstatus_unit=$? |
| 94 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
| 95 |
+ |
| 96 |
+ # Ensure that parallel runs don't die |
| 97 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
| 98 |
+ |
| 99 |
+ # create directories because mysqladmin might right out of order |
| 100 |
+ mkdir -p "${S}"/mysql-test/var-tests{,/log} |
| 101 |
+ |
| 102 |
+ # create symlink for the tests to find mysql_tzinfo_to_sql |
| 103 |
+ ln -s "${CMAKE_BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
| 104 |
+ |
| 105 |
+ # These are failing in MySQL 5.5 for now and are believed to be |
| 106 |
+ # false positives: |
| 107 |
+ # |
| 108 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
| 109 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
| 110 |
+ # funcs_1.is_columns_mysql |
| 111 |
+ # fails due to USE=-latin1 / utf8 default |
| 112 |
+ # |
| 113 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock: |
| 114 |
+ # segfaults at random under Portage only, suspect resource limits. |
| 115 |
+ # |
| 116 |
+ # sys_vars.plugin_dir_basic |
| 117 |
+ # fails because PLUGIN_DIR is set to MYSQL_LIBDIR64/plugin |
| 118 |
+ # instead of MYSQL_LIBDIR/plugin |
| 119 |
+ # |
| 120 |
+ # main.flush_read_lock_kill |
| 121 |
+ # fails because of unknown system variable 'DEBUG_SYNC' |
| 122 |
+ # |
| 123 |
+ # main.openssl_1 |
| 124 |
+ # error message changing |
| 125 |
+ # -mysqltest: Could not open connection 'default': 2026 SSL connection |
| 126 |
+ # error: ASN: bad other signature confirmation |
| 127 |
+ # +mysqltest: Could not open connection 'default': 2026 SSL connection |
| 128 |
+ # error: error:00000001:lib(0):func(0):reason(1) |
| 129 |
+ # |
| 130 |
+ # plugins.unix_socket |
| 131 |
+ # fails because portage strips out the USER enviornment variable |
| 132 |
+ # |
| 133 |
+ |
| 134 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
| 135 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
| 136 |
+ main.mysqld--help main.flush_read_lock_kill \ |
| 137 |
+ sys_vars.plugin_dir_basic main.openssl_1 plugins.unix_socket \ |
| 138 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
| 139 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
| 140 |
+ done |
| 141 |
+ |
| 142 |
+ # Run mysql tests |
| 143 |
+ pushd "${TESTDIR}" |
| 144 |
+ |
| 145 |
+ # run mysql-test tests |
| 146 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" |
| 147 |
+ retstatus_tests=$? |
| 148 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
| 149 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 150 |
+ |
| 151 |
+ popd |
| 152 |
+ |
| 153 |
+ # Cleanup is important for these testcases. |
| 154 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
| 155 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
| 156 |
+ |
| 157 |
+ failures="" |
| 158 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
| 159 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
| 160 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
| 161 |
+ |
| 162 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
| 163 |
+ einfo "Tests successfully completed" |
| 164 |
+ |
| 165 |
+ else |
| 166 |
+ |
| 167 |
+ einfo "Skipping server tests due to minimal build." |
| 168 |
+ fi |
| 169 |
+} |
Archives