Version bump.

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 173ddb5e8daa13258bce2b29de94a08ed7db88dd..f880657632dc131c2d3b1989010e02f9b3182a30 100644 (file)
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # 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.138 2004/10/26 16:11:02 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.139 2004/10/31 01:24:14 robbat2 Exp $
+
+*mysql-4.0.22 (30 Oct 2004)
+
+  30 Oct 2004; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.0.22.ebuild:
+  Version bump.
 
   26 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> mysql-4.0.21.ebuild:
   Removed COPYING.LIB from dodoc as the file doesn't exist.

diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 88b78d08520c7d9f165c7abc439515e063be2308..16431b22a84f0c819a2c04695d9bc44a1cfaca88 100644 (file)
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 13b377458aedd7a42553fea8f5c45fbb mysql-3.23.57-r1.ebuild 6490
 MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535
 MD5 a1556aed69d52ec722f4c5a31bb726c1 mysql-4.0.18-r2.ebuild 7830
@@ -17,9 +20,10 @@ MD5 04d40b0f70053e44662143dd7d434297 mysql-4.0.16.ebuild 7503
 MD5 7608932f4067e134cebf1a6edc446d3c mysql-4.0.13-r4.ebuild 7278
 MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538
 MD5 a38984d40495a5a672104f9fc9b5b6ad mysql-4.0.20-r1.ebuild 8454
+MD5 dd863ae555c68a5e9483f1b6217067fa mysql-4.0.22.ebuild 8321
 MD5 c62be75421fc4af81b3313a638b34d1c mysql-4.0.18.ebuild 7652
 MD5 a9990372dc3f4a3323810ad38c9e1752 mysql-3.23.58-r1.ebuild 6607
-MD5 183f145ddb85cd43c60fa11870977a80 ChangeLog 20912
+MD5 f59e743d996013b44f2de0c3e359c4d0 ChangeLog 21035
 MD5 8aa1d4333221eae80f21a743f6c664da mysql-4.0.15.ebuild 7561
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
@@ -44,6 +48,7 @@ MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18 66
 MD5 b776101113ddfd5cda3cdc0ccf2f08c1 files/digest-mysql-4.0.19 66
 MD5 577f09c36de46438158d16c2c855ec13 files/digest-mysql-4.0.20 66
 MD5 5d1008d2d21bd40484440715bf4eaaec files/digest-mysql-4.0.21 66
+MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 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
@@ -80,3 +85,11 @@ MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r2 66
 MD5 577f09c36de46438158d16c2c855ec13 files/digest-mysql-4.0.20-r1 66
 MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
 MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.5 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
+
+iD8DBQFBhD7ePpIsIjIzwiwRAs+XAJ0cH21TjmjaT8Q6iujNBtAeT0MIswCgvPv6
+W+dyETVyV72G4eZoQ7OrH8g=
+=Dckr
+-----END PGP SIGNATURE-----

diff --git a/dev-db/mysql/files/digest-mysql-4.0.22 b/dev-db/mysql/files/digest-mysql-4.0.22
new file mode 100644 (file)
index 0000000..e3e0885
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.22
@@ -0,0 +1 @@
+MD5 fab53259c3ba9f729a319bf271fc8587 mysql-4.0.22.tar.gz 14395535

diff --git a/dev-db/mysql/mysql-4.0.22.ebuild b/dev-db/mysql/mysql-4.0.22.ebuild
new file mode 100644 (file)
index 0000000..d226f35
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.22.ebuild
@@ -0,0 +1,260 @@
+# 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.22.ebuild,v 1.1 2004/10/31 01:24:14 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="~ia64 ~x86 ~sparc ~ppc ~amd64 ~hppa ~alpha ~mips ~s390 ~arm ~ppc64"
+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/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.21-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}
+       autoconf
+       # 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
+}
+
+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
+               # changing ownership of newly created databases to mysql.mysql
+               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/"
+               fi
+               chown -R mysql:mysql ${DATADIR}
+               chmod 0750 ${DATADIR}
+       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
+}