From: Julian Ospald <hasufell@gentoo.org>
Date: Mon, 26 Oct 2015 20:17:23 +0000 (+0100)
Subject: www-servers/tomcat: generate a more secure password
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=17b9a8844e59ffee9a7a21da49c77f8bd846ddb1;p=gentoo.git

www-servers/tomcat: generate a more secure password
---

diff --git a/www-servers/tomcat/tomcat-8.0.28-r1.ebuild b/www-servers/tomcat/tomcat-8.0.28-r1.ebuild
index a06fb32f8105..0d40f89e880f 100644
--- a/www-servers/tomcat/tomcat-8.0.28-r1.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.28-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="${COMMON_DEP}
 	!<dev-java/tomcat-native-1.1.24
 	>=virtual/jre-1.7"
 DEPEND="${COMMON_DEP}
+	app-admin/pwgen
 	>=virtual/jdk-1.7
 	test? (
 		>=dev-java/ant-junit-1.9:0
@@ -110,7 +111,7 @@ src_install() {
 	fperms 0750 "${dest}"/logs
 
 	# replace the default pw with a random one, see #92281
-	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	local randpw="$(pwgen -s -B 15 1)"
 	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
 
 	# prepend gentoo.classpath to common.loader, see #453212