[dev-db/mysql-3.23.58-r1] Don't call groupadd/useradd directly but use enew* calls instead - fixes bug 389381.

Package-Manager: portage-2.2.0_alpha83/cvs/Linux x86_64

3 files changed, 33 insertions, 27 deletions

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 <jmbsvicetto@gentoo.org>
+  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 <dilfridge@gentoo.org> +ChangeLog-2010:
   Split ChangeLog.
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 9ea5c1d47042..2531328d4d8d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX my.cnf 1249 RMD160 680752c5c5f1e18e02f5c3286aaade406f271b95 SHA1 f5592c43e52d23902a23d4f824d4dddccd7cdd0c SHA256 29c07ce113496ec62bf9427609f2291861e3e165200d6e98a69bd312c6c101ec
 AUX my.cnf-4.0 4316 RMD160 e2a9f3f1a13b1aa13151dc5dbeba1dad888337e3 SHA1 40d6f252fd103548bc422e86659ef644fbce1ac6 SHA256 f4616a38d7c1b5cc2bf6b4e5b175ffcc12a52e38772dd86274a8991ef50015af
@@ -35,7 +35,7 @@ DIST mysql-extras-20110713-0702Z.tar.bz2 1723462 RMD160 24127c9d9bd053259fb1d979
 DIST mysql-extras-20110721-0450Z.tar.bz2 1734716 RMD160 346bdcd46c5b3ec8f839274c078fd6625f981de0 SHA1 d98382e15808b9c54a8d6563483a8ab3de59aa55 SHA256 354c270c777b4c9b5afad1f5dcdcf400989273779fafa726c70d05277bb74a37
 DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 RMD160 835c401b8503f1c1bef4b50f7a7815493f95acc1 SHA1 22eeffe0e38e0a0c2731a2c97fe00ce7d1ab2dfc SHA256 71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12
 DIST percona-xtradb-1.0.6-10.tar.gz 1676716 RMD160 772947fe67725c55751f3ec349711c05ba23c39b SHA1 07de0fd126e684aa045a8b941002f7634cd9a604 SHA256 e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c
-EBUILD mysql-3.23.58-r1.ebuild 7397 RMD160 85c2f6ae75b4d4dc6bb4c3228e4e800a9b20bbdd SHA1 b532250266fb20af81b4b6b9b56d47de048789ce SHA256 9250045fb9af28896c2f266c8c9b33409b525f1481b2ba70d104ec9ba5b4a6d8
+EBUILD mysql-3.23.58-r1.ebuild 7477 RMD160 7a869c479e27c2cd2c32c83aeeb7147f40dc4e71 SHA1 12f75a6722eb4499674499526466e9d0cc3e07ce SHA256 752feee693c9b398c82ab8d0a62a840cdd10aafe469c8648e53b772d725945b9
 EBUILD mysql-4.0.27-r1.ebuild 1105 RMD160 55f3ea683ea8c57bc2197a64b81b50a0933a57b2 SHA1 0adb182c9cb4640e6f3a1e6b6f501190a3c46067 SHA256 eed1ba3bb284d74483c521b410cb2f165db846eb6f6f0f7bb5218dd8e7cad2ce
 EBUILD mysql-4.1.22-r1.ebuild 1343 RMD160 db6bd89ee2c7baeaac1e41b2f05f592b626c373c SHA1 49bd4a7125578b9fefa9c5cb1a88b6e4df6b99a5 SHA256 237e821bc7b47d259635f42255e80bc1e6f411341ada6b9014b6443d8ef52f08
 EBUILD mysql-5.0.54.ebuild 3264 RMD160 c028a3ed0d6e9c2c282e25b7045e7dd5cd3492a1 SHA1 ff54ac6a367b6481c2aaeff81f26d107edc457fa SHA256 d491a85c5d57fc57f3601be8ce4f268dfd19098ff208d2db03acc436d18a04a0
@@ -53,23 +53,23 @@ EBUILD mysql-5.1.59.ebuild 8731 RMD160 eb3a43286f073f80bb9a1db63baaf6a2a349e0a9
 EBUILD mysql-5.5.14.ebuild 3916 RMD160 c477eb7200fa7444aaaaa48699477a858d3de95f SHA1 32aeee60204ab8ed9b436144d88fc5f4da847ea2 SHA256 5382baf2d872a1251cf052744c473708026145ea43c4e5f5de8273cb726ae491
 EBUILD mysql-5.5.16.ebuild 3916 RMD160 4f83222913fc36d043e83dc757021efff23c54f8 SHA1 1eb821a41f4ba72d4ecdb79faae61a67462a8218 SHA256 cf7560b2ac3fbb2e59a581b01bd222931c0884774538ac1b092c56306d3bb313
 EBUILD mysql-5.5.19.ebuild 4230 RMD160 2e4c2f9fa9a05e9f324c3f75a6af1a89baf55a22 SHA1 32ce85bffa82518031631b3b38f8963a1589319a SHA256 6232bf4af334e19abf1e404f3c9b7dee815d0fe32efbdab12717af47e9ea834d
