update to 3.23.51; latest stable release

4 files changed, 228 insertions, 1 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 050c41578956..96cd3640d835 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,18 @@
 # 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.5 2002/06/16 16:39:18 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.6 2002/06/23 00:08:29 woodchip Exp $
+
+*mysql-3.23.51 (22 June 2002)
+
+  22 June 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Update to latest stable release; 3.23.51.
+  - Important!  On >=gentoo-1.3, the bundled 3.2.9a bezerkeley db will be
+    built if you have USE berkdb.  On <gentoo-1.3, the sys-libs/db-3.2.9
+    system version is used.
+  - added a small patch for tcpd; looks like an upstream bug?
+  - sync the compiler flags with their "official" spec ;)
+  - cleaned up the ebuild a little.
 
 *mysql-3.23.49-r2 (16 June 2002)
 
diff --git a/dev-db/mysql/files/digest-mysql-3.23.51 b/dev-db/mysql/files/digest-mysql-3.23.51
new file mode 100644
index 000000000000..6b2531a6f4cf
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-3.23.51
@@ -0,0 +1 @@
+MD5 af9f2aaba408898df82cccf462766542 mysql-3.23.51.tar.gz 11203102
diff --git a/dev-db/mysql/files/mysql-3.23.51-tcpd.patch b/dev-db/mysql/files/mysql-3.23.51-tcpd.patch
new file mode 100644
index 000000000000..6897ed0c17f1
--- /dev/null
+++ b/dev-db/mysql/files/mysql-3.23.51-tcpd.patch
@@ -0,0 +1,16 @@
+diff -uNr mysql-3.23.51.orig/sql/mysqld.cc mysql-3.23.51/sql/mysqld.cc
+--- mysql-3.23.51.orig/sql/mysqld.cc	Mon Jun  3 06:39:02 2002
++++ mysql-3.23.51/sql/mysqld.cc	Thu Jun 20 16:11:47 2002
+@@ -91,9 +91,9 @@
+ int deny_severity = LOG_WARNING;
+ 
+ #ifdef __linux__
+-#define my_fromhost(A)	   fromhost()
+-#define my_hosts_access(A) hosts_access()
+-#define my_eval_client(A)  eval_client()
++#define my_fromhost(A)	   fromhost(A)
++#define my_hosts_access(A) hosts_access(A)
++#define my_eval_client(A)  eval_client(A)
+ #else
+ #define my_fromhost(A)	   fromhost(A)
+ #define my_hosts_access(A) hosts_access(A)
diff --git a/dev-db/mysql/mysql-3.23.51.ebuild b/dev-db/mysql/mysql-3.23.51.ebuild
new file mode 100644
index 000000000000..997e0e0708d4
--- /dev/null
+++ b/dev-db/mysql/mysql-3.23.51.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.51.ebuild,v 1.1 2002/06/23 00:08:29 woodchip Exp $
+
+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"
+S=${WORKDIR}/${P}
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/glibc
+	readline? ( >=sys-libs/readline-4.1 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	>=sys-libs/zlib-1.1.3
+	sys-devel/perl
+	sys-apps/procps
+	berkdb? ( >sys-libs/db-3* )"
+# on >=gentoo-1.3, USE berkdb will build the bundled 3.2.9a version.
+# on <gentoo-1.3, sys-libs/db-3 is used for the USE berkdb component.
+
+# HEY!
+# the benchmark stuff in /usr/share/mysql/sql-bench and
+# the /usr/bin/mysql_setpermission script need dev-perl/DBD-mysql.
+# Can't add it here: circ depend.  Emerge it either before or after
+# mysql; easier before, then it pulls in mysql.
+
+pkg_setup() {
+	if ! groupmod mysql; then
+		groupadd -g 60 mysql || die "problem adding group mysql"
+	fi
+
+	if ! id mysql; then
+		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		assert "problem adding user mysql"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	# gentoo 1.3+ uses db 4.0.x by default..
+	if [ "${COMPILER}" != "gcc3" ]
+	then
+		einfo "patching for <gentoo-1.3 system (gcc-2.95.x).."
+		# for -ldb-3.2 instead of -ldb, because gentoo has -ldb1 instead
+		patch -p1 < ${FILESDIR}/mysql-3.23-db-3.2.3.diff || die
+	fi
+	# required for qmail-mysql
+	patch -p0 < ${FILESDIR}/mysql-3.23-nisam.h.diff || die
+	# zap startup script messages
+	patch -p1 < ${FILESDIR}/mysql-3.23-install-db-sh.diff || die
+	# zap binary distribution stuff
+	patch -p1 < ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff || die
+	# for correct hardcoded sysconf directory
+	patch -p1 < ${FILESDIR}/mysql-3.23-my-print-defaults.diff || die
+	# 3.23.51: hrmph.. not sure whats going on with this..
+	patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
+	aclocal || die
+	automake || die
+	autoconf || die
+}
+
+src_compile() {
+	local myconf
+	# use the bundled db on gentoo 1.3+
+	if [ "${COMPILER}" != "gcc3" ]
+	then
+		use berkdb && myconf="${myconf} \
+			--with-berkeley-db \
+			--with-berkeley-db-includes=/usr/include/db3 \
+			--with-berkeley-db-libs=/usr/lib"
+	else
+		use berkdb && myconf="${myconf} --with-berkeley-db"
+	fi
+	use berkdb || myconf="${myconf} --without-berkeley-db"
+	# first one means use the system readline
+	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"
+	[ -n "${DEBUGBUILD}" ] && myconf="${myconf} --with-debug"
+	[ -n "${DEBUGBUILD}" ] || myconf="${myconf} --without-debug"
+
+	# gcc-2.95.x: CXX must be g++ because gcc|c++ does not find /usr/lib/gcc-lib/libstc+++.so.
+	# gcc-3.1.x: should be okay yes?
+	# the compiler flags are as per their "official" spec ;-)
+	einfo "myconf is $myconf"
+	CC=gcc \
+	CFLAGS="${CFLAGS/-O?/} -O3" \
+	CXX=g++ \
+	CXXFLAGS="${CXXFLAGS/-O?/} -O3 -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="Gentoo ${PF}.ebuild package" \
+		--with-unix-socket-path=/var/run/mysqld/mysqld.sock \
+		--host=${CHOST} ${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
+	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
+	dohtml -r Docs/*
+
+	insinto /etc/mysql
+	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mysql.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
+}
+
+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...
+	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
+}