Fix bug #79216.

(Portage version: 2.0.51-r14)

16 files changed, 39 insertions, 31 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 3a9adfda7f92..24b691dd1689 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,14 @@
 # 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.169 2005/01/22 02:47:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.170 2005/01/23 23:38:36 robbat2 Exp $
+
+  23 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  mysql-3.23.52-r1.ebuild, mysql-3.23.56.ebuild, mysql-3.23.57-r1.ebuild,
+  mysql-3.23.57.ebuild, mysql-3.23.58-r1.ebuild, mysql-3.23.58.ebuild,
+  mysql-4.0.22-r1.ebuild, mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild,
+  mysql-4.0.23-r1.ebuild, mysql-4.0.23-r2.ebuild, mysql-4.0.23.ebuild,
+  mysql-4.1.7.ebuild, mysql-4.1.8-r1.ebuild, mysql-4.1.8.ebuild:
+  Fix bug #79216.
 
   21 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22-r2.ebuild,
   mysql-4.0.23-r2.ebuild:
diff --git a/dev-db/mysql/mysql-3.23.52-r1.ebuild b/dev-db/mysql/mysql-3.23.52-r1.ebuild
index add7e9cac6f7..67a98e9adb3f 100644
--- a/dev-db/mysql/mysql-3.23.52-r1.ebuild
+++ b/dev-db/mysql/mysql-3.23.52-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-3.23.52-r1.ebuild,v 1.20 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.52-r1.ebuild,v 1.21 2005/01/23 23:38:36 robbat2 Exp $
 
 SVER=${PV%.*}
 #normal releases:
@@ -148,7 +148,7 @@ pkg_preinst() {
 	fi
 
 	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql
 		assert "problem adding user mysql"
 	fi
 }
diff --git a/dev-db/mysql/mysql-3.23.56.ebuild b/dev-db/mysql/mysql-3.23.56.ebuild
index 20c118049379..2360668f820c 100644
--- a/dev-db/mysql/mysql-3.23.56.ebuild
+++ b/dev-db/mysql/mysql-3.23.56.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-3.23.56.ebuild,v 1.10 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.56.ebuild,v 1.11 2005/01/23 23:38:36 robbat2 Exp $
 
 # bug #11681; get b0rked code when using -march=k6 with this package.
 inherit flag-o-matic
@@ -166,7 +166,7 @@ pkg_preinst() {
 	fi
 
 	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql
 		assert "problem adding user mysql"
 	fi
 }
diff --git a/dev-db/mysql/mysql-3.23.57-r1.ebuild b/dev-db/mysql/mysql-3.23.57-r1.ebuild
index 16bc3cc20882..f1ec48bac233 100644
--- a/dev-db/mysql/mysql-3.23.57-r1.ebuild
+++ b/dev-db/mysql/mysql-3.23.57-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-3.23.57-r1.ebuild,v 1.10 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.57-r1.ebuild,v 1.11 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit flag-o-matic eutils
 
@@ -164,7 +164,7 @@ pkg_preinst() {
 	fi
 
 	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql
 		assert "problem adding user mysql"
 	fi
 }
diff --git a/dev-db/mysql/mysql-3.23.57.ebuild b/dev-db/mysql/mysql-3.23.57.ebuild
index db0a410601b6..84425584483e 100644
--- a/dev-db/mysql/mysql-3.23.57.ebuild
+++ b/dev-db/mysql/mysql-3.23.57.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-3.23.57.ebuild,v 1.10 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.57.ebuild,v 1.11 2005/01/23 23:38:36 robbat2 Exp $
 
 # bug #11681; get b0rked code when using -march=k6 with this package.
 inherit flag-o-matic
@@ -166,7 +166,7 @@ pkg_preinst() {
 	fi
 
 	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql
 		assert "problem adding user mysql"
 	fi
 }
diff --git a/dev-db/mysql/mysql-3.23.58-r1.ebuild b/dev-db/mysql/mysql-3.23.58-r1.ebuild
index fd2ca94ebc6c..91d116927541 100644
--- a/dev-db/mysql/mysql-3.23.58-r1.ebuild
+++ b/dev-db/mysql/mysql-3.23.58-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-3.23.58-r1.ebuild,v 1.8 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.9 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit flag-o-matic eutils
 
@@ -169,7 +169,7 @@ pkg_preinst() {
 	fi
 
 	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql
 		assert "problem adding user mysql"
 	fi
 }
