Tomcat 6.0.44 version bump. Remove vulnerable versions. Fix security bug 549536.

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

4 files changed, 29 insertions, 43 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index b3cb3cb76b22..49d6b3805ab7 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.183 2015/05/26 20:04:24 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.184 2015/06/03 14:56:25 monsieurp Exp $
+
+*tomcat-servlet-api-6.0.44 (03 Jun 2015)
+
+  03 Jun 2015; Patrice Clement <monsieurp@gentoo.org>
+  +tomcat-servlet-api-6.0.44.ebuild, -tomcat-servlet-api-6.0.41.ebuild,
+  -tomcat-servlet-api-6.0.43.ebuild:
+  Tomcat 6.0.44 version bump. Remove vulnerable versions. Fix security bug
+  549536.
 
 *tomcat-servlet-api-8.0.23 (26 May 2015)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 1ea4290b03e7..3f3790bd8f9c 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.5-build.xml 2864 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a SHA512 729fa2287e7178fdbc15747e57c9792de7a34366af3ab7bb703f17168ad1b296e395883e1d859dce0edb9640ca65e495b3b3224d5c2c91275f2fb35852cf4c0e WHIRLPOOL b882958a2be6610ccd81a21e74446c9f6f31dd306896360a42fc6929774159c1f71b7101ed9d19b855a6ddbe2c0d54e9841c5f28a5ab31532f27109521284506
 AUX 3.0-build.xml 3192 SHA256 94539ae9bb8360efcdcb3c9529a21cad7f3a744ef6491f54c8baea2a656a4a9a SHA512 fff70f29b7b8025ce10261c9afc140b0765aee35821fbbdc161872ecec4819832ed12a71bb54e9eea96ecf8418f51a11a8716b07bfdfb957dde6bc1abe8ee7e8 WHIRLPOOL b4ed25230c69d896003e53e66f17512b9c2a67ed8360207aa8ac5e3c20daa28885ddd8410b85e18b8a4fcf6ff3bf0a91eaf145500d1687db808c7f4ecc194800
 AUX 3.1-build.xml 3193 SHA256 4021d32b23fea3b34f37a2552c3021f9945d1d0f1b472319800d4e8323b15b21 SHA512 efa6753a44e7f18c04bff98b68262112ee192857a8b15899e6927de1754c25788fb551251207433f0a7cf69703e310e6f577853d6eb6f6f6e48f2a57ca4921c8 WHIRLPOOL 48424ae2709c6d9b5ea4caab2b1fd4f1d1914b7c6925b3f8aa7a2012d55f6ad1a32af7170d3bb97e9f779c8ecc6bc6e645bee26b0dba8182f9a1a057b062a603
@@ -6,8 +9,7 @@ AUX servlet-api-2.4-manifest 310 SHA256 134371e8d3d0b137096e268df05751c4bcb29911
 DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49faa718ab4a510790af3582b4189a48a5b951 SHA512 f2f36fbad5114c8a74154602249280226b839cbb75b2a584d6a6efbc11dcd2a5e27a67ee9b7ca2f12689cabfe1110035f95b27690ce6c304bbbb6389dfa97cd2 WHIRLPOOL 8188e2ed1aba7337b00e971e347594d897e01f6ea25d9e86e641cea4a1f2c68e4b9e594dd57f773447e81066bcb3377130c05ae7608fe9d9dc36a28bd89d515f
 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a WHIRLPOOL d3bca642fd8d5ad73dadf8864ebd0a75146adc805c298d0fd5ad26ab2d4d93293a9ea83d4190e64accd3a7cd38bebc1580dcc266f9a81c4472bacb37598acef7
 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
