From 9a28929e82c2b1511dcd8d369cd1624352632ab1 Mon Sep 17 00:00:00 2001 From: geos_one Date: Mon, 1 Feb 2010 08:43:39 +0000 Subject: [PATCH] dev-db/mysql: Bump use gentoo released patches package git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mysql@1913 6952d904-891a-0410-993b-d76249ca496b --- dev-db/mysql/ChangeLog | 4 + dev-db/mysql/Manifest | 6 +- dev-db/mysql/files/mysql-storage.diff | 19 +++ dev-db/mysql/mysql-5.1.43-r1.ebuild | 196 ++++++++++++++++++++++++++ 4 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 dev-db/mysql/files/mysql-storage.diff create mode 100644 dev-db/mysql/mysql-5.1.43-r1.ebuild diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 98dda02..ff6a4b2 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.488 2009/07/06 19:08:59 robbat2 Exp $ + 01 Feb 2010; Mario Fetka +mysql-5.1.43-r1.ebuild, + +files/mysql-storage.diff: + Bump use gentoo released patches package + 13 Jan 2010; Mario Fetka mysql-5.1.42-r1.ebuild: add pbms storage engine diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 1cddaea..22ebbb1 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,10 +1,13 @@ AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af AUX my.cnf-4.1 4235 RMD160 ca04e2e667322e99c29be59064c7a6ecaa4e1e4c SHA1 babc79984b2e2d3def93ac0c13cd2fc5c690212a SHA256 908a4883116e4f323510c468fd22c5765f8a2adce0344859fc212b7209a3a6c7 +AUX mysql-storage.diff 554 RMD160 9afe93a5d669ced77510e0c0a102f35a597a2fb4 SHA1 a29010c4a2b240acf642ef66a1b61d99fbaebf79 SHA256 065816864a15382aa74d6907c0d187b980e703aa104408f5a244f9f1fece9237 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 DIST mysql-5.1.41.tar.gz 23026814 RMD160 f99d17a2bb43fc45222c7015a3b65c6b4f686129 SHA1 04f7cf87419ca233c2508c2912d72548767b7e2c SHA256 5cb721db43a5f61710d8503813adef335cb1b738c7164e3d7d2a9681af8dbc16 DIST mysql-5.1.42.tar.gz 22267547 RMD160 03be40ad07238d0b13d82b3e763f5263962e3bef SHA1 b16a787b61dfc6f57ff6fb723223598c6f529db1 SHA256 9b4fcc5137b3f6ab7107f6f84248aa8c74702be55a73470091c24b451fe79abe +DIST mysql-5.1.43.tar.gz 22319586 RMD160 51aa017edc165f13f2cb696ee210505b8f2a21ee SHA1 fff98e59f17487d646998662409bc894a422b7e9 SHA256 6e417c22c0ba91ba7fea15a6c7b63b581decd446b638ea5dac896cd5de90baf3 DIST mysql-5.5.0-m2.tar.gz 21399110 RMD160 6472960ccb45eda240dc1a0a4068ad327cde3dde SHA1 5e547ee11841f4f5c35141ee365edc6f1e139571 SHA256 b5e2d16b7c0720d9688f4335ebcfbb3e239e5bdbb65afa0892d899b2f0ce2dd5 +DIST mysql-extras-20100201-0104Z.tar.bz2 933785 RMD160 7780fcc370d2eb8e48993aaeba480e2ec7785c14 SHA1 ce098829243327c5941a9864a9e0632ae5cee418 SHA256 d06f7d2e6920576392adf0fa544931aa6dcecf45060dac4968ea8d88e84c2f70 DIST mysql-storage-filesystem-0.1.1-gentoo-r7.tar.gz 17099 RMD160 fcc3fe5a9f6d0b4f1b0f2d36969634c7f2701ff7 SHA1 b8e846b18b6b43927d050e9f418a75ac5728e2ba SHA256 0ece3795d61d25f8a61fa62e8add858c05415c4c47acb225f221afea1d7736af DIST mysql-storage-innodb-1.0.6-gentoo-r1.tar.gz 1391223 RMD160 78655bd8ae52cda0db8b9342a3a8104fb6d3d50d SHA1 768ed5968ccfe9e68c04ec0100ee6105692b8383 SHA256 b60ef8d16e1a8e645f8d6320dfded35819c73ff0eca71e5d090104e4748db80c DIST mysql-storage-oqgraph-0.7-gentoo-r3.tar.gz 29818 RMD160 fec2071e0999547d1e70e9edacf0d53dbdec715b SHA1 e2ba0dc9fa10535cbe59f1a93d46673e92e77807 SHA256 b83bceede18bd27138ce126aacee6bc648de05410038c4793786194cd3e38573 @@ -18,6 +21,7 @@ DIST mysql-storage-spider-2.10-gentoo-r1.tar.gz 162512 RMD160 614e7dc1cab5a0b1b9 EBUILD mysql-5.1.41.ebuild 5087 RMD160 b9bc34589bb5f5ee19fd5808721ce5160ba680f5 SHA1 3d79b7051ab92079e102429b09caa551cc507c12 SHA256 2abacfaf4efcb9eb1a3c6e86fe052a35af628f68300231bc7f5d3d1aff16ea9d EBUILD mysql-5.1.42-r1.ebuild 5142 RMD160 9c329f73262f3728e0ef2cea9c83722946318456 SHA1 5f28e8bb42959029b84fe595652977df60373a05 SHA256 dab2321d80d1c75f084db16512c3d3425e51b060b83f685abd40f4a3a6852d35 EBUILD mysql-5.1.42.ebuild 5087 RMD160 d745249ad43819fee58ceaf7c61159738b437755 SHA1 b9cc7a3915bbef4e24d4b44e3c69bb16ce18545c SHA256 2933d9bdabf190b10db59fcac58a68452f1f9873f196fe7042b71c261fac0487 +EBUILD mysql-5.1.43-r1.ebuild 6545 RMD160 d2dd368ea5815699dc64024a62ade1ac824ff145 SHA1 4158a2225f48c38f945d0ba5165060bef5128c10 SHA256 f8fb1360d6d78dfdb02845388ae4e88595830c18569d89cb6cc8ee8322d683be EBUILD mysql-5.5.0_pre2.ebuild 4929 RMD160 00e97ca8efbe82f396404b461b9c31db6e1527e5 SHA1 cf7e57f1019b32fdf872b556f7ad0812cd1c733f SHA256 50b05c911523c7912d411384081455180fbfa0d2a9fd91d1cdbaeb02be683c4c -MISC ChangeLog 95714 RMD160 ed25303d4f9ff4d7687dfc75c0bcf08b6fcce0e3 SHA1 2e86db1ab2491e4a1cb50eef17463698f9b876a7 SHA256 5b85a1784ff89435d237ed917b78813b1a7fe20459bbc7cc6742898206fbb499 +MISC ChangeLog 95863 RMD160 4a5500acf4f8ac6a083721cdd696627f4840d994 SHA1 cf0d4295cda02a8d7077faee5992bd19709b191e SHA256 2e2678e710eba1c3898810ccf7151a993774ed91218be7f8a9aef629886a7261 MISC metadata.xml 918 RMD160 ee023d3ae746d0d29ac387c1c87f3f8dec7c9568 SHA1 10ef755d319f93d02de705b3158f4e73aca28af4 SHA256 046a9880921c49fea8861a819c1afd27fc5a873dea28b80b040da2733e029c47 diff --git a/dev-db/mysql/files/mysql-storage.diff b/dev-db/mysql/files/mysql-storage.diff new file mode 100644 index 0000000..6e29387 --- /dev/null +++ b/dev-db/mysql/files/mysql-storage.diff @@ -0,0 +1,19 @@ +--- mysql-5.1.42-r1.ebuild.orig 2010-02-01 06:37:57.000000000 +0100 ++++ mysql-5.1.43-r1.ebuild 2010-01-13 20:04:08.365193906 +0100 +@@ -5,6 +5,16 @@ + MY_EXTRAS_VER="live" + EAPI=2 + ++MYSQL_STORAGE="pbxt-1.0.10c-rc-gentoo-r1 ++ pbms-0.5.09-alpha-gentoo-r11 ++ revision-0.2-alpha-gentoo-r5 ++ soliddb-0081-gentoo-r2 ++ innodb-1.0.6-gentoo-r1 ++ filesystem-0.1.1-gentoo-r7 ++ sphinx-0.9.9-gentoo-r3 ++ spider-2.10-gentoo-r1 ++ oqgraph-0.7-gentoo-r3" ++ + inherit toolchain-funcs mysql + # only to make repoman happy. it is really set in the eclass + IUSE="$IUSE" diff --git a/dev-db/mysql/mysql-5.1.43-r1.ebuild b/dev-db/mysql/mysql-5.1.43-r1.ebuild new file mode 100644 index 0000000..23e206d --- /dev/null +++ b/dev-db/mysql/mysql-5.1.43-r1.ebuild @@ -0,0 +1,196 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.84-r1.ebuild,v 1.7 2009/11/09 18:00:20 fauli Exp $ + +MY_EXTRAS_VER="20100201-0104Z" +EAPI=2 + +MYSQL_STORAGE="pbxt-1.0.10c-rc-gentoo-r1 + pbms-0.5.09-alpha-gentoo-r11 + revision-0.2-alpha-gentoo-r5 + soliddb-0081-gentoo-r2 + innodb-1.0.6-gentoo-r1 + filesystem-0.1.1-gentoo-r7 + sphinx-0.9.9-gentoo-r3 + spider-2.10-gentoo-r1 + oqgraph-0.7-gentoo-r3" + +inherit toolchain-funcs mysql +# only to make repoman happy. it is really set in the eclass +IUSE="$IUSE" + +# Define the mysql-extras source +EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" + +# REMEMBER: also update eclass/mysql*.eclass before committing! +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" + +# When MY_EXTRAS is bumped, the index should be revised to exclude these. +EPATCH_EXCLUDE='' + +DEPEND="|| ( >=sys-devel/gcc-4 >=sys-devel/gcc-apple-4 )" +RDEPEND="" + +# Please do not add a naive src_unpack to this ebuild +# If you want to add a single patch, copy the ebuild to an overlay +# and create your own mysql-extras tarball, looking at 000_index.txt + +# Official test instructions: +# USE='berkdb cluster embedded extraengine perl ssl community' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + emake check || die "make check failed" + if ! use "minimal" ; then + if [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + cd "${S}" + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + local retstatus_unit + local retstatus_ns + local retstatus_ps + local t + addpredict /this-dir-does-not-exist/t9.MYI + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + # archive_gis really sucks a lot, but it's only relevant for the + # USE=extraengines case + case ${PV} in + 5.0.42) + mysql_disable_test "archive_gis" "Totally broken in 5.0.42" + ;; + + 5.0.4[3-9]|5.0.[56]*|5.0.70|5.0.87) + [ "$(tc-endian)" == "big" ] && \ + mysql_disable_test \ + "archive_gis" \ + "Broken in 5.0.43-70 and 5.0.87 on big-endian boxes only" + ;; + esac + + # This was a slight testcase breakage when the read_only security issue + # was fixed. + case ${PV} in + 5.0.54|5.0.51*) + mysql_disable_test \ + "read_only" \ + "Broken in 5.0.51-54, output in wrong order" + ;; + esac + + # Ditto to read_only + [ "${PV}" == "5.0.51a" ] && \ + mysql_disable_test \ + "view" \ + "Broken in 5.0.51, output in wrong order" + + # x86-specific, OOM issue with some subselects on low memory servers + [ "${PV}" == "5.0.54" ] && \ + [ "${ARCH/x86}" != "${ARCH}" ] && \ + mysql_disable_test \ + "subselect" \ + "Testcase needs tuning on x86 for oom condition" + + # Broke with the YaSSL security issue that didn't affect Gentoo. + [ "${PV}" == "5.0.56" ] && \ + for t in openssl_1 rpl_openssl rpl_ssl ssl \ + ssl_8k_key ssl_compress ssl_connect ; do \ + mysql_disable_test \ + "$t" \ + "OpenSSL tests broken on 5.0.56" + done + + # New test was broken in first time + # Upstream bug 41066 + # http://bugs.mysql.com/bug.php?id=41066 + [ "${PV}" == "5.0.72" ] && \ + mysql_disable_test \ + "status2" \ + "Broken in 5.0.72, new test is broken, upstream bug #41066" + + # The entire 5.0 series has pre-generated SSL certificates, they have + # mostly expired now. ${S}/mysql-tests/std-data/*.pem + # The certs really SHOULD be generated for the tests, so that they are + # not expiring like this. We cannot do so ourselves as the tests look + # closely as the cert path data, and we do not have the CA key to regen + # ourselves. Alternatively, upstream should generate them with at least + # 50-year validity. + # + # Known expiry points: + # 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09 + # 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27 + # 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28 + # + # mysql-test/std_data/untrusted-cacert.pem is MEANT to be + # expired/invalid. + case ${PV} in + 5.0.*|5.1.*) + for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_key \ + ssl_compress ssl_connect ; do \ + mysql_disable_test \ + "$t" \ + "These OpenSSL tests break due to expired certificates" + done + ;; + esac + + # These are also failing in MySQL 5.1 for now, and are believed to be + # false positives: + # + # main.mysql_comment, main.mysql_upgrade: + # fails due to USE=-latin1 / utf8 default + # + # main.mysql_client_test: + # segfaults at random under Portage only, suspect resource limits. + case ${PV} in + 5.1.*) + for t in main.mysql_client_test main.mysql_comments main.mysql_upgrade; do + mysql_disable_test "$t" "False positives in Gentoo" + done + ;; + esac + + # create directories because mysqladmin might right out of order + mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log} + + # We run the test protocols seperately + make -j1 test-unit + retstatus_unit=$? + [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" + + make -j1 test-ns force="--force --vardir=${S}/mysql-test/var-ns" + retstatus_ns=$? + [[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + make -j1 test-ps force="--force --vardir=${S}/mysql-test/var-ps" + retstatus_ps=$? + [[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + + # TODO: + # When upstream enables the pr and nr testsuites, we need those as well. + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_ns -eq 0 ]] || failures="${failures} test-ns" + [[ $retstatus_ps -eq 0 ]] || failures="${failures} test-ps" + has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" + else + einfo "Skipping server tests due to minimal build." + fi +}