1 |
commit: 688944ce5ebe5126c6e2670d2a568897eec9f5f8 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 30 18:38:02 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 30 18:38:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688944ce |
7 |
|
8 |
dev-db/mariadb: Drop old security vulnerable versions |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
dev-db/mariadb/Manifest | 6 - |
13 |
dev-db/mariadb/mariadb-10.1.12.ebuild | 213 --------------------------------- |
14 |
dev-db/mariadb/mariadb-10.1.13.ebuild | 213 --------------------------------- |
15 |
dev-db/mariadb/mariadb-10.1.14.ebuild | 218 ---------------------------------- |
16 |
dev-db/mariadb/mariadb-5.5.49.ebuild | 123 ------------------- |
17 |
5 files changed, 773 deletions(-) |
18 |
|
19 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
20 |
index 2a3ebff..8502390 100644 |
21 |
--- a/dev-db/mariadb/Manifest |
22 |
+++ b/dev-db/mariadb/Manifest |
23 |
@@ -1,18 +1,12 @@ |
24 |
DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c |
25 |
DIST mariadb-10.0.26.tar.gz 57621647 SHA256 578538d9b51f455cbd0cb021f523284a45480b4bba853b4a79f3497c49ec40c0 SHA512 7291a91cc0e17bcedbba6e93cf05679f3119efcd588b249beb423e9ac5152d1c0add9321a4dc0a59ac94ca16d5d733983234a64b7b555183b6312a045dc8991c WHIRLPOOL c09aba18191c476920fa2b39558ed5e64df1e77029ed913ffc2f34299402b89b03a3fefc711295cb58db346e84d8865fb8dabe78daa47e996c257dd9ea4a5d84 |
26 |
DIST mariadb-10.0.27.tar.gz 63258508 SHA256 bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd SHA512 c3aa415b7fc766dce34c99795cfcfa424a8d7eb7ee19497f1a61cad7c708914b94d66eabb104dff364b2db77d07471ce810d708ec541efb1bed7291ca1ce7364 WHIRLPOOL 9a90edc10d482140da818bee7598dd1b468076091478fb63e19f475d8a3af6e059f04d85851b701b6e305b9912aefa7bbfa0b0045c075db8d9f16c30944da584 |
27 |
-DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d |
28 |
-DIST mariadb-10.1.13.tar.gz 55272572 SHA256 21e1c7da1421146c69f5e8077333aaac06778a87046a1943ee4f449fbcefc00d SHA512 fdaa35f1a93e2a124339f3a4a85d7247c223ffec2cd7ed36f029f63a76bd348b8f41f491e5b2f81f53bed82ed79bc89b62dd6966d5a946910299070ece667b5e WHIRLPOOL 0ff2891af910380749be8b31bdacec02777cc4f2b474172b3257cecc10b900222c3c089515c9fd4621ea75ea58179b1f1336b7c26185ec43282df0ce661e621d |
29 |
-DIST mariadb-10.1.14.tar.gz 55341017 SHA256 18e71974a059a268a3f28281599607344d548714ade823d575576121f76ada13 SHA512 dad8f296320f95b2ab2f3a9e888c1829df63229cb8c76161ad004c6c1a1a488f0db7918e3e655de04281dc65aab71f6e5d9ecab75e6071521799631355cfeadf WHIRLPOOL 6788513c58e1b0875dba4a2f661a161e6d7a355503ff018c75cc298b8b2609e2d720a1c572904214aebc34aa71e394bb5eb1df8f6808ecf39b84aa72656b5a6a |
30 |
DIST mariadb-10.1.16.tar.gz 55527069 SHA256 67cb35c62cc5d4cf48d7b614c0c7a9245a762ca23d4e588e15c616c102e64393 SHA512 4bf9a0b9c964f2526ecb48a0b7863c39a43ca3a6d3685b6397f79a4004d0f065108ea2367116d53da42dd70e42a4b4761bf4ead79c0483e0ba65915f58a6dd73 WHIRLPOOL f881982cf04018c875f5128a5e9a94fc368d4eaedd2bf2cff03118cf79bbeab69a90eed7ee8f6d02953fecff9ac8d750836eded4a5df18077d48fe0f3298aee2 |
31 |
DIST mariadb-10.1.17.tar.gz 61158134 SHA256 4ca45ac5e34418761868115ebc8c068d511fed08e283b2cac52559d63ba4aab5 SHA512 900f019ec7544e315c98aea3647988f6ec257822b116c8a986851db678dd0bf71018dde1d0c90adeaa713af12348344ffc54c292a64869d9565f3f906599396d WHIRLPOOL e2e4d1294bc64c37d6916dc291d33769fd05c591697efba27fff79cb4debc76cf7a5eaf6e63a9ce3a12c22653ffc9d25082eb5a03f4f402b7395b91cb9ea415d |
32 |
DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31 |
33 |
-DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3 |
34 |
DIST mariadb-5.5.50.tar.gz 45731073 SHA256 030b60a787333bf20ec0ee02b02da52474772c069954dc914f894a7703989b76 SHA512 b20f0aefa3e9ff9ef94151a03ba9c6dc43d6993ee27356d5ead9c076554ed7196c9dca35d3a8547e395b094bfb121baa21d05da5fa343fb2b76c738d1276f72f WHIRLPOOL c8e7b539a51250216b3bd9c65a805675827a2660c8a24f79fdbae8557a2b4f72ba03fda4d8b9b3e996a25b4e8e8fe031e8a21f5c13ef5512a31bf13647746735 |
35 |
DIST mariadb-5.5.51.tar.gz 45747820 SHA256 877268e7056067aff1dd365249b7a7c87f3fa80aadd7a4f118c9595d665967e9 SHA512 aadffd3a8f86328a7836523349f0e730471100b23680fab0c0b24a7a59f8d5ddb0dc64a1946ebd6ca2a1c2e637e9da258d7566cb18877b87022861e82d1f7dd6 WHIRLPOOL d9646ec7f6a77d086174a3ee18e9e16f7ff179d961b511bb7e2844ed199743766bd4a51e439a3a29a1480c1eba81d1f19ba8ee10009677a46e644ea7802c1620 |
36 |
-DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa |
37 |
DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb |
38 |
-DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe |
39 |
DIST mysql-extras-20160629-1442Z.tar.bz2 299152 SHA256 c90979db927772468f8b398c640469ff4740f950068e740c04ff60500e714766 SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 WHIRLPOOL d8c94e4e43e772307d8d137a28e18991fa24a27b1587ec19ae5bd12c733cc0931e459092de2c43216776e3284c7c416d52030fe20c98a6439388507c5fe5111f |
40 |
DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d WHIRLPOOL becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927 |
41 |
DIST mysql-extras-20160818-1822Z.tar.bz2 302657 SHA256 7e4f42ea0754af120d2ad6b4a3e40dd9bd5a769913ac141453a2c53419bd6c05 SHA512 19bd509fd1a37c537ae28919516406735cdf3d3fbc66583f765b64b3d296bd041cf2bc2291004b7274604a2fda3cb399141d6c672ae5d6f8aced3d019ac81826 WHIRLPOOL 46b4e3c7f415b2de1440aa9d190805dfbc49a8f4a6ed26be5e4bb3e3e9553885cc7e7e13c83c49fadf71a6081bb8fd9d28d5f4d8372540c89a649f2d913fdd9b |
42 |
|
43 |
diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild |
44 |
deleted file mode 100644 |
45 |
index 198a9b2..00000000 |
46 |
--- a/dev-db/mariadb/mariadb-10.1.12.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,213 +0,0 @@ |
49 |
-# Copyright 1999-2016 Gentoo Foundation |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
-# $Id$ |
52 |
- |
53 |
-EAPI="6" |
54 |
-MY_EXTRAS_VER="20160131-0252Z" |
55 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
56 |
-WSREP_REVISION="25" |
57 |
-SUBSLOT="18" |
58 |
-MYSQL_PV_MAJOR="5.6" |
59 |
- |
60 |
-inherit toolchain-funcs mysql-multilib-r1 |
61 |
- |
62 |
-HOMEPAGE="http://mariadb.org/" |
63 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
64 |
- |
65 |
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
66 |
-RESTRICT="!bindist? ( bindist )" |
67 |
- |
68 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
69 |
- |
70 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
71 |
-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" |
72 |
- |
73 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
74 |
- |
75 |
-PATCHES=( |
76 |
- "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch |
77 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch |
78 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
79 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
80 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch |
81 |
-) |
82 |
- |
83 |
-COMMON_DEPEND=" |
84 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
85 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
86 |
- systemd? ( sys-apps/systemd:= ) |
87 |
- !bindist? ( >=sys-libs/readline-4.1:0= ) |
88 |
- server? ( |
89 |
- cracklib? ( sys-libs/cracklib:0= ) |
90 |
- extraengine? ( |
91 |
- odbc? ( dev-db/unixODBC:0= ) |
92 |
- xml? ( dev-libs/libxml2:2= ) |
93 |
- ) |
94 |
- innodb-lz4? ( app-arch/lz4 ) |
95 |
- innodb-lzo? ( dev-libs/lzo ) |
96 |
- innodb-snappy? ( app-arch/snappy ) |
97 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
98 |
- pam? ( virtual/pam:0= ) |
99 |
- tokudb? ( app-arch/snappy ) |
100 |
- ) |
101 |
- >=dev-libs/libpcre-8.35:3= |
102 |
-" |
103 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
104 |
- ${COMMON_DEPEND}" |
105 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
106 |
- galera? ( |
107 |
- sys-apps/iproute2 |
108 |
- =sys-cluster/galera-${WSREP_REVISION}* |
109 |
- sst-rsync? ( sys-process/lsof ) |
110 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
111 |
- ) |
112 |
- perl? ( !dev-db/mytop |
113 |
- virtual/perl-Getopt-Long |
114 |
- dev-perl/TermReadKey |
115 |
- virtual/perl-Term-ANSIColor |
116 |
- virtual/perl-Time-HiRes ) |
117 |
-" |
118 |
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
119 |
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
120 |
- |
121 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
122 |
- |
123 |
-src_configure(){ |
124 |
- # bug 508724 mariadb cannot use ld.gold |
125 |
- tc-ld-disable-gold |
126 |
- |
127 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
128 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
129 |
- -DWITH_PCRE=system |
130 |
- ) |
131 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
132 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
133 |
- ) |
134 |
- if use server ; then |
135 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
136 |
- if ! use extraengine ; then |
137 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
138 |
- -DPLUGIN_FEDERATED=NO |
139 |
- -DPLUGIN_FEDERATEDX=NO ) |
140 |
- fi |
141 |
- |
142 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
143 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
144 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
145 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
146 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
147 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
148 |
- -DPLUGIN_CASSANDRA=NO |
149 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
150 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
151 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
152 |
- -DCONNECT_WITH_MYSQL=1 |
153 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
154 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
155 |
- -DWITH_WSREP=$(usex galera) |
156 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
157 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo) |
158 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
159 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
160 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
161 |
- ) |
162 |
- fi |
163 |
- mysql-multilib-r1_src_configure |
164 |
-} |
165 |
- |
166 |
-# Official test instructions: |
167 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
168 |
-# FEATURES='test userpriv -usersandbox' \ |
169 |
-# ebuild mariadb-X.X.XX.ebuild \ |
170 |
-# digest clean package |
171 |
-multilib_src_test() { |
172 |
- |
173 |
- if ! multilib_is_native_abi ; then |
174 |
- einfo "Server tests not available on non-native abi". |
175 |
- return 0; |
176 |
- fi |
177 |
- |
178 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
179 |
- local retstatus_unit |
180 |
- local retstatus_tests |
181 |
- |
182 |
- if use server ; then |
183 |
- |
184 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
185 |
- # localhost. Also causes weird failures. |
186 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
187 |
- |
188 |
- if [[ $UID -eq 0 ]]; then |
189 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
190 |
- fi |
191 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
192 |
- |
193 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
194 |
- addpredict /this-dir-does-not-exist/t9.MYI |
195 |
- |
196 |
- # Run CTest (test-units) |
197 |
- cmake-utils_src_test |
198 |
- retstatus_unit=$? |
199 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
200 |
- |
201 |
- # Ensure that parallel runs don't die |
202 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
203 |
- # Enable parallel testing, auto will try to detect number of cores |
204 |
- # You may set this by hand. |
205 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
206 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
207 |
- |
208 |
- # create directories because mysqladmin might run out of order |
209 |
- mkdir -p "${T}"/var-tests{,/log} |
210 |
- |
211 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
212 |
- # false positives: |
213 |
- # |
214 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
215 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
216 |
- # funcs_1.is_columns_mysql main.bootstrap |
217 |
- # fails due to USE=-latin1 / utf8 default |
218 |
- # |
219 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
220 |
- # main.mysql_client_test_comp: |
221 |
- # segfaults at random under Portage only, suspect resource limits. |
222 |
- # |
223 |
- # plugins.cracklib_password_check |
224 |
- # Can randomly fail due to cracklib return message |
225 |
- |
226 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
227 |
- main.mysql_client_test_comp main.bootstrap \ |
228 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
229 |
- main.mysqld--help plugins.cracklib_password_check \ |
230 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
231 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
232 |
- done |
233 |
- |
234 |
- # Run mysql tests |
235 |
- pushd "${TESTDIR}" || die |
236 |
- |
237 |
- # run mysql-test tests |
238 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
239 |
- |
240 |
- retstatus_tests=$? |
241 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
242 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
243 |
- |
244 |
- popd || die |
245 |
- |
246 |
- # Cleanup is important for these testcases. |
247 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
248 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
249 |
- |
250 |
- failures="" |
251 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
252 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
253 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
254 |
- |
255 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
256 |
- einfo "Tests successfully completed" |
257 |
- |
258 |
- else |
259 |
- einfo "Skipping server tests due to minimal build." |
260 |
- fi |
261 |
-} |
262 |
|
263 |
diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild |
264 |
deleted file mode 100644 |
265 |
index 198a9b2..00000000 |
266 |
--- a/dev-db/mariadb/mariadb-10.1.13.ebuild |
267 |
+++ /dev/null |
268 |
@@ -1,213 +0,0 @@ |
269 |
-# Copyright 1999-2016 Gentoo Foundation |
270 |
-# Distributed under the terms of the GNU General Public License v2 |
271 |
-# $Id$ |
272 |
- |
273 |
-EAPI="6" |
274 |
-MY_EXTRAS_VER="20160131-0252Z" |
275 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
276 |
-WSREP_REVISION="25" |
277 |
-SUBSLOT="18" |
278 |
-MYSQL_PV_MAJOR="5.6" |
279 |
- |
280 |
-inherit toolchain-funcs mysql-multilib-r1 |
281 |
- |
282 |
-HOMEPAGE="http://mariadb.org/" |
283 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
284 |
- |
285 |
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
286 |
-RESTRICT="!bindist? ( bindist )" |
287 |
- |
288 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
289 |
- |
290 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
291 |
-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" |
292 |
- |
293 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
294 |
- |
295 |
-PATCHES=( |
296 |
- "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch |
297 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch |
298 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
299 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
300 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch |
301 |
-) |
302 |
- |
303 |
-COMMON_DEPEND=" |
304 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
305 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
306 |
- systemd? ( sys-apps/systemd:= ) |
307 |
- !bindist? ( >=sys-libs/readline-4.1:0= ) |
308 |
- server? ( |
309 |
- cracklib? ( sys-libs/cracklib:0= ) |
310 |
- extraengine? ( |
311 |
- odbc? ( dev-db/unixODBC:0= ) |
312 |
- xml? ( dev-libs/libxml2:2= ) |
313 |
- ) |
314 |
- innodb-lz4? ( app-arch/lz4 ) |
315 |
- innodb-lzo? ( dev-libs/lzo ) |
316 |
- innodb-snappy? ( app-arch/snappy ) |
317 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
318 |
- pam? ( virtual/pam:0= ) |
319 |
- tokudb? ( app-arch/snappy ) |
320 |
- ) |
321 |
- >=dev-libs/libpcre-8.35:3= |
322 |
-" |
323 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
324 |
- ${COMMON_DEPEND}" |
325 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
326 |
- galera? ( |
327 |
- sys-apps/iproute2 |
328 |
- =sys-cluster/galera-${WSREP_REVISION}* |
329 |
- sst-rsync? ( sys-process/lsof ) |
330 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
331 |
- ) |
332 |
- perl? ( !dev-db/mytop |
333 |
- virtual/perl-Getopt-Long |
334 |
- dev-perl/TermReadKey |
335 |
- virtual/perl-Term-ANSIColor |
336 |
- virtual/perl-Time-HiRes ) |
337 |
-" |
338 |
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
339 |
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
340 |
- |
341 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
342 |
- |
343 |
-src_configure(){ |
344 |
- # bug 508724 mariadb cannot use ld.gold |
345 |
- tc-ld-disable-gold |
346 |
- |
347 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
348 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
349 |
- -DWITH_PCRE=system |
350 |
- ) |
351 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
352 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
353 |
- ) |
354 |
- if use server ; then |
355 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
356 |
- if ! use extraengine ; then |
357 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
358 |
- -DPLUGIN_FEDERATED=NO |
359 |
- -DPLUGIN_FEDERATEDX=NO ) |
360 |
- fi |
361 |
- |
362 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
363 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
364 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
365 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
366 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
367 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
368 |
- -DPLUGIN_CASSANDRA=NO |
369 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
370 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
371 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
372 |
- -DCONNECT_WITH_MYSQL=1 |
373 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
374 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
375 |
- -DWITH_WSREP=$(usex galera) |
376 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
377 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo) |
378 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
379 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
380 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
381 |
- ) |
382 |
- fi |
383 |
- mysql-multilib-r1_src_configure |
384 |
-} |
385 |
- |
386 |
-# Official test instructions: |
387 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
388 |
-# FEATURES='test userpriv -usersandbox' \ |
389 |
-# ebuild mariadb-X.X.XX.ebuild \ |
390 |
-# digest clean package |
391 |
-multilib_src_test() { |
392 |
- |
393 |
- if ! multilib_is_native_abi ; then |
394 |
- einfo "Server tests not available on non-native abi". |
395 |
- return 0; |
396 |
- fi |
397 |
- |
398 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
399 |
- local retstatus_unit |
400 |
- local retstatus_tests |
401 |
- |
402 |
- if use server ; then |
403 |
- |
404 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
405 |
- # localhost. Also causes weird failures. |
406 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
407 |
- |
408 |
- if [[ $UID -eq 0 ]]; then |
409 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
410 |
- fi |
411 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
412 |
- |
413 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
414 |
- addpredict /this-dir-does-not-exist/t9.MYI |
415 |
- |
416 |
- # Run CTest (test-units) |
417 |
- cmake-utils_src_test |
418 |
- retstatus_unit=$? |
419 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
420 |
- |
421 |
- # Ensure that parallel runs don't die |
422 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
423 |
- # Enable parallel testing, auto will try to detect number of cores |
424 |
- # You may set this by hand. |
425 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
426 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
427 |
- |
428 |
- # create directories because mysqladmin might run out of order |
429 |
- mkdir -p "${T}"/var-tests{,/log} |
430 |
- |
431 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
432 |
- # false positives: |
433 |
- # |
434 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
435 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
436 |
- # funcs_1.is_columns_mysql main.bootstrap |
437 |
- # fails due to USE=-latin1 / utf8 default |
438 |
- # |
439 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
440 |
- # main.mysql_client_test_comp: |
441 |
- # segfaults at random under Portage only, suspect resource limits. |
442 |
- # |
443 |
- # plugins.cracklib_password_check |
444 |
- # Can randomly fail due to cracklib return message |
445 |
- |
446 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
447 |
- main.mysql_client_test_comp main.bootstrap \ |
448 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
449 |
- main.mysqld--help plugins.cracklib_password_check \ |
450 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
451 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
452 |
- done |
453 |
- |
454 |
- # Run mysql tests |
455 |
- pushd "${TESTDIR}" || die |
456 |
- |
457 |
- # run mysql-test tests |
458 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
459 |
- |
460 |
- retstatus_tests=$? |
461 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
462 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
463 |
- |
464 |
- popd || die |
465 |
- |
466 |
- # Cleanup is important for these testcases. |
467 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
468 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
469 |
- |
470 |
- failures="" |
471 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
472 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
473 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
474 |
- |
475 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
476 |
- einfo "Tests successfully completed" |
477 |
- |
478 |
- else |
479 |
- einfo "Skipping server tests due to minimal build." |
480 |
- fi |
481 |
-} |
482 |
|
483 |
diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild |
484 |
deleted file mode 100644 |
485 |
index fbfc6f3..00000000 |
486 |
--- a/dev-db/mariadb/mariadb-10.1.14.ebuild |
487 |
+++ /dev/null |
488 |
@@ -1,218 +0,0 @@ |
489 |
-# Copyright 1999-2016 Gentoo Foundation |
490 |
-# Distributed under the terms of the GNU General Public License v2 |
491 |
-# $Id$ |
492 |
- |
493 |
-EAPI="6" |
494 |
-MY_EXTRAS_VER="20160131-0252Z" |
495 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
496 |
-WSREP_REVISION="25" |
497 |
-SUBSLOT="18" |
498 |
-MYSQL_PV_MAJOR="5.6" |
499 |
- |
500 |
-inherit toolchain-funcs mysql-multilib-r1 |
501 |
- |
502 |
-HOMEPAGE="http://mariadb.org/" |
503 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
504 |
- |
505 |
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
506 |
-RESTRICT="!bindist? ( bindist )" |
507 |
- |
508 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
509 |
- |
510 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
511 |
-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" |
512 |
- |
513 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
514 |
- |
515 |
-PATCHES=( |
516 |
- "${MY_PATCH_DIR}"/20004_all_mariadb-filter-tokudb-flags-10.1.10.patch |
517 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch |
518 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
519 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
520 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.7-without-clientlibs-tools.patch |
521 |
-) |
522 |
- |
523 |
-COMMON_DEPEND=" |
524 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
525 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
526 |
- systemd? ( sys-apps/systemd:= ) |
527 |
- !bindist? ( |
528 |
- sys-libs/binutils-libs:0= |
529 |
- >=sys-libs/readline-4.1:0= |
530 |
- ) |
531 |
- server? ( |
532 |
- cracklib? ( sys-libs/cracklib:0= ) |
533 |
- extraengine? ( |
534 |
- odbc? ( dev-db/unixODBC:0= ) |
535 |
- xml? ( dev-libs/libxml2:2= ) |
536 |
- ) |
537 |
- innodb-lz4? ( app-arch/lz4 ) |
538 |
- innodb-lzo? ( dev-libs/lzo ) |
539 |
- innodb-snappy? ( app-arch/snappy ) |
540 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
541 |
- pam? ( virtual/pam:0= ) |
542 |
- tokudb? ( app-arch/snappy ) |
543 |
- ) |
544 |
- >=dev-libs/libpcre-8.35:3= |
545 |
-" |
546 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
547 |
- ${COMMON_DEPEND}" |
548 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
549 |
- galera? ( |
550 |
- sys-apps/iproute2 |
551 |
- =sys-cluster/galera-${WSREP_REVISION}* |
552 |
- sst-rsync? ( sys-process/lsof ) |
553 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
554 |
- ) |
555 |
- perl? ( !dev-db/mytop |
556 |
- virtual/perl-Getopt-Long |
557 |
- dev-perl/TermReadKey |
558 |
- virtual/perl-Term-ANSIColor |
559 |
- virtual/perl-Time-HiRes ) |
560 |
-" |
561 |
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
562 |
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
563 |
- |
564 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
565 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
566 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
567 |
- |
568 |
-src_configure(){ |
569 |
- # bug 508724 mariadb cannot use ld.gold |
570 |
- tc-ld-disable-gold |
571 |
- |
572 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
573 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
574 |
- -DWITH_PCRE=system |
575 |
- ) |
576 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
577 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
578 |
- ) |
579 |
- if use server ; then |
580 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
581 |
- if ! use extraengine ; then |
582 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
583 |
- -DPLUGIN_FEDERATED=NO |
584 |
- -DPLUGIN_FEDERATEDX=NO ) |
585 |
- fi |
586 |
- |
587 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
588 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
589 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
590 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
591 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
592 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
593 |
- -DPLUGIN_CASSANDRA=NO |
594 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
595 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
596 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
597 |
- -DCONNECT_WITH_MYSQL=1 |
598 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
599 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
600 |
- -DWITH_WSREP=$(usex galera) |
601 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
602 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo) |
603 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
604 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
605 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
606 |
- ) |
607 |
- fi |
608 |
- mysql-multilib-r1_src_configure |
609 |
-} |
610 |
- |
611 |
-# Official test instructions: |
612 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
613 |
-# FEATURES='test userpriv -usersandbox' \ |
614 |
-# ebuild mariadb-X.X.XX.ebuild \ |
615 |
-# digest clean package |
616 |
-multilib_src_test() { |
617 |
- |
618 |
- if ! multilib_is_native_abi ; then |
619 |
- einfo "Server tests not available on non-native abi". |
620 |
- return 0; |
621 |
- fi |
622 |
- |
623 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
624 |
- local retstatus_unit |
625 |
- local retstatus_tests |
626 |
- |
627 |
- if use server ; then |
628 |
- |
629 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
630 |
- # localhost. Also causes weird failures. |
631 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
632 |
- |
633 |
- if [[ $UID -eq 0 ]]; then |
634 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
635 |
- fi |
636 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
637 |
- |
638 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
639 |
- addpredict /this-dir-does-not-exist/t9.MYI |
640 |
- |
641 |
- # Run CTest (test-units) |
642 |
- cmake-utils_src_test |
643 |
- retstatus_unit=$? |
644 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
645 |
- |
646 |
- # Ensure that parallel runs don't die |
647 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
648 |
- # Enable parallel testing, auto will try to detect number of cores |
649 |
- # You may set this by hand. |
650 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
651 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
652 |
- |
653 |
- # create directories because mysqladmin might run out of order |
654 |
- mkdir -p "${T}"/var-tests{,/log} |
655 |
- |
656 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
657 |
- # false positives: |
658 |
- # |
659 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
660 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
661 |
- # funcs_1.is_columns_mysql main.bootstrap |
662 |
- # fails due to USE=-latin1 / utf8 default |
663 |
- # |
664 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
665 |
- # main.mysql_client_test_comp: |
666 |
- # segfaults at random under Portage only, suspect resource limits. |
667 |
- # |
668 |
- # plugins.cracklib_password_check |
669 |
- # Can randomly fail due to cracklib return message |
670 |
- |
671 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
672 |
- main.mysql_client_test_comp main.bootstrap \ |
673 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
674 |
- main.mysqld--help plugins.cracklib_password_check \ |
675 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
676 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
677 |
- done |
678 |
- |
679 |
- # Run mysql tests |
680 |
- pushd "${TESTDIR}" || die |
681 |
- |
682 |
- # run mysql-test tests |
683 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
684 |
- |
685 |
- retstatus_tests=$? |
686 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
687 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
688 |
- |
689 |
- popd || die |
690 |
- |
691 |
- # Cleanup is important for these testcases. |
692 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
693 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
694 |
- |
695 |
- failures="" |
696 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
697 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
698 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
699 |
- |
700 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
701 |
- einfo "Tests successfully completed" |
702 |
- |
703 |
- else |
704 |
- einfo "Skipping server tests due to minimal build." |
705 |
- fi |
706 |
-} |
707 |
|
708 |
diff --git a/dev-db/mariadb/mariadb-5.5.49.ebuild b/dev-db/mariadb/mariadb-5.5.49.ebuild |
709 |
deleted file mode 100644 |
710 |
index d3fb539..00000000 |
711 |
--- a/dev-db/mariadb/mariadb-5.5.49.ebuild |
712 |
+++ /dev/null |
713 |
@@ -1,123 +0,0 @@ |
714 |
-# Copyright 1999-2016 Gentoo Foundation |
715 |
-# Distributed under the terms of the GNU General Public License v2 |
716 |
-# $Id$ |
717 |
- |
718 |
-EAPI="5" |
719 |
-MY_EXTRAS_VER="20150509-1847Z" |
720 |
- |
721 |
-# Build system |
722 |
-BUILD="cmake" |
723 |
- |
724 |
-inherit toolchain-funcs mysql-v2 |
725 |
-# only to make repoman happy. it is really set in the eclass |
726 |
-IUSE="$IUSE" |
727 |
- |
728 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
729 |
-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" |
730 |
- |
731 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
732 |
-EPATCH_EXCLUDE='' |
733 |
- |
734 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
735 |
-RDEPEND="${RDEPEND}" |
736 |
- |
737 |
-# Please do not add a naive src_unpack to this ebuild |
738 |
-# If you want to add a single patch, copy the ebuild to an overlay |
739 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
740 |
- |
741 |
-# Official test instructions: |
742 |
-# USE='embedded extraengine perl ssl static-libs community' \ |
743 |
-# FEATURES='test userpriv -usersandbox' \ |
744 |
-# ebuild mariadb-X.X.XX.ebuild \ |
745 |
-# digest clean package |
746 |
-src_test() { |
747 |
- |
748 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
749 |
- local retstatus_unit |
750 |
- local retstatus_tests |
751 |
- |
752 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
753 |
- # localhost. Also causes weird failures. |
754 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
755 |
- |
756 |
- if ! use "minimal" ; then |
757 |
- |
758 |
- if [[ $UID -eq 0 ]]; then |
759 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
760 |
- fi |
761 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
762 |
- |
763 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
764 |
- addpredict /this-dir-does-not-exist/t9.MYI |
765 |
- |
766 |
- # Run CTest (test-units) |
767 |
- cmake-utils_src_test |
768 |
- retstatus_unit=$? |
769 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
770 |
- |
771 |
- # Ensure that parallel runs don't die |
772 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
773 |
- # Enable parallel testing, auto will try to detect number of cores |
774 |
- # You may set this by hand. |
775 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
776 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
777 |
- |
778 |
- # create directories because mysqladmin might right out of order |
779 |
- mkdir -p "${T}"/var-tests{,/log} |
780 |
- |
781 |
- # create symlink for the tests to find the replace util |
782 |
- ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/" |
783 |
- |
784 |
- # These are failing in MariaDB 5.5 for now and are believed to be |
785 |
- # false positives: |
786 |
- # |
787 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
788 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
789 |
- # funcs_1.is_columns_mysql |
790 |
- # fails due to USE=-latin1 / utf8 default |
791 |
- # |
792 |
- # main.mysql_client_test, main.mysql_client_test_nonblock: |
793 |
- # segfaults at random under Portage only, suspect resource limits. |
794 |
- # |
795 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
796 |
- # fails due to bad cleanup of previous tests when run in parallel |
797 |
- # The tool is deprecated anyway |
798 |
- # Bug 532288 |
799 |
- |
800 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
801 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
802 |
- main.mysqld--help \ |
803 |
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
804 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
805 |
- mysql-v2_disable_test "$t" "False positives in Gentoo" |
806 |
- done |
807 |
- |
808 |
- # Run mysql tests |
809 |
- pushd "${TESTDIR}" |
810 |
- |
811 |
- # run mysql-test tests |
812 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
813 |
- --testcase-timeout=30 |
814 |
- retstatus_tests=$? |
815 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
816 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
817 |
- |
818 |
- popd |
819 |
- |
820 |
- # Cleanup is important for these testcases. |
821 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
822 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
823 |
- |
824 |
- failures="" |
825 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
826 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
827 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
828 |
- |
829 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
830 |
- einfo "Tests successfully completed" |
831 |
- |
832 |
- else |
833 |
- |
834 |
- einfo "Skipping server tests due to minimal build." |
835 |
- fi |
836 |
-} |