diff options
| -rw-r--r-- | dev-db/mysql/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-db/mysql/Manifest | 5 | ||||
| -rw-r--r-- | dev-db/mysql/files/digest-mysql-4.0.25-r2 | 1 | ||||
| -rw-r--r-- | dev-db/mysql/files/mysql-4.0.25-r2-asm-pic-fixes.patch | 304 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.0.25-r2.ebuild | 449 |
5 files changed, 766 insertions, 2 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 4ae1f22f0b3a..9b28a1535f51 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.207 2005/07/16 03:13:25 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.208 2005/07/20 09:12:11 vivo Exp $ + +*mysql-4.0.25-r2 (20 Jul 2005) + + 20 Jul 2005; portage <vivo@gentoo.org> + +files/mysql-4.0.25-r2-asm-pic-fixes.patch, +mysql-4.0.25-r2.ebuild: + Gladly to add the upstream version of the patch against text-relocation. + Again many thanks to bug #42968 people. 16 Jul 2005; portage <vivo@gentoo.org> -files/mysql-4.0.25-asm-pic-fixes.patch, diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index bf53ed6a8743..cf1584e84c19 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -15,12 +15,14 @@ MD5 6b4e7861f8acedbd5f7675160efb9dfb mysql-5.0.9_beta-r1.ebuild 16096 MD5 be85068e1f8dd9340882814ae10e1763 mysql-4.0.23-r1.ebuild 9160 MD5 950a2a955947846b03dbb285f5a53daf mysql-4.1.12.ebuild 15584 MD5 f26f6906248f45f5f0d23248a39c03a4 mysql-4.0.24.ebuild 9816 -MD5 474c59290c9171861cf87a8525b58bdc ChangeLog 33390 +MD5 3512e44d651f38f97ca39330d3c19802 ChangeLog 33652 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158 +MD5 7e4c53a41caf5d692185af4f33b0f788 mysql-4.0.25-r2.ebuild 13786 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439 MD5 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta-r1 70 MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217 +MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295 MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585 MD5 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12-r2 66 MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933 @@ -84,6 +86,7 @@ MD5 ce711c0d8387720dbb85de1d756daa75 files/digest-mysql-4.0.23-r2 67 MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r1 66 MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r2 66 MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r1 66 +MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r2 66 MD5 c5fcb05dcc3f2d093efd55bd96af2423 files/035_x86_asm-pic-fixes-r1.patch 4093 MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813 MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863 diff --git a/dev-db/mysql/files/digest-mysql-4.0.25-r2 b/dev-db/mysql/files/digest-mysql-4.0.25-r2 new file mode 100644 index 000000000000..f75729166e27 --- /dev/null +++ b/dev-db/mysql/files/digest-mysql-4.0.25-r2 @@ -0,0 +1 @@ +MD5 68a47ff8c1f0c24866a792f6b3bb59d6 mysql-4.0.25.tar.gz 11159288 diff --git a/dev-db/mysql/files/mysql-4.0.25-r2-asm-pic-fixes.patch b/dev-db/mysql/files/mysql-4.0.25-r2-asm-pic-fixes.patch new file mode 100644 index 000000000000..48e551737490 --- /dev/null +++ b/dev-db/mysql/files/mysql-4.0.25-r2-asm-pic-fixes.patch @@ -0,0 +1,304 @@ +--- mysql-4.0.25/strings/strings-x86.s 2005-06-29 19:06:44.000000000 +0200 ++++ mysql/strings/strings-x86.s 2005-07-19 15:41:31.000000000 +0200 +@@ -403,3 +403,5 @@ + ret + .strxmov_end: + .size strxmov,.strxmov_end-strxmov ++ ++ .section .note.GNU-stack,"",@progbits +--- mysql-4.0.25/strings/longlong2str-x86.s 2005-06-29 19:06:43.000000000 +0200 ++++ mysql/strings/longlong2str-x86.s 2005-07-19 15:41:31.000000000 +0200 +@@ -13,8 +13,9 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +-# Optimized longlong2str function for Intel 80x86 (gcc/gas syntax) +-# Some set sequences are optimized for pentuimpro II ++# longlong2str function for Intel 80x86 (gcc/gas syntax) ++ ++# See longlong2str(dst,radix,val) description in longlong2str.c. + + .file "longlong2str.s" + .version "1.01" +@@ -24,8 +25,123 @@ + + .globl longlong2str + .type longlong2str,@function +- ++ + longlong2str: ++ subl $80,%esp # Temporary buffer for up to 64 radix-2 digits ++ pushl %ebp ++ pushl %esi ++ pushl %edi ++ pushl %ebx ++ ++ movl 100(%esp),%esi # esi = Lower part of val ++ movl 112(%esp),%ebx # ebx = Radix ++ movl 104(%esp),%ebp # ebp = Higher part of val ++ movl 108(%esp),%edi # edi -> dst ++ ++ testl %ebx,%ebx ++ jge .L144 # (Radix >= 0) ++ ++ testl %ebp,%ebp ++ jge .L146 # (Higher part of val >= 0) ++ movb $45,(%edi) # Add '-' sign ++ incl %edi ++ negl %esi # Change val to positive ++ adcl $0,%ebp ++ negl %ebp ++.L146: ++ negl %ebx # Change radix to positive ++.L144: ++ cmpl $36,%ebx # Radix must be between 2 and 36 ++ ja .Lerror # (Radix not in range) ++ cmpl $2,%ebx ++ jb .Lerror # (Radix not in range) ++ ++ movl %esi,%eax # eax = lower part of val ... ++ orl %ebp,%eax # and it stays thus if ebp=0 ++ je Lzero # (Treat zero as special case) ++ ++ leal 92(%esp),%ecx # ecx -> End of temporary buffer ++ ++ testl %ebp,%ebp ++ je Llow # (Higher part of val = 0) ++ ++Lhigh: ++ #val in ebp:esi. div the high part by the radix, ++ #then div remainder + low part by the radix. ++ movl %ebp,%eax # edx=0,eax=high(from ebp) ++ xorl %edx,%edx ++ decl %ecx ++ divl %ebx ++ movl %eax,%ebp # edx=result of last, eax=low(from esi) ++ movl %esi,%eax ++ divl %ebx ++ movl %eax,%esi # ebp:esi = quotient ++ movb %dl,(%ecx) # store byte in temporary buffer ++ testl %ebp,%ebp ++ jne Lhigh # (Higher part of val still > 0) ++ ++Llow: ++ #val in 0:eax. div 0 + low part by the radix. ++ xorl %edx,%edx ++ decl %ecx ++ divl %ebx ++ movb %dl,(%ecx) # store byte in temporary buffer ++ testl %eax,%eax ++ jne Llow # (Lower part of val still <> 0) ++ ++ leal 92(%esp),%esi # esi -> End of temporary buffer ++ ++Lmov: ++ movb (%ecx),%dl # dl = byte from temporary buffer ++ movb $-1,%bl ++ cmpb $10,%dl # add 7 if dl > '9' ++ adcb $0,%bl ++ addb $48,%dl # add '0' ++ andb $7,%bl ++ addb %bl,%dl ++ incl %ecx ++ movb %dl,(%edi) # put dl in dst ++ incl %edi ++ cmpl %ecx,%esi ++ ja Lmov # (more bytes exist in temporary buffer) ++ movb $0,(%edi) # trailing '\0' in dst ++ movl %edi,%eax # eax = return value = pointer to '\0' ++.Lret: ++ popl %ebx ++ popl %edi ++ popl %esi ++ popl %ebp ++ addl $80,%esp ++ ret ++ ++.Lerror: ++ xorl %eax,%eax # Wrong radix ++ jmp .Lret ++ ++Lzero: ++ # Treat 0 as a special case. Unnecessary but we ++ # expect 0 will be frequent. ++ movl 108(%esp),%eax # eax = dst ++ popl %ebx ++ movb $48,(%eax) # '0' ++ popl %edi ++ incl %eax ++ popl %esi ++ popl %ebp ++ addl $80,%esp ++ movb $0,(%eax) # '\0' ++ ret ++ ++# ++# This is almost equal to the above, except that we can do the final ++# loop much more efficient ++# ++ ++ .align 4 ++ ++.globl longlong10_to_str ++ .type longlong10_to_str,@function ++longlong10_to_str: + subl $80,%esp + pushl %ebp + pushl %esi +@@ -34,85 +150,82 @@ + movl 100(%esp),%esi # Lower part of val + movl 104(%esp),%ebp # Higher part of val + movl 108(%esp),%edi # get dst +- movl 112(%esp),%ebx # Radix +- movl %ebx,%eax +- testl %eax,%eax +- jge .L144 +- +- addl $36,%eax +- cmpl $34,%eax +- ja .Lerror # Wrong radix +- testl %ebp,%ebp +- jge .L146 ++ movl 112(%esp),%ebx # Radix (10 or -10) ++ testl %ebx,%ebx ++ jge .L10_10 # Positive radix ++ ++ negl %ebx # Change radix to positive (= 10) ++ ++ testl %ebp,%ebp # Test if negative value ++ jge .L10_10 + movb $45,(%edi) # Add sign +- incl %edi # Change sign of val +- negl %esi ++ incl %edi ++ negl %esi # Change sign of val (ebp:esi) + adcl $0,%ebp + negl %ebp +-.L146: +- negl %ebx # Change radix to positive +- jmp .L148 + .align 4 +-.L144: +- addl $-2,%eax +- cmpl $34,%eax +- ja .Lerror # Radix in range + +-.L148: ++.L10_10: ++ leal 92(%esp),%ecx # End of buffer + movl %esi,%eax # Test if zero (for easy loop) + orl %ebp,%eax +- jne .L150 ++ jne .L10_30 # Not zero ++ ++ # Here when value is zero + movb $48,(%edi) + incl %edi +- jmp .L164 +- .align 4 +- +-.L150: +- leal 92(%esp),%ecx # End of buffer +- jmp .L155 ++ jmp .L10_end + .align 4 + +-.L153: ++.L10_20: + # val is stored in in ebp:esi +- + movl %ebp,%eax # High part of value + xorl %edx,%edx +- divl %ebx ++ divl %ebx # Divide by 10 + movl %eax,%ebp + movl %esi,%eax +- divl %ebx +- movl %eax,%esi # quotent in ebp:esi +- movb _dig_vec(%edx),%al # al is faster than dl ++ divl %ebx # Divide by 10 + decl %ecx +- movb %al,(%ecx) # store value in buff +- .align 4 +-.L155: ++ movl %eax,%esi # quotent in ebp:esi ++ addl $48,%edx # Convert to ascii ++ movb %dl,(%ecx) # store value in buff ++ ++.L10_30: + testl %ebp,%ebp +- ja .L153 ++ ja .L10_20 + testl %esi,%esi # rest value +- jl .L153 +- je .L160 # Ready +- movl %esi,%eax +- movl $_dig_vec,%ebp +- .align 4 ++ jl .L10_20 # Unsigned, do ulonglong div once more ++ je .L10_mov # Ready ++ movl %esi,%ebx # Move val to %ebx ++ ++ # The following code uses some tricks to change division by 10 to ++ # multiplication and shifts ++ movl $0xcccccccd,%esi # set %esi to 0xcccccccd ++ ++.L10_40: ++ movl %ebx,%eax ++ mull %esi ++ decl %ecx ++ shrl $3,%edx ++ leal (%edx,%edx,4),%eax ++ addl %eax,%eax ++ subb %al,%bl # %bl now contains val % 10 ++ addb $48,%bl ++ movb %bl,(%ecx) ++ movl %edx,%ebx ++ testl %ebx,%ebx ++ jne .L10_40 ++# jmp .L10_mov # Shared end with longlong10_to_str + +-.L154: # Do rest with integer precision +- cltd +- divl %ebx +- decl %ecx +- movb (%edx,%ebp),%dl # bh is always zero as ebx=radix < 36 +- testl %eax,%eax +- movb %dl,(%ecx) +- jne .L154 + +-.L160: ++.L10_mov: + movl %ecx,%esi + leal 92(%esp),%ecx # End of buffer + subl %esi,%ecx + rep + movsb + +-.L164: ++.L10_end: + movl %edi,%eax # Pointer to end null + movb $0,(%edi) # Store the end null + +@@ -123,18 +236,8 @@ + popl %ebp + addl $80,%esp + ret +- +-.Lerror: +- xorl %eax,%eax # Wrong radix +- jmp .L165 +- +-.Lfe3: +- .size longlong2str,.Lfe3-longlong2str +- +-.globl longlong10_to_str +- .type longlong10_to_str,@function +-longlong10_to_str: +- jmp longlong2str +- ++ + .L10end: + .size longlong10_to_str,.L10end-longlong10_to_str ++ ++ .section .note.GNU-stack,"",@progbits diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild new file mode 100644 index 000000000000..1e95a2077302 --- /dev/null +++ b/dev-db/mysql/mysql-4.0.25-r2.ebuild @@ -0,0 +1,449 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.1 2005/07/20 09:12:11 vivo Exp $ + +inherit eutils gnuconfig flag-o-matic versionator + +SVER=${PV%.*} +PLV="" +NEWP="${PN}-${SVER}.$( get_version_component_range 3-3 )${PLV}" + +# shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/${PN}" + +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +HOMEPAGE="http://www.mysql.com/" +SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd big-tables" +RESTRICT="primaryuri" + +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-process/procps + >=sys-apps/sed-4" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-mysql )" +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( dev-perl/DBD-mysql )" + +mysql_get_datadir() { + 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 2>/dev/null | 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}" + export DATADIR +} + +mysql_upgrade_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() { + mysql_upgrade_warning + mysql_get_datadir +} + +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 + + mv "${WORKDIR}/${NEWP}" "${S}" + cd "${S}" + + #zap startup script messages + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.23-install-db-sh.diff || die + #zap binary distribution stuff + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff || die + #required for qmail-mysql + EPATCH_OPTS="-p0 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff || die + #for correct hardcoded sysconf directory + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die + # NPTL support + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff || die + # Merged upstream as of 4.0.24 + # bad tmpfiles in mysqlaccess, see bug 77805 + #EPATCH_OPTS="-p1 -d ${S}" \ + #epatch ${FILESDIR}/mysql-accesstmp.patch + + # fixed in 4.0.25 + #EPATCH_OPTS="-p1 -d ${S}" \ + #epatch ${FILESDIR}/${PN}-4.0.24-manual.texi.patch || die + + # 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 || die + + # PIC fixes + # bug #42968 + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.25-r2-asm-pic-fixes.patch || die + + if use tcpd; then + EPATCH_OPTS="-p1 -d ${S}" \ + epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff || die + fi + + for d in ${S} ${S}/innobase; do + cd ${d} + # WARNING, plain autoconf breaks it! + #autoconf + # must use this instead + WANT_AUTOCONF=2.59 autoreconf --force + # Fix the evil "libtool.m4 and ltmain.sh have a version mismatch!" + libtoolize --copy --force + # Saving this for a rainy day, in case we need it again + #WANT_AUTOMAKE=1.7 automake + gnuconfig_update + done + + # 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() { + local myconf + + # 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`" + + use ssl \ + && myconf="${myconf} --with-vio --with-openssl" \ + || myconf="${myconf} --without-openssl" + + myconf="${myconf} `use_with debug` `use_with big-tables`" + + # benchmarking stuff needs perl + # and shouldn't be bothered with on minimal builds + if useq perl && ! useq minimal; then + myconf="${myconf} --with-bench" + else + myconf="${myconf} --without-bench" + fi + + # these are things we exclude from a minimal build + # note that the server actually does get built and installed + # but we then delete it before packaging. + local minimal_exclude_list="server embedded-server extra-tools innodb raid" + if ! useq minimal; then + for i in ${minimal_exclude_list}; do + myconf="${myconf} --with-${i}" + done + + # lots of chars + myconf="${myconf} --with-extra-charsets=all" + + #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 + # it boils down to non-64 bit safety. + if useq sparc || useq alpha || useq hppa || useq mips || useq amd64 + then + myconf="${myconf} --without-berkeley-db" + else + use berkdb \ + && myconf="${myconf} --with-berkeley-db=./bdb" \ + || myconf="${myconf} --without-berkeley-db" + fi + + else + for i in ${minimal_exclude_list}; do + myconf="${myconf} --without-${i}" + done + myconf="${myconf} --without-berkeley-db" + myconf="${myconf} --with-extra-charsets=none" + fi + + # documentation + myconf="${myconf} `use_with doc docs`" + + # glibc-2.3.2_pre fix; bug #16496 + append-flags "-DHAVE_ERRNO_AS_DEFINE=1" + + #bug fix for #15099, should make this api backward compatible + append-flags "-DUSE_OLD_FUNCTIONS" + + #the compiler flags are as per their "official" spec ;) + #CFLAGS="${CFLAGS/-O?/} -O3" \ + export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" + + econf \ + -C \ + --libexecdir=/usr/sbin \ + --sysconfdir=/etc/mysql \ + --localstatedir=/var/lib/mysql \ + --with-low-memory \ + --enable-assembler \ + --with-charset=latin1 \ + --enable-local-infile \ + --with-mysqld-user=mysql \ + --with-client-ldflags=-lstdc++ \ + --enable-thread-safe-client \ + --with-comment="Gentoo Linux ${PF}" \ + --with-unix-socket-path=/var/run/mysqld/mysqld.sock \ + ${myconf} || die "bad ./configure" + + emake || die "compile problem" +} + +src_install() { + make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die + + diropts "-m0750" + dodir "${DATADIR}" /var/log/mysql + + diropts "-m0755" + dodir /var/run/mysqld + + keepdir "${DATADIR}" /var/run/mysqld /var/log/mysql + chown -R mysql:mysql ${D}/var/lib/mysql \ + ${D}/var/run/mysqld \ + ${D}/var/log/mysql + + # move client libs, install a couple of missing headers + local lib=$(get_libdir) + 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/bin/make*distribution + rm -f ${D}/usr/share/mysql/make_*_distribution + rm -f ${D}/usr/share/mysql/mysql.server + rm -f ${D}/usr/share/mysql/binary-configure + 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/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission} + rm -f ${D}/usr/bin/mysqlhotcopy + rm -rf ${D}/usr/share/mysql/sql-bench + fi + + # clean up stuff for a minimal build + # this is anything server-specific + if useq minimal; then + rm -rf ${D}/usr/share/mysql/{mysql-test,sql-bench} + rm -f ${D}/usr/bin/{mysql_install_db,mysqlmanager*,mysql_secure_installation,mysql_fix_privilege_tables,mysqlhotcopy,mysql_convert_table_format,mysqld_multi,mysql_fix_extensions,mysql_zap,mysql_explain_log,mysql_tableinfo,mysqld_safe,myisam*,isam*,mysql_install,mysql_waitpid,mysqlbinlog,mysqltest,pack_isam} + rm -f ${D}/usr/sbin/mysqld + rm -f ${D}/usr/lib/mysql/lib{heap,merge,nisam,mysys,mystrings,mysqld,myisammrg,vio,dbug,myisam}.a + fi + + # config stuff + insinto /etc/mysql + doins scripts/mysqlaccess.conf + newins ${FILESDIR}/my.cnf-4.0.24-r1 my.cnf + + # minimal builds don't have the server + if ! useq minimal; then + exeinto /etc/init.d + newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate.mysql" mysql + fi + + # docs + dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE + # minimal builds don't have the server + if useq doc && ! useq minimal; then + dohtml Docs/*.html + dodoc Docs/manual.{txt,ps} + docinto conf-samples + dodoc support-files/my-*.cnf + fi + +} + +src_test() { + cd ${S} + einfo ">>> Test phase [check]: ${CATEGORY}/${PF}" + make check || die "make check failed" + if ! useq minimal; then + local retstatus + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + addpredict /this-dir-does-not-exist/t9.MYI + make test + retstatus=$? + + # to be sure ;) + pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null + pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null + pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null + pkill -9 -f ${S}/sql/mysqld 2>/dev/null + [[ $retstatus == 0 ]] || die "make test failed" + + else + einfo "Skipping server tests due to minimal build." + fi +} + +pkg_config() { + mysql_get_datadir + + if built_with_use dev-db/mysql minimal; then + die "Minimal builds do NOT include the MySQL server" + fi + + if [[ "$(pgrep mysqld)" != "" ]] ; then + die "Oops you already have a mysql daemon running!" + fi + + local pwd1="a" + local pwd2="b" + local maxtry=5 + + if [[ -d "${DATADIR}/mysql" ]] ; then + ewarn "You have already a MySQL database in place." + ewarn "Please rename it or delete it if you wish to replace it." + die "MySQL database already exists!" + fi + + einfo "Creating the mysql database and setting proper" + einfo "permissions on it..." + + einfo "Insert a password for the mysql 'root' user" + ewarn "the password will be visible on the screen" + + echo -n " >" && read -r pwd1 + einfo "Repeat the password" + echo -n " >" && read -r pwd2 + + if (( "x$pwd1" != "x$pwd2" )) ; then + die "Passwords are not the same" + fi + + ${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed" + + # MySQL 5.0 don't ned this + chown -R mysql:mysql ${DATADIR} + chmod 0750 ${ROOT}/${DATADIR} + + # now we can set the password + local socket=${ROOT}/var/run/mysqld/mysqld.sock + local mysqld="${ROOT}/usr/sbin/mysqld \ + --skip-grant-tables \ + --basedir=${ROOT}/usr \ + --datadir=${ROOT}/var/lib/mysql \ + --skip-innodb \ + --skip-bdb \ + --max_allowed_packet=8M \ + --net_buffer_length=16K \ + --socket=${socket} \ + --pid-file=${ROOT}/var/run/mysqld/mysqld.pid" + + $mysqld & + + while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] + do + maxtry=$(($maxtry-1)) + echo -n "." + sleep 1 + done + + # do this from memory we don't want clear text password in temp files + local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'" + ${ROOT}/usr/bin/mysql \ + --socket=${socket} \ + -hlocalhost \ + -e "${sql}" + local retstatus=$? + + kill $( cat ${ROOT}/var/run/mysqld/mysqld.pid ) + + [[ $retstatus == 0 ]] || die "Failed to communicate with MySQL server" + + einfo "done" +} + +pkg_preinst() { + enewgroup mysql 60 || die "problem adding group mysql" + enewuser mysql 60 /bin/false /var/lib/mysql mysql \ + || die "problem adding user mysql" +} + +pkg_postinst() { + mysql_get_datadir + + if ! useq minimal; then + #empty dirs... + [ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql + [ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld + [ -d "${ROOT}/var/log/mysql" ] || 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}/${DATADIR} + + # 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 + fi + + mysql_upgrade_warning + einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream." +} |