-DIST apache-tomcat-6.0.41-src.tar.gz 3591370 SHA256 6def26d6eefb168a0968400d53dc08939284570ca850a0c4740398e9b645ff3c SHA512 605b33fb48772af3d34f33082d30c6791308c8ce6c52607a0e8e97b353ecd1a768a400ed65abcf2701381fff7e61d4d83a887140d4eebf753551e26dcef58e5d WHIRLPOOL c70f397308c051287d5de77e2c66b70d6003dd015cc0ba236599c09f5046bc6d5f0f03ddb672c7c9267ec860491ad7144104ede3e599a064776a931f9babfddd
-DIST apache-tomcat-6.0.43-src.tar.gz 3595710 SHA256 ef32da195dc0f070c5f8d1c48b02a213cc69b680ec735f1297ef0d8ca62e75be SHA512 f2cb32e6d01e8841e4ea43cae0b495f988eb590649047627eea31411b7eac9d8a5d5747fb986d577946430c656c1e926a75b850bc7f59ec1b86c632fdb7af7e8 WHIRLPOOL 6c6ffe58a9c2bd162aa7d6b60248304fedd51724c602d9387ae2759a8218eedf93a85b40e18bb2e46de2b245c412d32ca941109045f8e5b898546f9b4cc7602f
+DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
 DIST apache-tomcat-7.0.56-src.tar.gz 4648164 SHA256 d51fd6b596fbcf418eddeff721f23b6109ec4d8085ba111580dbdeaa007c5b59 SHA512 f283ec2cd806ea1ac5372efc667e75687ea637185b1b74b396cf46379248da09c9a8bbdd1f4e37e84d91ed142f80a1185816fc5215e199df2ff25dded13cacff WHIRLPOOL cf63cd6e4888585f3dd9e4659f993f48e3a08f8c220414fe8f9dac9389a1456d49878b4a39674646fd6a9ad3df4259272005ccf40ead53ab51a196bee4150a93
 DIST apache-tomcat-7.0.57-src.tar.gz 4651308 SHA256 07962d20f2ce051c3e4fbdbd65a15d87d07553e7ee1542547a5ce0c201743c64 SHA512 fad8c296c2191c0168bf841b4b7c649b06900aa1b8b12d895fdaa1963f5a2b08fedb71f614cba1269b405892392daea0850c85360fb4fda2ea36311f8e8c563a WHIRLPOOL 9c938fdc419f989d9a2bc7618e9c68c0ee96b1dfaa94822d995818975c9217b7ff80c28b31cc6e9dea47d4097a2c61325e8075d4f313bc6415aa535361933741
 DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
@@ -18,12 +20,22 @@ EBUILD tomcat-servlet-api-3.ebuild 1007 SHA256 c80db78ac3e23f5f8f78929aad52c1a8c
 EBUILD tomcat-servlet-api-4.1.36.ebuild 1144 SHA256 760a639f1db06019140df2d3fae8bef8ba3acc07bc5e2aa589a14556470bc653 SHA512 be3c516dba70fdcb83ef5a14b73d17854ddecf66601a9f81df73db578e64aee0dfeaaad069ada7e9bcab3ff4d0dc0851393d7d089b05ee632324e85e1aa66277 WHIRLPOOL 2c371d8ead6f42024dad8c6e72bbe13b349e8cb911b52a0694cd1e7f74f9da0990c94f37967dda673efd8a5d98c7aa8ad37f3debb3aecc3a1c2a85c69612cdf5
 EBUILD tomcat-servlet-api-5.5.27-r1.ebuild 1569 SHA256 1c5128987b55e888b911e7624de4e80ef85cbd5069298eef47ebc8833d02777e SHA512 447b95366f49edcd47d4316fa4d2c2a745d4b13a662bfee83448a89b29fdb6ebae7ccd287c55a64626cf32df19d25a0a4c387209da16cbef238600ebdea8e070 WHIRLPOOL 4685db2d9630d39c48153cc7aafca28d0e1ba25d8fb60c8311a7623c966a03d48e510f8a21b1d10398f44931ae358fb8e4c4a247c48151855dde83779b589f5a
 EBUILD tomcat-servlet-api-5.5.34.ebuild 1577 SHA256 15d0f33e86760f8998c27f7b61950f4e84de607edb6c7dcc747f6aa5ca8edd75 SHA512 ce0f99fe2f0bec83f33ce38cb4b8e1daa05df4c562e918a1ee960af82b3cc338b5d6713a20fdcb28459cc3d85e137423312a330caccde68d70f697a95db2fdd5 WHIRLPOOL 412b80fd6b20b58aa2e6b656ffff6fe31c5d9dc0b9f09a976f1d343930ef165b83842e0112a3a736affa52a46d2078149ddb1382f1011aef62b31d62cb4b0d2b
