1 |
commit: 554d70084c157f0c078fef9d9f4a791205ca36e3 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 18:52:40 2015 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 18:53:13 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=554d7008 |
7 |
|
8 |
dev-db/mariadb: Version bump to 10.0.22 includes security fixes wrt bug 564442 |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
|
12 |
dev-db/mariadb/Manifest | 1 + |
13 |
dev-db/mariadb/mariadb-10.0.22-r1.ebuild | 127 +++++++++++++++++++++++++++++++ |
14 |
dev-db/mariadb/mariadb-10.0.22.ebuild | 123 ++++++++++++++++++++++++++++++ |
15 |
3 files changed, 251 insertions(+) |
16 |
|
17 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
18 |
index 1689a93..bea73bf 100644 |
19 |
--- a/dev-db/mariadb/Manifest |
20 |
+++ b/dev-db/mariadb/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e |
23 |
+DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d |
24 |
DIST mariadb-10.1.8.tar.gz 53920483 SHA256 7cbf6a4649aa6dc9cd1dc24424ade7b994de78582ce4d47ca0f4cd1c4c003bfa SHA512 6bb282f814a0d7a6d8e06feb11a819bf9fc6f240428e4a03716a50f2291e070d789224e7f88b4b9b33a160424c4cc0b9deef96c280dcc900476ffc9888dccb45 WHIRLPOOL 65d6857a5f10880aadd391e5eff1fc2c2cc68909e94b75da7e4d52e5405d780ecfaeb4d51f6e7d1ed9a531ef206c64057a17c028d1c5e0ba85dae185234eac37 |
25 |
DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c |
26 |
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326 |
27 |
|
28 |
diff --git a/dev-db/mariadb/mariadb-10.0.22-r1.ebuild b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild |
29 |
new file mode 100644 |
30 |
index 0000000..fbba5c3 |
31 |
--- /dev/null |
32 |
+++ b/dev-db/mariadb/mariadb-10.0.22-r1.ebuild |
33 |
@@ -0,0 +1,127 @@ |
34 |
+# Copyright 1999-2015 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI="5" |
39 |
+MY_EXTRAS_VER="20150717-1707Z" |
40 |
+HAS_TOOLS_PATCH="1" |
41 |
+SUBSLOT="18" |
42 |
+ |
43 |
+inherit toolchain-funcs mysql-multilib |
44 |
+IUSE="${IUSE}" |
45 |
+ |
46 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
47 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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" |
48 |
+ |
49 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
50 |
+EPATCH_EXCLUDE='' |
51 |
+ |
52 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
53 |
+RDEPEND="${RDEPEND}" |
54 |
+ |
55 |
+# Official test instructions: |
56 |
+# USE='embedded extraengine perl openssl static-libs' \ |
57 |
+# FEATURES='test userpriv -usersandbox' \ |
58 |
+# ebuild mariadb-X.X.XX.ebuild \ |
59 |
+# digest clean package |
60 |
+multilib_src_test() { |
61 |
+ |
62 |
+ if ! multilib_is_native_abi ; then |
63 |
+ einfo "Server tests not available on non-native abi". |
64 |
+ return 0; |
65 |
+ fi |
66 |
+ |
67 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
68 |
+ local retstatus_unit |
69 |
+ local retstatus_tests |
70 |
+ |
71 |
+ if use server ; then |
72 |
+ |
73 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
74 |
+ # localhost. Also causes weird failures. |
75 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
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 |
+ # Create a symlink to provided binaries so the tests can find them when client-libs is off |
91 |
+ if ! use client-libs ; then |
92 |
+ ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die |
93 |
+ ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die |
94 |
+ mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" |
95 |
+ fi |
96 |
+ |
97 |
+ # Ensure that parallel runs don't die |
98 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
99 |
+ # Enable parallel testing, auto will try to detect number of cores |
100 |
+ # You may set this by hand. |
101 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
102 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
103 |
+ |
104 |
+ # create directories because mysqladmin might run out of order |
105 |
+ mkdir -p "${T}"/var-tests{,/log} |
106 |
+ |
107 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
108 |
+ # false positives: |
109 |
+ # |
110 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
111 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
112 |
+ # funcs_1.is_columns_mysql main.bootstrap |
113 |
+ # fails due to USE=-latin1 / utf8 default |
114 |
+ # |
115 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
116 |
+ # main.mysql_client_test_comp: |
117 |
+ # segfaults at random under Portage only, suspect resource limits. |
118 |
+ # |
119 |
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
120 |
+ # fails due to bad cleanup of previous tests when run in parallel |
121 |
+ # The tool is deprecated anyway |
122 |
+ # Bug 532288 |
123 |
+ |
124 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
125 |
+ main.mysql_client_test_comp \ |
126 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
127 |
+ main.mysqld--help main.bootstrap \ |
128 |
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
129 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
130 |
+ mysql-multilib_disable_test "$t" "False positives in Gentoo" |
131 |
+ done |
132 |
+ |
133 |
+ # Run mysql tests |
134 |
+ pushd "${TESTDIR}" |
135 |
+ |
136 |
+ # run mysql-test tests |
137 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
138 |
+ |
139 |
+ retstatus_tests=$? |
140 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
141 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
142 |
+ |
143 |
+ popd |
144 |
+ |
145 |
+ # Cleanup is important for these testcases. |
146 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
147 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
148 |
+ |
149 |
+ failures="" |
150 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
151 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
152 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
153 |
+ |
154 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
155 |
+ einfo "Tests successfully completed" |
156 |
+ |
157 |
+ else |
158 |
+ einfo "Skipping server tests due to minimal build." |
159 |
+ fi |
160 |
+} |
161 |
|
162 |
diff --git a/dev-db/mariadb/mariadb-10.0.22.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild |
163 |
new file mode 100644 |
164 |
index 0000000..825bd6f |
165 |
--- /dev/null |
166 |
+++ b/dev-db/mariadb/mariadb-10.0.22.ebuild |
167 |
@@ -0,0 +1,123 @@ |
168 |
+# Copyright 1999-2015 Gentoo Foundation |
169 |
+# Distributed under the terms of the GNU General Public License v2 |
170 |
+# $Id$ |
171 |
+ |
172 |
+EAPI="5" |
173 |
+MY_EXTRAS_VER="20141215-0144Z" |
174 |
+SUBSLOT="18" |
175 |
+ |
176 |
+inherit toolchain-funcs mysql-multilib |
177 |
+# only to make repoman happy. it is really set in the eclass |
178 |
+IUSE="$IUSE" |
179 |
+ |
180 |
+# REMEMBER: also update eclass/mysql*.eclass before committing! |
181 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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" |
182 |
+ |
183 |
+# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
184 |
+EPATCH_EXCLUDE='' |
185 |
+ |
186 |
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
187 |
+RDEPEND="${RDEPEND}" |
188 |
+ |
189 |
+# Official test instructions: |
190 |
+# USE='embedded extraengine perl openssl static-libs' \ |
191 |
+# FEATURES='test userpriv -usersandbox' \ |
192 |
+# ebuild mariadb-X.X.XX.ebuild \ |
193 |
+# digest clean package |
194 |
+multilib_src_test() { |
195 |
+ |
196 |
+ if ! multilib_is_native_abi ; then |
197 |
+ einfo "Server tests not available on non-native abi". |
198 |
+ return 0; |
199 |
+ fi |
200 |
+ |
201 |
+ local TESTDIR="${BUILD_DIR}/mysql-test" |
202 |
+ local retstatus_unit |
203 |
+ local retstatus_tests |
204 |
+ |
205 |
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named |
206 |
+ # localhost. Also causes weird failures. |
207 |
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
208 |
+ |
209 |
+ if ! use "minimal" ; then |
210 |
+ |
211 |
+ if [[ $UID -eq 0 ]]; then |
212 |
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
213 |
+ fi |
214 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
215 |
+ |
216 |
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
217 |
+ addpredict /this-dir-does-not-exist/t9.MYI |
218 |
+ |
219 |
+ # Run CTest (test-units) |
220 |
+ cmake-utils_src_test |
221 |
+ retstatus_unit=$? |
222 |
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
223 |
+ |
224 |
+ # Ensure that parallel runs don't die |
225 |
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
226 |
+ # Enable parallel testing, auto will try to detect number of cores |
227 |
+ # You may set this by hand. |
228 |
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
229 |
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
230 |
+ |
231 |
+ # create directories because mysqladmin might right out of order |
232 |
+ mkdir -p "${T}"/var-tests{,/log} |
233 |
+ |
234 |
+ # These are failing in MariaDB 10.0 for now and are believed to be |
235 |
+ # false positives: |
236 |
+ # |
237 |
+ # main.information_schema, binlog.binlog_statement_insert_delayed, |
238 |
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
239 |
+ # funcs_1.is_columns_mysql main.bootstrap |
240 |
+ # fails due to USE=-latin1 / utf8 default |
241 |
+ # |
242 |
+ # main.mysql_client_test, main.mysql_client_test_nonblock |
243 |
+ # main.mysql_client_test_comp: |
244 |
+ # segfaults at random under Portage only, suspect resource limits. |
245 |
+ # |
246 |
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
247 |
+ # |
248 |
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
249 |
+ # fails due to bad cleanup of previous tests when run in parallel |
250 |
+ # The tool is deprecated anyway |
251 |
+ # Bug 532288 |
252 |
+ |
253 |
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
254 |
+ main.mysql_client_test_comp \ |
255 |
+ binlog.binlog_statement_insert_delayed main.information_schema \ |
256 |
+ main.mysqld--help main.bootstrap \ |
257 |
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
258 |
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
259 |
+ mysql-multilib_disable_test "$t" "False positives in Gentoo" |
260 |
+ done |
261 |
+ |
262 |
+ # Run mysql tests |
263 |
+ pushd "${TESTDIR}" |
264 |
+ |
265 |
+ # run mysql-test tests |
266 |
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" |
267 |
+ |
268 |
+ retstatus_tests=$? |
269 |
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
270 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
271 |
+ |
272 |
+ popd |
273 |
+ |
274 |
+ # Cleanup is important for these testcases. |
275 |
+ pkill -9 -f "${S}/ndb" 2>/dev/null |
276 |
+ pkill -9 -f "${S}/sql" 2>/dev/null |
277 |
+ |
278 |
+ failures="" |
279 |
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
280 |
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
281 |
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
282 |
+ |
283 |
+ [[ -z "$failures" ]] || die "Test failures: $failures" |
284 |
+ einfo "Tests successfully completed" |
285 |
+ |
286 |
+ else |
287 |
+ |
288 |
+ einfo "Skipping server tests due to minimal build." |
289 |
+ fi |
290 |
+} |