Feed dodir and fperms functions with the ${dest} variable. This variable is

already formatted with the $CATALINA_BASE full path. Fix security bug 458890.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

5 files changed, 26 insertions, 21 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index f95b1f7de138..a414203d8e85 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.361 2015/07/21 15:33:26 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.362 2015/07/22 12:21:07 monsieurp Exp $
+
+  22 Jul 2015; Patrice Clement <monsieurp@gentoo.org> tomcat-6.0.44-r0.ebuild,
+  tomcat-7.0.59-r2.ebuild, tomcat-8.0.23-r2.ebuild:
+  Feed dodir and fperms functions with the ${dest} variable. This variable is
+  already formatted with the $CATALINA_BASE full path. Fix security bug 458890.
 
 *tomcat-6.0.44-r0 (21 Jul 2015)
 *tomcat-7.0.59-r2 (21 Jul 2015)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 403c4fb31627..b5d1f437d4fa 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -12,24 +12,24 @@ AUX tomcat.init 2989 SHA256 bae9e2663e5fda9c665fc97e916074cca46468560af17e3bbad0
 DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
 DIST apache-tomcat-8.0.23-src.tar.gz 4868650 SHA256 6293713e78da9bb803060c8ddff982f8f7aef5a2e4b325340088493ce9957ba4 SHA512 cc83194b2847fc2db5448d548c7e65a1198cda02726b070f913a762d324152315886fba09532b879e26d15ec57e04057cc30b3a686b2a2307d6447d17f84e16c WHIRLPOOL b0559a4ef1b4c1f0683e4cce976d31db175d3c4f4d2b809b127e1074d49a6bf764366cc3e91f9a0818afd6de35e662a7aab89866dfd2e61673327c50535bff88
-EBUILD tomcat-6.0.44-r0.ebuild 4169 SHA256 e194e8cdd26bb3a32be116d49cdb7814b7c8bd45e2369069890bc8f05185ec04 SHA512 f2d9c1964be0a68ef223250e119391646aa2bfe02086535b1b7563f07a78947b4dc8c9e3213cda5c6194462ebaa7a3d6946b585d7244bb9f3d8cfd86bac30f69 WHIRLPOOL 06e54b82e6499055743fe475933b0beb8d6d9c21483365dac38e7714b38b5ec6dbc1f37fe4f05fd833669da7b564dfc1afeaedf8aebc78dc262b328fac741e32
+EBUILD tomcat-6.0.44-r0.ebuild 4137 SHA256 c55f429410203107fd1b85fdfa2d72517c5b23b233dc032df7d13368a98d57c3 SHA512 653d3a0ecf574fd653c92cefcab59a02b8e14fd86e5230994c09b7c93d857e509cda7860973f67cc9f87ec92c81d8dd618ea6e3cf1d5cabcb90acf080ebcb142 WHIRLPOOL 57ef1a30138f194c3102ecb9c7ec0ee73fc7586a5145ebbe3b44d475a2aae912f67a1da9d6c994a6bc8daffb16c447ff7429baf96c517cf4e60fb9e1a25eb645
 EBUILD tomcat-6.0.44.ebuild 3981 SHA256 9c9c65233de3f8b3c67fd2284596ddf11ffa909c8ffdefd3fae6740d65e077a8 SHA512 895ff3b45dcef71f111842a36e40267e913ed5182a448fb2dd90584d318b8b4404adbe02225cc0fadf7c3b59ffd26ebb27a8a1bf67925eb18b054e2fed09d6d4 WHIRLPOOL 1f6a81f4f697234f5615f51105d24998b3f813bf4f325cff1e1ccea2283ebfdb0babe00bdfbd6568d8964709f9fda0a7d0d0cc76a91ea875a599087fa3a8d66e
 EBUILD tomcat-7.0.59-r1.ebuild 4322 SHA256 f9be909f3ef9a4e451fcd80ff93ecc85650b0cd60519f2534aa5bfd3e0b840d3 SHA512 3df119a2cc39ec494e71e943f6067f58bda0c0c06922cc1d0c219528b3cd59ba0060881d7cb2a07e3bbb02a2655afde0fbc3ed4e9a47b836cb7a1a14c8609741 WHIRLPOOL 1642c6cda43daea4f0a376344cb505457854907c144bc08c0a4d9438f44fef889efcaa145fcccb362fe52d104d9f89d0e80bd916f82d8dd88392537e7ecf6e97
