From c33ae8e2ff34f7209f6a2060042e050e771cc723 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto" Date: Fri, 6 Jan 2012 19:27:22 +0000 Subject: [dev-db/mysql-3.23.58-r1] Don't call groupadd/useradd directly but use enew* calls instead - fixes bug 389381. (Portage version: 2.2.0_alpha83/cvs/Linux x86_64) --- dev-db/mysql/ChangeLog | 7 ++++++- dev-db/mysql/mysql-3.23.58-r1.ebuild | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'dev-db/mysql') diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index 1f63eebc4bf9..f617a9b448c4 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/mysql # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.590 2012/01/01 20:44:08 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.591 2012/01/06 19:27:22 jmbsvicetto Exp $ + + 06 Jan 2012; Jorge Manuel B. S. Vicetto + mysql-3.23.58-r1.ebuild: + [dev-db/mysql-3.23.58-r1] Don't call groupadd/useradd directly but use enew* + calls instead - fixes bug 389381. 01 Jan 2012; Andreas K. Huettel +ChangeLog-2010: Split ChangeLog. diff --git a/dev-db/mysql/mysql-3.23.58-r1.ebuild b/dev-db/mysql/mysql-3.23.58-r1.ebuild index d4e099cb17da..9e387bd83e16 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-2008 Gentoo Foundation +# Copyright 1999-2012 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.27 2008/01/25 23:23:49 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.28 2012/01/06 19:27:22 jmbsvicetto Exp $ inherit flag-o-matic eutils @@ -30,6 +30,12 @@ DEPEND="readline? ( >=sys-libs/readline-4.1 ) sys-process/procps" PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )" +pkg_setup() { + + enewgroup mysql 60 || die "problem adding 'mysql' group" + enewuser mysql 60 -1 /var/lib/mysql mysql || die "problem adding 'mysql' user" +} + src_unpack() { use innodb || ewarn "InnoDB support is not selected to be compiled in." unpack ${A} || die @@ -181,14 +187,9 @@ pkg_config() { } pkg_preinst() { - if ! groupmod mysql; then - groupadd -g 60 mysql || die "problem adding group mysql" - fi - if ! id mysql; then - useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql - assert "problem adding user mysql" - fi + enewgroup mysql 60 || die "problem adding 'mysql' group" + enewuser mysql 60 -1 /var/lib/mysql mysql || die "problem adding 'mysql' user" } pkg_postinst() { -- cgit v1.2.3-65-gdbad