1 |
commit: b4137d4999e54013061fc32818077f9d10df9f43 |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 27 02:25:59 2011 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 27 02:25:59 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b4137d49 |
7 |
|
8 |
Bumped mariadb to 5.2.9 release. |
9 |
|
10 |
(Portage version: 2.2.0_alpha59/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
dev-db/mariadb/ChangeLog | 5 + |
14 |
dev-db/mariadb/Manifest | 24 +----- |
15 |
dev-db/mariadb/mariadb-5.2.9.ebuild | 171 +++++++++++++++++++++++++++++++++++ |
16 |
3 files changed, 179 insertions(+), 21 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
19 |
index 7dbdc8f..ba33f24 100644 |
20 |
--- a/dev-db/mariadb/ChangeLog |
21 |
+++ b/dev-db/mariadb/ChangeLog |
22 |
@@ -2,6 +2,11 @@ |
23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+*mariadb-5.2.9 (27 Sep 2011) |
27 |
+ |
28 |
+ 27 Sep 2011; <atlantis@g.o> +mariadb-5.2.9.ebuild: |
29 |
+ Bumped mariadb to 5.2.9 release. |
30 |
+ |
31 |
*mariadb-5.3.1_beta (22 Sep 2011) |
32 |
|
33 |
22 Sep 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
34 |
|
35 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
36 |
index ee83813..a7361da 100644 |
37 |
--- a/dev-db/mariadb/Manifest |
38 |
+++ b/dev-db/mariadb/Manifest |
39 |
@@ -1,11 +1,9 @@ |
40 |
------BEGIN PGP SIGNED MESSAGE----- |
41 |
-Hash: SHA1 |
42 |
- |
43 |
AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 |
44 |
AUX my.cnf-5.1 4193 RMD160 38b438457f32e0f0eeac2fd7991bb5cea7290c31 SHA1 08ed81d2a187be4ab77fbc5d8818b06226a55a8a SHA256 9668a147c27630bcf30239e4faed7a749d113db285fd2b96d1d337d2b3a77ea4 |
45 |
DIST mariadb-5.1.55.tar.gz 24613002 RMD160 e3d46d15b472616f07bd22a9a72107029af1f05b SHA1 789452c8a63c58692fcc4f16f45dc1b3e5d6cfe2 SHA256 df031b2f7dcc92a36da3a76b346034c286e5cb77d8f634e3030543b54f8c052b |
46 |
DIST mariadb-5.2.7.tar.gz 25099195 RMD160 3a5a70d65e9bf8f2898b18c49381f64362cb5452 SHA1 851bc49ca146c23bf1faa1a4657e343fa18eedbc SHA256 77dbdc387d1ed2054d888cb28723673a71f4f10b9e62b6229714d823da3fe1c3 |
47 |
DIST mariadb-5.2.8.tar.gz 25105533 RMD160 13d74d1690ff39ae3b7169ebd795ca58ba5754a6 SHA1 21dc153e9163b6c8fc407df26c91219d711a11da SHA256 60880cf3e96f063069154bd45757c48f4289620031d3b6a046cb9629a424fb5e |
48 |
+DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f731f42ba65f40ea07ad21a4471 SHA1 da87cdc4d3f76cbbe059684175461e18972f323b SHA256 6ef38be1d6f1fe7b1b99b9d6ddf5ac46cd7d0c05cb2a5088a7ec294e62fbd611 |
49 |
DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d4488147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a |
50 |
DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad |
51 |
DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SHA256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8 |
52 |
@@ -13,24 +11,8 @@ DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2fb526257e |
53 |
EBUILD mariadb-5.1.55.ebuild 6034 RMD160 3ed5380f73b48e83fbd5acb354a91e2eb7115745 SHA1 1c319648ce162c384d7114e5362144520c30a9ed SHA256 a944dfeb9d0efb9bdee3c78755fe6bb6533f550d5126c70d1ba1c88fb96dc550 |
54 |
EBUILD mariadb-5.2.7.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612 |
55 |
EBUILD mariadb-5.2.8.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612 |
56 |
+EBUILD mariadb-5.2.9.ebuild 5901 RMD160 403c9f89c2698d300e3fa59f3adcd4582958e203 SHA1 5695e021ca78ee4868ac8271ae8e98a3f25f3d44 SHA256 7f9ac19a6dbb4fe917e34aea0345001b7d8874cd28789ba457e52b537d68c612 |
57 |
EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa |
58 |
EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 564451ed9dd9bf6b3e9f4e102bc8aceca910ffc0 SHA1 48bd66083289653310b41454fe66fa19d6e9fb11 SHA256 3f3421a91895c07179fb70ad2ba281fef308c0235f51d25a24369318373db4fa |
59 |
-MISC ChangeLog 3889 RMD160 59d6018e24ca8de383013b6cda5850831c8f5dad SHA1 27dde9e14984470ec8baab15061e0962022949d7 SHA256 79b916284091304769df376e04fd013a031d9aa7cab908969d54c5d36dd3bab3 |
60 |
+MISC ChangeLog 4015 RMD160 2e32e9a249b9e42e5cda380ec15e3d7013f18b07 SHA1 50378f4458d4b20bc816fa96595e935428198c7d SHA256 eb6f48c2d477ef016c9f3422cb495856a8707b1c9e404097eabbab55513b0c09 |
61 |
MISC metadata.xml 1270 RMD160 189fad1db7079270ebd91e307bb9bde808007d10 SHA1 4347979f6379d304c7c3b84108fa0c7921243ca1 SHA256 1e9f218218e4775346cb94b39d8b8835755bd09a28fd1fe510ef2bac0f9c1a37 |
62 |
------BEGIN PGP SIGNATURE----- |
63 |
-Version: GnuPG v2.0.18 (GNU/Linux) |
64 |
- |
65 |
-iQIcBAEBAgAGBQJOeqV7AAoJEC8ZTXQF1qEP8WQP/3+DzXmD87f+yWv0Vn4KgSVh |
66 |
-25/RRYwhxb7YyMsfZoD0afDzVdc1e+zR8HJ/QJ7ZkODxjviS0unHg7B335swc1hj |
67 |
-xXPUnIa8eg8KLgSOu2c/DXuWp8m7bQNnOOJVaysPx99ewrqyvGlJB2o9js2f5utC |
68 |
-nv6k6UAu+7qjQVNvHv/t3YBFVZMiRXBmwMpaQit5Sg5lB3I7Td83TCC7J5+v2MYo |
69 |
-DTQJpeVkCSZI2XDemMq54ZN0rjd/hOJJr6UZOKZhI1ChfkH7Bw/3NVgcCv9JOcVA |
70 |
-91DCHZ0LX3n2FujvHGCrvZ/14SvZ623nvLor+7l3fPuYfwuTqTyjUvTVfNg2Cfg9 |
71 |
-jKlWFB4hijZN8aCVLN+iI3q2v8JbftO6KcLL/iDa159rHpqRdAgiTgAim9hg9ClL |
72 |
-rlkym78vbQQAIgehYHT6FeRYUQpPkIsn/DguWSDD7Q7Df9C9O/TPV89HLlnLhrq8 |
73 |
-ZUY7pS+Ho8o+TjA0luaOGR+d0O+hlkTgxNImwkSw1BM2aBOLY34ctO1URUPBsqag |
74 |
-xYiyxMt2Zx3ij2LZ5P5abt+Ij1WFztvYRLraA/nDF7s3Rm57uzodfX583P2TlH4X |
75 |
-s+lA74zOzXCBnZva9FfpJU/b/j6XrCFDv3MgD87YfLeUOrjB9rnzbz3WAaT+L7ZA |
76 |
-MGxLhNQnHZ5cbTQ0UP8Z |
77 |
-=thUg |
78 |
------END PGP SIGNATURE----- |
79 |
|
80 |
diff --git a/dev-db/mariadb/mariadb-5.2.9.ebuild b/dev-db/mariadb/mariadb-5.2.9.ebuild |
81 |
new file mode 100644 |
82 |
index 0000000..76cd16e |
83 |
--- /dev/null |
84 |
+++ b/dev-db/mariadb/mariadb-5.2.9.ebuild |
85 |
@@ -0,0 +1,171 @@ |
86 |
+# Copyright 1999-2011 Gentoo Foundation |
87 |
+# Distributed under the terms of the GNU General Public License v2 |
88 |
+# $Header: $ |
89 |
+ |
90 |
+MY_EXTRAS_VER="20110819-0415Z" |
91 |
+EAPI="2" |
92 |
+ |
93 |
+# Build system |
94 |
+BUILD="autotools" |
95 |
+ |
96 |
+inherit toolchain-funcs mysql-v2 |
97 |
+# only to make repoman happy. it is really set in the eclass |
98 |
+IUSE="$IUSE" |
99 |
+ |
100 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
101 |
+KEYWORDS="~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd" |
102 |
+ |
103 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
104 |
+EPATCH_EXCLUDE='' |
105 |
+ |
106 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
107 |
+RDEPEND="${RDEPEND}" |
108 |
+ |
109 |
+# Please do not add a naive src_unpack to this ebuild |
110 |
+# If you want to add a single patch, copy the ebuild to an overlay |
111 |
+# and create your own mysql-extras tarball, looking at 000_index.txt |
112 |
+src_prepare() { |
113 |
+ sed -i \ |
114 |
+ -e '/^noinst_PROGRAMS/s/basic-t//g' \ |
115 |
+ "${S}"/unittest/mytap/t/Makefile.am |
116 |
+ mysql-v2_src_prepare |
117 |
+} |
118 |
+ |
119 |
+# Official test instructions: |
120 |
+# USE='berkdb -cluster embedded extraengine perl ssl community' \ |
121 |
+# FEATURES='test userpriv -usersandbox' \ |
122 |
+# ebuild mariadb-X.X.XX.ebuild \ |
123 |
+# digest clean package |
124 |
+src_test() { |
125 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
126 |
+ # localhost. Also causes weird failures. |
127 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
128 |
+ |
129 |
+ emake check || die "make check failed" |
130 |
+ if ! use "minimal" ; then |
131 |
+ if [[ $UID -eq 0 ]]; then |
132 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
133 |
+ fi |
134 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
135 |
+ cd "${S}" |
136 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
137 |
+ local retstatus_unit |
138 |
+ local retstatus_ns |
139 |
+ local retstatus_ps |
140 |
+ local t |
141 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
142 |
+ |
143 |
+ # Ensure that parallel runs don't die |
144 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
145 |
+ |
146 |
+ # The entire 5.0 series has pre-generated SSL certificates, they have |
147 |
+ # mostly expired now. ${S}/mysql-tests/std-data/*.pem |
148 |
+ # The certs really SHOULD be generated for the tests, so that they are |
149 |
+ # not expiring like this. We cannot do so ourselves as the tests look |
150 |
+ # closely as the cert path data, and we do not have the CA key to regen |
151 |
+ # ourselves. Alternatively, upstream should generate them with at least |
152 |
+ # 50-year validity. |
153 |
+ # |
154 |
+ # Known expiry points: |
155 |
+ # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 |
156 |
+ # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 |
157 |
+ # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 |
158 |
+ # |
159 |
+ # mysql-test/std_data/untrusted-cacert.pem is MEANT to be |
160 |
+ # expired/invalid. |
161 |
+ case ${PV} in |
162 |
+ 5.1.*|5.4.*|5.5.*) |
163 |
+ for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ |
164 |
+ ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \ |
165 |
+ mysql-v2_disable_test \ |
166 |
+ "$t" \ |
167 |
+ "These OpenSSL tests break due to expired certificates" |
168 |
+ done |
169 |
+ ;; |
170 |
+ esac |
171 |
+ |
172 |
+ # These are also failing in MySQL 5.1 for now, and are believed to be |
173 |
+ # false positives: |
174 |
+ # |
175 |
+ # main.mysql_comment, main.mysql_upgrade, main.information_schema, |
176 |
+ # funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers: |
177 |
+ # fails due to USE=-latin1 / utf8 default |
178 |
+ # |
179 |
+ # main.mysql_client_test: |
180 |
+ # segfaults at random under Portage only, suspect resource limits. |
181 |
+ # |
182 |
+ # main.not_partition: |
183 |
+ # Failure reason unknown at this time, must resolve before package.mask |
184 |
+ # removal FIXME |
185 |
+ case ${PV} in |
186 |
+ 5.1.*|5.2.*|5.4.*|5.5.*) |
187 |
+ for t in main.mysql_client_test main.mysql_comments \ |
188 |
+ main.mysql_upgrade \ |
189 |
+ main.information_schema \ |
190 |
+ main.not_partition funcs_1.is_columns_mysql \ |
191 |
+ funcs_1.is_tables_mysql funcs_1.is_triggers; do |
192 |
+ mysql-v2_disable_test "$t" "False positives in Gentoo" |
193 |
+ done |
194 |
+ ;; |
195 |
+ esac |
196 |
+ |
197 |
+ # New failures in 5.1.50/5.1.51, reported by jmbsvicetto. |
198 |
+ # These tests are picking up a 'connect-timeout' config from somewhere, |
199 |
+ # which is not valid, and since it does not have 'loose-' in front of |
200 |
+ # it, it's causing a failure |
201 |
+ case ${PV} in |
202 |
+ 5.1.5*|5.4.*|5.5.*|6*) |
203 |
+ for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do |
204 |
+ mysql-v2_disable_test "$t" \ |
205 |
+ "False positives in Gentoo: connect-timeout" |
206 |
+ done |
207 |
+ ;; |
208 |
+ esac |
209 |
+ |
210 |
+ use profiling && use community \ |
211 |
+ || mysql-v2_disable_test main.profiling \ |
212 |
+ "Profiling test needs profiling support" |
213 |
+ |
214 |
+ if [ "${PN}" == "mariadb" ]; then |
215 |
+ for t in \ |
216 |
+ parts.part_supported_sql_func_ndb \ |
217 |
+ parts.partition_auto_increment_ndb ; do |
218 |
+ mysql-v2_disable_test $t "ndb not supported in mariadb" |
219 |
+ done |
220 |
+ fi |
221 |
+ |
222 |
+ # create directories because mysqladmin might make out of order |
223 |
+ mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} |
224 |
+ |
225 |
+ # We run the test protocols seperately |
226 |
+ emake test-unit |
227 |
+ retstatus_unit=$? |
228 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
229 |
+ |
230 |
+ emake test-ns force="--force --vardir=${S}/mysql-test/var-ns" |
231 |
+ retstatus_ns=$? |
232 |
+ [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" |
233 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
234 |
+ |
235 |
+ emake test-ps force="--force --vardir=${S}/mysql-test/var-ps" |
236 |
+ retstatus_ps=$? |
237 |
+ [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" |
238 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
239 |
+ |
240 |
+ # TODO: |
241 |
+ # When upstream enables the pr and nr testsuites, we need those as well. |
242 |
+ |
243 |
+ # Cleanup is important for these testcases. |
244 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
245 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
246 |
+ failures="" |
247 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
248 |
+ [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" |
249 |
+ [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" |
250 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
251 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
252 |
+ einfo "Tests successfully completed" |
253 |
+ else |
254 |
+ einfo "Skipping server tests due to minimal build." |
255 |
+ fi |
256 |
+} |