-EBUILD tomcat-7.0.59-r2.ebuild 4442 SHA256 d5fbf3e8b711c5a363357a458ade5bc145160690c7f76ef7caa785df4057ca0f SHA512 12916690127a8cd24906710a3fbf4e77d1931531735074234eeae4874a343cee0eec4bd92291c226fe3a643a19a532f110e0ecfb78877a7aab3d034d429237df WHIRLPOOL 72c769243122b38de1abe1b5a41c14b276db050d854fdaa0b8096717f0c49b4f22094a57f8253be6ad2b3f85352438e6a9aeb673db2adf245f3b70c080ae8a86
+EBUILD tomcat-7.0.59-r2.ebuild 4462 SHA256 20b2fd39b3781c1efe72f8670e49438667451bf72c86e5917c22cd9fdc0b2dba SHA512 40d2c623a021e153efa46bf53993661174113bbd135f37473d4b26e2b967724f67a34228a17ff86c7cce447380a7eee1db795cb87e345db695e8e9f73c359d9c WHIRLPOOL bd85546584374618f397ed67ff2a5dbc28d2f285fc34f32a0cbafa9b891fbe6f71bb49deb8bef1993e5e59df2cafd5cdc58eaf5eeefde8892c764d556b04575f
 EBUILD tomcat-7.0.59.ebuild 4355 SHA256 d3bb85c86f500a7ee59a4e85d362d67d7741792dc0af6fa1e3ed694076e6a822 SHA512 2f7e2b7a33c87af7498c1b4c84a7c7e0af5fae4fe2edafdd7d6fb84f13f32bc4a2ea7b3334d1c7b423a91c60a5981df3b65cbedccaec140f7e47a904630e7bef WHIRLPOOL 953632ee7590be60c342a748dc3d92e8e7e22fa840057476b6f083497993c756240a93f7902104e175935d19b9d9251e7ed2b9adf7618930474ac4c2583e95f2
 EBUILD tomcat-8.0.23-r1.ebuild 4153 SHA256 da6b77d97c1ce9c4358080edd1682ed86aa5e265acc7eecff30622cccd95d0f8 SHA512 083f04e9f936cdbb5ef9b591ecbce56423e5bf50c8e86aa26101b86cbcd0bb7dbc7da6f74c785c4cbb4038f12353f114f31e274ac6897ae9a9718646b0a7e8cf WHIRLPOOL 30206000dfca5c5522e4bb0f8da5a2b3edb94734766eae25580e34c6ed9efd6b78cf8d3bbd633315785d2d7c4500e9a73c480f8a75f0a6e7de4f994a420b9cfb
-EBUILD tomcat-8.0.23-r2.ebuild 4312 SHA256 ff527eae7b6c8f5772ac26adc3197636d9a1525cecadd4f24cdc48dbf5a896a3 SHA512 322b6a2d864e8b8dbaf293ded3b22ce4b7b4ccd92a97e283db01b2789b11b91b817745047ddc3d2171a1b57fba6e6c0dd1c58854f78d78cbf198941e8d1c66aa WHIRLPOOL c9aeeb9c9dd19771e4ff4b632e969a8acf7a29b3c500e4abc23a47d9e94cd72120c1bd334baa10502dace421ee41e4346224a3a9266ad80e118edc13d9bd5ecc
+EBUILD tomcat-8.0.23-r2.ebuild 4280 SHA256 c4230f6246868d439b0cf50545592a1ba4210157852bfebf74497529e3424331 SHA512 4d94bab2f704ad6fa639a3cc06318dc23b6f1c8412195609d9fc03b1a1eafc851399f1ab23149a21ab5a81a7ef47f1e21bbe9c2b45d413cb409548ad7fe9e105 WHIRLPOOL 4b90527be5ba37117e618273a292f3634c0d32d512321242d42c8143709513ea48e1f969671ec2c004e6e4ce7016672c185f98516b9f1f3ff0c556cc4231031b
 EBUILD tomcat-8.0.23.ebuild 4195 SHA256 a3d63d0ac2e032f06f87e8be7c6dd6205e25ff090d26e2a4545b13c15027678c SHA512 632113159f1bcf2ec364ce4d4d5774316fcfeaab1f52101ea1298e7aecf5551b62cb291488f594edb6b2b040b60eb3856f421cc3f45fac4cea88b94e5af141dd WHIRLPOOL 29aaa1db8b67f239c4b271a7d277b22179a6ca4dd3490c6af51ba8585a3e4c862236d6250c3a9244861755f47668b4caf96bd7423ee8b96b1c91e5e8532b2c95
