1 |
commit: 3915ad0146200091675a1d74a22203b4c218fc30 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 4 12:49:16 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 4 12:50:05 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3915ad01 |
7 |
|
8 |
dev-db/mariadb: Drop security vulnerable versions |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
dev-db/mariadb/Manifest | 3 - |
13 |
dev-db/mariadb/mariadb-10.1.22.ebuild | 225 ---------------------------------- |
14 |
dev-db/mariadb/mariadb-5.5.54.ebuild | 122 ------------------ |
15 |
dev-db/mariadb/mariadb-5.5.55.ebuild | 122 ------------------ |
16 |
4 files changed, 472 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
19 |
index eb73f0bdb6b..93b342e6f7a 100644 |
20 |
--- a/dev-db/mariadb/Manifest |
21 |
+++ b/dev-db/mariadb/Manifest |
22 |
@@ -1,10 +1,7 @@ |
23 |
DIST mariadb-10.0.29.tar.gz 63385696 SHA256 f5f8da646f7df4b1fb21adb8d2b15e6dfbe1964ceb8cea53207d580a464350f4 SHA512 187c3563e8cb74221505e3e77dbe716a8f3fe53130b304c073105c59f0aededf7285b3fa0d0a60cc2d084323f7d2892dce14d60755c594b20c06864255c2dc9c WHIRLPOOL ef9b20fccf280da2bc65c64081f8b1fb7c1984fd8815da3ee40957fa6f977a415b983ba35cf57ddb0380e273e18039deba93007c2ce7496ec4f3ae2d5554397b |
24 |
DIST mariadb-10.0.30.tar.gz 63433598 SHA256 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 WHIRLPOOL d109efc6599f457b0a270c62f32115bc0753a5357e88f40023944668c2cfece70f01050fe4773f2bb97ae58c76da15b22031a281aeebaf0512a64bc9ff3f4c37 |
25 |
-DIST mariadb-10.1.22.tar.gz 61542321 SHA256 bcb0572e7ad32cea9740a21e9255f733bdf60a5561ffbda317c22dd12b3966ce SHA512 cf02044b7531f83618eeb42bbddce7b761c6530d22fc69701b3efe7461a1e932510cee923aa59044dcf0bbb5a9edf7bc76d3568f300b648f4983848f5975f7b2 WHIRLPOOL b0637e3a267ef70a527f7b15da634158f6dd873c3f3f88f81d60855784325ced0557e76e8be71e24d0927cec4c081e4cbf816f0c465d8cc9d9ef0576572ab44e |
26 |
DIST mariadb-10.1.23.tar.gz 61772244 SHA256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf SHA512 338d016251038ef03d78744d93a2e21db6517e44f911512aaa3f34b52ddf6b2fc255783f8cacd63a7f89bc56eb728321c658b11f06718c83baf22109907149c6 WHIRLPOOL 2f1ae9e3dab858998cff8578b7ec8d1c0949a908a9872dc48c997ae2b233eba629d65594bf67ae145d911bb6bd8dcf3dab2778d3a0fbe74d8855805326ccee12 |
27 |
DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31 |
28 |
-DIST mariadb-5.5.54.tar.gz 45765936 SHA256 54405ad9beff02339819eb73c59b4bf25f58a2c5abffbf17e81c4940a893538c SHA512 fe1ff7545989e542f777c201774eaeead906f864277bb1a98bcd06c50b97816a56cb70e83e6fd4517e8d8887ae237eb9cc75e27ab473a2e7a8f154882fc9e2a3 WHIRLPOOL 6f37cf5675eae31347c77d1444e17e70d35d91932251efb0f772de6d36f7b74c797d92be2fec99dc803b18f99ea8dc5a55170e76c91b72b20b74797e99092bfe |
29 |
-DIST mariadb-5.5.55.tar.gz 45757922 SHA256 cb94e315d0fc90c62db5a6c7829c9966f674285d99b3ba3ffa575fb4a26edc86 SHA512 6fe725c997600009a7bb3dd0e78a4a94c370a07760c26cb124eee68aa81f859be159618cab782595e33aefecaf0401a6a1229f9acd847b8e2425cee069a2bc4e WHIRLPOOL 6984b35add26a65844f036e11f9db1fc2663300b23c8d60510bda789753189a339da8dbf463699eeb2a145d05a803fac92a3ba729c6866139f7867b8eb69cfc7 |
30 |
DIST mariadb-5.5.56.tar.gz 45777456 SHA256 950c3422cb262b16ce133caadbc342219f50f9b45dcc71b8db78fc376a971726 SHA512 c3d12bf7d78618f3567f9c428800419510fddc62ae8c6715c809dd2cf205689ca910c27adb12033744f8e827a5d824aa2cac4d9ecdee59356bb776a22d45a97b WHIRLPOOL c4ceef2d653cbc65e8a367194a99e19f87925df8113affd04d66ecc263cb6708ec54382989867376038b4ce7e545daa2a696682fe9b5651fe214932f734970a7 |
31 |
DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 WHIRLPOOL d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f |
32 |
DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d WHIRLPOOL becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927 |
33 |
|
34 |
diff --git a/dev-db/mariadb/mariadb-10.1.22.ebuild b/dev-db/mariadb/mariadb-10.1.22.ebuild |
35 |
deleted file mode 100644 |
36 |
index 6b915fe4aae..00000000000 |
37 |
--- a/dev-db/mariadb/mariadb-10.1.22.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,225 +0,0 @@ |
40 |
-# Copyright 1999-2017 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI="6" |
44 |
-MY_EXTRAS_VER="20170316-1355Z" |
45 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
46 |
-WSREP_REVISION="25" |
47 |
-SUBSLOT="18" |
48 |
-MYSQL_PV_MAJOR="5.6" |
49 |
- |
50 |
-JAVA_PKG_OPT_USE="jdbc" |
51 |
- |
52 |
-inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 |
53 |
- |
54 |
-HOMEPAGE="http://mariadb.org/" |
55 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
56 |
- |
57 |
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
58 |
-RESTRICT="!bindist? ( bindist )" |
59 |
- |
60 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )" |
61 |
- |
62 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
63 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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" |
64 |
- |
65 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
66 |
- |
67 |
-PATCHES=( |
68 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch |
69 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
70 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
71 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
72 |
- "${MY_PATCH_DIR}"/20034_all_mariadb-10.1.22-MDEV-12261.patch |
73 |
-) |
74 |
- |
75 |
-COMMON_DEPEND=" |
76 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
77 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
78 |
- systemd? ( sys-apps/systemd:= ) |
79 |
- !bindist? ( |
80 |
- sys-libs/binutils-libs:0= |
81 |
- >=sys-libs/readline-4.1:0= |
82 |
- ) |
83 |
- server? ( |
84 |
- cracklib? ( sys-libs/cracklib:0= ) |
85 |
- extraengine? ( |
86 |
- odbc? ( dev-db/unixODBC:0= ) |
87 |
- xml? ( dev-libs/libxml2:2= ) |
88 |
- sys-libs/zlib[minizip] |
89 |
- ) |
90 |
- innodb-lz4? ( app-arch/lz4 ) |
91 |
- innodb-lzo? ( dev-libs/lzo ) |
92 |
- innodb-snappy? ( app-arch/snappy ) |
93 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
94 |
- pam? ( virtual/pam:0= ) |
95 |
- tokudb? ( app-arch/snappy ) |
96 |
- ) |
97 |
- >=dev-libs/libpcre-8.35:3= |
98 |
-" |
99 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
100 |
- server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) |
101 |
- ${COMMON_DEPEND}" |
102 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
103 |
- galera? ( |
104 |
- sys-apps/iproute2 |
105 |
- =sys-cluster/galera-${WSREP_REVISION}* |
106 |
- sst-rsync? ( sys-process/lsof ) |
107 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
108 |
- ) |
109 |
- perl? ( !dev-db/mytop |
110 |
- virtual/perl-Getopt-Long |
111 |
- dev-perl/TermReadKey |
112 |
- virtual/perl-Term-ANSIColor |
113 |
- virtual/perl-Time-HiRes ) |
114 |
- server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) |
115 |
-" |
116 |
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
117 |
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" |
118 |
- |
119 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
120 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
121 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
122 |
- |
123 |
-pkg_setup() { |
124 |
- java-pkg-opt-2_pkg_setup |
125 |
- mysql-multilib-r1_pkg_setup |
126 |
-} |
127 |
- |
128 |
-pkg_preinst() { |
129 |
- java-pkg-opt-2_pkg_preinst |
130 |
- mysql-multilib-r1_pkg_preinst |
131 |
-} |
132 |
- |
133 |
-src_prepare() { |
134 |
- java-pkg-opt-2_src_prepare |
135 |
- mysql-multilib-r1_src_prepare |
136 |
-} |
137 |
- |
138 |
-src_configure(){ |
139 |
- # bug 508724 mariadb cannot use ld.gold |
140 |
- tc-ld-disable-gold |
141 |
- |
142 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
143 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
144 |
- -DWITH_PCRE=system |
145 |
- ) |
146 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
147 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
148 |
- ) |
149 |
- if use server ; then |
150 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
151 |
- if ! use extraengine ; then |
152 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
153 |
- -DPLUGIN_FEDERATED=NO |
154 |
- -DPLUGIN_FEDERATEDX=NO ) |
155 |
- fi |
156 |
- |
157 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
158 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
159 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
160 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
161 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
162 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
163 |
- -DPLUGIN_CASSANDRA=NO |
164 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
165 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
166 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
167 |
- -DCONNECT_WITH_MYSQL=1 |
168 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
169 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
170 |
- -DCONNECT_WITH_JDBC=$(usex jdbc) |
171 |
- -DWITH_WSREP=$(usex galera) |
172 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) |
173 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) |
174 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) |
175 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
176 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
177 |
- ) |
178 |
- fi |
179 |
- mysql-multilib-r1_src_configure |
180 |
-} |
181 |
- |
182 |
-# Official test instructions: |
183 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
184 |
-# FEATURES='test userpriv -usersandbox' \ |
185 |
-# ebuild mariadb-X.X.XX.ebuild \ |
186 |
-# digest clean package |
187 |
-multilib_src_test() { |
188 |
- |
189 |
- if ! multilib_is_native_abi ; then |
190 |
- einfo "Server tests not available on non-native abi". |
191 |
- return 0; |
192 |
- fi |
193 |
- |
194 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
195 |
- local retstatus_unit |
196 |
- local retstatus_tests |
197 |
- |
198 |
- if ! use server ; then |
199 |
- einfo "Skipping server tests due to minimal build." |
200 |
- return 0 |
201 |
- fi |
202 |
- |
203 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
204 |
- # localhost. Also causes weird failures. |
205 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
206 |
- |
207 |
- if [[ $UID -eq 0 ]]; then |
208 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
209 |
- fi |
210 |
- has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" |
211 |
- |
212 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
213 |
- |
214 |
- # Run CTest (test-units) |
215 |
- cmake-utils_src_test |
216 |
- retstatus_unit=$? |
217 |
- |
218 |
- # Ensure that parallel runs don't die |
219 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
220 |
- # Enable parallel testing, auto will try to detect number of cores |
221 |
- # You may set this by hand. |
222 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
223 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
224 |
- |
225 |
- # create directories because mysqladmin might run out of order |
226 |
- mkdir -p "${T}"/var-tests{,/log} |
227 |
- |
228 |
- # Run mysql tests |
229 |
- pushd "${TESTDIR}" || die |
230 |
- |
231 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
232 |
- # false positives: |
233 |
- # |
234 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
235 |
- # main.mysql_client_test_comp: |
236 |
- # segfaults at random under Portage only, suspect resource limits. |
237 |
- |
238 |
- local t |
239 |
- for t in plugins.cracklib_password_check plugins.two_password_validations ; do |
240 |
- mysql-multilib-r1_disable_test "$t" "False positive due to varying policies" |
241 |
- done |
242 |
- |
243 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
244 |
- main.mysql_client_test_comp ; do |
245 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
246 |
- done |
247 |
- |
248 |
- # run mysql-test tests |
249 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
250 |
- retstatus_tests=$? |
251 |
- |
252 |
- popd || die |
253 |
- |
254 |
- # Cleanup is important for these testcases. |
255 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
256 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
257 |
- |
258 |
- local failures="" |
259 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
260 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
261 |
- |
262 |
- [[ -z "$failures" ]] || eerror "Test failures: $failures" |
263 |
- einfo "Tests successfully completed" |
264 |
-} |
265 |
|
266 |
diff --git a/dev-db/mariadb/mariadb-5.5.54.ebuild b/dev-db/mariadb/mariadb-5.5.54.ebuild |
267 |
deleted file mode 100644 |
268 |
index aa0132d8a7b..00000000000 |
269 |
--- a/dev-db/mariadb/mariadb-5.5.54.ebuild |
270 |
+++ /dev/null |
271 |
@@ -1,122 +0,0 @@ |
272 |
-# Copyright 1999-2017 Gentoo Foundation |
273 |
-# Distributed under the terms of the GNU General Public License v2 |
274 |
- |
275 |
-EAPI="5" |
276 |
-MY_EXTRAS_VER="20160721-1526Z" |
277 |
- |
278 |
-# Build system |
279 |
-BUILD="cmake" |
280 |
- |
281 |
-inherit toolchain-funcs mysql-v2 |
282 |
-# only to make repoman happy. it is really set in the eclass |
283 |
-IUSE="$IUSE" |
284 |
- |
285 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
286 |
-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" |
287 |
- |
288 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
289 |
-EPATCH_EXCLUDE='' |
290 |
- |
291 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
292 |
-RDEPEND="${RDEPEND}" |
293 |
- |
294 |
-# Please do not add a naive src_unpack to this ebuild |
295 |
-# If you want to add a single patch, copy the ebuild to an overlay |
296 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
297 |
- |
298 |
-# Official test instructions: |
299 |
-# USE='embedded extraengine perl ssl static-libs community' \ |
300 |
-# FEATURES='test userpriv -usersandbox' \ |
301 |
-# ebuild mariadb-X.X.XX.ebuild \ |
302 |
-# digest clean package |
303 |
-src_test() { |
304 |
- |
305 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
306 |
- local retstatus_unit |
307 |
- local retstatus_tests |
308 |
- |
309 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
310 |
- # localhost. Also causes weird failures. |
311 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
312 |
- |
313 |
- if ! use "minimal" ; then |
314 |
- |
315 |
- if [[ $UID -eq 0 ]]; then |
316 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
317 |
- fi |
318 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
319 |
- |
320 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
321 |
- addpredict /this-dir-does-not-exist/t9.MYI |
322 |
- |
323 |
- # Run CTest (test-units) |
324 |
- cmake-utils_src_test |
325 |
- retstatus_unit=$? |
326 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
327 |
- |
328 |
- # Ensure that parallel runs don't die |
329 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
330 |
- # Enable parallel testing, auto will try to detect number of cores |
331 |
- # You may set this by hand. |
332 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
333 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
334 |
- |
335 |
- # create directories because mysqladmin might right out of order |
336 |
- mkdir -p "${T}"/var-tests{,/log} |
337 |
- |
338 |
- # create symlink for the tests to find the replace util |
339 |
- ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/" |
340 |
- |
341 |
- # These are failing in MariaDB 5.5 for now and are believed to be |
342 |
- # false positives: |
343 |
- # |
344 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
345 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
346 |
- # funcs_1.is_columns_mysql |
347 |
- # fails due to USE=-latin1 / utf8 default |
348 |
- # |
349 |
- # main.mysql_client_test, main.mysql_client_test_nonblock: |
350 |
- # segfaults at random under Portage only, suspect resource limits. |
351 |
- # |
352 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
353 |
- # fails due to bad cleanup of previous tests when run in parallel |
354 |
- # The tool is deprecated anyway |
355 |
- # Bug 532288 |
356 |
- |
357 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
358 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
359 |
- main.mysqld--help \ |
360 |
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
361 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
362 |
- mysql-v2_disable_test "$t" "False positives in Gentoo" |
363 |
- done |
364 |
- |
365 |
- # Run mysql tests |
366 |
- pushd "${TESTDIR}" |
367 |
- |
368 |
- # run mysql-test tests |
369 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
370 |
- --testcase-timeout=30 |
371 |
- retstatus_tests=$? |
372 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
373 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
374 |
- |
375 |
- popd |
376 |
- |
377 |
- # Cleanup is important for these testcases. |
378 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
379 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
380 |
- |
381 |
- failures="" |
382 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
383 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
384 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
385 |
- |
386 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
387 |
- einfo "Tests successfully completed" |
388 |
- |
389 |
- else |
390 |
- |
391 |
- einfo "Skipping server tests due to minimal build." |
392 |
- fi |
393 |
-} |
394 |
|
395 |
diff --git a/dev-db/mariadb/mariadb-5.5.55.ebuild b/dev-db/mariadb/mariadb-5.5.55.ebuild |
396 |
deleted file mode 100644 |
397 |
index aa0132d8a7b..00000000000 |
398 |
--- a/dev-db/mariadb/mariadb-5.5.55.ebuild |
399 |
+++ /dev/null |
400 |
@@ -1,122 +0,0 @@ |
401 |
-# Copyright 1999-2017 Gentoo Foundation |
402 |
-# Distributed under the terms of the GNU General Public License v2 |
403 |
- |
404 |
-EAPI="5" |
405 |
-MY_EXTRAS_VER="20160721-1526Z" |
406 |
- |
407 |
-# Build system |
408 |
-BUILD="cmake" |
409 |
- |
410 |
-inherit toolchain-funcs mysql-v2 |
411 |
-# only to make repoman happy. it is really set in the eclass |
412 |
-IUSE="$IUSE" |
413 |
- |
414 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
415 |
-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" |
416 |
- |
417 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
418 |
-EPATCH_EXCLUDE='' |
419 |
- |
420 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
421 |
-RDEPEND="${RDEPEND}" |
422 |
- |
423 |
-# Please do not add a naive src_unpack to this ebuild |
424 |
-# If you want to add a single patch, copy the ebuild to an overlay |
425 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
426 |
- |
427 |
-# Official test instructions: |
428 |
-# USE='embedded extraengine perl ssl static-libs community' \ |
429 |
-# FEATURES='test userpriv -usersandbox' \ |
430 |
-# ebuild mariadb-X.X.XX.ebuild \ |
431 |
-# digest clean package |
432 |
-src_test() { |
433 |
- |
434 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
435 |
- local retstatus_unit |
436 |
- local retstatus_tests |
437 |
- |
438 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
439 |
- # localhost. Also causes weird failures. |
440 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
441 |
- |
442 |
- if ! use "minimal" ; then |
443 |
- |
444 |
- if [[ $UID -eq 0 ]]; then |
445 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
446 |
- fi |
447 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
448 |
- |
449 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
450 |
- addpredict /this-dir-does-not-exist/t9.MYI |
451 |
- |
452 |
- # Run CTest (test-units) |
453 |
- cmake-utils_src_test |
454 |
- retstatus_unit=$? |
455 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
456 |
- |
457 |
- # Ensure that parallel runs don't die |
458 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
459 |
- # Enable parallel testing, auto will try to detect number of cores |
460 |
- # You may set this by hand. |
461 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
462 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
463 |
- |
464 |
- # create directories because mysqladmin might right out of order |
465 |
- mkdir -p "${T}"/var-tests{,/log} |
466 |
- |
467 |
- # create symlink for the tests to find the replace util |
468 |
- ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/" |
469 |
- |
470 |
- # These are failing in MariaDB 5.5 for now and are believed to be |
471 |
- # false positives: |
472 |
- # |
473 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
474 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
475 |
- # funcs_1.is_columns_mysql |
476 |
- # fails due to USE=-latin1 / utf8 default |
477 |
- # |
478 |
- # main.mysql_client_test, main.mysql_client_test_nonblock: |
479 |
- # segfaults at random under Portage only, suspect resource limits. |
480 |
- # |
481 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
482 |
- # fails due to bad cleanup of previous tests when run in parallel |
483 |
- # The tool is deprecated anyway |
484 |
- # Bug 532288 |
485 |
- |
486 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
487 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
488 |
- main.mysqld--help \ |
489 |
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
490 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
491 |
- mysql-v2_disable_test "$t" "False positives in Gentoo" |
492 |
- done |
493 |
- |
494 |
- # Run mysql tests |
495 |
- pushd "${TESTDIR}" |
496 |
- |
497 |
- # run mysql-test tests |
498 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
499 |
- --testcase-timeout=30 |
500 |
- retstatus_tests=$? |
501 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
502 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
503 |
- |
504 |
- popd |
505 |
- |
506 |
- # Cleanup is important for these testcases. |
507 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
508 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
509 |
- |
510 |
- failures="" |
511 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
512 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
513 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
514 |
- |
515 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
516 |
- einfo "Tests successfully completed" |
517 |
- |
518 |
- else |
519 |
- |
520 |
- einfo "Skipping server tests due to minimal build." |
521 |
- fi |
522 |
-} |