1 |
commit: 4491e62ef18f9f5d299ee8dbfc2b31c96163b481 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 29 02:39:56 2011 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 29 02:39:56 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4491e62e |
7 |
|
8 |
[dev-db/mariadb] Bump to the first 5.3.0 beta release. |
9 |
|
10 |
(Portage version: 2.2.0_alpha47/git/Linux x86_64, signed Manifest commit with key BB0E6E98) |
11 |
|
12 |
--- |
13 |
dev-db/mariadb/ChangeLog | 6 + |
14 |
dev-db/mariadb/Manifest | 30 +++--- |
15 |
dev-db/mariadb/mariadb-5.3.0_beta.ebuild | 171 ++++++++++++++++++++++++++++++ |
16 |
profiles/package.unmask | 2 +- |
17 |
4 files changed, 194 insertions(+), 15 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
20 |
index 4952d1d..f6eded5 100644 |
21 |
--- a/dev-db/mariadb/ChangeLog |
22 |
+++ b/dev-db/mariadb/ChangeLog |
23 |
@@ -2,6 +2,12 @@ |
24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
25 |
# $Header: $ |
26 |
|
27 |
+*mariadb-5.3.0_beta (29 Jul 2011) |
28 |
+ |
29 |
+ 29 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
30 |
+ +mariadb-5.3.0_beta.ebuild: |
31 |
+ [dev-db/mariadb] Bump to the first 5.3.0 beta release. |
32 |
+ |
33 |
21 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
34 |
-mariadb-5.1.42-r1.ebuild, -mariadb-5.1.50.ebuild, -mariadb-5.1.50-r1.ebuild, |
35 |
-mariadb-5.1.53.ebuild, -mariadb-5.2.4.ebuild, -mariadb-5.2.5.ebuild, |
36 |
|
37 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
38 |
index 098af7c..9192aa1 100644 |
39 |
--- a/dev-db/mariadb/Manifest |
40 |
+++ b/dev-db/mariadb/Manifest |
41 |
@@ -5,25 +5,27 @@ AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc799 |
42 |
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4 |
43 |
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b |
44 |
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3 |
45 |
+DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a |
46 |
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 |
47 |
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550 |
48 |
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 056b6bdb6064e5dae224b5671568196f65f5e34a SHA1 64abe85e4b59255ab728eedd3ea7a4f3e728dd3f SHA256 e52526c53b64bfec59dc53dfa7080806fad641e1086ae602232e81b981c413e3 |
49 |
-MISC ChangeLog 3122 RMD160 698b002b0e4633c0c98446739b88b2ce3f3f0ddf SHA1 b2440b2b4627cc8c2ffcc21f1ea6bd355c494ab2 SHA256 bf0385cf2b87c12c336b59820234d19f18bbcff52c84ee4aa82f8b9b638fdb8b |
50 |
+EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 d5ed7b10ad72dcb60892988867f540705b113bd9 SHA1 1d4e81918735530dbe2209a8f216425a3a2577ea SHA256 442fa0bb6f19b641bbb8fe6c3eaf9c1827e8be75630c0d9ee8ff78ab1ace32cc |
51 |
+MISC ChangeLog 3312 RMD160 9795f9ff9be31c5cac0bebe4f1f79622058405ec SHA1 7dce78149c43b5f28e32e593d4906b286cb02685 SHA256 b3a6403b63854d2e62bcd4349713db40738688122df5a8fb290b6cb6cb6ed71a |
52 |
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37 |
53 |
-----BEGIN PGP SIGNATURE----- |
54 |
Version: GnuPG v2.0.17 (GNU/Linux) |
55 |
|
56 |
-iQIcBAEBAgAGBQJOKJoJAAoJEC8ZTXQF1qEPW90QANpv1rPR/6+VLGSWXfB9pqwm |
57 |
-DtAhUpSa+kH+N4jU/ux7TFVo2+oKEqdzCRTfN1IGYKV1x198Q/emU8ZnhsfiH5Is |
58 |
-xSBSYA4/MnR66Wd7J4U3UC4aZTt17URwTT8sOylnqDYB8PPT2+Ve6ODvt80bMTnW |
59 |
-eB3O1QbkObYvm890NGrqlCEtaSAlESlYVa9D/XfiUurPn2Mi8VI4e6Cw4hbgk3/A |
60 |
-vXjd6kENBvdDgv5TM+h7fCvkTR+mF8q4W5gszirrAZOzhI0CkZRf6pY5sgmgk/QM |
61 |
-S8DSNIQgq+269ZBS2J2N8RbYEHMZw3t19TRKtJe93rn49/fQA28FgsuqzqtEf8eq |
62 |
-hde2cQazxEPGe5yN3aGyEnzFi8AtTnM1r7P7A0eG4tt5EgotBKDgOnpH1WyvAmEd |
63 |
-qpb88HQlje9UdEuZ+usiS9fU0RU+YGwqk5wF63UPcKUrT2kFDh8a0yfUWced8Yqp |
64 |
-Q7XHSW1dJbGIKTBxuaGlA/hw5dAmWrdEcwWO+g02eMpZfEvg0o3PbsFUXIJdK4mV |
65 |
-Eh7jq/BnnvXHqrgvemeO0Pzh0h9/qvHJrnCiLy8PC5kJJR/M8bXJaRsTlTCzAvev |
66 |
-G0xY+1eXVDi7QKRjy+1yVd0vEndYZImp9xwijp47ykS0epKgIaNZ5BieTkOTyPNI |
67 |
-Temmk1C56eMplB+PaOoF |
68 |
-=jQgJ |
69 |
+iQIcBAEBAgAGBQJOMh18AAoJEC8ZTXQF1qEPUaIQAJoML1wQBIGU3ptPlGpb/4+g |
70 |
+wnLADzB0gnspCQkB7788W/LhCBHe8cBG0J/oaFpOoMC3bWAABulRkqw4zPUn83J+ |
71 |
+7e+p6NCCi1hnEG3oKrFL0z/Hz4bFcaFkeE0cWLaHWjOauXmZk0r7uNbwDxu0FSmi |
72 |
+01k/eDWA+ar+gTGfKyvij8RIyxCZB3iQPxw0E8wZwTdbri5QWaWmykBeTIiahihc |
73 |
+XFKqdiEQuJW+3CnfUbXmnjFJ0E6d2/recwglu0wUPryEsQB1iUahl1CAQ2c0/kM7 |
74 |
+xunxEOoTEeq1h98muU0rKYeWNJGOGF5etxdJWbMg18VHtfMA0s+ejbaZbztPafT1 |
75 |
+Gs8FXobinsjY240PjZhid6ibQtJnIC4VNsxWPGiN0kPvwzW07ImDj75VYXuL/1WA |
76 |
+1GyeuG7ASKDwpZPltGyrjr5B+ib4XTGBBo85kbgF1LS2XTtx64/fZD1zd6rTeCH5 |
77 |
+qtSi6EzZPN2RJ2ek3CYFCtvQe112BMox4qNDtam+uw9LyLGtvlmen4ylxKIIXp/g |
78 |
+YiKdFhnAPvtfocaFyXOUWWXEBvyuAG1+0t1G4E3paBKExxRU3DqywPpk5THKc0tI |
79 |
+U4m43y5rGjjBkU9V3YE28IqQuAV1IBOhfZSWydJLGar/uKys3Hfu8PnNEz9g11uP |
80 |
+qbFZkwy926dv9I0O1A84 |
81 |
+=27vb |
82 |
-----END PGP SIGNATURE----- |
83 |
|
84 |
diff --git a/dev-db/mariadb/mariadb-5.3.0_beta.ebuild b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild |
85 |
new file mode 100644 |
86 |
index 0000000..a7b1306 |
87 |
--- /dev/null |
88 |
+++ b/dev-db/mariadb/mariadb-5.3.0_beta.ebuild |
89 |
@@ -0,0 +1,171 @@ |
90 |
+# Copyright 1999-2011 Gentoo Foundation |
91 |
+# Distributed under the terms of the GNU General Public License v2 |
92 |
+# $Header: $ |
93 |
+ |
94 |
+MY_EXTRAS_VER="20110426-1046Z" |
95 |
+EAPI="2" |
96 |
+ |
97 |
+# Build system |
98 |
+BUILD="autotools" |
99 |
+ |
100 |
+inherit toolchain-funcs mysql-v2 |
101 |
+# only to make repoman happy. it is really set in the eclass |
102 |
+IUSE="$IUSE" |
103 |
+ |
104 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
105 |
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" |
106 |
+ |
107 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
108 |
+EPATCH_EXCLUDE='' |
109 |
+ |
110 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
111 |
+RDEPEND="${RDEPEND}" |
112 |
+ |
113 |
+# Please do not add a naive src_unpack to this ebuild |
114 |
+# If you want to add a single patch, copy the ebuild to an overlay |
115 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
116 |
+src_prepare() { |
117 |
+ sed -i \ |
118 |
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \ |
119 |
+ "${S}"/unittest/mytap/t/Makefile.am |
120 |
+ mysql-v2_src_prepare |
121 |
+} |
122 |
+ |
123 |
+# Official test instructions: |
124 |
+# USE='berkdb -cluster embedded extraengine perl ssl community' \ |
125 |
+# FEATURES='test userpriv -usersandbox' \ |
126 |
+# ebuild mariadb-X.X.XX.ebuild \ |
127 |
+# digest clean package |
128 |
+src_test() { |
129 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
130 |
+ # localhost. Also causes weird failures. |
131 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
132 |
+ |
133 |
+ emake check || die "make check failed" |
134 |
+ if ! use "minimal" ; then |
135 |
+ if [[ $UID -eq 0 ]]; then |
136 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
137 |
+ fi |
138 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
139 |
+ cd "${S}" |
140 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
141 |
+ local retstatus_unit |
142 |
+ local retstatus_ns |
143 |
+ local retstatus_ps |
144 |
+ local t |
145 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
146 |
+ |
147 |
+ # Ensure that parallel runs don't die |
148 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
149 |
+ |
150 |
+ # The entire 5.0 series has pre-generated SSL certificates, they have |
151 |
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem |
152 |
+ # The certs really SHOULD be generated for the tests, so that they are |
153 |
+ # not expiring like this. We cannot do so ourselves as the tests look |
154 |
+ # closely as the cert path data, and we do not have the CA key to regen |
155 |
+ # ourselves. Alternatively, upstream should generate them with at least |
156 |
+ # 50-year validity. |
157 |
+ # |
158 |
+ # Known expiry points: |
159 |
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 |
160 |
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 |
161 |
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 |
162 |
+ # |
163 |
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be |
164 |
+ # expired/invalid. |
165 |
+ case ${PV} in |
166 |
+ 5.1.*|5.5.*) |
167 |
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ |
168 |
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ |
169 |
+ mysql-v2_disable_test \ |
170 |
+ "$t" \ |
171 |
+ "These OpenSSL tests break due to expired certificates" |
172 |
+ done |
173 |
+ ;; |
174 |
+ esac |
175 |
+ |
176 |
+ # These are also failing in MySQL 5.1 for now, and are believed to be |
177 |
+ # false positives: |
178 |
+ # |
179 |
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema, |
180 |
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: |
181 |
+ # fails due to USE=-latin1 / utf8 default |
182 |
+ # |
183 |
+ # main.mysql_client_test: |
184 |
+ # segfaults at random under Portage only, suspect resource limits. |
185 |
+ # |
186 |
+ # main.not_partition: |
187 |
+ # Failure reason unknown at this time, must resolve before package.mask |
188 |
+ # removal FIXME |
189 |
+ case ${PV} in |
190 |
+ 5.1.*|5.2.*|5.3.*|5.5.*) |
191 |
+ for t in main.mysql_client_test main.mysql_comments \ |
192 |
+ main.mysql_upgrade \ |
193 |
+ main.information_schema \ |
194 |
+ main.not_partition funcs_1.is_columns_mysql \ |
195 |
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do |
196 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
197 |
+ done |
198 |
+ ;; |
199 |
+ esac |
200 |
+ |
201 |
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. |
202 |
+ # These tests are picking up a 'connect-timeout' config from somewhere, |
203 |
+ # which is not valid, and since it does not have 'loose-' in front of |
204 |
+ # it, it's causing a failure |
205 |
+ case ${PV} in |
206 |
+ 5.1.5*|5.5.*|6*) |
207 |
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do |
208 |
+ mysql-v2_disable_test "$t" \ |
209 |
+ "False positives in Gentoo: connect-timeout" |
210 |
+ done |
211 |
+ ;; |
212 |
+ esac |
213 |
+ |
214 |
+ use profiling && use community \ |
215 |
+ || mysql-v2_disable_test main.profiling \ |
216 |
+ "Profiling test needs profiling support" |
217 |
+ |
218 |
+ if [ "${PN}" == "mariadb" ]; then |
219 |
+ for t in \ |
220 |
+ parts.part_supported_sql_func_ndb \ |
221 |
+ parts.partition_auto_increment_ndb ; do |
222 |
+ mysql-v2_disable_test $t "ndb not supported in mariadb" |
223 |
+ done |
224 |
+ fi |
225 |
+ |
226 |
+ # create directories because mysqladmin might make out of order |
227 |
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} |
228 |
+ |
229 |
+ # We run the test protocols seperately |
230 |
+ emake test-unit |
231 |
+ retstatus_unit=$? |
232 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
233 |
+ |
234 |
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" |
235 |
+ retstatus_ns=$? |
236 |
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" |
237 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
238 |
+ |
239 |
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" |
240 |
+ retstatus_ps=$? |
241 |
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" |
242 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
243 |
+ |
244 |
+ # TODO: |
245 |
+ # When upstream enables the pr and nr testsuites, we need those as well. |
246 |
+ |
247 |
+ # Cleanup is important for these testcases. |
248 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
249 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
250 |
+ failures="" |
251 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
252 |
+ [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" |
253 |
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" |
254 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
255 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
256 |
+ einfo "Tests successfully completed" |
257 |
+ else |
258 |
+ einfo "Skipping server tests due to minimal build." |
259 |
+ fi |
260 |
+} |
261 |
|
262 |
diff --git a/profiles/package.unmask b/profiles/package.unmask |
263 |
index 73beb70..16f932b 100644 |
264 |
--- a/profiles/package.unmask |
265 |
+++ b/profiles/package.unmask |
266 |
@@ -1,6 +1,6 @@ |
267 |
# Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> (27 Mar 2011) |
268 |
# Unmasking the virtual packages so users can test mariadb-5.2 and mysql-5.5 |
269 |
->=dev-db/mariadb-5.2.0 |
270 |
+<dev-db/mariadb-5.3.0_beta |
271 |
<dev-db/mysql-5.6.0 |
272 |
=virtual/mysql-5.2 |
273 |
=virtual/mysql-5.5 |