-MISC ChangeLog 85348 SHA256 7cbc72506cee56a54cbeadb128c75e5cc9a09890df91667873d8eb5576c58fca SHA512 4472930b1d7015055b9d5ca1dbadd3cb2aa976560fcaa287a04d7028a46fbbedb6509a85f2c283f017ecb9533f4e1f4637d396a6b8fdafe192c4ddacd15dcebb WHIRLPOOL bb783b8c3a688ed15a96897b9f3477c763cc1ff81f3a4c3740d699c01bdee241991ae5889236c00c68682bdab59f7baf1427ec70a36ccbe3b280298c986f3d0e
+MISC ChangeLog 85638 SHA256 e093a6541f2eec79ac03295cf1994ed8b8c34fb2f0d25c171ea5a8504558ef61 SHA512 31d4578f62526cd96a481ce9f9c847ab4edc3624d0c3df81ad63cb776be528f3caf557f9dda82c8ab84377ea43a73dbcf3964a4f349352654c4b4e7939309a96 WHIRLPOOL bbca1d4ecd84acc5be7305a3762b14fff56e50471cbb93725b673d9a71ea48fab72d2a7ad380a6b5a08b9638cd93a015052a503ab082a0a8cd162ab47e224dfe
 MISC metadata.xml 652 SHA256 ec9dcba0295a5c3eff6b20d7d8038e09c6438d2fc56e45b5cfc3c27206f4bfd8 SHA512 07bc791d1240d11cb34a117657187a9efe4ef4bcdfee76d99f9656caa6fde1c1ffb67b78fe5e552c2a44ddb7e595d4175ada50f0426f2b0d832f0162f6b0afac WHIRLPOOL e1cc5d3799a6b7f6249f5c1420248600b5fec9228dd803fd673b1a75e26900c6539222a1da07e83bb4560e17681ecdf9ff31fe5dcc4d0fb15a694e9402991d7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVrnSSAAoJEJGRpfGTSRu4IdMIAKMsYqLZDdl81YQkp/+ht5oG
-6mXmGKpEPq+0wlsIH8mWBsEb8epYWHgTopobuTlMJyRX9z5szSZT2+tqeh8DUjT6
-TXHgJAnHT3SBT0la/6/csEfh7gkjrire9IJsFQTXJD6uRz/Rfqp4t0KSoEodcNMG
-Jbu2+nS0BVTqqvg/XZCFCGZP1XPApoeY/OLNBrloQUy7WsnOEdVc8S4VbUMXNLCi
-4JVs5EAazVhjNfB+dApbuxiGhImH2JgnDlx2NKtsuMGLAC8qrKt3LvrRoYLPt5qe
-UjmGvF+zt/ad+ftHUWRlq8XCrZOE3jQLGYVaDEOFCJtKw6zR5p4/nTTiDbJkwUk=
-=8t8y
+iQEcBAEBCAAGBQJVr5j+AAoJEJGRpfGTSRu4ShwH/inyC/T5lWwjBgL5a8g6H/kb
+Rcdx2DYgDPJQVvl2BgzBWMajTQ7mQifpwLrxvkM70Tf0RT565oMYjpk23yn5Vmtn
+CkfxmN2T5s0dKCZJDYdHXJXQfedyWlQF2s1NtC6MkQWR4z+Z4+idKButmLpPzrJK
+b9bXJahzC4ycE1uqn+BNWE0l4k9qmB3MHofp/9a5tuoZHDTQ9usHDmbZtfVI5Vbo
+LQk3uABPg/1pXJVBx4GmjQmScJFAkAvJVcn5Y0Am/WMFYBcio4M/45s6NcbLTVFE
+gRmlMchcohbHsgVxQrm0xJZfnjeQH3WrGrXTo7AvHXZPbSqrFaFTFNnGFM5sEWI=
+=R//g
 -----END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild b/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
index 590b4701edf7..e2a5316c5839 100644
--- a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.44-r0.ebuild,v 1.1 2015/07/21 15:33:26 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.44-r0.ebuild,v 1.2 2015/07/22 12:21:07 monsieurp Exp $
 
 EAPI=5
 
@@ -106,8 +106,8 @@ src_install() {
 
 	# create "logs" directory in $CATALINA_BASE
 	# and set correct perms, see #458890
-	dodir /usr/share/tomcat-${SLOT}/logs
-	fperms 0750 /usr/share/tomcat-${SLOT}/logs
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
 
 	# replace the default pw with a random one, see #92281
 	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
diff --git a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild b/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
index 0c083f945c73..ea658fdbfd6d 100644
--- a/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.59-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v 1.1 2015/07/21 15:33:26 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.59-r2.ebuild,v 1.2 2015/07/22 12:21:07 monsieurp Exp $
 
 EAPI=5
 
@@ -109,8 +109,8 @@ src_install() {
 
 	# create "logs" directory in $CATALINA_BASE
 	# and set correct perms, see #458890
-	dodir logs
-	fperms 0750 logs
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
 
 	# replace the default pw with a random one, see #92281
 	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
diff --git a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild b/www-servers/tomcat/tomcat-8.0.23-r2.ebuild
index 52ecbf241a85..a6f703acb387 100644
--- a/www-servers/tomcat/tomcat-8.0.23-r2.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.23-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.23-r2.ebuild,v 1.1 2015/07/21 15:33:26 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-8.0.23-r2.ebuild,v 1.2 2015/07/22 12:21:07 monsieurp Exp $
 
 EAPI="5"
 
@@ -107,8 +107,8 @@ src_install() {
 
 	# create "logs" directory in $CATALINA_BASE
 	# and set correct perms, see #458890
-	dodir /usr/share/tomcat-${SLOT}/logs
-	fperms 0750 /usr/share/tomcat-${SLOT}/logs
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
 
 	# replace the default pw with a random one, see #92281
 	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)