version bump to 4.0.15 (improved init.d script included).

properly install updated config file (>=4.0.14-r1).
ensure correct permissions on data directory after ebuild config (>=4.0.14-r1).

7 files changed, 318 insertions, 9 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index eac1f19aade2..b2978521e348 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.70 2003/09/15 09:03:12 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.71 2003/09/17 07:10:37 robbat2 Exp $
+
+*mysql-4.0.15 (17 Sep 2003)
+
+  17 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
+  mysql-4.0.14-r2.ebuild, mysql-4.0.15.ebuild, files/mysql-4.0.15.rc6:
+  version bump to 4.0.15 (improved init.d script included).
+  properly install updated config file (>=4.0.14-r1).
+  ensure correct permissions on data directory after ebuild config (>=4.0.14-r1).
 
 *mysql-3.23.57-r1 (15 Sep 2003)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index a56159f89fb2..0e05837b33df 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,17 +1,18 @@
 MD5 59bc60d84a04496aec5097ff309ae47c mysql-3.23.57-r1.ebuild 6605
 MD5 230f1fb1b0fedce4997ec435d06675e7 mysql-3.23.56.ebuild 6547
-MD5 c4c247d692770520902b09a8c7651553 mysql-4.0.14-r2.ebuild 7190
+MD5 3ede13ba6bc6fd962f1ae8c6b4dcfc5a mysql-4.0.14-r2.ebuild 7572
 MD5 f0681b3b5b41cd507265d567e1440d91 mysql-4.0.12.ebuild 6773
 MD5 00b9e676cebb5ab00da1e455dbf9c758 mysql-4.0.14.ebuild 6919
 MD5 b1716c908bb6b91f9d95929d8882d362 mysql-3.23.52-r1.ebuild 5872
-MD5 1a09d2cfb6c99925c7448a1e0a6f7e20 mysql-4.0.14-r1.ebuild 7035
+MD5 0fbc8592d73284ef36923e7741c30966 mysql-4.0.14-r1.ebuild 7416
 MD5 6b519e83d68043614f6631e7b098d87c mysql-4.0.13-r4.ebuild 7282
 MD5 a3702a4c1f2b7118dcd12c8157f07009 mysql-3.23.57.ebuild 6550
-MD5 f36834889124bc47211a204a3e81e96d ChangeLog 11323
-MD5 c4c247d692770520902b09a8c7651553 mysql-4.0.15.ebuild 7190
+MD5 96387965c4b6c17b54502db8b0a89490 ChangeLog 11700
+MD5 fa27fbd8f5e9b6224bee9611e3679e4d mysql-4.0.15.ebuild 7572
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
 MD5 6b6ee32d2f9f3030b5fcea0a2a9a5360 files/mysql-4.0.rc6 950
+MD5 b9d81963ed567af7d958f7a461d859cc files/mysql-4.0.15.rc6 963
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
 MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57-r1 67
 MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
diff --git a/dev-db/mysql/files/digest-mysql-4.0.15 b/dev-db/mysql/files/digest-mysql-4.0.15
new file mode 100644
index 000000000000..022a6c3697b3
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.15
@@ -0,0 +1 @@
+MD5 a6ce917730e8778ef7c9e1f7b5053b2d mysql-4.0.15.tar.gz 12771603
diff --git a/dev-db/mysql/files/mysql-4.0.15.rc6 b/dev-db/mysql/files/mysql-4.0.15.rc6
new file mode 100644
index 000000000000..45b5c498c0f7
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.15.rc6
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.15.rc6,v 1.1 2003/09/17 07:10:37 robbat2 Exp $
+
+depend() {
+	need net
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f /etc/mysql/my.cnf ] ; then
+		eerror "No /etc/mysql/my.cnf file exists!"
+	fi
+
+    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
+
+	if [ ! -d $dir/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 --retry 5 --quiet --pidfile=/var/run/mysqld/mysqld.pid
+	eend $?
+}
diff --git a/dev-db/mysql/mysql-4.0.14-r1.ebuild b/dev-db/mysql/mysql-4.0.14-r1.ebuild
index 4533c5bb0a56..954375897021 100644
--- a/dev-db/mysql/mysql-4.0.14-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r1.ebuild,v 1.6 2003/09/06 22:25:50 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r1.ebuild,v 1.7 2003/09/17 07:10:37 robbat2 Exp $
 
 #to accomodate -laadeedah releases
 NEWP=${P}
