Gentoo Archives: gentoo-commits

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