From 64a28f731343c85c535af51e3b3d63fdaab67682 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 23 Dec 2004 10:56:52 +0000 Subject: New versions, and bugs fixed 74248, 74742, 70122, 58469, 50921, 60869. --- dev-db/mysql/ChangeLog | 10 +- dev-db/mysql/Manifest | 8 +- dev-db/mysql/files/digest-mysql-4.0.23 | 1 + dev-db/mysql/files/digest-mysql-4.1.8 | 1 + dev-db/mysql/files/logrotate.mysql | 13 + dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff | 20 ++ dev-db/mysql/mysql-4.0.23.ebuild | 270 ++++++++++++++++++++ dev-db/mysql/mysql-4.1.7.ebuild | 4 +- dev-db/mysql/mysql-4.1.8.ebuild | 275 +++++++++++++++++++++ 9 files changed, 598 insertions(+), 4 deletions(-) create mode 100644 dev-db/mysql/files/digest-mysql-4.0.23 create mode 100644 dev-db/mysql/files/digest-mysql-4.1.8 create mode 100644 dev-db/mysql/files/logrotate.mysql create mode 100644 dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff create mode 100644 dev-db/mysql/mysql-4.0.23.ebuild create mode 100644 dev-db/mysql/mysql-4.1.8.ebuild (limited to 'dev-db') diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 0d57384968ec..178a298cadc3 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.149 2004/11/17 22:25:22 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.150 2004/12/23 10:56:51 robbat2 Exp $ + +*mysql-4.1.8 (23 Dec 2004) +*mysql-4.0.23 (23 Dec 2004) + + 23 Dec 2004; Robin H. Johnson +files/logrotate.mysql, + +files/mysql-4.0.23-install-db-sh.diff, +mysql-4.0.23.ebuild, + +mysql-4.1.7.ebuild, +mysql-4.1.8.ebuild: + New versions, and bugs fixed 74248, 74742, 70122, 58469, 50921, 60869. *mysql-4.1.7 (17 Nov 2004) diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 11809bb4ae5a..e789d1881165 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,11 +1,13 @@ MD5 13b377458aedd7a42553fea8f5c45fbb mysql-3.23.57-r1.ebuild 6490 MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535 -MD5 9a5f5ec0cb606036ff7b8665037cdc85 mysql-4.1.7.ebuild 8361 +MD5 51c18e242ea4e31c2966f285c22294d2 mysql-4.1.7.ebuild 8381 MD5 49ebe7c04e4e2971c911ee5e225561ad mysql-3.23.58.ebuild 6489 +MD5 888820d8ccc3a63d5ef9320ffed4e7c0 mysql-4.0.23.ebuild 8613 MD5 f57faf79f4ad744991e5d6e76ca45edc mysql-3.23.52-r1.ebuild 5851 MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538 MD5 d24e97ec0ef04280cb9176f6cc8fd9ac mysql-4.0.22.ebuild 8337 MD5 a9990372dc3f4a3323810ad38c9e1752 mysql-3.23.58-r1.ebuild 6607 +MD5 517d32837e0fb27eb1a24fc83a26b4a4 mysql-4.1.8.ebuild 8660 MD5 f57a0ec246542d4da73aa8a6c377ee6f ChangeLog 22495 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477 @@ -22,17 +24,21 @@ MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587 MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557 MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66 +MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23 66 MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047 MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429 MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 +MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055 MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307 MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562 MD5 85b95c8a74c219d70135c924b541ca20 files/digest-mysql-4.1.7 65 +MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65 MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503 MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654 MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271 MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654 +MD5 8357d8a55aa41c0f4bda76c6095b1637 files/logrotate.mysql 429 MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231 MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366 diff --git a/dev-db/mysql/files/digest-mysql-4.0.23 b/dev-db/mysql/files/digest-mysql-4.0.23 new file mode 100644 index 000000000000..d651bdb55e4d --- /dev/null +++ b/dev-db/mysql/files/digest-mysql-4.0.23 @@ -0,0 +1 @@ +MD5 8b3a40434348f961b71715ed45fe540e mysql-4.0.23.tar.gz 16601941 diff --git a/dev-db/mysql/files/digest-mysql-4.1.8 b/dev-db/mysql/files/digest-mysql-4.1.8 new file mode 100644 index 000000000000..64b3ef829861 --- /dev/null +++ b/dev-db/mysql/files/digest-mysql-4.1.8 @@ -0,0 +1 @@ +MD5 d1b3e84d1d49366e2692f453e7bf8879 mysql-4.1.8.tar.gz 22288304 diff --git a/dev-db/mysql/files/logrotate.mysql b/dev-db/mysql/files/logrotate.mysql new file mode 100644 index 000000000000..7f20baebe154 --- /dev/null +++ b/dev-db/mysql/files/logrotate.mysql @@ -0,0 +1,13 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/logrotate.mysql,v 1.1 2004/12/23 10:56:52 robbat2 Exp $ +/var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err { +monthly +create 660 mysql mysql +notifempty +size 5M +sharedscripts +postrotate +/sbin/kill -HUP `cat /var/run/mysqld/mysqld.pid` +endscript +} diff --git a/dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff new file mode 100644 index 000000000000..fe3d8d303acc --- /dev/null +++ b/dev-db/mysql/files/mysql-4.0.23-install-db-sh.diff @@ -0,0 +1,20 @@ +--- mysql-4.0.23/scripts/mysql_install_db.sh.orig 2004-12-23 02:28:09.755109232 -0800 ++++ mysql-4.0.23/scripts/mysql_install_db.sh 2004-12-23 02:31:32.204332272 -0800 +@@ -368,10 +368,13 @@ + echo + fi + echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !" +- echo "To do so, start the server, then issue the following commands:" +- echo "$bindir/mysqladmin -u root password 'new-password'" +- echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'" +- echo "See the manual for more instructions." ++ echo "To do so, issue the following commands to start the server" ++ echo "and change the applicable passwords:" ++ echo " /etc/init.d/mysql start" ++ echo " $bindir/mysqladmin -u root -h $hostname password 'new-password'" ++ echo " $bindir/mysqladmin -u root password 'new-password'" ++ echo "Depending on your configuration, a -p option may be needed" ++ echo "in the last command. See the manual for more details." + # + # Print message about upgrading unless we have created a new db table. + if test -z "$c_d" diff --git a/dev-db/mysql/mysql-4.0.23.ebuild b/dev-db/mysql/mysql-4.0.23.ebuild new file mode 100644 index 000000000000..b2a0b7fb46a9 --- /dev/null +++ b/dev-db/mysql/mysql-4.0.23.ebuild @@ -0,0 +1,270 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23.ebuild,v 1.1 2004/12/23 10:56:52 robbat2 Exp $ + +inherit eutils gnuconfig +#to accomodate -laadeedah releases +NEWP=${P} + +SVER=${PV%.*} +#normal releases: +SDIR=MySQL-${SVER} +#for a pre-release: +#SDIR=MySQL-${SVER}-Pre + +S=${WORKDIR}/${NEWP} + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +HOMEPAGE="http://www.mysql.com/" +SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="static readline innodb berkdb tcpd ssl perl debug selinux" +RESTRICT="nomirror" + +DEPEND="readline? ( >=sys-libs/readline-4.1 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 ) + ssl? ( >=dev-libs/openssl-0.9.6d ) + perl? ( dev-lang/perl ) + >=sys-libs/zlib-1.1.3 + >=sys-apps/texinfo-4.7-r1 + sys-apps/procps + >=sys-apps/sed-4" +PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )" +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )" + +warning() { + ewarn + ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you" + ewarn "must recompile the other packages on your system that link with" + ewarn "libmysqlclient after the upgrade completes. To obtain such a list" + ewarn "of packages for your system, you may use 'revdep-rebuild' from" + ewarn "app-portage/gentoolkit." + ewarn + epause 5 +} + +pkg_setup() { + warning +} + +src_unpack() { + if use static && use ssl; then + local msg="MySQL does not support building statically with SSL support" + eerror "${msg}" + die "${msg}" + fi + unpack ${A} || die + + #zap startup script messages + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.23-install-db-sh.diff + #zap binary distribution stuff + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff + #required for qmail-mysql + EPATCH_OPTS="-p0 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff + #for correct hardcoded sysconf directory + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff + # NPTL support + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff + + # attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled + # i would really prefer to fix this at the Makefile.am level, but can't + # get the software to autoreconf as distributed - too many missing files + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch + + if use tcpd; then + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff + fi + + # security fix from http://lists.mysql.com/internals/15185 + # gentoo bug #60744 + #EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch + # Already included upstream in 4.0.21 + + cd ${S} + autoreconf --install --force + # Saving this for a rainy day, in case we need it again + #WANT_AUTOMAKE=1.7 automake + gnuconfig_update +} + +src_compile() { + local myconf + + #The following fix is due to a bug with bdb on sparc's. See: + #http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 + if use sparc || use alpha || use hppa || use mips + 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? + # this is because it refers to the building of a bundled readline + # versus the system copy + use readline && myconf="${myconf} --without-readline" + use readline || myconf="${myconf} --with-readline" + + use static \ + && myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \ + || myconf="${myconf} --enable-shared --enable-static" + + myconf="${myconf} `use_with tcpd libwrap`" + myconf="${myconf} `use_with innodb`" + + use ssl \ + && myconf="${myconf} --with-vio --with-openssl" \ + || 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" + + #bug fix for #15099, should make this api backward compatible + export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS" + + #the compiler flags are as per their "official" spec ;) + #CFLAGS="${CFLAGS/-O?/} -O3" \ + CXXFLAGS="${CXXFLAGS} -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 \ + --with-embedded-server \ + ${myconf} || die "bad ./configure" + + emake || die "compile problem" +} + +src_install() { + make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die + + #move client libs, install a couple of missing headers + mv ${D}/usr/$(get_libdir)/mysql/libmysqlclient*.so* ${D}/usr/$(get_libdir) + dosym ../libmysqlclient.so /usr/$(get_libdir)/mysql/libmysqlclient.so + dosym ../libmysqlclient_r.so /usr/$(get_libdir)/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/mysql.server + rm -f ${D}/usr/share/mysql/binary-configure + rm -f ${D}/usr/share/mysql/make_binary_distribution + rm -f ${D}/usr/share/mysql/mysql-log-rotate + rm -f ${D}/usr/share/mysql/{post,pre}install + rm -f ${D}/usr/share/mysql/mi_test* + rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk + rm -f ${D}/usr/share/mysql/*.plist # Apple gunk + rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere + + # All of these (ab)use Perl. + if ! use perl; then + rm -f ${D}/usr/bin/mysql_setpermission + rm -rf ${D}/usr/share/mysql/sql-bench + fi + + dohtml Docs/*.html + rm -f Docs/*.html + dodoc README COPYING Docs/manual.* + docinto conf-samples + dodoc support-files/my-*.cnf + + insinto /etc/mysql + newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf + doins scripts/mysqlaccess.conf + exeinto /etc/init.d + newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql + + insinto /etc/logrotate.d + newins ${FILESDIR}/logrotate.mysql mysql +} + +pkg_config() { + local DATADIR="" + if [ -f '/etc/mysql/my.cnf' ] ; then + #DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'` + #DATADIR=`/usr/sbin/mysqld --help |grep '^datadir' | awk '{print $2}'` + #DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'` + DATADIR=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1` + fi + if [ -z "${DATADIR}" ]; then + DATADIR="/var/lib/mysql/" + einfo "Using default DATADIR" + fi + einfo "MySQL DATADIR is ${DATADIR}" + + if [ ! -d ${ROOT}/${DATADIR}/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 + # changing ownership of newly created databases to mysql.mysql + chown -R mysql:mysql ${ROOT}/${DATADIR} + chmod 0750 ${ROOT}/${DATADIR} + ewarn "For security reasons you should set your MySQL root" + ewarn "password as soon as possible." + + 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 group mysql" + enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql" +} + +pkg_postinst() { + #empty dirs... + install -d -m0750 -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* + chmod 0660 ${ROOT}/var/log/mysql/mysql* + # secure some directories + chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/var/lib/mysql + + #your friendly public service announcement... + einfo + einfo "You might want to run:" + einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\"" + einfo "if this is a new install." + einfo + + warning +} diff --git a/dev-db/mysql/mysql-4.1.7.ebuild b/dev-db/mysql/mysql-4.1.7.ebuild index d97eec662240..6bd6f5ebef46 100644 --- a/dev-db/mysql/mysql-4.1.7.ebuild +++ b/dev-db/mysql/mysql-4.1.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.7.ebuild,v 1.2 2004/11/18 23:14:53 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.7.ebuild,v 1.3 2004/12/23 10:56:52 robbat2 Exp $ inherit eutils gnuconfig #to accomodate -laadeedah releases @@ -90,7 +90,7 @@ src_unpack() { fi cd ${S} - autoconf + autoreconf --install --force # Saving this for a rainy day, in case we need it again #WANT_AUTOMAKE=1.7 automake gnuconfig_update diff --git a/dev-db/mysql/mysql-4.1.8.ebuild b/dev-db/mysql/mysql-4.1.8.ebuild new file mode 100644 index 000000000000..403d9ac1bab5 --- /dev/null +++ b/dev-db/mysql/mysql-4.1.8.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8.ebuild,v 1.1 2004/12/23 10:56:52 robbat2 Exp $ + +inherit eutils gnuconfig +#to accomodate -laadeedah releases +NEWP=${P} + +SVER=${PV%.*} +#normal releases: +SDIR=MySQL-${SVER} +#for a pre-release: +#SDIR=MySQL-${SVER}-Pre + +S=${WORKDIR}/${NEWP} + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +HOMEPAGE="http://www.mysql.com/" +SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="static readline innodb berkdb tcpd ssl perl ruby selinux debug cluster" +RESTRICT="nomirror" + +DEPEND=" + !=sys-libs/readline-4.1 ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 ) + ssl? ( >=dev-libs/openssl-0.9.6d ) + perl? ( dev-lang/perl ) + >=sys-libs/zlib-1.1.3 + sys-apps/procps + >=sys-apps/texinfo-4.7 + >=sys-apps/sed-4" +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) + ruby? ( >=dev-ruby/mysql-ruby-2.5 )" +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )" + +warning() { + ewarn + ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you" + ewarn "must recompile the other packages on your system that link with" + ewarn "libmysqlclient after the upgrade completes. To obtain such a list" + ewarn "of packages for your system, you may use 'revdep-rebuild' from" + ewarn "app-portage/gentoolkit." + ewarn + ewarn "TODO: you must also follow the official upgrade instructions (research and write this up here)" + epause 5 +} + +pkg_setup() { + warning +} + +src_unpack() { + if use static && use ssl; then + local msg="MySQL does not support building statically with SSL support" + eerror "${msg}" + die "${msg}" + fi + unpack ${A} || die + + #zap startup script messages + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.23-install-db-sh.diff + #zap binary distribution stuff + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff + #required for qmail-mysql + EPATCH_OPTS="-p0 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff + #for correct hardcoded sysconf directory + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff + # NPTL support + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff + + # attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled + # i would really prefer to fix this at the Makefile.am level, but can't + # get the software to autoreconf as distributed - too many missing files + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch + + if use tcpd; then + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff + fi + + cd ${S} + # this does the libtoolize stuff + autoreconf --install --force + # Saving this for a rainy day, in case we need it again + #WANT_AUTOMAKE=1.7 automake + gnuconfig_update +} + +src_compile() { + local myconf + + #The following fix is due to a bug with bdb on sparc's. See: + #http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8 + if use sparc || use alpha || use hppa || use mips + 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? + # this is because it refers to the building of a bundled readline + # versus the system copy + use readline && myconf="${myconf} --without-readline" + use readline || myconf="${myconf} --with-readline" + + use static \ + && myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \ + || myconf="${myconf} --enable-shared --enable-static" + + myconf="${myconf} `use_with tcpd libwrap`" + myconf="${myconf} `use_with innodb`" + + use ssl \ + && myconf="${myconf} --with-vio --with-openssl" \ + || myconf="${myconf} --without-openssl" + + myconf="${myconf} `use_with debug`" + + # MySQL CLuster UseFlag + if use cluster; then + myconf="${myconf} --with-ndbcluster" + fi + + #glibc-2.3.2_pre fix; bug #16496 + export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1" + + #bug fix for #15099, should make this api backward compatible + export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS" + + #the compiler flags are as per their "official" spec ;) + #CFLAGS="${CFLAGS/-O?/} -O3" \ + CXXFLAGS="${CXXFLAGS} -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 \ + --with-embedded-server \ + ${myconf} || die "bad ./configure" + + emake || die "compile problem" +} + +src_install() { + make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die + + #move client libs, install a couple of missing headers + mv ${D}/usr/$(get_libdir)/mysql/libmysqlclient*.so* ${D}/usr/$(get_libdir) + dosym ../libmysqlclient.so /usr/$(get_libdir)/mysql/libmysqlclient.so + dosym ../libmysqlclient_r.so /usr/$(get_libdir)/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/mysql.server + rm -f ${D}/usr/share/mysql/binary-configure + rm -f ${D}/usr/share/mysql/make_binary_distribution + rm -f ${D}/usr/share/mysql/mysql-log-rotate + rm -f ${D}/usr/share/mysql/{post,pre}install + rm -f ${D}/usr/share/mysql/mi_test* + rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk + rm -f ${D}/usr/share/mysql/*.plist # Apple gunk + rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere + + # All of these (ab)use Perl. + if ! use perl; then + rm -f ${D}/usr/bin/mysql_setpermission + rm -rf ${D}/usr/share/mysql/sql-bench + fi + + dohtml Docs/*.html + rm -f Docs/*.html + dodoc README COPYING COPYING.LIB Docs/manual.* + docinto conf-samples + dodoc support-files/my-*.cnf + + insinto /etc/mysql + newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf + doins scripts/mysqlaccess.conf + exeinto /etc/init.d + newexe ${FILESDIR}/mysql-4.0.15.rc6 mysql + + insinto /etc/logrotate.d + newins ${FILESDIR}/logrotate.mysql mysql +} + +pkg_config() { + local DATADIR="" + if [ -f '/etc/mysql/my.cnf' ] ; then + #DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'` + #DATADIR=`/usr/sbin/mysqld --help |grep '^datadir' | awk '{print $2}'` + #DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'` + DATADIR=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1` + fi + if [ -z "${DATADIR}" ]; then + DATADIR="/var/lib/mysql/" + einfo "Using default DATADIR" + fi + einfo "MySQL DATADIR is ${DATADIR}" + + if [ ! -d ${ROOT}/${DATADIR}/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 + # changing ownership of newly created databases to mysql.mysql + chown -R mysql:mysql ${ROOT}/${DATADIR} + chmod 0750 ${ROOT}/${DATADIR} + ewarn "For security reasons you should set your MySQL root" + ewarn "password as soon as possible." + + 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 group mysql" + enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql" +} + +pkg_postinst() { + #empty dirs... + install -d -m0750 -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* + chmod 0660 ${ROOT}/var/log/mysql/mysql* + # secure some directories + chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/var/lib/mysql + + #your friendly public service announcement... + einfo + einfo "You might want to run:" + einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\"" + einfo "if this is a new install." + einfo + + warning +} -- cgit v1.2.3-65-gdbad