-EBUILD tomcat-servlet-api-6.0.41.ebuild 1030 SHA256 c61e0d3a03d5cedf427f5b10891170cb5feadf3af9236b3223b104bb4bd23fbc SHA512 c7056b5cdaf1301b09c88f8b65c697659e76109485dcbfb24c1145e64b76bf5a0a6e565d4ec2d066bd7f45ebd306b5f4f5c93b8278ef23c10be02adf85fdb3b4 WHIRLPOOL 222af2904455796f776853f2d99071dd55a13d81e145ce50f14745d1c07ab2268710c4434ecd151ec591f1a35facfff54eaa3488578da2a9122e8810b50e18a8
-EBUILD tomcat-servlet-api-6.0.43.ebuild 1039 SHA256 a4ca9615a51a42a42267e4366e342feecceae3408d43a0333b1d39dee87cf81b SHA512 1ef78f23214bc2bda860efc4d9979c3e98dd7e7bf8dd69a55a86f67df5a2f90104172f234784478f09cf0b68e9e81131abac99e2e6ee14cd8bcfb87647be70ca WHIRLPOOL ca4aa3f27633356b8c243fdf8976e1e8685231237d479e2702fcade154672c5d32e2bcf5b2623a3a1411f9798f753c9d117035e85c4f027b9e7263ab46e3c369
+EBUILD tomcat-servlet-api-6.0.44.ebuild 1040 SHA256 53fbb4fd0941eed3b1499d59f1f2e802474f56df77180255081f1ea0778ccc17 SHA512 b7c0b58a0a472c2e2b7f8a8204c1255b445cac4038939e601981bac997caefbd3d092aa8f15e59b39e65e64e47d4d86ebfc9618f065294b9652411e5a6cdfd16 WHIRLPOOL 9af53e232adc1400bcad3468e5a63789621d07224cf25dbe319108b466eda1b6df7efc021e1cc6085120e094e1a13c8fc7e5d653e12cfab2e0864fbb0c6dce64
 EBUILD tomcat-servlet-api-7.0.56.ebuild 1134 SHA256 0371eadf576eedc6dce14742b7bf2eb69924c49cdf202456f291f3501ec3b902 SHA512 3201128be640a5b7fdf3485bec52db3e8c6ce5dbe567bf5a9e0372c118bc5e817ed56e6dae4a845f39e1ecd43807aace9102e8c577fdd05c0e492047e6797ea1 WHIRLPOOL f1a8f4943bfdcc54932cc6544d79cf825273c2c32deca88c898ade57c33070a37b913c992965ccc61c77d02596ca1f13833d19addfd2768d406129306c26d9ed
 EBUILD tomcat-servlet-api-7.0.57.ebuild 1109 SHA256 0e97b5bb4be88320b190ccc5c6218ad470f5fcf5038715f6bbe7485f5032e157 SHA512 19a463c3d9043fc93a09e73cf6a7875c0c793041de4587a7d9b6091633be71d6f46047edd35e65fc64c5762cf041dd839f66acc45588f66745bfd4adf918b600 WHIRLPOOL 168cfc667bd7ff63620bbfe6f862371e072289b8c94259be4298b08eae546523326f2f99b1b3740f2d5dfabd58108a58a5d4701ba63984af67383b5499f1cae3
 EBUILD tomcat-servlet-api-7.0.59.ebuild 1113 SHA256 bd5a84828befd6fb4d22cb6937070dd1b86bd697163c1007062fbfe5364a1406 SHA512 c23d3b1b7416f7447c8318b8c2b74f682e502d84fd922734f5a318d45db49891486cc2fe26a449c35cd51a02328e560413a78d0ed3af45c427838496268f9ac0 WHIRLPOOL 438c446e8de6a8217eca816f58b26c6e51c3d8dc2abacf234f830d0068611a1bd326635b78d766f80dbfb15b260a54e47cb037757ce93341e40ad1944f3ae67f
 EBUILD tomcat-servlet-api-8.0.22.ebuild 1131 SHA256 72ed8df19a937a24e2ec100f9ccbf6711748788c7643c8c2bce04b99ac19b46b SHA512 131ec5521d7afb5dc87e24d7d287f47ff6b7bfe4ca3205f5ff4aaf88b4bf94cb450dd314edf478f3ee8cb4ab345848d10bdef5d8c27b029cc797cef760eacb62 WHIRLPOOL 0d4169eb08a87553a3f25ba4a0604f564e4e23b52760e358543a2471fbdfa76cf43f7ccdbf73a6f14f6472c71e16a4730264906e2d576f971cdb3bd171c7782a
 EBUILD tomcat-servlet-api-8.0.23.ebuild 1131 SHA256 a557a069342e1bf8133abfd6afb31a47e2fc36b8790deb5e36dcc264b46b257f SHA512 5b91c35812285f2dbb2e77da437cee9894a3571d37ab07e0df4948fe835bcaabed45aa75d046ec01400fca1d7387122e8c4011fbc8ac3d41266c61cdf35bcf74 WHIRLPOOL 07f3347fbf21ccb0911af044750f6b1ae8c582887189d4fe92899c5e674ee1ecbc8d59598b8a863479c5dac19e1f756c1292b90307a4077ab2480f31fca72196
