1 |
commit: e668d57acce32433276849590e445ce40c9d2df9 |
2 |
Author: Brian Evans <grknight <AT> tuffmail <DOT> com> |
3 |
AuthorDate: Tue Apr 1 17:36:07 2014 +0000 |
4 |
Commit: Brian Evans <grknight <AT> lavabit <DOT> com> |
5 |
CommitDate: Tue Apr 1 17:36:07 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e668d57a |
7 |
|
8 |
[percona-server] Version bumps |
9 |
|
10 |
Signed-off-by: Brian Evans <grknight <AT> tuffmail.com> |
11 |
|
12 |
--- |
13 |
dev-db/percona-server/Manifest | 11 ++--------- |
14 |
...r-5.5.35.33.0.ebuild => percona-server-5.5.36.34.2.ebuild} | 10 ++++++++-- |
15 |
...r-5.6.15.63.0.ebuild => percona-server-5.6.16.64.2.ebuild} | 9 +++++++-- |
16 |
eclass/mysql-multilib.eclass | 9 ++++----- |
17 |
eclass/mysql-v2.eclass | 7 +++---- |
18 |
5 files changed, 24 insertions(+), 22 deletions(-) |
19 |
|
20 |
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest |
21 |
index a49f041..f2be9e8 100644 |
22 |
--- a/dev-db/percona-server/Manifest |
23 |
+++ b/dev-db/percona-server/Manifest |
24 |
@@ -1,9 +1,2 @@ |
25 |
-DIST Percona-Server-5.5.30-rel30.2.tar.gz 22567579 SHA256 260b90a85cd6099b6ab2bbc483e9df651525dccd2f8cac1c32cf5b71c0de1ad4 SHA512 eb12ff70715e0dda4f04554f3b065c0a1fced6519d30698c3b934a7294a65f00281508f145886bb51008f29eae27db6ae0d5bb6d7beffdb107ee0494e5a15dce WHIRLPOOL 8e9534e3c0904dce7774eff3d9c6387cb22f681a23b9dabcd5fa3980b49b6b99c32fbe8f4d607595846b307491694c43f2b763c0e77c58e5b16ffef39babacc3 |
26 |
-DIST Percona-Server-5.5.33-rel31.1.tar.gz 22538385 SHA256 2039ae974d0973b765a4cdc7ffa1dc75ebd93540769fb134b3a8dc521dfc0b3a SHA512 2b2aa04ce7f2ed23cd1f4752453d95a42d06e4c855330edb3606c2c03a274d96cab3c8c1b9e278b18d331090108dbfa9cc5e2789a87eee4a2935712ac612d187 WHIRLPOOL fd74b29d17b91118733c1dc1bd620694474508f850c5657bab7f064296c99246fd08ba79f6d403512652a8d2ac771a49e09a5b134ec8a564da70ce15f70b802d |
27 |
-DIST Percona-Server-5.5.34-rel32.0.tar.gz 22579884 SHA256 775931aba537dea4fcd4ff6d37f2f30ce24921c79cef17f0c9c595222f95a741 SHA512 46e6526444550e89831fbb96b54fb91a77a0495cb804b082ef6e4d9af5ad89b0c982356d76c7a30a6a481ff4e7c51098e953914fdee84f5577ff989f9a82bac4 WHIRLPOOL 05b639a3d9421437e99c799168ddd214ae513992b2820850a038222b7e1cd9ee30b479026aea1ea0c6c274d0d641adb5040b98d94c29c3764be5dc4ec10cd14d |
28 |
-DIST Percona-Server-5.5.35-rel33.0.tar.gz 22465700 SHA256 ffa9335fc6ee204b13c5d6ebe32709f2b5bc930665e8000db1864555a02049b8 SHA512 230e51c1dd9bf6e502ad392de8f976e43690449b460739d4c3d19d22a15e52243a3f09785bdab3f9406418c5acf12f6e1ddeeedc5006e0e665bfb4b6fe90bebb WHIRLPOOL cd6ccdeca0cc9f714fe5dbe49262b140213369f4faec1348f70a4ddc8d513fb92b889a7d6fa7730515bbbd0e6c87a7198943ce03a27905ae4ec7f55af1077eb4 |
29 |
-DIST Percona-Server-5.6.13-rc60.5.tar.gz 33213326 SHA256 90de6997d2d20e37aa7d7e240ad310a446c5c85ae55cd4146bf6b17ffd5bb0a5 SHA512 212ea07a2ebc2f743ff49768770495c954e58eaafcf8d8be9b7ba1d9ca7600865d098cb779bf3ca6f0aa49ab9f2f62b44156c7d704dca25e87be40800bd4bab4 WHIRLPOOL 85a957fef0b8f93e705d1eb4c7a545d042620032c6937f47d4468520ec5755e907a5efa58fa143e6f0f239c66a1f4ae4a80ae9133f0db05ddd9ba98a6aaa1c18 |
30 |
-DIST Percona-Server-5.6.13-rel61.0.tar.gz 33401056 SHA256 6fa6c240f08c3aedacbefe31559128d239c7f18089c5bba64136698bd64910c8 SHA512 7499bdc1c40fe7902412043ab7d815c97696dfaf0357681ac103f59b3a2294de4b244a9b821029b1be0ae0a1f6b27a22dd4a00c670e5b9bdb2be93250cbea846 WHIRLPOOL 9d14b2e12997797fe1f6207497b495ff82c2070d7eb146b62ac38176a3bc9302f4679afc37e4aeeae253cfb798f6ea61ea489bb10a51c11494be05674c46619f |
31 |
-DIST Percona-Server-5.6.14-rel62.0.tar.gz 33386914 SHA256 69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280 SHA512 d79379ec3ecb8f962bd9a7be893b3d6ac1b35f0414e919056884410c0d14ec793993a9bb8f9929b81e4db2392c2de6e5742d84207c9c2d8dcd7c184da3a8c093 WHIRLPOOL e595dfa47de77a84082acb74496a3db708f155e58452117824bf86110353f84b8ae3f5fa2a120203b30e4cb7d11f079344b3e32b83d710eec3b059575bab7fd2 |
32 |
-DIST Percona-Server-5.6.15-rel63.0.tar.gz 33371236 SHA256 0d433310c374025e4aae05038b1542a5c90b35d01842c5b9718dcc0ed66ea0cc SHA512 52828d666694cac2872b2a7e002d1619a5bd96dcf8bc770de13121d014e8d0f6ac81a6ce16fec3736953eefd195f802ca1933c3da0a907502954d3c05689affb WHIRLPOOL 19f580351c135270d351b9b34d5bc6a1c69f36ed5191bbe28da378c0cfe8dc93da486db5bdf3615092b0cbf284871e3c02af4cad4389b15c50365ef919cb9cf2 |
33 |
-DIST mysql-extras-20140121-1138Z.tar.bz2 1493430 SHA256 c04953c41fc559018491a26acfce4fb509e26b0d07e8ecef0d5e5f5c1c416862 SHA512 7fafdc52803044605e0c86f18503b258a949eadd1da71d3e7fae1571329ed869f577bff971da373767db56538c1a9feb864ad5451d1628958f0285a401d0886f WHIRLPOOL e3ab7c61d7b647669201417867237ce8e566dd59c42394add571814491fa59e89969ad9a3bd9a7399fb9cf8689b3a4e535fcc2a0bab32d44e45a24cb4526405a |
34 |
+DIST percona-server-5.5.36-34.2.tar.gz 24206105 SHA256 62a0c4a45412e4c2eadf53d3a60977d33e27e650be32bf46bb13dff2b3e84fee SHA512 f6a072df53c85d170774e12d39e1b8d83db8d47daae370a915d9513e7c0224cd3afa64c84242aefbea98dd2e9f363bbe6bc454a3cfc1fbecdba274f550b724ae WHIRLPOOL d0bc8775a0618daa823f939339c875019b5c71400edf6401d4414d352e91d7a1963bc05bd4a81992cb915ae8ec6220df14dce066e11552575a496dfbe0721e88 |
35 |
+DIST percona-server-5.6.16-64.2.tar.gz 34455024 SHA256 841eb00ac9178c56f37ef621742ffe4ca43867637236f061321bafc7e64d8e8d SHA512 c114d4267f4c917bd886d76d4d6dca3c71bfc33efc57a8cbac623ec52b87b8cf1aaa6bdef3df6db91a074206d3c2206997c39d316abc33e927584307b791fb5c WHIRLPOOL ed60be8ec2008f9893df408b4e883ecf7c459d4e81a6e302207595980ac88ad5879f32d842ae9de66e5470b00db5b5b7a3fc5cb200468019f574d0e00df539de |
36 |
|
37 |
diff --git a/dev-db/percona-server/percona-server-5.5.35.33.0.ebuild b/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild |
38 |
similarity index 94% |
39 |
rename from dev-db/percona-server/percona-server-5.5.35.33.0.ebuild |
40 |
rename to dev-db/percona-server/percona-server-5.5.36.34.2.ebuild |
41 |
index be9d1f1..7c1debc 100644 |
42 |
--- a/dev-db/percona-server/percona-server-5.5.35.33.0.ebuild |
43 |
+++ b/dev-db/percona-server/percona-server-5.5.36.34.2.ebuild |
44 |
@@ -94,11 +94,16 @@ src_test() { |
45 |
# main.file_contents |
46 |
# Fails finding a BZR revision number from a text file. |
47 |
# This is an information only test and not needed in Gentoo |
48 |
+ # |
49 |
+ # main.percona_bug1289599 |
50 |
+ # Appears to be a syntax error in the test file itself |
51 |
+ # |
52 |
|
53 |
for t in main.mysql_client_test \ |
54 |
binlog.binlog_statement_insert_delayed main.information_schema \ |
55 |
main.mysqld--help-notwin main.flush_read_lock_kill \ |
56 |
- sys_vars.plugin_dir_basic main.openssl_1 main.file_contents ; do |
57 |
+ sys_vars.plugin_dir_basic main.openssl_1 main.file_contents \ |
58 |
+ main.percona_bug1289599 ; do |
59 |
mysql-v2_disable_test "$t" "False positives in Gentoo" |
60 |
done |
61 |
|
62 |
@@ -106,7 +111,8 @@ src_test() { |
63 |
pushd "${TESTDIR}" |
64 |
|
65 |
# run mysql-test tests |
66 |
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" |
67 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \ |
68 |
+ --testcase-timeout=30 |
69 |
retstatus_tests=$? |
70 |
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
71 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
72 |
|
73 |
diff --git a/dev-db/percona-server/percona-server-5.6.15.63.0.ebuild b/dev-db/percona-server/percona-server-5.6.16.64.2.ebuild |
74 |
similarity index 96% |
75 |
rename from dev-db/percona-server/percona-server-5.6.15.63.0.ebuild |
76 |
rename to dev-db/percona-server/percona-server-5.6.16.64.2.ebuild |
77 |
index 3070f89..1d7b70d 100644 |
78 |
--- a/dev-db/percona-server/percona-server-5.6.15.63.0.ebuild |
79 |
+++ b/dev-db/percona-server/percona-server-5.6.16.64.2.ebuild |
80 |
@@ -96,6 +96,10 @@ src_test() { |
81 |
# main.file_contents |
82 |
# Fails finding a BZR revision number from a text file. |
83 |
# This is an information only test and not needed in Gentoo |
84 |
+ # |
85 |
+ # main.percona_bug1289599 |
86 |
+ # Looks to be a syntax error in the test file itself |
87 |
+ # |
88 |
|
89 |
for t in main.mysql_client_test \ |
90 |
binlog.binlog_statement_insert_delayed main.information_schema \ |
91 |
@@ -103,7 +107,7 @@ src_test() { |
92 |
sys_vars.plugin_dir_basic main.openssl_1 binlog.binlog_mysqlbinlog_filter \ |
93 |
perfschema.binlog_edge_mix perfschema.binlog_edge_stmt \ |
94 |
funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers \ |
95 |
- main.file_contents; do |
96 |
+ main.file_contents main.percona_bug1289599; do |
97 |
mysql-v2_disable_test "$t" "False positives in Gentoo" |
98 |
done |
99 |
|
100 |
@@ -111,7 +115,8 @@ src_test() { |
101 |
pushd "${TESTDIR}" |
102 |
|
103 |
# run mysql-test tests |
104 |
- perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" |
105 |
+ perl mysql-test-run.pl --force --vardir="${S}/mysql-test/var-tests" \ |
106 |
+ --testcase-timeout=30 |
107 |
retstatus_tests=$? |
108 |
[[ $retstatus_tests -eq 0 ]] || eerror "tests failed" |
109 |
has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" |
110 |
|
111 |
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass |
112 |
index 52ea3e2..7814b2d 100644 |
113 |
--- a/eclass/mysql-multilib.eclass |
114 |
+++ b/eclass/mysql-multilib.eclass |
115 |
@@ -126,10 +126,9 @@ if [[ -z ${SERVER_URI} ]]; then |
116 |
MY_PV=$(get_version_component_range 1-3 ${PV}) |
117 |
PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) |
118 |
PERCONA_RC=$(get_version_component_range 6 ${PV}) |
119 |
- PERCONA_RC=${PERCONA_RC:-rel} |
120 |
- SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/${PERCONA_PN}-${MY_PV}-${PERCONA_RC:-rel}${PERCONA_RELEASE}.tar.gz" |
121 |
-# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-5.5.30-rel30.2.tar.gz |
122 |
-# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/Percona-Server-5.6.13-rc60.5.tar.gz |
123 |
+ SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" |
124 |
+# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-rel30.2.tar.gz |
125 |
+# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz |
126 |
else |
127 |
if [[ "${PN}" == "mysql-cluster" ]] ; then |
128 |
URI_DIR="MySQL-Cluster" |
129 |
@@ -299,7 +298,7 @@ DEPEND="${DEPEND} |
130 |
# For other stuff to bring us in |
131 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
132 |
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
133 |
- =virtual/mysql-${MYSQL_PV_MAJOR}" |
134 |
+ ~virtual/mysql-${MYSQL_PV_MAJOR}" |
135 |
|
136 |
# my_config.h includes ABI specific data |
137 |
MULTILIB_WRAPPED_HEADERS=( /usr/include/mysql/my_config.h ) |
138 |
|
139 |
diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass |
140 |
index cee33d4..3a04875 100644 |
141 |
--- a/eclass/mysql-v2.eclass |
142 |
+++ b/eclass/mysql-v2.eclass |
143 |
@@ -146,10 +146,9 @@ if [[ -z ${SERVER_URI} ]]; then |
144 |
MY_PV=$(get_version_component_range 1-3 ${PV}) |
145 |
PERCONA_RELEASE=$(get_version_component_range 4-5 ${PV}) |
146 |
PERCONA_RC=$(get_version_component_range 6 ${PV}) |
147 |
- mysql_version_is_at_least "5.5.34" && PERCONA_RC=${PERCONA_RC:-rel} |
148 |
- SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/${PERCONA_PN}-${MY_PV}-${PERCONA_RC:-rel}${PERCONA_RELEASE}.tar.gz" |
149 |
-# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/Percona-Server-5.5.30-rel30.2.tar.gz |
150 |
-# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/Percona-Server-5.6.13-rc60.5.tar.gz |
151 |
+ SERVER_URI="http://www.percona.com/redir/downloads/${PERCONA_PN}-${MIRROR_PV}/${PERCONA_PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}/source/tarball/${PN}-${MY_PV}-${PERCONA_RC}${PERCONA_RELEASE}.tar.gz" |
152 |
+# http://www.percona.com/redir/downloads/Percona-Server-5.5/LATEST/source/tarball/Percona-Server-5.5.30-30.2.tar.gz |
153 |
+# http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.13-rc60.5/source/tarball/Percona-Server-5.6.13-rc60.5.tar.gz |
154 |
else |
155 |
if [[ "${PN}" == "mysql-cluster" ]] ; then |
156 |
URI_DIR="MySQL-Cluster" |