Fix #62603, #62903.

4 files changed, 93 insertions, 86 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 8f86e9a04997..718c3e3afe77 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # 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.125 2004/09/06 18:07:12 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.126 2004/09/07 02:00:44 robbat2 Exp $
+
+  06 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> files/mysql-4.0.15.rc6:
+  Fix #62603, #62903.
 
   06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> mysql-4.0.12.ebuild,
   mysql-4.0.13-r4.ebuild, mysql-4.0.14-r1.ebuild, mysql-4.0.14-r2.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 5e9a02616bb7..4929a9e927ba 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,88 +1,78 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f57faf79f4ad744991e5d6e76ca45edc mysql-3.23.52-r1.ebuild 5851
-MD5 c62be75421fc4af81b3313a638b34d1c mysql-4.0.18.ebuild 7652
+MD5 2193bc621b968832d3ae0c9766ca69e0 mysql-3.23.57-r1.ebuild 6492
+MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535
 MD5 a1556aed69d52ec722f4c5a31bb726c1 mysql-4.0.18-r2.ebuild 7830
+MD5 9af0592ebadb6e826c826ecafbfa24ad mysql-4.0.14-r2.ebuild 7555
 MD5 b1a85366387a7e6c806934a5a3802c75 mysql-4.0.17.ebuild 7939
+MD5 1128a9b91141872457c1c58ffd3f84e8 mysql-4.0.12.ebuild 6767
+MD5 ad99e9c61bbea0a45573315cd1db9b2d mysql-4.0.15-r1.ebuild 7678
+MD5 5d76052afa5e2d3e5572f34a5da7c34b mysql-3.23.58.ebuild 6491
+MD5 d8eedb1c922e126b97d1bf281d8cc20e mysql-4.0.19.ebuild 7917
+MD5 27cdeefd2f6da319d4bcfb3e6b5282cf mysql-4.0.14.ebuild 6919
+MD5 f57faf79f4ad744991e5d6e76ca45edc mysql-3.23.52-r1.ebuild 5851
 MD5 3efb527ae682b4a02a4ffcdd45c65e7a mysql-4.0.18-r1.ebuild 7823
 MD5 eaf1eab1310e84ca04f0c096f2a3fd88 mysql-4.0.14-r1.ebuild 7417
-MD5 d8eedb1c922e126b97d1bf281d8cc20e mysql-4.0.19.ebuild 7917
-MD5 0889b11c852ddb62183acea2c0a059bb ChangeLog 19503
+MD5 cbf07632cb329c68fc0464c1b8e38fee mysql-4.0.20.ebuild 7872
 MD5 04d40b0f70053e44662143dd7d434297 mysql-4.0.16.ebuild 7503
-MD5 9af0592ebadb6e826c826ecafbfa24ad mysql-4.0.14-r2.ebuild 7555
 MD5 7608932f4067e134cebf1a6edc446d3c mysql-4.0.13-r4.ebuild 7278
-MD5 5d76052afa5e2d3e5572f34a5da7c34b mysql-3.23.58.ebuild 6491
-MD5 de397ab5d8aaee11e62530b9ac16780a mysql-4.0.20-r1.ebuild 8079
-MD5 1128a9b91141872457c1c58ffd3f84e8 mysql-4.0.12.ebuild 6767
-MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
-MD5 27cdeefd2f6da319d4bcfb3e6b5282cf mysql-4.0.14.ebuild 6919
-MD5 08977a0b9448cd08009b1158e512f5ac mysql-3.23.56.ebuild 6535
+MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538
+MD5 65d7e767d4039abc2463e54ba8e62d7a mysql-4.0.20-r1.ebuild 8458
+MD5 c62be75421fc4af81b3313a638b34d1c mysql-4.0.18.ebuild 7652
 MD5 2ee117063d336db3665f1b82d8d3b4f2 mysql-3.23.58-r1.ebuild 6608
+MD5 4074919aac2ea32a1c92df2bc667e562 ChangeLog 19603
 MD5 8aa1d4333221eae80f21a743f6c664da mysql-4.0.15.ebuild 7561
-MD5 ad99e9c61bbea0a45573315cd1db9b2d mysql-4.0.15-r1.ebuild 7678
-MD5 2193bc621b968832d3ae0c9766ca69e0 mysql-3.23.57-r1.ebuild 6492
-MD5 cbf07632cb329c68fc0464c1b8e38fee mysql-4.0.20.ebuild 7872
-MD5 2a761cb155aff6fd0ad3dafdc9bb5fcb mysql-3.23.57.ebuild 6538
-MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r4 66
-MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15 66
-MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
+MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
+MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
+MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
+MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
+MD5 8dccc63cf115add3969acb39f2c48fd9 files/mysql-4.0.15.rc6 1193
+MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
 MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57-r1 67
-MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18 66
+MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
+MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
+MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
+MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
 MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557
-MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r1 66
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
-MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r2 66
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
 MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
-MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933
-MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
-MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
+MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14 66
+MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15 66
+MD5 b3d105fcbd2750964387bfcc010c145e files/digest-mysql-4.0.16 66
 MD5 02c1c39a55937905f61ff17dcdb2ec0a files/digest-mysql-4.0.17 66
-MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 a0c6a17e87c4bd9353f68851ec473ed9 files/mysql-4.0.15.rc6 946
-MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
-MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
+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 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
 MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429
-MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
+MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
+MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
+MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
+MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562
+MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
+MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654
+MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
+MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
+MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473
+MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
+MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
 MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 577f09c36de46438158d16c2c855ec13 files/digest-mysql-4.0.20-r1 66
+MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
+MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
+MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
 MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
+MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
+MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
+MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
+MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
+MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
+MD5 0d15b78f60dc9d26e02923e591d39ea7 files/digest-mysql-4.0.13-r4 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r1 66
+MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r2 66
 MD5 68e456716a2026e49c85766696180bfc files/digest-mysql-4.0.15-r1 66
-MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
-MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14 66
-MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503
-MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723
+MD5 748cfc1902ce23fac508e803ed6907ee files/digest-mysql-4.0.18-r1 66
+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
-MD5 33666c6c9542fe3ef02379877f0c6bac files/digest-mysql-4.0.14-r2 66
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 b3d105fcbd2750964387bfcc010c145e files/digest-mysql-4.0.16 66
-MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
-MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
-MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
-MD5 b776101113ddfd5cda3cdc0ccf2f08c1 files/digest-mysql-4.0.19 66
-MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
-MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654
-MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBPKaoLLFUmVNQ7rkRAiL9AKDRJ4yCbuLBz4NVDi0o0Rzfcn+XgQCfaace
-1HBBZ8gQOjPdaXRnUR9q+AE=
-=Jzi6
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/mysql-4.0.15.rc6 b/dev-db/mysql/files/mysql-4.0.15.rc6
index 62ed0bb45c66..35ea07645523 100644
--- a/dev-db/mysql/files/mysql-4.0.15.rc6
+++ b/dev-db/mysql/files/mysql-4.0.15.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.15.rc6,v 1.3 2004/07/14 21:41:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.15.rc6,v 1.4 2004/09/07 02:00:44 robbat2 Exp $
 
 depend() {
 	need net
@@ -9,14 +9,21 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -f /etc/mysql/my.cnf ] ; then
+	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|"`
+    #dir=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
+	dir=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
 
-	if [ ! -d $dir/mysql ] ; then
-		eerror "You dont appear to have the mysql database installed yet."
+	if [ -z "$dir" ]; then
+		eerror "Your mysql doesn't have any datadir setting, default or specific"
+		eerror "Please check your my.cnf"
+		return 1
+	fi
+
+	if [ ! -d "$dir/mysql" ]; then
+		eerror "You don't appear to have the mysql database installed yet."
 		eerror "Please run /usr/bin/mysql_install_db to have this done..."
 		return 1
 	fi
diff --git a/dev-db/mysql/mysql-4.0.20-r1.ebuild b/dev-db/mysql/mysql-4.0.20-r1.ebuild
index 704cd5cce120..bf977518a27d 100644
--- a/dev-db/mysql/mysql-4.0.20-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.20-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.20-r1.ebuild,v 1.9 2004/09/06 18:05:24 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.20-r1.ebuild,v 1.10 2004/09/07 02:00:44 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -21,7 +21,7 @@ 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"
+IUSE="static readline innodb berkdb tcpd ssl perl debug selinux"
 RESTRICT="nomirror"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
@@ -32,13 +32,15 @@ DEPEND="readline? ( >=sys-libs/readline-4.1 )
 	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, 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 "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
 }
@@ -215,12 +217,15 @@ pkg_config() {
 		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=`/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"
@@ -237,14 +242,16 @@ pkg_preinst() {
 
 pkg_postinst() {
 	#empty dirs...
-	install -d -m0755 -o mysql -g mysql ${ROOT}/var/lib/mysql
+	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.{log,err}
-	chmod 0660 ${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