1 |
commit: 56e1b7cf9a7d0bbb07563dbac27229844f7a0a60 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 11 14:13:59 2016 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 11 14:13:59 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e1b7cf |
7 |
|
8 |
dev-db/mariadb: Remove security vulnerable versions |
9 |
|
10 |
Package-Manager: portage-2.3.1 |
11 |
|
12 |
dev-db/mariadb/Manifest | 4 - |
13 |
dev-db/mariadb/mariadb-10.0.25.ebuild | 186 ----------------------------- |
14 |
dev-db/mariadb/mariadb-10.0.26.ebuild | 187 ----------------------------- |
15 |
dev-db/mariadb/mariadb-10.1.16.ebuild | 217 ---------------------------------- |
16 |
4 files changed, 594 deletions(-) |
17 |
|
18 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
19 |
index 9ad8797..8b49321 100644 |
20 |
--- a/dev-db/mariadb/Manifest |
21 |
+++ b/dev-db/mariadb/Manifest |
22 |
@@ -1,11 +1,7 @@ |
23 |
-DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c |
24 |
-DIST mariadb-10.0.26.tar.gz 57621647 SHA256 578538d9b51f455cbd0cb021f523284a45480b4bba853b4a79f3497c49ec40c0 SHA512 7291a91cc0e17bcedbba6e93cf05679f3119efcd588b249beb423e9ac5152d1c0add9321a4dc0a59ac94ca16d5d733983234a64b7b555183b6312a045dc8991c WHIRLPOOL c09aba18191c476920fa2b39558ed5e64df1e77029ed913ffc2f34299402b89b03a3fefc711295cb58db346e84d8865fb8dabe78daa47e996c257dd9ea4a5d84 |
25 |
DIST mariadb-10.0.27.tar.gz 63258508 SHA256 bdf3a0c25aa2bc7a22a47e994eb7c8aa782624810eb3156038cc62bc9085c0cd SHA512 c3aa415b7fc766dce34c99795cfcfa424a8d7eb7ee19497f1a61cad7c708914b94d66eabb104dff364b2db77d07471ce810d708ec541efb1bed7291ca1ce7364 WHIRLPOOL 9a90edc10d482140da818bee7598dd1b468076091478fb63e19f475d8a3af6e059f04d85851b701b6e305b9912aefa7bbfa0b0045c075db8d9f16c30944da584 |
26 |
-DIST mariadb-10.1.16.tar.gz 55527069 SHA256 67cb35c62cc5d4cf48d7b614c0c7a9245a762ca23d4e588e15c616c102e64393 SHA512 4bf9a0b9c964f2526ecb48a0b7863c39a43ca3a6d3685b6397f79a4004d0f065108ea2367116d53da42dd70e42a4b4761bf4ead79c0483e0ba65915f58a6dd73 WHIRLPOOL f881982cf04018c875f5128a5e9a94fc368d4eaedd2bf2cff03118cf79bbeab69a90eed7ee8f6d02953fecff9ac8d750836eded4a5df18077d48fe0f3298aee2 |
27 |
DIST mariadb-10.1.17.tar.gz 61158134 SHA256 4ca45ac5e34418761868115ebc8c068d511fed08e283b2cac52559d63ba4aab5 SHA512 900f019ec7544e315c98aea3647988f6ec257822b116c8a986851db678dd0bf71018dde1d0c90adeaa713af12348344ffc54c292a64869d9565f3f906599396d WHIRLPOOL e2e4d1294bc64c37d6916dc291d33769fd05c591697efba27fff79cb4debc76cf7a5eaf6e63a9ce3a12c22653ffc9d25082eb5a03f4f402b7395b91cb9ea415d |
28 |
DIST mariadb-10.2.1.tar.gz 55721519 SHA256 90b7a17f3372c92c12dff084b37fcca8c4cf8106f4dcabd35fadc8efbaa348a2 SHA512 3dde348e4bba2b6837e0a0671e9ec944aa494e4a01ebb4704e067cc8fe71865aef685f4ce368e9a81c5adeb1e8cc4f3a1b4067193a4b1ffc1fc567bf79a0b4ff WHIRLPOOL cbf33b7f6fb131a834367214ff4ab49bbda8aebb6e6fe449c7be2648934bcdab79c50a043907c07603f51892041701be59ff45984db43e302b2174f6fd40bc31 |
29 |
DIST mariadb-5.5.52.tar.gz 45745859 SHA256 e142f9459507b97c5848042863b313ce70750118446bb4e35e5c07fe66007293 SHA512 76d1c1209aa8b56d6562907cb224d0be4f6bccd46e30d16dfb57f19fee1c60dcba21d8388c70674cac0a09e11361e1c5296d1e79d2ba9edc16bc4f9c7a7733eb WHIRLPOOL 4030f24f9d79fded7eb51a9c84b590f81a58ae07797322a6b6f5c3f6c84ea86975eceeb03922c38acf0bcd18769c8a0759624822e570d7301fc950cffc283631 |
30 |
-DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb |
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 |
DIST mysql-extras-20160818-1822Z.tar.bz2 302657 SHA256 7e4f42ea0754af120d2ad6b4a3e40dd9bd5a769913ac141453a2c53419bd6c05 SHA512 19bd509fd1a37c537ae28919516406735cdf3d3fbc66583f765b64b3d296bd041cf2bc2291004b7274604a2fda3cb399141d6c672ae5d6f8aced3d019ac81826 WHIRLPOOL 46b4e3c7f415b2de1440aa9d190805dfbc49a8f4a6ed26be5e4bb3e3e9553885cc7e7e13c83c49fadf71a6081bb8fd9d28d5f4d8372540c89a649f2d913fdd9b |
34 |
|
35 |
diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild |
36 |
deleted file mode 100644 |
37 |
index 131af89..00000000 |
38 |
--- a/dev-db/mariadb/mariadb-10.0.25.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,186 +0,0 @@ |
41 |
-# Copyright 1999-2016 Gentoo Foundation |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
-# $Id$ |
44 |
- |
45 |
-EAPI="6" |
46 |
-MY_EXTRAS_VER="20151223-1501Z" |
47 |
-SUBSLOT="18" |
48 |
-MYSQL_PV_MAJOR="5.6" |
49 |
- |
50 |
-inherit toolchain-funcs mysql-multilib-r1 |
51 |
- |
52 |
-HOMEPAGE="http://mariadb.org/" |
53 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
54 |
- |
55 |
-IUSE="bindist odbc oqgraph pam sphinx tokudb xml" |
56 |
-RESTRICT="!bindist? ( bindist )" |
57 |
- |
58 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )" |
59 |
- |
60 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
61 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
62 |
- |
63 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
64 |
-PATCHES=( |
65 |
- "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
66 |
- "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch" |
67 |
- "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.15.patch" |
68 |
- "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
69 |
- "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
70 |
-) |
71 |
-COMMON_DEPEND=" |
72 |
- !bindist? ( >=sys-libs/readline-4.1:0= ) |
73 |
- server? ( |
74 |
- extraengine? ( |
75 |
- odbc? ( dev-db/unixODBC:0= ) |
76 |
- xml? ( dev-libs/libxml2:2= ) |
77 |
- ) |
78 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
79 |
- pam? ( virtual/pam:0= ) |
80 |
- tokudb? ( app-arch/snappy ) |
81 |
- ) |
82 |
- >=dev-libs/libpcre-8.35:3= |
83 |
-" |
84 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
85 |
- ${COMMON_DEPEND}" |
86 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
87 |
- perl? ( !dev-db/mytop |
88 |
- virtual/perl-Getopt-Long |
89 |
- dev-perl/TermReadKey |
90 |
- virtual/perl-Term-ANSIColor |
91 |
- virtual/perl-Time-HiRes ) |
92 |
-" |
93 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) |
94 |
- |
95 |
-src_configure(){ |
96 |
- # bug 508724 mariadb cannot use ld.gold |
97 |
- tc-ld-disable-gold |
98 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
99 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
100 |
- -DWITH_PCRE=system |
101 |
- ) |
102 |
- if use server ; then |
103 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
104 |
- if ! use extraengine ; then |
105 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
106 |
- -DWITHOUT_FEDERATED=1 |
107 |
- -DWITHOUT_FEDERATEDX=1 ) |
108 |
- fi |
109 |
- |
110 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
111 |
- $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
112 |
- $(mysql-cmake_use_plugin sphinx SPHINX) |
113 |
- $(mysql-cmake_use_plugin tokudb TOKUDB) |
114 |
- $(mysql-cmake_use_plugin pam AUTH_PAM) |
115 |
- -DWITHOUT_CASSANDRA=0 |
116 |
- $(mysql-cmake_use_plugin extraengine SEQUENCE) |
117 |
- $(mysql-cmake_use_plugin extraengine SPIDER) |
118 |
- $(mysql-cmake_use_plugin extraengine CONNECT) |
119 |
- -DCONNECT_WITH_MYSQL=1 |
120 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
121 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
122 |
- -DWITHOUT_MROONGA=1 |
123 |
- ) |
124 |
- fi |
125 |
- mysql-multilib-r1_src_configure |
126 |
-} |
127 |
- |
128 |
-# Official test instructions: |
129 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
130 |
-# FEATURES='test userpriv -usersandbox' \ |
131 |
-# ebuild mariadb-X.X.XX.ebuild \ |
132 |
-# digest clean package |
133 |
-multilib_src_test() { |
134 |
- |
135 |
- if ! multilib_is_native_abi ; then |
136 |
- einfo "Server tests not available on non-native abi". |
137 |
- return 0; |
138 |
- fi |
139 |
- |
140 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
141 |
- local retstatus_unit |
142 |
- local retstatus_tests |
143 |
- |
144 |
- if use server ; then |
145 |
- |
146 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
147 |
- # localhost. Also causes weird failures. |
148 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
149 |
- |
150 |
- if [[ $UID -eq 0 ]]; then |
151 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
152 |
- fi |
153 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
154 |
- |
155 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
156 |
- addpredict /this-dir-does-not-exist/t9.MYI |
157 |
- |
158 |
- # Run CTest (test-units) |
159 |
- cmake-utils_src_test |
160 |
- retstatus_unit=$? |
161 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
162 |
- |
163 |
- # Ensure that parallel runs don't die |
164 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
165 |
- # Enable parallel testing, auto will try to detect number of cores |
166 |
- # You may set this by hand. |
167 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
168 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
169 |
- |
170 |
- # create directories because mysqladmin might run out of order |
171 |
- mkdir -p "${T}"/var-tests{,/log} |
172 |
- |
173 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
174 |
- # false positives: |
175 |
- # |
176 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
177 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
178 |
- # funcs_1.is_columns_mysql main.bootstrap |
179 |
- # fails due to USE=-latin1 / utf8 default |
180 |
- # |
181 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
182 |
- # main.mysql_client_test_comp: |
183 |
- # segfaults at random under Portage only, suspect resource limits. |
184 |
- # |
185 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
186 |
- # fails due to bad cleanup of previous tests when run in parallel |
187 |
- # The tool is deprecated anyway |
188 |
- # Bug 532288 |
189 |
- |
190 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
191 |
- main.mysql_client_test_comp \ |
192 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
193 |
- main.mysqld--help main.bootstrap \ |
194 |
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
195 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
196 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
197 |
- done |
198 |
- |
199 |
- # Run mysql tests |
200 |
- pushd "${TESTDIR}" || die |
201 |
- |
202 |
- # run mysql-test tests |
203 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
204 |
- |
205 |
- retstatus_tests=$? |
206 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
207 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
208 |
- |
209 |
- popd || die |
210 |
- |
211 |
- # Cleanup is important for these testcases. |
212 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
213 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
214 |
- |
215 |
- failures="" |
216 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
217 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
218 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
219 |
- |
220 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
221 |
- einfo "Tests successfully completed" |
222 |
- |
223 |
- else |
224 |
- einfo "Skipping server tests due to minimal build." |
225 |
- fi |
226 |
-} |
227 |
|
228 |
diff --git a/dev-db/mariadb/mariadb-10.0.26.ebuild b/dev-db/mariadb/mariadb-10.0.26.ebuild |
229 |
deleted file mode 100644 |
230 |
index f23ba12..00000000 |
231 |
--- a/dev-db/mariadb/mariadb-10.0.26.ebuild |
232 |
+++ /dev/null |
233 |
@@ -1,187 +0,0 @@ |
234 |
-# Copyright 1999-2016 Gentoo Foundation |
235 |
-# Distributed under the terms of the GNU General Public License v2 |
236 |
-# $Id$ |
237 |
- |
238 |
-EAPI="6" |
239 |
-MY_EXTRAS_VER="20160629-1442Z" |
240 |
-SUBSLOT="18" |
241 |
-MYSQL_PV_MAJOR="5.6" |
242 |
- |
243 |
-inherit toolchain-funcs mysql-multilib-r1 |
244 |
- |
245 |
-HOMEPAGE="http://mariadb.org/" |
246 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
247 |
- |
248 |
-IUSE="bindist odbc oqgraph pam sphinx tokudb xml" |
249 |
-RESTRICT="!bindist? ( bindist )" |
250 |
- |
251 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )" |
252 |
- |
253 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
254 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
255 |
- |
256 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
257 |
-PATCHES=( |
258 |
- "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
259 |
- "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch" |
260 |
- "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
261 |
- "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
262 |
-) |
263 |
-COMMON_DEPEND=" |
264 |
- !bindist? ( >=sys-libs/readline-4.1:0= ) |
265 |
- server? ( |
266 |
- extraengine? ( |
267 |
- odbc? ( dev-db/unixODBC:0= ) |
268 |
- xml? ( dev-libs/libxml2:2= ) |
269 |
- ) |
270 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
271 |
- pam? ( virtual/pam:0= ) |
272 |
- tokudb? ( app-arch/snappy ) |
273 |
- ) |
274 |
- >=dev-libs/libpcre-8.35:3= |
275 |
-" |
276 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
277 |
- ${COMMON_DEPEND}" |
278 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
279 |
- perl? ( !dev-db/mytop |
280 |
- virtual/perl-Getopt-Long |
281 |
- dev-perl/TermReadKey |
282 |
- virtual/perl-Term-ANSIColor |
283 |
- virtual/perl-Time-HiRes ) |
284 |
-" |
285 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
286 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
287 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
288 |
- |
289 |
-src_configure(){ |
290 |
- # bug 508724 mariadb cannot use ld.gold |
291 |
- tc-ld-disable-gold |
292 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
293 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
294 |
- -DWITH_PCRE=system |
295 |
- ) |
296 |
- if use server ; then |
297 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
298 |
- if ! use extraengine ; then |
299 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
300 |
- -DWITHOUT_FEDERATED=1 |
301 |
- -DWITHOUT_FEDERATEDX=1 ) |
302 |
- fi |
303 |
- |
304 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
305 |
- $(mysql-cmake_use_plugin oqgraph OQGRAPH) |
306 |
- $(mysql-cmake_use_plugin sphinx SPHINX) |
307 |
- $(mysql-cmake_use_plugin tokudb TOKUDB) |
308 |
- $(mysql-cmake_use_plugin pam AUTH_PAM) |
309 |
- -DWITHOUT_CASSANDRA=0 |
310 |
- $(mysql-cmake_use_plugin extraengine SEQUENCE) |
311 |
- $(mysql-cmake_use_plugin extraengine SPIDER) |
312 |
- $(mysql-cmake_use_plugin extraengine CONNECT) |
313 |
- -DCONNECT_WITH_MYSQL=1 |
314 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
315 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
316 |
- -DWITHOUT_MROONGA=1 |
317 |
- ) |
318 |
- fi |
319 |
- mysql-multilib-r1_src_configure |
320 |
-} |
321 |
- |
322 |
-# Official test instructions: |
323 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
324 |
-# FEATURES='test userpriv -usersandbox' \ |
325 |
-# ebuild mariadb-X.X.XX.ebuild \ |
326 |
-# digest clean package |
327 |
-multilib_src_test() { |
328 |
- |
329 |
- if ! multilib_is_native_abi ; then |
330 |
- einfo "Server tests not available on non-native abi". |
331 |
- return 0; |
332 |
- fi |
333 |
- |
334 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
335 |
- local retstatus_unit |
336 |
- local retstatus_tests |
337 |
- |
338 |
- if use server ; then |
339 |
- |
340 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
341 |
- # localhost. Also causes weird failures. |
342 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
343 |
- |
344 |
- if [[ $UID -eq 0 ]]; then |
345 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
346 |
- fi |
347 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
348 |
- |
349 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
350 |
- addpredict /this-dir-does-not-exist/t9.MYI |
351 |
- |
352 |
- # Run CTest (test-units) |
353 |
- cmake-utils_src_test |
354 |
- retstatus_unit=$? |
355 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
356 |
- |
357 |
- # Ensure that parallel runs don't die |
358 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
359 |
- # Enable parallel testing, auto will try to detect number of cores |
360 |
- # You may set this by hand. |
361 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
362 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
363 |
- |
364 |
- # create directories because mysqladmin might run out of order |
365 |
- mkdir -p "${T}"/var-tests{,/log} |
366 |
- |
367 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
368 |
- # false positives: |
369 |
- # |
370 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
371 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
372 |
- # funcs_1.is_columns_mysql main.bootstrap |
373 |
- # fails due to USE=-latin1 / utf8 default |
374 |
- # |
375 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
376 |
- # main.mysql_client_test_comp: |
377 |
- # segfaults at random under Portage only, suspect resource limits. |
378 |
- # |
379 |
- # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
380 |
- # fails due to bad cleanup of previous tests when run in parallel |
381 |
- # The tool is deprecated anyway |
382 |
- # Bug 532288 |
383 |
- |
384 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
385 |
- main.mysql_client_test_comp \ |
386 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
387 |
- main.mysqld--help main.bootstrap \ |
388 |
- archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ |
389 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
390 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
391 |
- done |
392 |
- |
393 |
- # Run mysql tests |
394 |
- pushd "${TESTDIR}" || die |
395 |
- |
396 |
- # run mysql-test tests |
397 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
398 |
- |
399 |
- retstatus_tests=$? |
400 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
401 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
402 |
- |
403 |
- popd || die |
404 |
- |
405 |
- # Cleanup is important for these testcases. |
406 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
407 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
408 |
- |
409 |
- failures="" |
410 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
411 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
412 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
413 |
- |
414 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
415 |
- einfo "Tests successfully completed" |
416 |
- |
417 |
- else |
418 |
- einfo "Skipping server tests due to minimal build." |
419 |
- fi |
420 |
-} |
421 |
|
422 |
diff --git a/dev-db/mariadb/mariadb-10.1.16.ebuild b/dev-db/mariadb/mariadb-10.1.16.ebuild |
423 |
deleted file mode 100644 |
424 |
index ef776e3..00000000 |
425 |
--- a/dev-db/mariadb/mariadb-10.1.16.ebuild |
426 |
+++ /dev/null |
427 |
@@ -1,217 +0,0 @@ |
428 |
-# Copyright 1999-2016 Gentoo Foundation |
429 |
-# Distributed under the terms of the GNU General Public License v2 |
430 |
-# $Id$ |
431 |
- |
432 |
-EAPI="6" |
433 |
-MY_EXTRAS_VER="20160721-1526Z" |
434 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
435 |
-WSREP_REVISION="25" |
436 |
-SUBSLOT="18" |
437 |
-MYSQL_PV_MAJOR="5.6" |
438 |
- |
439 |
-inherit toolchain-funcs mysql-multilib-r1 |
440 |
- |
441 |
-HOMEPAGE="http://mariadb.org/" |
442 |
-DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
443 |
- |
444 |
-IUSE="bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" |
445 |
-RESTRICT="!bindist? ( bindist )" |
446 |
- |
447 |
-REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) " |
448 |
- |
449 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
450 |
-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" |
451 |
- |
452 |
-MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
453 |
- |
454 |
-PATCHES=( |
455 |
- "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch |
456 |
- "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch |
457 |
- "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch |
458 |
- "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch |
459 |
-) |
460 |
- |
461 |
-COMMON_DEPEND=" |
462 |
- mroonga? ( app-text/groonga-normalizer-mysql ) |
463 |
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
464 |
- systemd? ( sys-apps/systemd:= ) |
465 |
- !bindist? ( |
466 |
- sys-libs/binutils-libs:0= |
467 |
- >=sys-libs/readline-4.1:0= |
468 |
- ) |
469 |
- server? ( |
470 |
- cracklib? ( sys-libs/cracklib:0= ) |
471 |
- extraengine? ( |
472 |
- odbc? ( dev-db/unixODBC:0= ) |
473 |
- xml? ( dev-libs/libxml2:2= ) |
474 |
- ) |
475 |
- innodb-lz4? ( app-arch/lz4 ) |
476 |
- innodb-lzo? ( dev-libs/lzo ) |
477 |
- innodb-snappy? ( app-arch/snappy ) |
478 |
- oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) |
479 |
- pam? ( virtual/pam:0= ) |
480 |
- tokudb? ( app-arch/snappy ) |
481 |
- ) |
482 |
- >=dev-libs/libpcre-8.35:3= |
483 |
-" |
484 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) |
485 |
- ${COMMON_DEPEND}" |
486 |
-RDEPEND="${RDEPEND} ${COMMON_DEPEND} |
487 |
- galera? ( |
488 |
- sys-apps/iproute2 |
489 |
- =sys-cluster/galera-${WSREP_REVISION}* |
490 |
- sst-rsync? ( sys-process/lsof ) |
491 |
- sst-xtrabackup? ( net-misc/socat[ssl] ) |
492 |
- ) |
493 |
- perl? ( !dev-db/mytop |
494 |
- virtual/perl-Getopt-Long |
495 |
- dev-perl/TermReadKey |
496 |
- virtual/perl-Term-ANSIColor |
497 |
- virtual/perl-Time-HiRes ) |
498 |
-" |
499 |
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
500 |
-PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" |
501 |
- |
502 |
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h |
503 |
- /usr/include/mysql/private/probes_mysql_nodtrace.h |
504 |
- /usr/include/mysql/private/probes_mysql_dtrace.h ) |
505 |
- |
506 |
-src_configure(){ |
507 |
- # bug 508724 mariadb cannot use ld.gold |
508 |
- tc-ld-disable-gold |
509 |
- |
510 |
- local MYSQL_CMAKE_NATIVE_DEFINES=( |
511 |
- -DWITH_JEMALLOC=$(usex jemalloc system) |
512 |
- -DWITH_PCRE=system |
513 |
- ) |
514 |
- local MYSQL_CMAKE_EXTRA_DEFINES=( |
515 |
- -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) |
516 |
- ) |
517 |
- if use server ; then |
518 |
- # Federated{,X} must be treated special otherwise they will not be built as plugins |
519 |
- if ! use extraengine ; then |
520 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
521 |
- -DPLUGIN_FEDERATED=NO |
522 |
- -DPLUGIN_FEDERATEDX=NO ) |
523 |
- fi |
524 |
- |
525 |
- MYSQL_CMAKE_NATIVE_DEFINES+=( |
526 |
- -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) |
527 |
- -DPLUGIN_SPHINX=$(usex sphinx YES NO) |
528 |
- -DPLUGIN_TOKUDB=$(usex tokudb YES NO) |
529 |
- -DPLUGIN_AUTH_PAM=$(usex pam YES NO) |
530 |
- -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) |
531 |
- -DPLUGIN_CASSANDRA=NO |
532 |
- -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) |
533 |
- -DPLUGIN_SPIDER=$(usex extraengine YES NO) |
534 |
- -DPLUGIN_CONNECT=$(usex extraengine YES NO) |
535 |
- -DCONNECT_WITH_MYSQL=1 |
536 |
- -DCONNECT_WITH_LIBXML2=$(usex xml) |
537 |
- -DCONNECT_WITH_ODBC=$(usex odbc) |
538 |
- -DWITH_WSREP=$(usex galera) |
539 |
- -DWITH_INNODB_LZ4=$(usex innodb-lz4) |
540 |
- -DWITH_INNODB_LZO=$(usex innodb-lzo) |
541 |
- -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) |
542 |
- -DPLUGIN_MROONGA=$(usex mroonga YES NO) |
543 |
- -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) |
544 |
- ) |
545 |
- fi |
546 |
- mysql-multilib-r1_src_configure |
547 |
-} |
548 |
- |
549 |
-# Official test instructions: |
550 |
-# USE='embedded extraengine perl server openssl static-libs' \ |
551 |
-# FEATURES='test userpriv -usersandbox' \ |
552 |
-# ebuild mariadb-X.X.XX.ebuild \ |
553 |
-# digest clean package |
554 |
-multilib_src_test() { |
555 |
- |
556 |
- if ! multilib_is_native_abi ; then |
557 |
- einfo "Server tests not available on non-native abi". |
558 |
- return 0; |
559 |
- fi |
560 |
- |
561 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
562 |
- local retstatus_unit |
563 |
- local retstatus_tests |
564 |
- |
565 |
- if use server ; then |
566 |
- |
567 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
568 |
- # localhost. Also causes weird failures. |
569 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
570 |
- |
571 |
- if [[ $UID -eq 0 ]]; then |
572 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
573 |
- fi |
574 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
575 |
- |
576 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
577 |
- addpredict /this-dir-does-not-exist/t9.MYI |
578 |
- |
579 |
- # Run CTest (test-units) |
580 |
- cmake-utils_src_test |
581 |
- retstatus_unit=$? |
582 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
583 |
- |
584 |
- # Ensure that parallel runs don't die |
585 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
586 |
- # Enable parallel testing, auto will try to detect number of cores |
587 |
- # You may set this by hand. |
588 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
589 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
590 |
- |
591 |
- # create directories because mysqladmin might run out of order |
592 |
- mkdir -p "${T}"/var-tests{,/log} |
593 |
- |
594 |
- # These are failing in MariaDB 10.0 for now and are believed to be |
595 |
- # false positives: |
596 |
- # |
597 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
598 |
- # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, |
599 |
- # funcs_1.is_columns_mysql main.bootstrap |
600 |
- # fails due to USE=-latin1 / utf8 default |
601 |
- # |
602 |
- # main.mysql_client_test, main.mysql_client_test_nonblock |
603 |
- # main.mysql_client_test_comp: |
604 |
- # segfaults at random under Portage only, suspect resource limits. |
605 |
- # |
606 |
- # plugins.cracklib_password_check |
607 |
- # Can randomly fail due to cracklib return message |
608 |
- |
609 |
- for t in main.mysql_client_test main.mysql_client_test_nonblock \ |
610 |
- main.mysql_client_test_comp main.bootstrap \ |
611 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
612 |
- main.mysqld--help plugins.cracklib_password_check \ |
613 |
- funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do |
614 |
- mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" |
615 |
- done |
616 |
- |
617 |
- # Run mysql tests |
618 |
- pushd "${TESTDIR}" || die |
619 |
- |
620 |
- # run mysql-test tests |
621 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder |
622 |
- |
623 |
- retstatus_tests=$? |
624 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
625 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
626 |
- |
627 |
- popd || die |
628 |
- |
629 |
- # Cleanup is important for these testcases. |
630 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
631 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
632 |
- |
633 |
- failures="" |
634 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
635 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
636 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
637 |
- |
638 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
639 |
- einfo "Tests successfully completed" |
640 |
- |
641 |
- else |
642 |
- einfo "Skipping server tests due to minimal build." |
643 |
- fi |
644 |
-} |