-MISC ChangeLog 4972 RMD160 a9d111eae326f9257ebbb6575159acfbdc6c12ab SHA1 1c1b81da79e0107ac1758bc1693481b87abe45bc SHA256 6de3a90bfcdbd22385cc8abd885887c7eea6cb6d20944963b683adfa04575469
+MISC ChangeLog 5184 RMD160 8ee464d86fed73342cae12186dcc2cd3d259e3c6 SHA1 d4019403733e4489ab30b8ba759cd7dd3a4f7ad2 SHA256 d415e5a079695ce02ad028d9b260b47f41d858a96bafd1d95cdf79b7aee72ef5
 MISC ChangeLog-2010 108404 RMD160 11fd27413d19e453f2cfe1877c93f53d06c81f82 SHA1 4722e0f32417772921ab328942a7dcbd743b3c56 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd
 MISC metadata.xml 1497 RMD160 82a73ef66a72224add24244ddf39df290a1f67dc SHA1 3a1fd203707ee79ea61202e559b8e912653ffbff SHA256 dde83b854d83894cffd06d26a28ed66e7a0788ba70a745ece4ff719445cc9bf1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPAMYTAAoJEEb+UGWnxTyHwokP/06UQ00zLjyFIxjf29o/8a8Z
-pKUsI9TMKcX5q1+dDtW0I/AkpZAZt3Nwiu6BattdR2KL2RHlJDub9VplWEVdlnks
-UqxSniviV682MoyduxiPYvQeqg/A/tQzi6WK+CxWe5wTRc3D7j5GVMzcOcOoK05t
-gi5T2iqBvoLlfkbiVEd2HXjKrYwiWFo+9mIo1VU8y4VAK+m6Uir9kbajze6FMqD4
-MUU8wxdU+QHuIb6/7xeHsXxbgV2kW2Ues3NYW5LF5CIKYq1u27hvDOh7a7St+dhA
-5Sn5UrLWICCzxPRSCFjRJdu/bLsnfMqCRTw6q1DYKYQ0O4MFlVHk/AXdml2N+/WI
-NYH3jiW7KhvgHl8+xp2G7TM+ZuEeLm3sdsNfmN4r6CuWn4Yz2Pma/wm/jTilYd3y
-P+L7fmjjXrTFWjqahmZxOvlfxrCH3BQXVLlWPb2nJTttW1qlvMH+1NPR7nMSLUQB
-szldgkaq3LXhmPNV1ahU5tdx3PgwHz43P7r4vMiCcSNlgHNi6JxvsefszAT8LAl6
-raJMzP/HOYlzPGwKE5F3Zw7CaPEoNSEiUUDKmMlMCswCZWQZrwlH3oKvYMrvOx38
-TwLbFVynmv62JEjm+SQQn0aaJhndDxiaJj3O3LkEs6Rijnsm8oEjaZ8jH3cI0gzm
-tRr1wfdviLVIJ0aGoYoX
-=jWuc
+iQIcBAEBAgAGBQJPB0qvAAoJEC8ZTXQF1qEPv0wQALmcAGiJa+9UIqd9Lx5o+tJf
+um+i4ihKqANzdWYOiOtRWdAbSH/2OgWvUorH76CvgLrEPT3JYZ8mYZrjQZWSoe3e
+0TE8dCOvQwZTlUrdf0u8BYQWOWofhxbrHEJZkzER0R8KqVHuFq1Ht0ViEYMlGakS
+Ds9IenxG8z1AqFX3KmQecs52wivXfo2HTfjMIOtqTP/8eYVd8ltbrMiNm9bpO7qK
+RbCdrwXfCLMUUIEnmn4+B5MfAYoC/BjwAXv2UsFAIefgso8qdjKT8EyYhRQ+4PEY
+KYzO91HYCzdP2agbx1P491RoJtQWhIp3CqSQrLCSiTbO+zcSyqbKTzvpZUPu1wOQ
+9Auomvl/srCVr/3XMyQEBqUNozwqHKBil1f8dqWf73GGv+J6Cul7qGmTh2vB1/MJ
+r1R8bO1wa+Mp+UpNosiLpSFIGxOWlsMEAdlfT+0v4ydLaVartTs81OycZxneYorN
+eJyWiLj+Nd64EzgErU1yHc1lpj8zMviDl30lW2GqWppC2LmC/zdAAAn1ZqI1xVUj
+RoK4QVCAmLuwB4xJjml0bp1Td2SOBX7sUyQGrpi1uAwCpJJYY2DSxej5QBmCY0lu
+wA9MmpOchELENfJN5jS6RoItCtTn+60npZTsZk4+kjV7FZPfCHemb4hhNJkSBtWV
+gqH+MWO15BGe+DWGUy6A
+=9uuW
 -----END PGP SIGNATURE-----
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() {