1 |
commit: abc93cdb904e5cbc3a801038d7bdeddb953e507a |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 6 14:01:46 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 6 14:01:46 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abc93cdb |
7 |
|
8 |
dev-db/mysql: Drop security vulnerable versions wrt bug 606254 |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
dev-db/mysql/Manifest | 2 - |
13 |
dev-db/mysql/mysql-5.5.53.ebuild | 126 ------------------------------ |
14 |
dev-db/mysql/mysql-5.6.34.ebuild | 164 --------------------------------------- |
15 |
3 files changed, 292 deletions(-) |
16 |
|
17 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
18 |
index c0f0022..3bc0223 100644 |
19 |
--- a/dev-db/mysql/Manifest |
20 |
+++ b/dev-db/mysql/Manifest |
21 |
@@ -1,6 +1,4 @@ |
22 |
-DIST mysql-5.5.53.tar.gz 21035716 SHA256 a7a86dd42524e698c9dd8dab2520e6e75377cde077ed71eaf5a3b5a3d1f7d6ea SHA512 b69344149fbb7955221ba961a760ce963271eee732a5009b5ddf202c86af3532042c0a438dcbc38828bdc55a1a6e61ae0c2b1ced90bd3af59ebb1ac030c1069f WHIRLPOOL 0fe92b67faedff1f3edcc34b1c3823b0fed55d91bf2d26de7b214b951f0e9e75d4b79eb3f2db193a3eeff71f772b5eb60e4bbc4a7af05d72684f4b181ffb500c |
23 |
DIST mysql-5.5.54.tar.gz 21041949 SHA256 273bcbcf8cc84061eb07c359308563b2029eb3f70f78b558905bc1b5c5791ab8 SHA512 885e21a59cf7e835dd1ca7254889fc4e5762fdebbb1e625465ef7fa3be6533d48091b68a6d1f2de0297270cfd0ca7e8e643fc2e0b7fc14325f48708e7a55460b WHIRLPOOL bdb8ec54b6b831dba673c5a7b6328809e79b8406a511a108ced93bd3efa42d718d35462cf0bf098db0a1108217d5d47c19c2540d87ad5f1ccfd66c55dd67ca3f |
24 |
-DIST mysql-5.6.34.tar.gz 32094762 SHA256 ee90bafec6af3abe2715ccb0b3cc9345ed8d1cce025d41e6ec2b2b7a7d820823 SHA512 2395455d6b62161695b6923a3da05480f5a6044e695adf3619459655adbfa63e9c82abbbe20f2ba1096a5900bb850af8b5b3a9306526fceb42f4479bae5dd6f2 WHIRLPOOL 888d3cd4d7ed56defe4ae127a6f31c8aa7a3e43285c8b43c001203eefaf5ffb19b5508cb5facd05d0aa5a9edb713dc0dd506b0d46dbf815177f253da29870fab |
25 |
DIST mysql-5.6.35.tar.gz 32167628 SHA256 dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 SHA512 106c4b05c52cd2bb5378376e4a453aeb55eda0adce527862c435068597c3e60f44e3c64476011befefd688e6fdf30f2245e28320d57d9fccbb2415d87498e7f2 WHIRLPOOL e8972bba163453e54dc3859a7cfd07b4dc38125e0b5f7b41940afa6f1466820079f18e88769ea198b12645383d105340ab5ea998b32a95d083d08689658510bc |
26 |
DIST mysql-extras-20160212-0233Z.tar.bz2 297332 SHA256 01a52587ef1335b2795197d2e547c0b3a1e4b705db09f96cdfb45d2152b6536b SHA512 956dbdcb987556c0625944848f97a36d096cd1f1712a2e051dd027f2856d3c6e94a18d23faca71882260c4b12ee329e3a5f569443b877a3c3e5e88146bfac916 WHIRLPOOL e3837d329ddd137be60fe9d0b37f35ed2e0e7fe1383f38ee45617be288ae318a444e6befdfbaf64b07d4a88ec47fec5cd88d733ecd5bb32ce40f3ba8d09573cd |
27 |
DIST mysql-extras-20161019-1853Z.tar.bz2 304137 SHA256 985a498fd45b2fb0d9ca06f45c18823b019cd807a6dfea1f3a1fd9e7dde970e4 SHA512 2f46663e268f46db9c8102a0c69d5ded1d1b5cde74d446586f5faf9a74e4de1afbeade79922faab91cd2b214d3dd1298bcd02df915d3f09f07ec649bba1aa390 WHIRLPOOL d0326a0399fa2a79a1446b4dbcd7528089cb14c7598ec83a54817c5d41bc144c9a5215954067c4f19932a4a6ec3d4bc4dca95ba735694b4ef0421a59479ca4f0 |
28 |
|
29 |
diff --git a/dev-db/mysql/mysql-5.5.53.ebuild b/dev-db/mysql/mysql-5.5.53.ebuild |
30 |
deleted file mode 100644 |
31 |
index 6a9e6af..00000000 |
32 |
--- a/dev-db/mysql/mysql-5.5.53.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,126 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
-# $Id$ |
38 |
- |
39 |
-EAPI="5" |
40 |
- |
41 |
-MY_EXTRAS_VER="20161019-1853Z" |
42 |
-MY_PV="${PV//_alpha_pre/-m}" |
43 |
-MY_PV="${MY_PV//_/-}" |
44 |
- |
45 |
-# Build type |
46 |
-BUILD="cmake" |
47 |
- |
48 |
-inherit toolchain-funcs mysql-v2 |
49 |
-# only to make repoman happy. it is really set in the eclass |
50 |
-IUSE="$IUSE" |
51 |
- |
52 |
-# Define the mysql-extras source |
53 |
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" |
54 |
- |
55 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
56 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
57 |
- |
58 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
59 |
-EPATCH_EXCLUDE='20019_all_mysql-5.5-mtr-perl-deprecation.patch' |
60 |
- |
61 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
62 |
-RDEPEND="${RDEPEND}" |
63 |
- |
64 |
-# Please do not add a naive src_unpack to this ebuild |
65 |
-# If you want to add a single patch, copy the ebuild to an overlay |
66 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
67 |
- |
68 |
-# Official test instructions: |
69 |
-# USE='embedded extraengine perl ssl static-libs community' \ |
70 |
-# FEATURES='test userpriv -usersandbox' \ |
71 |
-# ebuild mysql-X.X.XX.ebuild \ |
72 |
-# digest clean package |
73 |
-src_test() { |
74 |
- |
75 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
76 |
- local retstatus_unit |
77 |
- local retstatus_tests |
78 |
- |
79 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
80 |
- # localhost. Also causes weird failures. |
81 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
82 |
- |
83 |
- if ! use "minimal" ; then |
84 |
- |
85 |
- if [[ $UID -eq 0 ]]; then |
86 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
87 |
- fi |
88 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
89 |
- |
90 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
91 |
- addpredict /this-dir-does-not-exist/t9.MYI |
92 |
- |
93 |
- # Run CTest (test-units) |
94 |
- cmake-utils_src_test |
95 |
- retstatus_unit=$? |
96 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
97 |
- |
98 |
- # Ensure that parallel runs don't die |
99 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
100 |
- # Enable parallel testing, auto will try to detect number of cores |
101 |
- # You may set this by hand. |
102 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
103 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
104 |
- |
105 |
- # create directories because mysqladmin might right out of order |
106 |
- mkdir -p "${T}"/var-tests{,/log} |
107 |
- |
108 |
- # create symlink for the tests to find mysql_tzinfo_to_sql |
109 |
- ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
110 |
- |
111 |
- # These are failing in MySQL 5.5 for now and are believed to be |
112 |
- # false positives: |
113 |
- # |
114 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
115 |
- # main.mysqld--help-notwin |
116 |
- # fails due to USE=-latin1 / utf8 default |
117 |
- # |
118 |
- # main.mysql_client_test: |
119 |
- # segfaults at random under Portage only, suspect resource limits. |
120 |
- # |
121 |
- # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
122 |
- # fails due to bad cleanup of previous tests when run in parallel |
123 |
- # The tool is deprecated anyway |
124 |
- # Bug 532288 |
125 |
- |
126 |
- for t in main.mysql_client_test main.openssl_1 \ |
127 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
128 |
- main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do |
129 |
- mysql-v2_disable_test "$t" "False positives in Gentoo" |
130 |
- done |
131 |
- |
132 |
- # Run mysql tests |
133 |
- pushd "${TESTDIR}" |
134 |
- |
135 |
- # run mysql-test tests |
136 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
137 |
- --testcase-timeout=30 --reorder |
138 |
- retstatus_tests=$? |
139 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
140 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
141 |
- |
142 |
- popd |
143 |
- |
144 |
- # Cleanup is important for these testcases. |
145 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
146 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
147 |
- |
148 |
- failures="" |
149 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
150 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
151 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
152 |
- |
153 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
154 |
- einfo "Tests successfully completed" |
155 |
- |
156 |
- else |
157 |
- |
158 |
- einfo "Skipping server tests due to minimal build." |
159 |
- fi |
160 |
-} |
161 |
|
162 |
diff --git a/dev-db/mysql/mysql-5.6.34.ebuild b/dev-db/mysql/mysql-5.6.34.ebuild |
163 |
deleted file mode 100644 |
164 |
index a85a16a..00000000 |
165 |
--- a/dev-db/mysql/mysql-5.6.34.ebuild |
166 |
+++ /dev/null |
167 |
@@ -1,164 +0,0 @@ |
168 |
-# Copyright 1999-2017 Gentoo Foundation |
169 |
-# Distributed under the terms of the GNU General Public License v2 |
170 |
-# $Id$ |
171 |
- |
172 |
-EAPI="6" |
173 |
- |
174 |
-MY_EXTRAS_VER="20160212-0233Z" |
175 |
-MY_PV="${PV//_alpha_pre/-m}" |
176 |
-MY_PV="${MY_PV//_/-}" |
177 |
-HAS_TOOLS_PATCH="1" |
178 |
-SUBSLOT="18" |
179 |
- |
180 |
-inherit mysql-multilib-r1 |
181 |
-# only to make repoman happy. it is really set in the eclass |
182 |
-IUSE="$IUSE" |
183 |
- |
184 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
185 |
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
186 |
- |
187 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
188 |
-EPATCH_EXCLUDE='' |
189 |
- |
190 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
191 |
-RDEPEND="${RDEPEND}" |
192 |
- |
193 |
-# Please do not add a naive src_unpack to this ebuild |
194 |
-# If you want to add a single patch, copy the ebuild to an overlay |
195 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
196 |
- |
197 |
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) |
198 |
-# disable until we see what happens with it |
199 |
-MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 ) |
200 |
- |
201 |
-src_prepare() { |
202 |
- mysql-multilib-r1_src_prepare |
203 |
- if use libressl ; then |
204 |
- sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ |
205 |
- "${S}/cmake/ssl.cmake" || die |
206 |
- fi |
207 |
-} |
208 |
- |
209 |
-# Official test instructions: |
210 |
-# USE='server embedded extraengine perl openssl static-libs' \ |
211 |
-# FEATURES='test userpriv -usersandbox' \ |
212 |
-# ebuild mysql-X.X.XX.ebuild \ |
213 |
-# digest clean package |
214 |
-multilib_src_test() { |
215 |
- |
216 |
- if ! multilib_is_native_abi ; then |
217 |
- einfo "Server tests not available on non-native abi". |
218 |
- return 0; |
219 |
- fi |
220 |
- |
221 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
222 |
- local retstatus_unit |
223 |
- local retstatus_tests |
224 |
- |
225 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
226 |
- # localhost. Also causes weird failures. |
227 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
228 |
- |
229 |
- if use server ; then |
230 |
- |
231 |
- if [[ $UID -eq 0 ]]; then |
232 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
233 |
- fi |
234 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
235 |
- |
236 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
237 |
- |
238 |
- # Run CTest (test-units) |
239 |
- cmake-utils_src_test |
240 |
- retstatus_unit=$? |
241 |
- |
242 |
- # Ensure that parallel runs don't die |
243 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
244 |
- # Enable parallel testing, auto will try to detect number of cores |
245 |
- # You may set this by hand. |
246 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
247 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
248 |
- |
249 |
- # create directories because mysqladmin might right out of order |
250 |
- mkdir -p "${T}"/var-tests{,/log} |
251 |
- |
252 |
- # create symlink for the tests to find mysql_tzinfo_to_sql |
253 |
- ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
254 |
- |
255 |
- # These are failing in MySQL 5.5/5.6 for now and are believed to be |
256 |
- # false positives: |
257 |
- # |
258 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
259 |
- # funcs_1.is_triggers funcs_1.is_tables_mysql, |
260 |
- # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, |
261 |
- # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, |
262 |
- # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql |
263 |
- # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter |
264 |
- # fails due to USE=-latin1 / utf8 default |
265 |
- # |
266 |
- # main.mysql_client_test: |
267 |
- # segfaults at random under Portage only, suspect resource limits. |
268 |
- # |
269 |
- # rpl.rpl_plugin_load |
270 |
- # fails due to included file not listed in expected result |
271 |
- # appears to be poor planning |
272 |
- # |
273 |
- # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
274 |
- # fails due to bad cleanup of previous tests when run in parallel |
275 |
- # The tool is deprecated anyway |
276 |
- # Bug 532288 |
277 |
- for t in \ |
278 |
- binlog.binlog_mysqlbinlog_filter \ |
279 |
- binlog.binlog_statement_insert_delayed \ |
280 |
- funcs_1.is_columns_mysql \ |
281 |
- funcs_1.is_tables_mysql \ |
282 |
- funcs_1.is_triggers \ |
283 |
- main.information_schema \ |
284 |
- main.mysql_client_test \ |
285 |
- main.mysqld--help-notwin \ |
286 |
- perfschema.binlog_edge_mix \ |
287 |
- perfschema.binlog_edge_stmt \ |
288 |
- rpl.rpl_plugin_load \ |
289 |
- main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
290 |
- ; do |
291 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
292 |
- done |
293 |
- |
294 |
- if ! use extraengine ; then |
295 |
- # bug 401673, 530766 |
296 |
- for t in federated.federated_plugin ; do |
297 |
- mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" |
298 |
- done |
299 |
- fi |
300 |
- |
301 |
- # Run mysql tests |
302 |
- pushd "${TESTDIR}" |
303 |
- |
304 |
- # Set file limits higher so tests run |
305 |
- ulimit -n 3000 |
306 |
- |
307 |
- # run mysql-test tests |
308 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
309 |
- --suite-timeout=5000 --reorder |
310 |
- retstatus_tests=$? |
311 |
-# [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
312 |
-# has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
313 |
- |
314 |
- popd |
315 |
- |
316 |
- # Cleanup is important for these testcases. |
317 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
318 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
319 |
- |
320 |
- failures="" |
321 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
322 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
323 |
-# has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
324 |
- |
325 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
326 |
- einfo "Tests successfully completed" |
327 |
- |
328 |
- else |
329 |
- einfo "Skipping server tests due to minimal build." |
330 |
- fi |
331 |
-} |