Hidding passwords when requested in pkg_config().

Package-Manager: portage-2.0.52-r1

7 files changed, 73 insertions, 68 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 269601c34a85..957b2ed66573 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.230 2005/09/10 08:52:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.231 2005/09/11 16:30:54 vivo Exp $
+
+  11 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.0.26.ebuild, mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild,
+  mysql-5.0.12_beta.ebuild:
+  Hidding passwords when requested in pkg_config().
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org> mysql-4.0.25-r2.ebuild:
   Mark 4.0.25-r2 stable on alpha
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index c8b25030f4cb..3c7c5bc75074 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,52 +1,52 @@
+MD5 4ede44755e223d1a7b927f5772aa7f97 mysql-5.0.12_beta.ebuild 16816
+MD5 5eae89d810d67eec1d676a5121a9f433 mysql-4.1.14.ebuild 16681
+MD5 0b8b79e3e70645f5f419044470312afa mysql-4.0.26.ebuild 13310
+MD5 fd9b66e2ee927df1ee9ed642ecda1fa6 mysql-4.1.13-r1.ebuild 16273
+MD5 d168c71df57729ea0eeadab3c6a59f43 mysql-4.0.22.ebuild 8768
 MD5 c28056421db550a09a548ad1dff517f5 mysql-4.0.22-r2.ebuild 9613
+MD5 0cfd7831f2d57b93e252c0f3d9c25276 mysql-3.23.58-r1.ebuild 7063
 MD5 240fc6da2d2c2d7dd224b147db251f80 mysql-4.0.24.ebuild 9827
-MD5 5081ce980106093aedfa8ce23e46fe9e mysql-4.0.25-r2.ebuild 13770
+MD5 38f0b0890c77e07ca253139505b2fef4 ChangeLog 40608
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-MD5 9289f218396ada96230fa64f5c7216c1 mysql-5.0.12_beta.ebuild 16820
-MD5 8f731aa137c2c6356ffbc514e71ba305 mysql-4.0.26.ebuild 13310
-MD5 95c7d3a502cdeb09edf945b85fd87b4b ChangeLog 40390
-MD5 d168c71df57729ea0eeadab3c6a59f43 mysql-4.0.22.ebuild 8768
-MD5 9e54c538f394f29c6e94f4a24b43adde mysql-4.1.14.ebuild 16685
-MD5 0dfa3f1c8accfc384b42caf169f8948c mysql-4.1.13-r1.ebuild 16277
-MD5 0cfd7831f2d57b93e252c0f3d9c25276 mysql-3.23.58-r1.ebuild 7063
-MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905
-MD5 c46a8d39ac5d7568ff42b7c3ccce5e1d files/701_all_test-myisam-geometry.patch 1259
-MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r2 66
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
-MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
-MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603
-MD5 9209843349ac5e9560f9ad7450c49769 files/703_all_test-rpl_rotate_logs.patch 802
-MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24 66
-MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
-MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
-MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
+MD5 5ab197f8ea8f7de43f00dbc8891ee4c2 mysql-4.0.25-r2.ebuild 13766
+MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
+MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295
+MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
+MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13-r1 66
+MD5 237315cdafd5415390df78dec50669e9 files/035_x86_asm-pic-fixes-r2.patch 8201
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
-MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
-MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
-MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393
+MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
+MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
+MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
 MD5 228ba118e90b78411917acdd15ebee66 files/digest-mysql-5.0.12_beta 144
+MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66
-MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
-MD5 ad883e978e48b2040477a12951c01806 files/digest-mysql-4.1.13-r1 66
-MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
-MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67
-MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318
-MD5 76446c512e91b2f8e9e69a0379178e5c files/mysql-4.0.25-r2-asm-pic-fixes.patch 7295
-MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
+MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24 66
 MD5 afbd9a0788032f51caf036064836992f files/digest-mysql-4.0.26 139
-MD5 237315cdafd5415390df78dec50669e9 files/035_x86_asm-pic-fixes-r2.patch 8201
-MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585
-MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
+MD5 726c2db19d163113d218d25d8a55e00a files/digest-mysql-4.1.14 139
 MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217
