Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql/
Date: Sun, 07 May 2017 23:44:08
Message-Id: 1494200634.f4002a1f6df48aab093a074975ad7fadd14ba515.grknight@gentoo
1 commit: f4002a1f6df48aab093a074975ad7fadd14ba515
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 7 23:43:54 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sun May 7 23:43:54 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4002a1f
7
8 dev-db/mysql: Drop security vulnerable versions for the 5.5 series
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 dev-db/mysql/Manifest | 2 -
13 dev-db/mysql/mysql-5.5.54-r1.ebuild | 125 ------------------------------------
14 dev-db/mysql/mysql-5.5.55.ebuild | 125 ------------------------------------
15 3 files changed, 252 deletions(-)
16
17 diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
18 index 732a560dc5a..e931c6f0558 100644
19 --- a/dev-db/mysql/Manifest
20 +++ b/dev-db/mysql/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST mysql-5.5.54.tar.gz 21041949 SHA256 273bcbcf8cc84061eb07c359308563b2029eb3f70f78b558905bc1b5c5791ab8 SHA512 885e21a59cf7e835dd1ca7254889fc4e5762fdebbb1e625465ef7fa3be6533d48091b68a6d1f2de0297270cfd0ca7e8e643fc2e0b7fc14325f48708e7a55460b WHIRLPOOL bdb8ec54b6b831dba673c5a7b6328809e79b8406a511a108ced93bd3efa42d718d35462cf0bf098db0a1108217d5d47c19c2540d87ad5f1ccfd66c55dd67ca3f
23 -DIST mysql-5.5.55.tar.gz 21040959 SHA256 9af0a504e2603b0bc0c7c3a4a747df064fb51670a0022b1ad6114f9058b64171 SHA512 3da7a45665e54fd77461980e3096937470aaa6308d89c8b5b9bee54ca11050cc08aab56063f07fb0f166e564329576a1be52ec8815e855ccca9e1076a03faac9 WHIRLPOOL a140850d30e80ae36b4dd43530eb50d52094dd65050f25b50cbd5d28da9985339e3ae59d925014e965e777343fd9550c47ed79a38065deb3dee3af44ca48b097
24 DIST mysql-5.5.56.tar.gz 21025832 SHA256 3fd30a24267cef84ee8aeb327a5b08a669d3ab8c4d76d1b1b3b66d26cf777a0a SHA512 58aec4cfc82abac5bb9d5e5594d2545c979910af5b7bbcfe339f9590d157244c869a83659f89a2cca09254353ecb52d2dcb3e2cd55e117219e2a72c54187a975 WHIRLPOOL 5aa01ff21da05a86f5c3d5264afb9c5722001154d36c1042ab88bd38c02b9daae8cba47f933909579eb22872aeafb146e6b2d382f5a4c6319f163e261116de4d
25 DIST mysql-5.6.35.tar.gz 32167628 SHA256 dddcba169b98844d7c65346cbd791c853edf942d78440381685087b84aa35020 SHA512 106c4b05c52cd2bb5378376e4a453aeb55eda0adce527862c435068597c3e60f44e3c64476011befefd688e6fdf30f2245e28320d57d9fccbb2415d87498e7f2 WHIRLPOOL e8972bba163453e54dc3859a7cfd07b4dc38125e0b5f7b41940afa6f1466820079f18e88769ea198b12645383d105340ab5ea998b32a95d083d08689658510bc
26 DIST mysql-5.6.36.tar.gz 32192348 SHA256 0af81a5538fc7fe2b747295dfa96589ace8831d2a7d4a26660fca456babeb147 SHA512 b3e3bcb1d1e913994f274f4c6dc72c77f1f52b132389e784c675d1720b5913788ce035f045b99ef3754d1b257db55e8300b5c7622ec79c33afafec5968801c18 WHIRLPOOL 628e33a58532dcdca20e489c3120824604b8d51e10d609f1f9c2adb11552124a8f87f206df99766162d288d5877dac22d2cacffdba1458c73fb52b529245a1e6
27
28 diff --git a/dev-db/mysql/mysql-5.5.54-r1.ebuild b/dev-db/mysql/mysql-5.5.54-r1.ebuild
29 deleted file mode 100644
30 index 483b3462e93..00000000000
31 --- a/dev-db/mysql/mysql-5.5.54-r1.ebuild
32 +++ /dev/null
33 @@ -1,125 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI="5"
38 -
39 -MY_EXTRAS_VER="20170301-2020Z"
40 -MY_PV="${PV//_alpha_pre/-m}"
41 -MY_PV="${MY_PV//_/-}"
42 -
43 -# Build type
44 -BUILD="cmake"
45 -
46 -inherit toolchain-funcs mysql-v2
47 -# only to make repoman happy. it is really set in the eclass
48 -IUSE="$IUSE"
49 -
50 -# Define the mysql-extras source
51 -EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
52 -
53 -# REMEMBER: also update eclass/mysql*.eclass before committing!
54 -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"
55 -
56 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
57 -EPATCH_EXCLUDE='20019_all_mysql-5.5-mtr-perl-deprecation.patch'
58 -
59 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
60 -RDEPEND="${RDEPEND}"
61 -
62 -# Please do not add a naive src_unpack to this ebuild
63 -# If you want to add a single patch, copy the ebuild to an overlay
64 -# and create your own mysql-extras tarball, looking at 000_index.txt
65 -
66 -# Official test instructions:
67 -# USE='embedded extraengine perl ssl static-libs community' \
68 -# FEATURES='test userpriv -usersandbox' \
69 -# ebuild mysql-X.X.XX.ebuild \
70 -# digest clean package
71 -src_test() {
72 -
73 - local TESTDIR="${BUILD_DIR}/mysql-test"
74 - local retstatus_unit
75 - local retstatus_tests
76 -
77 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
78 - # localhost. Also causes weird failures.
79 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
80 -
81 - if ! use "minimal" ; then
82 -
83 - if [[ $UID -eq 0 ]]; then
84 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
85 - fi
86 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
87 -
88 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
89 - addpredict /this-dir-does-not-exist/t9.MYI
90 -
91 - # Run CTest (test-units)
92 - cmake-utils_src_test
93 - retstatus_unit=$?
94 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
95 -
96 - # Ensure that parallel runs don't die
97 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
98 - # Enable parallel testing, auto will try to detect number of cores
99 - # You may set this by hand.
100 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
101 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
102 -
103 - # create directories because mysqladmin might right out of order
104 - mkdir -p "${T}"/var-tests{,/log}
105 -
106 - # create symlink for the tests to find mysql_tzinfo_to_sql
107 - ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
108 -
109 - # These are failing in MySQL 5.5 for now and are believed to be
110 - # false positives:
111 - #
112 - # main.information_schema, binlog.binlog_statement_insert_delayed,
113 - # main.mysqld--help-notwin
114 - # fails due to USE=-latin1 / utf8 default
115 - #
116 - # main.mysql_client_test:
117 - # segfaults at random under Portage only, suspect resource limits.
118 - #
119 - # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
120 - # fails due to bad cleanup of previous tests when run in parallel
121 - # The tool is deprecated anyway
122 - # Bug 532288
123 -
124 - for t in main.mysql_client_test main.openssl_1 \
125 - binlog.binlog_statement_insert_delayed main.information_schema \
126 - main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
127 - mysql-v2_disable_test "$t" "False positives in Gentoo"
128 - done
129 -
130 - # Run mysql tests
131 - pushd "${TESTDIR}"
132 -
133 - # run mysql-test tests
134 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
135 - --testcase-timeout=30 --reorder
136 - retstatus_tests=$?
137 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
138 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
139 -
140 - popd
141 -
142 - # Cleanup is important for these testcases.
143 - pkill -9 -f "${S}/ndb" 2>/dev/null
144 - pkill -9 -f "${S}/sql" 2>/dev/null
145 -
146 - failures=""
147 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
148 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
149 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
150 -
151 - [[ -z "$failures" ]] || die "Test failures: $failures"
152 - einfo "Tests successfully completed"
153 -
154 - else
155 -
156 - einfo "Skipping server tests due to minimal build."
157 - fi
158 -}
159
160 diff --git a/dev-db/mysql/mysql-5.5.55.ebuild b/dev-db/mysql/mysql-5.5.55.ebuild
161 deleted file mode 100644
162 index 483b3462e93..00000000000
163 --- a/dev-db/mysql/mysql-5.5.55.ebuild
164 +++ /dev/null
165 @@ -1,125 +0,0 @@
166 -# Copyright 1999-2017 Gentoo Foundation
167 -# Distributed under the terms of the GNU General Public License v2
168 -
169 -EAPI="5"
170 -
171 -MY_EXTRAS_VER="20170301-2020Z"
172 -MY_PV="${PV//_alpha_pre/-m}"
173 -MY_PV="${MY_PV//_/-}"
174 -
175 -# Build type
176 -BUILD="cmake"
177 -
178 -inherit toolchain-funcs mysql-v2
179 -# only to make repoman happy. it is really set in the eclass
180 -IUSE="$IUSE"
181 -
182 -# Define the mysql-extras source
183 -EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
184 -
185 -# REMEMBER: also update eclass/mysql*.eclass before committing!
186 -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"
187 -
188 -# When MY_EXTRAS is bumped, the index should be revised to exclude these.
189 -EPATCH_EXCLUDE='20019_all_mysql-5.5-mtr-perl-deprecation.patch'
190 -
191 -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
192 -RDEPEND="${RDEPEND}"
193 -
194 -# Please do not add a naive src_unpack to this ebuild
195 -# If you want to add a single patch, copy the ebuild to an overlay
196 -# and create your own mysql-extras tarball, looking at 000_index.txt
197 -
198 -# Official test instructions:
199 -# USE='embedded extraengine perl ssl static-libs community' \
200 -# FEATURES='test userpriv -usersandbox' \
201 -# ebuild mysql-X.X.XX.ebuild \
202 -# digest clean package
203 -src_test() {
204 -
205 - local TESTDIR="${BUILD_DIR}/mysql-test"
206 - local retstatus_unit
207 - local retstatus_tests
208 -
209 - # Bug #213475 - MySQL _will_ object strenously if your machine is named
210 - # localhost. Also causes weird failures.
211 - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
212 -
213 - if ! use "minimal" ; then
214 -
215 - if [[ $UID -eq 0 ]]; then
216 - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
217 - fi
218 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
219 -
220 - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
221 - addpredict /this-dir-does-not-exist/t9.MYI
222 -
223 - # Run CTest (test-units)
224 - cmake-utils_src_test
225 - retstatus_unit=$?
226 - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
227 -
228 - # Ensure that parallel runs don't die
229 - export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
230 - # Enable parallel testing, auto will try to detect number of cores
231 - # You may set this by hand.
232 - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
233 - export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
234 -
235 - # create directories because mysqladmin might right out of order
236 - mkdir -p "${T}"/var-tests{,/log}
237 -
238 - # create symlink for the tests to find mysql_tzinfo_to_sql
239 - ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
240 -
241 - # These are failing in MySQL 5.5 for now and are believed to be
242 - # false positives:
243 - #
244 - # main.information_schema, binlog.binlog_statement_insert_delayed,
245 - # main.mysqld--help-notwin
246 - # fails due to USE=-latin1 / utf8 default
247 - #
248 - # main.mysql_client_test:
249 - # segfaults at random under Portage only, suspect resource limits.
250 - #
251 - # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
252 - # fails due to bad cleanup of previous tests when run in parallel
253 - # The tool is deprecated anyway
254 - # Bug 532288
255 -
256 - for t in main.mysql_client_test main.openssl_1 \
257 - binlog.binlog_statement_insert_delayed main.information_schema \
258 - main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
259 - mysql-v2_disable_test "$t" "False positives in Gentoo"
260 - done
261 -
262 - # Run mysql tests
263 - pushd "${TESTDIR}"
264 -
265 - # run mysql-test tests
266 - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
267 - --testcase-timeout=30 --reorder
268 - retstatus_tests=$?
269 - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
270 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
271 -
272 - popd
273 -
274 - # Cleanup is important for these testcases.
275 - pkill -9 -f "${S}/ndb" 2>/dev/null
276 - pkill -9 -f "${S}/sql" 2>/dev/null
277 -
278 - failures=""
279 - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
280 - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
281 - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
282 -
283 - [[ -z "$failures" ]] || die "Test failures: $failures"
284 - einfo "Tests successfully completed"
285 -
286 - else
287 -
288 - einfo "Skipping server tests due to minimal build."
289 - fi
290 -}