diff --git a/dev-db/mysql/mysql-3.23.58.ebuild b/dev-db/mysql/mysql-3.23.58.ebuild
index d39e275b5fdf..dd67da7e3ebd 100644
--- a/dev-db/mysql/mysql-3.23.58.ebuild
+++ b/dev-db/mysql/mysql-3.23.58.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-3.23.58.ebuild,v 1.4 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58.ebuild,v 1.5 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit flag-o-matic eutils
 
@@ -164,7 +164,7 @@ pkg_preinst() {
 	fi
 
 	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql
 		assert "problem adding user mysql"
 	fi
 }
diff --git a/dev-db/mysql/mysql-4.0.22-r1.ebuild b/dev-db/mysql/mysql-4.0.22-r1.ebuild
index 4013d313ba7e..d2d8e9f0cda2 100644
--- a/dev-db/mysql/mysql-4.0.22-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.22-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.0.22-r1.ebuild,v 1.3 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r1.ebuild,v 1.4 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -250,7 +250,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.0.22-r2.ebuild b/dev-db/mysql/mysql-4.0.22-r2.ebuild
index 57f6f3c017ed..2d1a219ed1d7 100644
--- a/dev-db/mysql/mysql-4.0.22-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.22-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.22-r2.ebuild,v 1.8 2005/01/22 02:47:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22-r2.ebuild,v 1.9 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -260,7 +260,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.0.22.ebuild b/dev-db/mysql/mysql-4.0.22.ebuild
index dc2b2d7a2a1f..59d73372a938 100644
--- a/dev-db/mysql/mysql-4.0.22.ebuild
+++ b/dev-db/mysql/mysql-4.0.22.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.22.ebuild,v 1.11 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.22.ebuild,v 1.12 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -234,7 +234,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.0.23-r1.ebuild b/dev-db/mysql/mysql-4.0.23-r1.ebuild
index 03bc1dcdb1af..f0dd268fc80d 100644
--- a/dev-db/mysql/mysql-4.0.23-r1.ebuild
+++ b/dev-db/mysql/mysql-4.0.23-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.0.23-r1.ebuild,v 1.5 2005/01/19 21:13:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r1.ebuild,v 1.6 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -247,7 +247,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.0.23-r2.ebuild b/dev-db/mysql/mysql-4.0.23-r2.ebuild
index acd7aa558f2d..8de676b31fc6 100644
--- a/dev-db/mysql/mysql-4.0.23-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.23-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.23-r2.ebuild,v 1.2 2005/01/22 02:47:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23-r2.ebuild,v 1.3 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -255,7 +255,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.0.23.ebuild b/dev-db/mysql/mysql-4.0.23.ebuild
index 98d7cb0034d7..6d61b62bb87a 100644
--- a/dev-db/mysql/mysql-4.0.23.ebuild
+++ b/dev-db/mysql/mysql-4.0.23.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.23.ebuild,v 1.4 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.23.ebuild,v 1.5 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -244,7 +244,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.1.7.ebuild b/dev-db/mysql/mysql-4.1.7.ebuild
index fb3553266bac..abb852b7cf62 100644
--- a/dev-db/mysql/mysql-4.1.7.ebuild
+++ b/dev-db/mysql/mysql-4.1.7.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.7.ebuild,v 1.4 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.7.ebuild,v 1.5 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -238,7 +238,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.1.8-r1.ebuild b/dev-db/mysql/mysql-4.1.8-r1.ebuild
index edc7ca243bde..036700591355 100644
--- a/dev-db/mysql/mysql-4.1.8-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.8-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.8-r1.ebuild,v 1.2 2005/01/20 22:37:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8-r1.ebuild,v 1.3 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -252,7 +252,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {
diff --git a/dev-db/mysql/mysql-4.1.8.ebuild b/dev-db/mysql/mysql-4.1.8.ebuild
index 91b3964937e7..7a68faa902f3 100644
--- a/dev-db/mysql/mysql-4.1.8.ebuild
+++ b/dev-db/mysql/mysql-4.1.8.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.8.ebuild,v 1.3 2005/01/01 17:37:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.8.ebuild,v 1.4 2005/01/23 23:38:36 robbat2 Exp $
 
 inherit eutils gnuconfig
 #to accomodate -laadeedah releases
@@ -249,7 +249,7 @@ pkg_config() {
 
 pkg_preinst() {
 	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /dev/null /var/lib/mysql mysql || die "problem adding user mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
 }
 
 pkg_postinst() {