+MD5 9209843349ac5e9560f9ad7450c49769 files/703_all_test-rpl_rotate_logs.patch 802
+MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055
-MD5 726c2db19d163113d218d25d8a55e00a files/digest-mysql-4.1.14 139
-MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587
+MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307
+MD5 d3f7b593978d1620e8070552ab4f86bb files/010_all_my-print-defaults-r2.patch 908
+MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
+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 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393
+MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318
 MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
-MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394
 MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
+MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
+MD5 c46a8d39ac5d7568ff42b7c3ccce5e1d files/701_all_test-myisam-geometry.patch 1259
+MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905
+MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
+MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
+MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
+MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603
+MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
+MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
+MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66
+MD5 06a7c1ead0dfe570f7c67d525c45f7c3 files/digest-mysql-4.0.25-r2 66
 MD5 a868ff3e6a328acbed6842fdd17c8cdf files/035_x86_asm-pic-fixes-r1.patch 4102
-MD5 d3f7b593978d1620e8070552ab4f86bb files/010_all_my-print-defaults-r2.patch 908
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index feefabe20b92..d012b94bebac 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.14 2005/09/10 08:52:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.15 2005/09/11 16:30:54 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -366,13 +366,13 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "bug: avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
-	einfo "Repeat the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd1 ; echo
+	einfo "Check the password"
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  "x$pwd1" != "x$pwd2" )) ; then
+	if [[  "x$pwd1" != "x$pwd2" ]] ; then
 		die "Passwords are not the same"
 	fi
 
diff --git a/dev-db/mysql/mysql-4.0.26.ebuild b/dev-db/mysql/mysql-4.0.26.ebuild
index f598040e7950..82780d267a2e 100644
--- a/dev-db/mysql/mysql-4.0.26.ebuild
+++ b/dev-db/mysql/mysql-4.0.26.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.26.ebuild,v 1.2 2005/09/09 11:42:28 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.3 2005/09/11 16:30:54 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -386,13 +386,13 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "bug: avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
-	einfo "Repeat the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd1 ; echo
+	einfo "Check the password"
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  "x$pwd1" != "x$pwd2" )) ; then
+	if [[  "x$pwd1" != "x$pwd2" ]] ; then
 		die "Passwords are not the same"
 	fi
 
diff --git a/dev-db/mysql/mysql-4.1.13-r1.ebuild b/dev-db/mysql/mysql-4.1.13-r1.ebuild
index 5c3901324fd6..57044130a384 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.5 2005/08/29 12:55:19 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.13-r1.ebuild,v 1.6 2005/09/11 16:30:54 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -417,13 +417,13 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "Avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
+	read -rsp "    >" pwd1 ; echo
 	einfo "Check the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  pwd1 != pwd2 )) ; then
+	if [[  pwd1 != pwd2 ]] ; then
 		die "Passwords are not the same"
 	fi
 
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index b558d0d0185d..bcd6c6b4ee23 100644
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.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.14.ebuild,v 1.2 2005/09/09 11:42:28 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.3 2005/09/11 16:30:54 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -473,13 +473,13 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "Avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
+	read -rsp "    >" pwd1 ; echo
 	einfo "Check the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  pwd1 != pwd2 )) ; then
+	if [[  pwd1 != pwd2 ]] ; then
 		die "Passwords are not the same"
 	fi
 
diff --git a/dev-db/mysql/mysql-5.0.12_beta.ebuild b/dev-db/mysql/mysql-5.0.12_beta.ebuild
index a44ad7477c16..1eac5a0d2a0a 100644
--- a/dev-db/mysql/mysql-5.0.12_beta.ebuild
+++ b/dev-db/mysql/mysql-5.0.12_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.12_beta.ebuild,v 1.3 2005/09/09 11:42:28 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.4 2005/09/11 16:30:54 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -480,13 +480,13 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "Avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
+	read -rsp "    >" pwd1 ; echo
 	einfo "Check the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  pwd1 != pwd2 )) ; then
+	if [[  pwd1 != pwd2 ]] ; then
 		die "Passwords are not the same"
 	fi