security update

4 files changed, 202 insertions, 3 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 6eba2a3477e2..eac1f19aade2 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # 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.69 2003/09/11 16:50:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.70 2003/09/15 09:03:12 aliz Exp $
+
+*mysql-3.23.57-r1 (15 Sep 2003)
+
+  15 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> mysql-3.23.57-r1.ebuild:
+  Security update
 
   11 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r2.ebuild:
   fix bug #28421
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b8fee27cf050..bc8d9a078e05 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,12 +1,13 @@
-MD5 f090be0da73474d8d0deb16b1e549fac ChangeLog 11202
+MD5 6774a56f698c15e711e18f00e8eba1e5 ChangeLog 11324
 MD5 2d9fd1c37cc537963c5b77f2088a335c mysql-3.23.52-r1.ebuild 5873
-MD5 22cba07f398f679736975fb489b3222d mysql-3.23.57-r1.ebuild 6605
+MD5 09995b6e0a6f2f3007789f81c4436955 mysql-3.23.57-r1.ebuild 6606
 MD5 c59ceb38e06de5f8125f689edc52b191 mysql-4.0.13-r4.ebuild 7283
 MD5 a29166a4378eca3f2a954c4b6648e1ce mysql-4.0.14-r2.ebuild 7191
 MD5 c63efd889b589a982ec42c3381e93d1a mysql-3.23.56.ebuild 6548
 MD5 43070c2dd889f22108e60c753d857ea7 mysql-4.0.12.ebuild 6774
 MD5 6c282fa35bb93dabe168fc49e5f109cd mysql-4.0.14.ebuild 6920
 MD5 ca51174c7baee5c8fad1a8a40b99d03a mysql-4.0.14-r1.ebuild 7036
+MD5 f0015144c259bd17ac209d3ea53bdf52 mysql-3.23.57.ebuild 6551
 MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
 MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r4 66
 MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r2 66
diff --git a/dev-db/mysql/files/digest-mysql-3.23.57-r1 b/dev-db/mysql/files/digest-mysql-3.23.57-r1
new file mode 100644
index 000000000000..2ee8fd90da1d
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-3.23.57-r1
@@ -0,0 +1 @@
+MD5 892f7d97af1ce7502e89d824031abd05 mysql-3.23.57.tar.gz 11738262
diff --git a/dev-db/mysql/mysql-3.23.57-r1.ebuild b/dev-db/mysql/mysql-3.23.57-r1.ebuild
new file mode 100644
index 000000000000..6763f38a247f
--- /dev/null
+++ b/dev-db/mysql/mysql-3.23.57-r1.ebuild
@@ -0,0 +1,192 @@
+# 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-3.23.57-r1.ebuild,v 1.1 2003/09/15 09:03:12 aliz Exp $
+
+# bug #11681; get b0rked code when using -march=k6 with this package.
+inherit flag-o-matic
+replace-flags "-march=k6-3" "-march=i586"
+replace-flags "-march=k6-2" "-march=i586"
+replace-flags "-march=k6" "-march=i586"
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static readline innodb berkdb tcpd ssl debug"
+KEYWORDS="x86 ~sparc ~alpha ~hppa"
+
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	>=sys-libs/zlib-1.1.3
+	dev-lang/perl
+	sys-apps/procps"
+
+PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	# required for qmail-mysql
+	patch -p0 < ${FILESDIR}/mysql-3.23-nisam.h.diff || die
+	# zap startup script messages
+	patch -p1 < ${FILESDIR}/mysql-3.23.52-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
+	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
+	epatch ${FILESDIR}/mysql-4.0.14-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
+	# same for alpha (see http://www.mysql.com/doc/en/BDB_portability.html)
+	# thanks to peter@icebear.net for noticing this.
+	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"
+	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"
+	use ssl && myconf="${myconf} --with-vio --with-openssl"
+	use ssl || 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"
+	export CXXFLAGS="${CXXFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
+
+	# the compiler flags are as per their "official" spec ;-)
+	einfo "\$myconf is $myconf"
+	CFLAGS="${CFLAGS/-O?/} -O3" \
+	CXXFLAGS="${CXXFLAGS/-O?/} -O3 -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 \
+		${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
+	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/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
+
+	#hmm what about all the very nice benchmark/test scripts
+	#in /usr/share/mysql/sql-bench
+	if ! use perl; then
+		rm -f ${D}/usr/bin/mysql_setpermission
+	fi
+
+	dodoc README COPYING COPYING.LIB MIRRORS \
+		Docs/{manual.ps,manual.txt}
+	dohtml -r Docs/*
+	docinto conf-samples
+	dodoc support-files/my-*.cnf
+
+	insinto /etc/mysql
+	doins ${FILESDIR}/my.cnf scripts/mysqlaccess.conf
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/mysql.init 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_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
+}