@@ -172,7 +172,8 @@ src_install() {
 	dohtml -r Docs/*
 
 	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf-4.0.14-r1 scripts/mysqlaccess.conf
+	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
+	doins scripts/mysqlaccess.conf
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/mysql-4.0.rc6 mysql
 }
@@ -183,6 +184,16 @@ pkg_config() {
 		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}'`
+		fi
+		if [ -z "${DATADIR}" ]; then
+			DATADIR="/var/lib/mysql/"
+		fi
+		chown -R mysql.mysql ${DATADIR}
 	else
 		einfo "Hmm, it appears as though you already have the mysql"
 		einfo "database in place.  If you are having problems trying"
diff --git a/dev-db/mysql/mysql-4.0.14-r2.ebuild b/dev-db/mysql/mysql-4.0.14-r2.ebuild
index c17969095713..01d9851e3ef6 100644
--- a/dev-db/mysql/mysql-4.0.14-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r2.ebuild,v 1.2 2003/09/11 16:50:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.14-r2.ebuild,v 1.3 2003/09/17 07:10:37 robbat2 Exp $
 
 inherit eutils
 #to accomodate -laadeedah releases
@@ -176,7 +176,8 @@ src_install() {
 	dohtml -r Docs/*
 
 	insinto /etc/mysql
-	doins ${FILESDIR}/my.cnf-4.0.14-r1 scripts/mysqlaccess.conf
+	newins ${FILESDIR}/my.cnf-4.0.14-r1 my.cnf
+	doins scripts/mysqlaccess.conf
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/mysql-4.0.rc6 mysql
 }
@@ -187,6 +188,16 @@ pkg_config() {
 		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}'`
+		fi
+		if [ -z "${DATADIR}" ]; then
+			DATADIR="/var/lib/mysql/"
+		fi
+		chown -R mysql.mysql ${DATADIR}
 	else
 		einfo "Hmm, it appears as though you already have the mysql"
 		einfo "database in place.  If you are having problems trying"
diff --git a/dev-db/mysql/mysql-4.0.15.ebuild b/dev-db/mysql/mysql-4.0.15.ebuild
new file mode 100644
index 000000000000..19b750035006
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.15.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.15.ebuild,v 1.1 2003/09/17 07:10:37 robbat2 Exp $
+
+inherit eutils
+#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"
+
+KEYWORDS="~x86 ~sparc ~ppc ~arm ~amd64 ~hppa"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static readline innodb berkdb tcpd ssl perl debug"
+
+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 )"
+
+warning() {
+	ewarn
+	ewarn "If you're upgrading from MySQL-3.x, you must recompile the other"
+	ewarn "packages on your system that link with libmysqlclient after the"
+	ewarn "upgrade completes.  To obtain such a list of packages for your"
+	ewarn "system, you may use 'revdep-rebuild' from app-portage/gentoolkit."
+	ewarn
+	sleep 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
+	cd ${S} || die
+	#required for qmail-mysql
+	patch -p0 < ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
+	#zap startup script messages
+	patch -p1 < ${FILESDIR}/${PN}-4.0.4-install-db-sh.diff || die
+	#zap binary distribution stuff
+	patch -p1 < ${FILESDIR}/${PN}-4.0.14-mysqld-safe-sh.diff || die
+	#for correct hardcoded sysconf directory
+	patch -p1 < ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
+	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.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
+	# Robert Coie <rac@gentoo.org> 2003.06.12
+	patch -p0 < ${FILESDIR}/${PN}-4.0.13-thrssl.patch || die
+
+	if use tcpd; then
+		patch -p1 -d ${S} < ${FILESDIR}/mysql-4.0.14-r1-tcpd-vars-fix.diff || die
+	fi
+	# fix buffer overflow in mysql4 prior to 4.0.15 bug #28394
+	[ "$PV" == "4.0.14" ] &&
+		 epatch ${FILESDIR}/mysql-${PV}-security-28394.patch
+}
+
+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 sparc64 || use alpha || use hppa
+	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?
+	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/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/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
+
+	dodoc README COPYING COPYING.LIB MIRRORS Docs/manual.*
+	docinto conf-samples
+	dodoc support-files/my-*.cnf
+	dohtml -r Docs/*
+
+	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}'`
+		fi
+		if [ -z "${DATADIR}" ]; then
+			DATADIR="/var/lib/mysql/"
+		fi
+		chown -R mysql.mysql ${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() {
+	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
+}
+
+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/dev-db/${PF}/${PF}.ebuild config\""
+	einfo "if this is a new install."
+	einfo
+
+	warning
+}