1 |
commit: 9537f0f34c09bc45c92db5bfba8dbc6c4ae368d7 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 14 00:46:35 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 14 00:46:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9537f0f3 |
7 |
|
8 |
dev-db/mysql: Security cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
dev-db/mysql/Manifest | 2 - |
13 |
dev-db/mysql/mysql-5.5.58.ebuild | 133 --------------------------------------- |
14 |
2 files changed, 135 deletions(-) |
15 |
|
16 |
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest |
17 |
index 87a8a8778c1..97e79509bc4 100644 |
18 |
--- a/dev-db/mysql/Manifest |
19 |
+++ b/dev-db/mysql/Manifest |
20 |
@@ -1,4 +1,3 @@ |
21 |
-DIST mysql-5.5.58.tar.gz 21045852 BLAKE2B 220a614d5cbb420b290c37b2f721f865640b15cdb3009470b267957548c2cb6fa4a22e885953b1587b4eb2c4b9ef4c6eaf8e2fe9e19af7d73b30cf2fd62dcf3c SHA512 a57613034bb7456827d2dfa3e6d1fd006c3bd3f61e6ad4e882bb36a11beca4cf3d76b6b6d2bf0ccdb115d6896a08a7a20d0781a31e22abca2562b7b9a81614b0 |
22 |
DIST mysql-5.5.59.tar.gz 21050313 BLAKE2B 2a17307caf1fe00f8be6662e85e55a1cf8a0f6d1a00e0d26970bdd04dd2f92bd7e7c5e1f7a19d311ce0b59cb5f40434d605b3c276ab60ef1e94a99c6148f6b36 SHA512 18abca4a607d7f7ad90e9adb989c665302ee85e264f298fdc3591c4d9cd85a2486f1b402aea1ac3672506d1433eb1f3a246da5e4abd04dc41344ed9fed5ef0ae |
23 |
DIST mysql-5.6.36.tar.gz 32192348 BLAKE2B 8ccb7d85ff7255832f8f304a173d6ad436362f36f59f58b5772e0623a4c250c19f0d67a65bee4cc8f6815088559c20e3b80f07443666e85753b164b82a9c0362 SHA512 b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18 |
24 |
DIST mysql-5.6.37.tar.gz 32200158 BLAKE2B be64aca7e3a831fbdb737a6628e87dcea195bfee01228cc05858ef855a2eb41355456cf6e516fca77a5e4a96381248360a2e79e87fea5b649bd06dd3cad6976f SHA512 6935cf11490fb32832468e2a69a9d81a567b1b4ab0afaa0614896e3ddbb95a74b26406284f307637e4b2b9620ef4d96a167128ce7fcb1d338b0ebbc2cef2e597 |
25 |
@@ -6,6 +5,5 @@ DIST mysql-5.6.38.tar.gz 32197625 BLAKE2B 5edd6d05e562568d2418edd81c6822b3971030 |
26 |
DIST mysql-5.6.39.tar.gz 32110958 BLAKE2B 2f279c6745bc995c860bb4f2868409136e112cc8b9fb0c04fa7673bb6d5612f3ef6d3462666de736d6e7fe5439275ab49908a6609175d1cb8c096d5db5ecb59c SHA512 e1e60854c82d71f9600bf611df964f441815d9d0f896134110a749b29fe340fa216d7c89f4da63d492929565f19a2502463549b8c8c038c658e0be8409a3ffb5 |
27 |
DIST mysql-extras-20170302-1359Z.tar.bz2 306816 BLAKE2B 7ac3d79f265916306ba8dd0a8ac16f5c4673baf9f910e21aedcc460b028fee674faabad470984e4830256f6218a7c61f31f6155e808d8a2dd4772a1c8bb72d3d SHA512 2c096c68e0d545c98fb5520f92b9e85f6bbc910853793f60f0e67979ee927410bbecadece3400364fdc2b5682f9105664f6a2de8fa0ee1818fb266e063e82869 |
28 |
DIST mysql-extras-20170719-1335Z.tar.bz2 311350 BLAKE2B 4ee604de76d9da004c7cb9f84e7e4112c0cdab3b18a82923ad5bcb880377813f85e369697d84b37ed2fd9cd26b160d4616bfb7d1dba3bfe0b6bbc296e0edd5ea SHA512 3450725b4cdcf1e330aee775c1c169510bd7f06f19b874a3e94203227d393b136165eca1e77270bfc37c534f4120aeeeb3df8fbd71704312836b79a99d81a122 |
29 |
-DIST mysql-extras-20171018-1948Z.tar.bz2 313540 BLAKE2B fb39cd40af2a013f2e8c71094a14b72f0be6c24c440e17839b447afc01b6a8a3264dec4cfa6973a1e919c96e9cbf6e2bb7d4ed6b0c32502d02dd0d3af316ee1f SHA512 35ba9f3c8462ae188e47f5973e891cbd72e5d742e92fabc09678f93c83bb26337ae11d6fa8400b2a8c5125ba2a771f780e008b7448e3006446b13d3e51adcaba |
30 |
DIST mysql-extras-20171121-1518Z.tar.bz2 313539 BLAKE2B c397fdf7ffb3fcbcecda20933e18234062a9500dcf4031e9b17131e2a1f23dca7535ed33ff541fc075eb9995c67a9a8fd7261d7524dd42d8d333543c368b4c15 SHA512 dd0d4a00c0ed710e786d157a73f02c6f555ab7a68e57014d958627096a4245a0b45d22ec860dc5389002d106554e80166661c0b6ddcadff1f737e3fa195badda |
31 |
DIST mysql-extras-20180214-0024Z.tar.bz2 316686 BLAKE2B a893e2975a8062ab236f642d158a7833656942adb31d467b784a9224e7dd87872c3784bb29e93b620a58cd9a835d65248f1a817cdbafa574b5949e2b4262108a SHA512 ad0e81695a70954ad107fe104f9140be24e53d499aed6c123e68e1a062ec5cc90c70f6272fdc014e567794e331301e656ba01b22c2c7a1afaf11e14a9190fb0b |
32 |
|
33 |
diff --git a/dev-db/mysql/mysql-5.5.58.ebuild b/dev-db/mysql/mysql-5.5.58.ebuild |
34 |
deleted file mode 100644 |
35 |
index aafa5a49293..00000000000 |
36 |
--- a/dev-db/mysql/mysql-5.5.58.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,133 +0,0 @@ |
39 |
-# Copyright 1999-2018 Gentoo Foundation |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
- |
42 |
-EAPI="5" |
43 |
- |
44 |
-MY_EXTRAS_VER="20171018-1948Z" |
45 |
-MY_PV="${PV//_alpha_pre/-m}" |
46 |
-MY_PV="${MY_PV//_/-}" |
47 |
- |
48 |
-# Build type |
49 |
-BUILD="cmake" |
50 |
-#fails to build with ninja |
51 |
-CMAKE_MAKEFILE_GENERATOR=emake |
52 |
- |
53 |
-inherit toolchain-funcs mysql-v2 |
54 |
-# only to make repoman happy. it is really set in the eclass |
55 |
-IUSE="$IUSE" |
56 |
- |
57 |
-# Define the mysql-extras source |
58 |
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" |
59 |
- |
60 |
-# REMEMBER: also update eclass/mysql*.eclass before committing! |
61 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
62 |
- |
63 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
64 |
-EPATCH_EXCLUDE='' |
65 |
- |
66 |
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" |
67 |
-RDEPEND="${RDEPEND}" |
68 |
- |
69 |
-SLOT="0/18" |
70 |
- |
71 |
-# Please do not add a naive src_unpack to this ebuild |
72 |
-# If you want to add a single patch, copy the ebuild to an overlay |
73 |
-# and create your own mysql-extras tarball, looking at 000_index.txt |
74 |
- |
75 |
-# Official test instructions: |
76 |
-# USE='embedded extraengine perl ssl static-libs community' \ |
77 |
-# FEATURES='test userpriv -usersandbox' \ |
78 |
-# ebuild mysql-X.X.XX.ebuild \ |
79 |
-# digest clean package |
80 |
-src_test() { |
81 |
- |
82 |
- local TESTDIR="${BUILD_DIR}/mysql-test" |
83 |
- local retstatus_unit |
84 |
- local retstatus_tests |
85 |
- |
86 |
- # Bug #213475 - MySQL _will_ object strenously if your machine is named |
87 |
- # localhost. Also causes weird failures. |
88 |
- [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" |
89 |
- |
90 |
- if ! use "minimal" ; then |
91 |
- |
92 |
- if [[ $UID -eq 0 ]]; then |
93 |
- die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
94 |
- fi |
95 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
96 |
- |
97 |
- einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" |
98 |
- addpredict /this-dir-does-not-exist/t9.MYI |
99 |
- |
100 |
- # Run CTest (test-units) |
101 |
- cmake-utils_src_test |
102 |
- retstatus_unit=$? |
103 |
- [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" |
104 |
- |
105 |
- # Ensure that parallel runs don't die |
106 |
- export MTR_BUILD_THREAD="$((${RANDOM} % 100))" |
107 |
- # Enable parallel testing, auto will try to detect number of cores |
108 |
- # You may set this by hand. |
109 |
- # The default maximum is 8 unless MTR_MAX_PARALLEL is increased |
110 |
- export MTR_PARALLEL="${MTR_PARALLEL:-auto}" |
111 |
- |
112 |
- # create directories because mysqladmin might right out of order |
113 |
- mkdir -p "${T}"/var-tests{,/log} |
114 |
- |
115 |
- # create symlink for the tests to find mysql_tzinfo_to_sql |
116 |
- ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" |
117 |
- |
118 |
- # These are failing in MySQL 5.5 for now and are believed to be |
119 |
- # false positives: |
120 |
- # |
121 |
- # main.information_schema, binlog.binlog_statement_insert_delayed, |
122 |
- # main.mysqld--help-notwin |
123 |
- # fails due to USE=-latin1 / utf8 default |
124 |
- # |
125 |
- # main.mysql_client_test: |
126 |
- # segfaults at random under Portage only, suspect resource limits. |
127 |
- # |
128 |
- # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam |
129 |
- # fails due to bad cleanup of previous tests when run in parallel |
130 |
- # The tool is deprecated anyway |
131 |
- # Bug 532288 |
132 |
- |
133 |
- for t in main.mysql_client_test main.openssl_1 \ |
134 |
- binlog.binlog_statement_insert_delayed main.information_schema \ |
135 |
- main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do |
136 |
- mysql-v2_disable_test "$t" "False positives in Gentoo" |
137 |
- done |
138 |
- |
139 |
- for t in main.mysql main.mysql_upgrade ; do |
140 |
- mysql-v2_disable_test "$t" "Test $t broken upstream - error return value not updated" |
141 |
- done |
142 |
- |
143 |
- # Run mysql tests |
144 |
- pushd "${TESTDIR}" |
145 |
- |
146 |
- # run mysql-test tests |
147 |
- perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ |
148 |
- --testcase-timeout=30 --reorder |
149 |
- retstatus_tests=$? |
150 |
- [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
151 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
152 |
- |
153 |
- popd |
154 |
- |
155 |
- # Cleanup is important for these testcases. |
156 |
- pkill -9 -f "${S}/ndb" 2>/dev/null |
157 |
- pkill -9 -f "${S}/sql" 2>/dev/null |
158 |
- |
159 |
- failures="" |
160 |
- [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" |
161 |
- [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" |
162 |
- has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
163 |
- |
164 |
- [[ -z "$failures" ]] || die "Test failures: $failures" |
165 |
- einfo "Tests successfully completed" |
166 |
- |
167 |
- else |
168 |
- |
169 |
- einfo "Skipping server tests due to minimal build." |
170 |
- fi |
171 |
-} |