-MISC ChangeLog 29165 SHA256 6146c0ed1ed07327f9feb1b0cd4d52dadc50df3763da9b851279b360e16f54a1 SHA512 c101fc2c7c32df93fdc90c96a7df7c58ed3aca0b1d80929caeaa87e01b687f7d931fb78d15e6e6e4b653ec004100e461f1f6065279c68a37c11f7a679cde19fc WHIRLPOOL bbe01052d97fa3bc142020e13e294fb6ea6b33eaaa48453da3a021faf3fac3c1726de5ab4736423467f989f47b656631b35a6f85b86b087230b52d607eae0e5a
+MISC ChangeLog 29457 SHA256 bea06bdfa6841300c6126463e67aabadeea51d587abc888fe135b06b1d5a0526 SHA512 4cbda96c57129f508c84729ca3a4f766e2fbcb742e74fcaae245325505c59e462b6acebdac8fefc70e0b1ffd8467e26bd350cd91ddb9111deb62a74eda871d04 WHIRLPOOL f5255c7151bed72105a79ac7db71d2fcb6e07f19396fbc2f860c2f49faeaac0feb4e5fab43ba14fa85432e0f324a228a01662387904075c20d286d4dae707ad3
 MISC metadata.xml 265 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b SHA512 1d6299dd8a1ec8fc5fcb06ec43c2c59504b4285aa7cbfaa1eea3cc28f20b68d7367c74fc2ba29101f2e359d2990e64b7a21d719a6c68e55d2f7c94c2d8e22bbc WHIRLPOOL 2d40903d68542f78c6c62b0072610e5d1fdea4634f2aa55a7fcb1bb0dbf3ed00ee35a84b7f23bde7eee24770fca1dc1be2809cc0a6376edb9f0960b2826f566a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJVbxUkAAoJEJGRpfGTSRu4Fi4H/0RLmkLTOEVybr9QlqmOGgC2
+IqtPDyUYaUkhto7oVkQ1IkJMZw5jSJHT0abJ6XraR2lEkKZK295NnQ9D7eGHoEe2
+5DDqREcHCnAAhBoCHsSZdb75YiPTdL+VvcdnmVpsFAB3THQUBoVF1wiSjd+luLRy
+JNnJtltlYeQE27ATg1p7ZQzGP9FQYD9c+uawB6xhIqfxWRHUiuH6+sFk/IvW2Lto
+1x1jR699Mxy3m4QNoQ2f+ngQH6AJNleX5bfCX1nhpzSUcjYMCplmsZ1H9G2Ah/fu
+3tSDL7k/oOfvAFfrKYZVurOEy0tBl8UQbs5W/QuvcBBmXFHAKF0/1lW7kWMR9SM=
+=r9GQ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
deleted file mode 100644
index 1abfb3720f77..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.41.ebuild,v 1.5 2014/11/29 13:35:44 ago Exp $
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${MY_P}/"
-
-java_prepare() {
-	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
-	rm */*/build.xml
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/output/build/lib/*.jar
-	use source && java-pkg_dosrc java/javax/servlet/
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild
index 6c815732ec09..3a2369524300 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.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/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.43.ebuild,v 1.1 2015/02/10 12:16:27 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.44.ebuild,v 1.1 2015/06/03 14:56:25 monsieurp Exp $
 
 EAPI="5"
 JAVA_PKG_IUSE="source"
@@ -18,8 +18,8 @@ SLOT="2.5"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
 
 S="${WORKDIR}/${MY_P}/"