Fix permission of $DATADIR (again) bug #95320

Package-Manager: portage-2.0.51.22-r2

6 files changed, 34 insertions, 37 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 17cf2f37c869..c09593842924 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.217 2005/08/17 18:04:12 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.218 2005/08/18 00:47:43 vivo Exp $
+
+  18 Aug 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.1.13-r1.ebuild, mysql-5.0.9_beta-r2.ebuild,
+  mysql-5.0.10_beta.ebuild:
+  Fix permission of $DATADIR (again) bug #95320
 
   17 Aug 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild:
   Stable on x86 and amd64, this fix bug #42968 too
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 28918f6ada08..7b6661edc2d5 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -3,10 +3,10 @@ MD5 e43e3bc71ccf6832470f216636dd156b mysql-4.0.24-r2.ebuild 13747
 MD5 44dc5280381a06b8ce48d2a92d8bc416 mysql-3.23.58.ebuild 6947
 MD5 4934e2f34bd00ba4dd037222836a3697 mysql-4.0.23.ebuild 9059
 MD5 0cfe352d9d7ac0595951401ad80c72eb mysql-4.0.25-r1.ebuild 13809
-MD5 e430eaffa5d4bdd93e99c0e4379ec594 mysql-5.0.9_beta-r2.ebuild 16671
+MD5 55dfc93b08b3ccdc42599173dc7a691f mysql-5.0.9_beta-r2.ebuild 16660
 MD5 d7ff11dcd8af325be5a80286307e5a56 mysql-4.0.23-r2.ebuild 9427
-MD5 37e6225722bee3143be5102fd0615b79 mysql-4.1.13-r1.ebuild 16296
-MD5 768db2f57552ab30e9914b714fd8b9fa mysql-5.0.10_beta.ebuild 16669
+MD5 8268c892b7722d5bb7549a8198e8bb23 mysql-4.1.13-r1.ebuild 16285
+MD5 18a1e97d010b0613e9e77fc4500b7011 mysql-5.0.10_beta.ebuild 16658
 MD5 1b9b5ba4d58d54c962b3592dd26900e8 mysql-4.1.8-r1.ebuild 9243
 MD5 a9cebc508de69f6c21bad7776432d9f8 mysql-4.0.24-r1.ebuild 11918
 MD5 72f1eb68e70c1bccc2d4972a7e155412 mysql-4.0.22.ebuild 8776
@@ -15,9 +15,9 @@ MD5 82eebc79341497bc468d529ecac22ab1 mysql-3.23.58-r1.ebuild 7064
 MD5 1f8d9a7c214e1f7ce3227fc915a44d8c mysql-4.1.8.ebuild 9105
 MD5 344659e307cb1ee515bc0cabc4ac9015 mysql-4.0.23-r1.ebuild 9179
 MD5 7a2300e4b7c4f1c68d680ea6fa75aab1 mysql-4.0.24.ebuild 9835
-MD5 f788f3e93381e488a39b88cad7b06e4c ChangeLog 37521
+MD5 cbca1d5fe0983d00b59df01beda3135f ChangeLog 37725
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-MD5 d03cc25e81a1d8db5e83de7b9280244d mysql-4.0.25-r2.ebuild 13804
+MD5 5df66e82623ad0af7eea7c86c1497ff8 mysql-4.0.25-r2.ebuild 13781
 MD5 93827506c0de13cf7b5023847a4afd95 files/digest-mysql-5.0.9_beta-r2 70
 MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
 MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index 01c459ab96b4..f329b24237ae 100644
--- a/dev-db/mysql/mysql-4.0.25-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.25-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.6 2005/08/17 18:04:12 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.7 2005/08/18 00:47:43 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -238,6 +238,10 @@ src_compile() {
 src_install() {
 	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /dev/null mysql \
+	|| die "problem adding user mysql"
+
 	diropts "-m0750"
 	dodir "${DATADIR}" /var/log/mysql
 
@@ -415,12 +419,6 @@ pkg_config() {
 	einfo "done"
 }
 
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
-	|| die "problem adding user mysql"
-}
-
 pkg_postinst() {
 	mysql_get_datadir
 
diff --git a/dev-db/mysql/mysql-4.1.13-r1.ebuild b/dev-db/mysql/mysql-4.1.13-r1.ebuild
index b8f070c9c2a2..482ac4c27dab 100644
--- a/dev-db/mysql/mysql-4.1.13-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.3 2005/07/29 11:39:14 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.4 2005/08/18 00:47:43 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -280,11 +280,15 @@ src_compile() {
 src_install() {
 	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /dev/null mysql \
+	|| die "problem adding user mysql"
+
 	diropts "-m0750"
 	if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
 		dodir "${DATADIR}"
 		keepdir "${DATADIR}"
-		chown -R "${D}/${DATADIR}"
+		chown -R mysql:mysql "${D}/${DATADIR}"
 	fi
 
 	dodir /var/log/mysql
@@ -481,12 +485,6 @@ pkg_config() {
 	einfo "done"
 }
 
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
-	|| die "problem adding user mysql"
-}
-
 pkg_postinst() {
 	mysql_get_datadir
 
diff --git a/dev-db/mysql/mysql-5.0.10_beta.ebuild b/dev-db/mysql/mysql-5.0.10_beta.ebuild
index 37349b9ddede..8cfa58a28758 100644
--- a/dev-db/mysql/mysql-5.0.10_beta.ebuild
+++ b/dev-db/mysql/mysql-5.0.10_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.10_beta.ebuild,v 1.1 2005/07/29 11:39:14 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.10_beta.ebuild,v 1.2 2005/08/18 00:47:43 vivo Exp $
 
 inherit flag-o-matic versionator
 
@@ -294,11 +294,15 @@ src_install() {
 
 	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /dev/null mysql \
+	|| die "problem adding user mysql"
+
 	diropts "-m0750"
 	if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
 		dodir "${DATADIR}"
 		keepdir "${DATADIR}"
-		chown -R "${D}/${DATADIR}"
+		chown -R mysql:mysql "${D}/${DATADIR}"
 	fi
 
 	dodir /var/log/mysql
@@ -504,12 +508,6 @@ pkg_config() {
 	einfo "done"
 }
 
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
-	|| die "problem adding user mysql"
-}
-
 pkg_postinst() {
 	mysql_get_datadir
 
diff --git a/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild b/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild
index 028b99a611d2..a27df00d18d2 100644
--- a/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild
+++ b/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild,v 1.3 2005/07/29 11:39:14 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.9_beta-r2.ebuild,v 1.4 2005/08/18 00:47:43 vivo Exp $
 
 inherit flag-o-matic versionator
 
@@ -294,11 +294,15 @@ src_install() {
 
 	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /dev/null mysql \
+	|| die "problem adding user mysql"
+
 	diropts "-m0750"
 	if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
 		dodir "${DATADIR}"
 		keepdir "${DATADIR}"
-		chown -R "${D}/${DATADIR}"
+		chown -R mysql:mysql "${D}/${DATADIR}"
 	fi
 
 	dodir /var/log/mysql
@@ -504,12 +508,6 @@ pkg_config() {
 	einfo "done"
 }
 
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
-	|| die "problem adding user mysql"
-}
-
 pkg_postinst() {
 	mysql_get_datadir