added masked version of unreleased mysql-4.0.1

9 files changed, 351 insertions, 1 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 68a404a1df34..ff9b0505c601 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.7 2002/06/24 20:26:08 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.8 2002/06/28 02:55:15 rphillips Exp $
 
+*mysql-4.0.1 (27 June 2002)
+
+  27 June 2002; Ryan Phillips <rphillips@gentoo.org> :
+
+  Added the unreleased mysql for development purposes and testing.
+  Currently masked in portage.mask
+  
 *mysql-3.23.51 (22 June 2002)
 
   22 June 2002; Donny Davies <woodchip@gentoo.org> :
diff --git a/dev-db/mysql/files/digest-mysql-4.0.1_alpha b/dev-db/mysql/files/digest-mysql-4.0.1_alpha
new file mode 100644
index 000000000000..4c26d9b2e51f
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.1_alpha
@@ -0,0 +1 @@
+MD5 d27d493007db352dc3a4224babe1edc0 mysql-4.0.1-alpha.tar.gz 11801864
diff --git a/dev-db/mysql/files/mysql-4.0-db-3.2.1.diff b/dev-db/mysql/files/mysql-4.0-db-3.2.1.diff
new file mode 100644
index 000000000000..5028a5cf5625
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0-db-3.2.1.diff
@@ -0,0 +1,30 @@
+--- mysql-4.0.1-alpha.orig/acinclude.m4	Sun Dec 23 01:22:06 2001
++++ mysql-4.0.1-alpha/acinclude.m4	Sat Jun 22 17:59:04 2002
+@@ -972,13 +972,13 @@
+     if test X"$bdb_version_ok" = Xyes; then
+       save_LDFLAGS="$LDFLAGS"
+       LDFLAGS="-L$lib $LDFLAGS"
+-      AC_CHECK_LIB(db,db_env_create, [
++      AC_CHECK_LIB(db-3.2,db_env_create, [
+         bdb_dir_ok=installed
+         MYSQL_TOP_BUILDDIR([inc])
+         MYSQL_TOP_BUILDDIR([lib])
+         bdb_includes="-I$inc"
+-        bdb_libs="-L$lib -ldb"
+-        bdb_libs_with_path="$lib/libdb.a"
++        bdb_libs="-L$lib -ldb-3.2"
++        bdb_libs_with_path="$lib/libdb-3.2.a"
+       ])
+       LDFLAGS="$save_LDFLAGS"
+     else
+@@ -1006,8 +1006,8 @@
+         bdb="$dir"
+         MYSQL_TOP_BUILDDIR([dir])
+         bdb_includes="-I$dir/build_unix"
+-        bdb_libs="-L$dir/build_unix -ldb"
+-	bdb_libs_with_path="$dir/build_unix/libdb.a"
++        bdb_libs="-L$dir/build_unix -ldb-3.2"
++	bdb_libs_with_path="$dir/build_unix/libdb-3.2.a"
+       else
+         bdb_dir_ok="$bdb_version_ok"
+       fi
diff --git a/dev-db/mysql/files/mysql-4.0-install-db-sh.diff b/dev-db/mysql/files/mysql-4.0-install-db-sh.diff
new file mode 100644
index 000000000000..909de2b7dd6a
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0-install-db-sh.diff
@@ -0,0 +1,34 @@
+--- mysql-4.0.1-alpha.orig/scripts/mysql_install_db.sh	Sun Dec 23 01:22:14 2001
++++ mysql-4.0.1-alpha/scripts/mysql_install_db.sh	Sat Jun 22 18:07:37 2002
+@@ -313,14 +313,9 @@
+ END_OF_DATA
+ then
+   echo ""
+-  if test "$IN_RPM" -eq 0
+-  then
+-    echo "To start mysqld at boot time you have to copy support-files/mysql.server"
+-    echo "to the right place for your system"
+-    echo
+-  fi
+   echo "PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !"
+   echo "This is done with:"
++  echo "/etc/init.d/mysql start (you have to start the server first!)"
+   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."
+@@ -334,15 +329,6 @@
+     echo "able to use the new GRANT command!"
+   fi
+   echo
+-  if test "$IN_RPM" -eq 0
+-  then
+-    echo "You can start the MySQL daemon with:"
+-    echo "cd @prefix@ ; $bindir/mysqld_safe &"
+-    echo
+-    echo "You can test the MySQL daemon with the benchmarks in the 'sql-bench' directory:"
+-    echo "cd sql-bench ; run-all-tests"
+-    echo
+-  fi
+   echo "Please report any problems with the @scriptdir@/mysqlbug script!"
+   echo
+   echo "The latest information about MySQL is available on the web at"
diff --git a/dev-db/mysql/files/mysql-4.0-my-print-defaults.diff b/dev-db/mysql/files/mysql-4.0-my-print-defaults.diff
new file mode 100644
index 000000000000..b0865638da57
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0-my-print-defaults.diff
@@ -0,0 +1,11 @@
+--- mysql-4.0.1-alpha.orig/mysys/default.c	Sun Dec 23 01:22:08 2001
++++ mysql-4.0.1-alpha/mysys/default.c	Sat Jun 22 18:56:03 2002
+@@ -47,7 +47,7 @@
+ #ifdef __WIN__
+ "C:/",
+ #else
+-"/etc/",
++"/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,
diff --git a/dev-db/mysql/files/mysql-4.0-mysqld-safe-sh.diff b/dev-db/mysql/files/mysql-4.0-mysqld-safe-sh.diff
new file mode 100644
index 000000000000..b6d93012f2a6
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0-mysqld-safe-sh.diff
@@ -0,0 +1,49 @@
+--- mysql-4.0.1-alpha.orig/scripts/mysqld_safe.sh	Sun Dec 23 01:22:08 2001
++++ mysql-4.0.1-alpha/scripts/mysqld_safe.sh	Sat Jun 22 18:11:21 2002
+@@ -73,42 +73,15 @@
+   done
+ }
+ 
+-MY_PWD=`pwd`
+-# Check if we are starting this relative (for the binary release)
+-if test -d $MY_PWD/data/mysql -a -f ./share/mysql/english/errmsg.sys -a \
+- -x ./bin/mysqld
+-then
+-  MY_BASEDIR_VERSION=$MY_PWD		# Where bin, share and data are
+-  ledir=$MY_BASEDIR_VERSION/bin		# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/data
+-  if test -z "$defaults"
+-  then
+-    defaults="--defaults-extra-file=$MY_BASEDIR_VERSION/data/my.cnf"
+-  fi
+-# Check if this is a 'moved install directory'
+-elif test -f ./var/mysql/db.frm -a -f ./share/mysql/english/errmsg.sys -a \
+- -x ./libexec/mysqld
+-then
+-  MY_BASEDIR_VERSION=$MY_PWD		# Where libexec, share and var are
+-  ledir=$MY_BASEDIR_VERSION/libexec	# Where mysqld is
+-  DATADIR=$MY_BASEDIR_VERSION/var
+-else
+-  MY_BASEDIR_VERSION=@prefix@
+-  DATADIR=@localstatedir@
+-  ledir=@libexecdir@
+-fi
++MY_BASEDIR_VERSION=@prefix@
++DATADIR=@localstatedir@
++ledir=@libexecdir@
+ 
+ MYSQL_UNIX_PORT=${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}
+ MYSQL_TCP_PORT=${MYSQL_TCP_PORT:-@MYSQL_TCP_PORT@}
+ user=@MYSQLD_USER@
+ 
+-# Use the mysqld-max binary by default if the user doesn't specify a binary
+-if test -x $ledir/mysqld-max
+-then
+-  MYSQLD=mysqld-max
+-else
+-  MYSQLD=mysqld
+-fi
++MYSQLD=mysqld
+ 
+ # these rely on $DATADIR by default, so we'll set them later on
+ pid_file=
diff --git a/dev-db/mysql/files/mysql-4.0-nisam.h.diff b/dev-db/mysql/files/mysql-4.0-nisam.h.diff
new file mode 100644
index 000000000000..c8d9d676888e
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0-nisam.h.diff
@@ -0,0 +1,11 @@
+--- include/nisam.h~	Sat Jun 22 18:03:36 2002
++++ include/nisam.h	Sat Jun 22 18:03:53 2002
+@@ -30,7 +30,7 @@
+ 
+ #define N_MAXKEY	16		/* Max allowed keys */
+ #define N_MAXKEY_SEG	16		/* Max segments for key */
+-#define N_MAX_KEY_LENGTH 256		/* May be increased up to 500 */
++#define N_MAX_KEY_LENGTH 500		/* May be increased up to 500 */
+ #define N_MAX_KEY_BUFF	 (N_MAX_KEY_LENGTH+N_MAXKEY_SEG+sizeof(double)-1)
+ #define N_MAX_POSSIBLE_KEY_BUFF 500+9
+ 
diff --git a/dev-db/mysql/files/mysql-4.0.rc6 b/dev-db/mysql/files/mysql-4.0.rc6
new file mode 100644
index 000000000000..181ba6683729
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.rc6
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -d /var/lib/mysql/mysql ] ; then
+		eerror "You dont appear to have the mysql database installed yet."
+		eerror "Please run /usr/bin/mysql_install_db to have this done..."
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting mysqld"
+	start-stop-daemon --start --quiet --exec /usr/bin/mysqld_safe \
+		--background -- >/dev/null 2>&1
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping mysqld"
+	start-stop-daemon --stop --quiet --pidfile=/var/run/mysqld/mysqld.pid
+	eend $?
+}
diff --git a/dev-db/mysql/mysql-4.0.1_alpha.ebuild b/dev-db/mysql/mysql-4.0.1_alpha.ebuild
new file mode 100644
index 000000000000..93fb54d8916c
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.1_alpha.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+SVER=${PV%.*}
+#for normal releases:
+SDIR=MySQL-${SVER}
+#file is named with - not _ on the download sites ...
+DOWN_NAME=${P/_/-}
+
+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}/${DOWN_NAME}.tar.gz
+	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${DOWN_NAME}.tar.gz"
+S=${WORKDIR}/${DOWN_NAME}
+DEPEND="virtual/glibc
+	readline? ( >=sys-libs/readline-4.1 )
+	berkdb? ( =sys-libs/db-3* =sys-libs/db-1* )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=sys-libs/zlib-1.1.3
+	sys-devel/perl
+	sys-apps/procps"
+LICENSE="GPL-2"
+SLOT="0"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	# for -ldb-3.2 instead of -ldb, because gentoo has -ldb1 instead
+	patch -p1 < ${FILESDIR}/mysql-4.0-db-3.2.1.diff || die
+	# required for qmail-mysql
+	patch -p0 < ${FILESDIR}/mysql-4.0-nisam.h.diff || die
+	# zap startup script messages
+	patch -p1 < ${FILESDIR}/mysql-4.0-install-db-sh.diff || die
+	# zap binary distribution stuff
+	patch -p1 < ${FILESDIR}/mysql-4.0-mysqld-safe-sh.diff || die
+	# for correct hardcoded sysconf directory
+	patch -p1 < ${FILESDIR}/mysql-4.0-my-print-defaults.diff || die
+	aclocal || die
+	automake || die
+	autoconf || die
+}
+
+src_compile() {
+	local myconf
+	# means use the system readline
+	use readline && myconf="${myconf} --without-readline"
+	use berkdb && myconf="${myconf} --with-berkeley-db --with-berkeley-db-includes=/usr/include/db3 --with-berkeley-db-libs=/usr/lib"
+	use berkdb || myconf="${myconf} --without-berkeley-db"
+	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"
+	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
+	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
+
+	# CXX must be g++ because gcc|c++ does not find /usr/lib/gcc-lib/libstc+++.so.
+	# the compiler flags are needed to address stability issues.
+	CC=gcc \
+	CFLAGS="${CFLAGS/-O?/} -O2" \
+	CXX=g++ \
+	CXXFLAGS="${CXXFLAGS/-O?/} -O2 -felide-constructors -fno-exceptions -fno-rtti" \
+	./configure \
+		--prefix=/usr \
+		--libdir=/usr/lib \
+		--exec-prefix=/usr \
+		--datadir=/usr/share \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/mysql \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--includedir=/usr/include \
+		--localstatedir=/var/lib/mysql \
+		--with-raid \
+		--with-low-memory \
+		--enable-assembler \
+		--with-charset=latin1 \
+		--with-mysqld-user=mysql \
+		--with-extra-charsets=all \
+		--enable-thread-safe-client \
+		--with-client-ldflags=-lstdc++ \
+		--with-comment="${PF}.ebuild package" \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	make || die "compile problem"
+}
+
+src_install() {
+	dodir /var/lib/mysql /var/run/mysqld /var/log/mysql
+	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
+	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
+
+	# while my broom gently sweeps...
+	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
+
+	dodoc README COPYING COPYING.LIB MIRRORS Docs/{manual.ps,manual.txt}
+	docinto conf-samples ; dodoc support-files/my-*.cnf
+	docinto html ; dodoc Docs/*.html
+
+	insinto /etc/mysql
+	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
+	exeinto /etc/init.d ; newexe ${FILESDIR}/mysql-4.0.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
+	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
+
+	# ensure permissions on these just in case...
+	chown -R mysql ${ROOT}/var/lib/mysql ${ROOT}/var/run/mysqld
+}
+
+pkg_postinst() {
+	# /etc/passwd: mysql:x:60:60:mysql:/var/lib/mysql:/dev/null
+	# /etc/group:  mysql:x:60:
+	# creating mysql group if he isn't already there
+	if ! grep -q ^mysql: /etc/group ; then
+		#echo Adding system group: mysql.
+		groupadd -g 60 mysql || die "problem adding group mysql"
+	fi
+
+	# creating mysql user if he isn't already there
+	if ! grep -q ^mysql: /etc/passwd ; then
+		#echo Adding system user: mysql.
+		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		assert "problem adding user mysql"
+	fi
+
+	# modifying him if he was already there
+	usermod -c "mysql" mysql || die "usermod problem"
+	usermod -d "/var/lib/mysql" mysql || die "usermod problem"
+	usermod -g "mysql" mysql || die "usermod problem"
+	usermod -s "/dev/null" mysql || die "usermod problem"
+
+	# ensure sane permissions on existing databases and /var/run/mysqld
+	chown mysql.mysql ${ROOT}/var/lib/mysql ${ROOT}/var/run/mysqld
+	find ${ROOT}/var/lib/mysql -not \( -group root -or -group mysql \) -exec chgrp mysql {} \;
+
+	# get these proper and ready to go
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql.mysql ${ROOT}/var/log/mysql/mysql.{log,err}
+	chmod 0600 ${ROOT}/var/log/mysql/mysql.{log,err}
+
+	einfo
+	einfo "You might want to run:"
+	einfo "\"ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config\""
+	einfo "if this is a new install."
+	einfo
+}