From: Robin H. Johnson Date: Mon, 9 Jan 2012 07:07:14 +0000 (+0000) Subject: MySQL-3.23 no longer supported (was in-tree for migrations from MySQL-3.22). MySQL... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f34abeafb9cec8fae209feb5e8bf59892d91abcc;p=gentoo.git MySQL-3.23 no longer supported (was in-tree for migrations from MySQL-3.22). MySQL-4 has been stable for at least 7 years. Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 40a09e96cee8..9fc2b658dc37 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.594 2012/01/09 02:22:40 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.595 2012/01/09 07:07:14 robbat2 Exp $ + + 09 Jan 2012; Robin H. Johnson -mysql-3.23.58-r1.ebuild: + MySQL-3.23 no longer supported (was in-tree for migrations from MySQL-3.22). + MySQL-4 has been stable for at least 7 years. *mysql-5.0.91 (09 Jan 2012) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 1e22590875d2..67f8bb6a6691 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,12 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - 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 my.cnf-5.1 4199 RMD160 c12797534dd8273d1640844b4813ec7307911cef SHA1 5845dcaf469bd95d918cc07b1ffc80e2bd4c5a68 SHA256 c50e38004c901d4921d00a5f458bcd191852262a93f3d9fbfb6b040186b1ec45 AUX mysql.init 886 RMD160 26b8aa45af3f930db01f0db731865b9293626fb1 SHA1 d7d99a3f45fa807d1fb57ab04b35800a69cae430 SHA256 2d7faf6d88fd13e5c10368a20074fdb59554635f8b1fd17e088d82208e611c12 -DIST mysql-3.23.58.tar.gz 12039843 RMD160 b7d436ac7aaa9238e724bf3c62c5f837bef676b6 SHA1 f3383e41e8926c040a295173881414a1e96e0266 SHA256 8dcc6a613820701221b787419c32c1c717562194cfd296187da0e87454252acc DIST mysql-4.0.27.tar.gz 11152643 RMD160 00cf895eab192e3e0ab526587ccab3e81c6c9070 SHA1 9cce3b92c47d17bf58ec6cdefebfdf953b5ce2c4 SHA256 c79f83bed7c1ea98e018b8829375b55c1de838d21a526d7f679becc75de00d0f DIST mysql-4.1.22.tar.gz 17761101 RMD160 bfcf5058e4247cf4d7d1550ea54c64ebc8bc615e SHA1 857e942cc3207caf56e2aa48961fc1ed66d932e6 SHA256 6bd2436fd0f233bb1518e15975cb4e9fa4434acb53c3c3cd7d4648219abf58e9 DIST mysql-5.0.91.tar.gz 22340514 RMD160 3aaa638172f6916d3698c5421b24a01647f7e9db SHA1 14a79138a1296ce6ebb681fceba622d870feba3e SHA256 4669abf059bcf97c2fc1f3ce678e83f738ffe2299bd893e1a3d31afbc682c754 @@ -19,7 +15,6 @@ DIST mysql-5.1.57.tar.gz 23660514 RMD160 9ca7f79d14525fef2c1badf8410fecd238ee283 DIST mysql-5.1.58.tar.gz 24333490 RMD160 199729c701c764cd22584c2b952230c07d0f31a6 SHA1 cfd70bee07ad99576eecde01785b7b2a74ec87ab SHA256 3c69562399655fc62d1424437e6ef59ef7c1ed225f940f81558f549b803f3fd7 DIST mysql-5.1.59.tar.gz 24325443 RMD160 bbc54a2fc0eb3657f297ac097e9374c98e90442e SHA1 1d425a421edc94fba616f1986a16bdc9d0b5c193 SHA256 f87b99b73c0d936ed892326ebd4c90b1d5c7d5d2ac8832fc62f538db99fb04f7 DIST mysql-5.5.19.tar.gz 24296942 RMD160 cae5bbea6d527ffb899eeeced8fc411375c285ae SHA1 f6a3b5fb5a10f8110fd85463e1a25fb314e60c24 SHA256 7f3643b378101de19205d133e6fb5ce03d8394e183f4e9ac2b0de59ba57fc34f -DIST mysql-extras-20061210.tar.bz2 51115 RMD160 52355e608d5048c91b7960aa5be0c030ecb0e5d8 SHA1 c9d035ac73d29fe2d1274760ca70b8c6b882fec6 SHA256 46505a8b54ae7cafdc610465edfdfde1cd74f101071f71cf1f5c1c02e92790eb DIST mysql-extras-20070105.tar.bz2 50005 RMD160 abf1f8ebab8ecdfdb5ebe9ca55076f39ab492acb SHA1 7f4dbc3d6c20fe953bf6e936a58343a229398ca0 SHA256 17697bf70acffd0eeefd976b5ef06dd36080273bf7e805b51a31d72f5f2c5172 DIST mysql-extras-20090228-2228Z.tar.bz2 254048 RMD160 d71ed448d9fbe61ecc9e4113bd0a7721e8321acb SHA1 9fd9370193e7038067e11cc8a26bfe4013eb6bac SHA256 03a986a5c5ae57f1436553565239613e978ae11e12834fcb275ec6457b12b6fb DIST mysql-extras-20100809-0452Z.tar.bz2 1228458 RMD160 baedaa994165ec17cfc31357d91212c8350be310 SHA1 e464adc36d96b76a5c6ac74856060d05ff0bba3d SHA256 2ba39a87dd5ea2c819193d1b25c6e2abbd4506d63c1e8b845846b7b33d64e52b @@ -31,7 +26,6 @@ DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d979 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c -EBUILD mysql-3.23.58-r1.ebuild 7477 RMD160 7a869c479e27c2cd2c32c83aeeb7147f40dc4e71 SHA1 12f75a6722eb4499674499526466e9d0cc3e07ce SHA256 752feee693c9b398c82ab8d0a62a840cdd10aafe469c8648e53b772d725945b9 EBUILD mysql-4.0.27-r1.ebuild 1105 RMD160 55f3ea683ea8c57bc2197a64b81b50a0933a57b2 SHA1 0adb182c9cb4640e6f3a1e6b6f501190a3c46067 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce EBUILD mysql-4.1.22-r1.ebuild 1343 RMD160 db6bd89ee2c7baeaac1e41b2f05f592b626c373c SHA1 49bd4a7125578b9fefa9c5cb1a88b6e4df6b99a5 SHA256 237e821bc7b47d259635f42255e80bc1e6f411341ada6b9014b6443d8ef52f08 EBUILD mysql-5.0.91.ebuild 6584 RMD160 cfbcca2e8dd153a4cf2e9890ac1d3cfa842d44e8 SHA1 6e551b1a44e03c3b4d7b41e0b63be36b35440c29 SHA256 3ad7006f694d77b7a13c8806a70b43d93f42ddb2c7e79a95036295316d2a17de @@ -46,23 +40,6 @@ EBUILD mysql-5.1.57.ebuild 8719 RMD160 2b3573c5c3480a74a69e6be8c3c6c0b2e79aec98 EBUILD mysql-5.1.58-r1.ebuild 8725 RMD160 b24dfc0ef0585fff9c90be233e38d0a18a8729e1 SHA1 44e88a0c9b7b8274e01db08fbd59264441af879a SHA256 5bcf90202f0feeea590291aacd639a5e15a2f1f4e8b4ad02c67b72e70b00aea6 EBUILD mysql-5.1.59.ebuild 8735 RMD160 6c6414519d83c587e0cd9d784f2421d8aefde9be SHA1 44c8a608cb92777dc990742a562d8433ab1d3798 SHA256 3d883c45c0b74802b85952ecafff61aeabf7213ce3a9ed2e3f68075270848eb1 EBUILD mysql-5.5.19.ebuild 4234 RMD160 ab95178bb615cfdf73d6085b424c2127e45640e0 SHA1 d5ec9a7dde6788c6cb1a189f45d02e532ce5861c SHA256 b178e2dbcb0afb843b53cf2c0148dfc52a1909141435d43fd32d4e4dfee94e3a -MISC ChangeLog 6083 RMD160 afe9852288fa161fbb5762e9b43b23c068e58e7c SHA1 65332611e4f1ed15a37fdba44cf729ff60cba1c0 SHA256 08859763154b9bd246094d520101df607f7144470434d8282b85cc5746c9b995 +MISC ChangeLog 6286 RMD160 16db72dd71fe2096b63e57a625d3c2eaf6931e05 SHA1 a04d7822e9e949e86bffca72b18b645c317b59bc SHA256 d46b2e88dfac5ef53702d9917556697a4e81dd66f8fb2bff396aa6df2e6b037d MISC ChangeLog-2010 108404 RMD160 11fd27413d19e453f2cfe1877c93f53d06c81f82 SHA1 4722e0f32417772921ab328942a7dcbd743b3c56 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd MISC metadata.xml 1497 RMD160 82a73ef66a72224add24244ddf39df290a1f67dc SHA1 3a1fd203707ee79ea61202e559b8e912653ffbff SHA256 dde83b854d83894cffd06d26a28ed66e7a0788ba70a745ece4ff719445cc9bf1 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) - -iQIcBAEBAgAGBQJPCk8HAAoJEC8ZTXQF1qEPjRUP/2SsFN8bmLg/P7+fSd+zbNbo -WSVT0omEQmiWX/fsU7g4wQzN4CwQkLuQokCaRid1YLkGzHIQiDIn9x9DB+4A7Q+Q -WHgF6YI3qrmM+HJ1oUSCGteyI6onBzNx8c2OkQO1qpURze2q/ztBvjGZjgYpBe3L -MMtE2tmpVmhjyVFnr458LMdlLIMe70+vOKDt2vJSDwiU5TMhq5UIPOnGhbUBTled -035lOOAZgXzvHncDBc66u1/9IGQVMxqzp7vYSIE0u4Y4WB5kYTt537BwJVnDl6P3 -I9KnuZQuNfL55/q0alDf21R8GYKW7YxD/mB5oqhXtJGl1LilXi7Q6fijpmPRexHY -RF+F1g1lWN+IGQZcHIY3uYgabyN4/TzdsXYVhs8zaoaAMPtCdaknhiRgs74aPWVb -iZqPdO6qFhBqHVz3VA1HhrmreT3tVcz7d/unmeLzi8q0jEmO9xFIiI8pH3vqiNH+ -c8PVOBe3l+2tow6u3XNhKBRwDmWMb8H7Bf7P8355vu2ViBkA4tdXp0iAnVZCLCl2 -FgM1x0uMrxlLMyJuF8qW+tj9nJUPUBGWpRU59GvwzbuN7lLdqId0vJoeF83acJK0 -irs0r9GWvcxkL4ygeKPE1WsXe/DdKHQLYvvGcKvSy1yqZMSasarrhK1pC+bRuNrM -hWLO5PJLkYFG1AY8jlR8 -=sTj0 ------END PGP SIGNATURE----- diff --git a/dev-db/mysql/mysql-3.23.58-r1.ebuild b/dev-db/mysql/mysql-3.23.58-r1.ebuild deleted file mode 100644 index 9e387bd83e16..000000000000 --- a/dev-db/mysql/mysql-3.23.58-r1.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.28 2012/01/06 19:27:22 jmbsvicetto Exp $ - -inherit flag-o-matic eutils - -SVER=${PV%.*} -#normal releases: -SDIR=MySQL-${SVER} -#for a pre-release: -#SDIR=MySQL-${SVER}-Pre - -DESCRIPTION="A fast, multi-threaded, multi-user SQL database server." -HOMEPAGE="http://www.mysql.com/" -SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz - ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz - mirror://gentoo/mysql-extras-20061210.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha hppa ppc sparc x86" -IUSE="berkdb debug innodb perl readline ssl static tcpd" - -DEPEND="readline? ( >=sys-libs/readline-4.1 ) - berkdb? ( sys-apps/ed ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - ssl? ( >=dev-libs/openssl-0.9.6d ) - >=sys-libs/zlib-1.2.3 - dev-lang/perl - sys-process/procps" -PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )" - -pkg_setup() { - - enewgroup mysql 60 || die "problem adding 'mysql' group" - enewuser mysql 60 -1 /var/lib/mysql mysql || die "problem adding 'mysql' user" -} - -src_unpack() { - use innodb || ewarn "InnoDB support is not selected to be compiled in." - unpack ${A} || die - cd "${S}" || die - - local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras" - - # required for qmail-mysql - epatch ${MY_PATCH_SOURCE}/mysql-3.23-nisam.h.diff || die - # zap startup script messages - epatch ${MY_PATCH_SOURCE}/mysql-3.23.52-install-db-sh.diff || die - # zap binary distribution stuff - epatch ${MY_PATCH_SOURCE}/mysql-3.23-safe-mysqld-sh.diff || die - # for correct hardcoded sysconf directory - epatch ${MY_PATCH_SOURCE}/mysql-3.23-my-print-defaults.diff || die - #patch -p1 < ${MY_PATCH_SOURCE}/mysql-3.23.51-tcpd.patch || die - #epatch ${MY_PATCH_SOURCE}/mysql-4.0.14-security-28394.patch - epatch ${MY_PATCH_SOURCE}/020_all_gentoo-nptl.patch || die - sed -e "s|res=.grep Linuxthreads|res=1 #\`grep Linuxthreads|" \ - -i "${S}"/configure - - # security fix from http://lists.mysql.com/internals/15185 - # gentoo bug #60744 - EPATCH_OPTS="-p1 -d ${S}" \ - epatch ${MY_PATCH_SOURCE}/${PN}-4.0-mysqlhotcopy-security.patch || die - - # upstream bug http://bugs.mysql.com/bug.php?id=7971 - # names conflict with stuff in 2.6.10 kernel headers - echo "${S}"/client/mysqltest.c "${S}"/extra/replace.c | xargs -n1 \ - sed -i \ - -e "s/set_bit/my__set_bit/g" \ - -e "s/clear_bit/my__clear_bit/g" \ - || die "Failed to fix bitops" - -} - -src_compile() { - # bug #11681; get b0rked code when using -march=k6 with this package. - replace-cpu-flags k6 k6-2 k6-3 i586 - - local myconf - # The following fix is due to a bug with berkdb on sparc's. See: - # http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 - # same for alpha (see http://www.mysql.com/doc/en/BDB_portability.html) - # thanks to peter@icebear.net for noticing this. - if use sparc || use alpha || use hppa - then - myconf="${myconf} --without-berkeley-db" - else - use berkdb && myconf="${myconf} --with-berkeley-db=./bdb" \ - || myconf="${myconf} --without-berkeley-db" - fi - #readline pair reads backwards on purpose, DONT change it around, Ok? - use readline && myconf="${myconf} --without-readline" - use readline || myconf="${myconf} --with-readline" - use static && myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" - use static || myconf="${myconf} --enable-shared --enable-static" - use tcpd && myconf="${myconf} --with-libwrap" - use tcpd || myconf="${myconf} --without-libwrap" - use innodb && myconf="${myconf} --with-innodb" - use innodb || myconf="${myconf} --without-innodb" - use ssl && myconf="${myconf} --with-vio --with-openssl" - use ssl || myconf="${myconf} --without-openssl" - myconf="${myconf} `use_with debug`" - - #glibc-2.3.2_pre fix; bug #16496 - export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1" - export CXXFLAGS="${CXXFLAGS} -DHAVE_ERRNO_AS_DEFINE=1" - - # the compiler flags are as per their "official" spec ;-) - einfo "\$myconf is $myconf" - CFLAGS="${CFLAGS/-O?/} -O3" \ - CXXFLAGS="${CXXFLAGS/-O?/} -O3 -felide-constructors -fno-exceptions -fno-rtti" \ - econf \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc/mysql \ - --localstatedir=/var/lib/mysql \ - --with-raid \ - --with-low-memory \ - --enable-assembler \ - --with-charset=latin1 \ - --enable-local-infile \ - --with-mysqld-user=mysql \ - --with-extra-charsets=all \ - --enable-thread-safe-client \ - --with-client-ldflags=-lstdc++ \ - --with-comment="Gentoo Linux ${PF}" \ - --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ - ${myconf} || die "bad ./configure" - - make || die "compile problem" -} - -src_install() { - make install DESTDIR="${D}" benchdir_root=/usr/share/mysql || die - - # eeek, not sure whats going on here.. are these needed by anything? - #use innodb && insinto /usr/lib/mysql && doins ${WORKDIR}/../libs/* - - # move client libs, install a couple of missing headers - mv "${D}"/usr/lib/mysql/libmysqlclient*.so* "${D}"/usr/lib - dosym ../libmysqlclient.so /usr/lib/mysql/libmysqlclient.so - dosym ../libmysqlclient_r.so /usr/lib/mysql/libmysqlclient_r.so - insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h} - - # convenience links - dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze - dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair - dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize - - # various junk - rm -f "${D}"/usr/share/mysql/binary-configure - rm -f "${D}"/usr/share/mysql/mysql.server - rm -f "${D}"/usr/share/mysql/make_binary_distribution - rm -f "${D}"/usr/share/mysql/mi_test_all* - rm -f "${D}"/usr/share/mysql/mysql-log-rotate - rm -f "${D}"/usr/share/mysql/mysql*.spec - rm -f "${D}"/usr/share/mysql/my-*.cnf - - #hmm what about all the very nice benchmark/test scripts - #in /usr/share/mysql/sql-bench - if ! use perl; then - rm -f "${D}"/usr/bin/mysql_setpermission - fi - - dodoc README MIRRORS Docs/{manual.ps,manual.txt} - dohtml -r Docs/* - docinto conf-samples - dodoc support-files/my-*.cnf - - insinto /etc/mysql - doins "${FILESDIR}"/my.cnf scripts/mysqlaccess.conf - newinitd "${FILESDIR}"/mysql.init mysql -} - -pkg_config() { - if [ ! -d "${ROOT}"/var/lib/mysql/mysql ] ; then - einfo "Press ENTER to create the mysql database and set proper" - einfo "permissions on it, or Control-C to abort now..." - read - "${ROOT}"/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1 - else - einfo "Hmm, it appears as though you already have the mysql" - einfo "database in place. If you are having problems trying" - einfo "to start mysqld, perhaps you need to manually run" - einfo "/usr/bin/mysql_install_db and/or check your config" - einfo "file(s) and/or database(s) and/or logfile(s)." - fi -} - -pkg_preinst() { - - enewgroup mysql 60 || die "problem adding 'mysql' group" - enewuser mysql 60 -1 /var/lib/mysql mysql || die "problem adding 'mysql' user" -} - -pkg_postinst() { - # empty dirs... - install -d -m0755 -o mysql -g mysql "${ROOT}"/var/lib/mysql - install -d -m0755 -o mysql -g mysql "${ROOT}"/var/run/mysqld - install -d -m0755 -o mysql -g mysql "${ROOT}"/var/log/mysql - - # secure the logfiles... does this bother anybody? - touch "${ROOT}"/var/log/mysql/mysql.{log,err} - chown mysql:mysql "${ROOT}"/var/log/mysql/mysql.{log,err} - chmod 0660 "${ROOT}"/var/log/mysql/mysql.{log,err} - - # your friendly public service announcement... - elog - elog "You might want to run:" - elog "\"emerge --config =${PF}\"" - elog "if this is a new install." - elog - use innodb || ewarn "InnoDB support is not selected to be compiled in." -}