Gentoo Archives: gentoo-commits

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