From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C8C391382B6 for ; Tue, 14 Jun 2016 11:51:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF68CE08FF; Tue, 14 Jun 2016 11:51:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58FF5E0900 for ; Tue, 14 Jun 2016 11:51:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C36353406DD for ; Tue, 14 Jun 2016 11:51:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9A3C2323 for ; Tue, 14 Jun 2016 11:51:32 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1465905079.d223d1e56dc38bf80361c5ec64ea9d65f8cb2d03.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/tomcat/Manifest www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch www-servers/tomcat/tomcat-9.0.0_alpha6-r1.ebuild www-servers/tomcat/tomcat-9.0.0_alpha8.ebuild X-VCS-Directories: www-servers/tomcat/ www-servers/tomcat/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: d223d1e56dc38bf80361c5ec64ea9d65f8cb2d03 X-VCS-Branch: master Date: Tue, 14 Jun 2016 11:51:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e7e16d32-8a31-4f74-a1d5-e4a3da557760 X-Archives-Hash: 03bea5b2d3eda5075545aa5552dc0d98 commit: d223d1e56dc38bf80361c5ec64ea9d65f8cb2d03 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Jun 14 11:50:46 2016 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Jun 14 11:51:19 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d223d1e5 www-servers/tomcat: version bump in slot 9 Package-Manager: portage-2.3.0_rc1 www-servers/tomcat/Manifest | 2 +- .../tomcat-9.0.0_alpha6-processmanifest.patch | 76 ---------------------- ...l.patch => tomcat-9.0.0_alpha8-build.xml.patch} | 68 ++++++++----------- ...alpha6-r1.ebuild => tomcat-9.0.0_alpha8.ebuild} | 4 +- 4 files changed, 29 insertions(+), 121 deletions(-) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 3eb7012..d103932 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -4,4 +4,4 @@ DIST apache-tomcat-7.0.69-src.tar.gz 4653637 SHA256 fd29dc7ecd4796a693fdd7fc568e DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79 DIST apache-tomcat-8.0.33-src.tar.gz 4969308 SHA256 1a141b90111347640df57fe506d9da29ca959e44b5885795df603b621c2ccb4f SHA512 f781c90dd0932082f0d9b154b634f147c909415ebf49242f047d29430e24e16086d392b982e16d13b4d5f848dc98fd6834c0768e1f9c60d99a35d7dad262265d WHIRLPOOL b1ca10a4c0ead57b75bade8f135eb943f4ca291bf85eae75d523b65e9538bd5b25a270a3f27c37d2c7ea6e1e847ed15e9fdcac923ceb8069282189976f9e8727 DIST apache-tomcat-8.0.35-src.tar.gz 4980657 SHA256 420036fde5e1bfe0a3d27299e355ee153b7c547d17c7b52fe4b15a1315d9c4e9 SHA512 c56ba4339fc114cda9a784c7f37be99c82238bbe043f69a3bed2ec86a0bf60325af9105d74cfcffa144636fecc7f4730cee08eca3a22ed035dd5e3e483fa1742 WHIRLPOOL 38d2382eabe19be8b008eb8975ddf95e086b482eb58cb56f566cf4ec7c7628663260a550b611f4db57803e503ab6746aedaac279bff24868c5997eaee3514966 -DIST apache-tomcat-9.0.0.M6-src.tar.gz 5023823 SHA256 7217416b1c6470f3653d978bbfdb153693aef74929da21c5823117a168992b2a SHA512 712a93d71bef2f6dbdd35d32cbf200045bacc1a27426cb9f92e3a645a7f59f3611adebebdc24168de569cea2c64500ea893acfba05670947f53d72abec0988f1 WHIRLPOOL fb98d23ac462cef450d1ed8c88eb8be88a0aad32b24cf1b5c8437e51966bfb3d5222a3368ea54a2f19b0be38118b3148bf7549d2d59f1c8267aaa29246ef1d62 +DIST apache-tomcat-9.0.0.M8-src.tar.gz 5024499 SHA256 bef36f9ead80188a8859fc1fa9846e77e570c54c99c05388857dc6dd29f526f8 SHA512 b1778709bddf6b0d1263115a57c743fcb58286b58dda384b06079ddcab8188a63de48efd3f47b6314c92154dd01c7bd1c8858ac2ea82d20a3d90c80899edcf87 WHIRLPOOL 8083b108a49ac0e066104a5849fcc6ef6c1355c09d9854d50a4108df769384664d0b37aa0cc85f59361a080e73fb585de36916855e1fcef1a441c4225653aca6 diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch deleted file mode 100644 index fa38d5d..0000000 --- a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-processmanifest.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 2016/05/04 11:07:55 1742251 -+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 2016/05/17 07:18:38 1744194 -@@ -370,40 +370,42 @@ - } - - Manifest manifest = jar.getManifest(); -- Attributes attributes = manifest.getMainAttributes(); -- String classPathAttribute = attributes.getValue("Class-Path"); -- if (classPathAttribute == null) { -- return; -- } -- String[] classPathEntries = classPathAttribute.split(" "); -- for (String classPathEntry : classPathEntries) { -- classPathEntry = classPathEntry.trim(); -- if (classPathEntry.length() == 0) { -- continue; -+ if (manifest != null) { -+ Attributes attributes = manifest.getMainAttributes(); -+ String classPathAttribute = attributes.getValue("Class-Path"); -+ if (classPathAttribute == null) { -+ return; - } -- URL jarURL = jar.getJarFileURL(); -- URI jarURI; -- try { -- jarURI = jarURL.toURI(); -- } catch (URISyntaxException e) { -- if (log.isDebugEnabled()) { -- log.debug(sm.getString("jarScan.invalidUri", jarURL)); -+ String[] classPathEntries = classPathAttribute.split(" "); -+ for (String classPathEntry : classPathEntries) { -+ classPathEntry = classPathEntry.trim(); -+ if (classPathEntry.length() == 0) { -+ continue; -+ } -+ URL jarURL = jar.getJarFileURL(); -+ URI jarURI; -+ try { -+ jarURI = jarURL.toURI(); -+ } catch (URISyntaxException e) { -+ if (log.isDebugEnabled()) { -+ log.debug(sm.getString("jarScan.invalidUri", jarURL)); -+ } -+ continue; - } -- continue; -+ /* -+ * Note: Resolving the relative URLs from the manifest has the -+ * potential to introduce security concerns. However, since -+ * only JARs provided by the container and NOT those provided -+ * by web applications are processed, there should be no -+ * issues. -+ * If this feature is ever extended to include JARs provided -+ * by web applications, checks should be added to ensure that -+ * any relative URL does not step outside the web application. -+ */ -+ URI classPathEntryURI = jarURI.resolve(classPathEntry); -+ URL classPathEntryURL = classPathEntryURI.toURL(); -+ classPathUrlsToProcess.add(classPathEntryURL); - } -- /* -- * Note: Resolving the relative URLs from the manifest has the -- * potential to introduce security concerns. However, since -- * only JARs provided by the container and NOT those provided -- * by web applications are processed, there should be no -- * issues. -- * If this feature is ever extended to include JARs provided -- * by web applications, checks should be added to ensure that -- * any relative URL does not step outside the web application. -- */ -- URI classPathEntryURI = jarURI.resolve(classPathEntry); -- URL classPathEntryURL = classPathEntryURI.toURL(); -- classPathUrlsToProcess.add(classPathEntryURL); - } - } - diff --git a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch similarity index 82% rename from www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch rename to www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch index f5d49c7..3c4e5c2 100644 --- a/www-servers/tomcat/files/tomcat-9.0.0_alpha6-build.xml.patch +++ b/www-servers/tomcat/files/tomcat-9.0.0_alpha8-build.xml.patch @@ -1,8 +1,8 @@ -diff --git a/apache-tomcat-9.0.0.M1-src/build.xml b/apache-tomcat-9.0.0.M1-src/build.xml -index eab0c45..63ac495 100644 ---- a/apache-tomcat-9.0.0.M1-src/build.xml -+++ b/apache-tomcat-9.0.0.M1-src/build.xml -@@ -711,24 +711,30 @@ +diff --git a/apache-tomcat-9.0.0.M8-src/build.xml b/apache-tomcat-9.0.0.M8-src/build.xml +index dfec1f7..4dfc5d8 100644 +--- a/apache-tomcat-9.0.0.M8-src/build.xml ++++ b/apache-tomcat-9.0.0.M8-src/build.xml +@@ -695,24 +695,30 @@ manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> @@ -33,7 +33,7 @@ index eab0c45..63ac495 100644 @@ -50,7 +50,7 @@ index eab0c45..63ac495 100644 -@@ -1069,7 +1075,7 @@ +@@ -1053,7 +1059,7 @@ @@ -59,7 +59,7 @@ index eab0c45..63ac495 100644 -@@ -1103,7 +1109,7 @@ +@@ -1087,7 +1093,7 @@ @@ -68,7 +68,7 @@ index eab0c45..63ac495 100644 @@ -77,7 +77,7 @@ index eab0c45..63ac495 100644 @@ -90,16 +90,7 @@ index eab0c45..63ac495 100644 -@@ -1606,7 +1613,7 @@ - - -+ description="Prepare to build web services extras package" unless="noget"> - - - -@@ -1745,7 +1752,7 @@ +@@ -1583,7 +1590,7 @@ -@@ -1940,6 +1947,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -1731,6 +1738,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. @@ -116,7 +107,7 @@ index eab0c45..63ac495 100644 @@ -124,14 +115,7 @@ index eab0c45..63ac495 100644 -+ maxmemory="512m" > - - +@@ -1835,9 +1844,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. @@ -143,7 +127,7 @@ index eab0c45..63ac495 100644 -@@ -2775,7 +2786,7 @@ skip.installer property in build.properties" /> +@@ -2578,7 +2589,7 @@ skip.installer property in build.properties" /> -@@ -2809,7 +2820,7 @@ skip.installer property in build.properties" /> +@@ -2612,7 +2623,7 @@ skip.installer property in build.properties" /> -@@ -2866,7 +2877,7 @@ skip.installer property in build.properties" /> +@@ -2669,7 +2680,7 @@ skip.installer property in build.properties" /> -@@ -2892,18 +2903,18 @@ skip.installer property in build.properties" /> +@@ -2695,18 +2706,18 @@ skip.installer property in build.properties" /> @@ -192,7 +176,7 @@ index eab0c45..63ac495 100644 -@@ -2915,7 +2926,7 @@ skip.installer property in build.properties" /> +@@ -2718,7 +2729,7 @@ skip.installer property in build.properties" /> @@ -201,7 +185,7 @@ index eab0c45..63ac495 100644 -@@ -2934,7 +2945,7 @@ skip.installer property in build.properties" /> +@@ -2737,7 +2748,7 @@ skip.installer property in build.properties" /> @@ -210,7 +194,7 @@ index eab0c45..63ac495 100644 -@@ -2945,7 +2956,7 @@ skip.installer property in build.properties" /> +@@ -2748,7 +2759,7 @@ skip.installer property in build.properties" /> @@ -219,7 +203,7 @@ index eab0c45..63ac495 100644 -@@ -2963,7 +2974,7 @@ skip.installer property in build.properties" /> +@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" /> @@ -228,7 +212,7 @@ index eab0c45..63ac495 100644 -@@ -2973,7 +2984,7 @@ skip.installer property in build.properties" /> +@@ -2776,7 +2787,7 @@ skip.installer property in build.properties" /> @@ -237,7 +221,7 @@ index eab0c45..63ac495 100644 -@@ -2996,7 +3007,7 @@ skip.installer property in build.properties" /> +@@ -2799,7 +2810,7 @@ skip.installer property in build.properties" /> @@ -246,7 +230,7 @@ index eab0c45..63ac495 100644 -@@ -3007,7 +3018,7 @@ skip.installer property in build.properties" /> +@@ -2810,7 +2821,7 @@ skip.installer property in build.properties" /> @@ -255,7 +239,7 @@ index eab0c45..63ac495 100644 -@@ -3018,7 +3029,7 @@ skip.installer property in build.properties" /> +@@ -2821,7 +2832,7 @@ skip.installer property in build.properties" />