From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1635730-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A898D15849D
for <garchives@archives.gentoo.org>; Sun, 26 May 2024 21:31:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 90BD5E29EE;
Sun, 26 May 2024 21:31:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 73AA3E29EB
for <gentoo-commits@lists.gentoo.org>; Sun, 26 May 2024 21:31:49 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ACCC1343007
for <gentoo-commits@lists.gentoo.org>; Sun, 26 May 2024 21:31:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D8C3C1BAD
for <gentoo-commits@lists.gentoo.org>; Sun, 26 May 2024 21:31:45 +0000 (UTC)
From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" <conikost@gentoo.org>
Message-ID: <1716758951.77f6f2a756d8271d8ebf4344fd12d36b1f6e575b.conikost@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
X-VCS-Directories: www-servers/tomcat/files/
X-VCS-Committer: conikost
X-VCS-Committer-Name: Conrad Kostecki
X-VCS-Revision: 77f6f2a756d8271d8ebf4344fd12d36b1f6e575b
X-VCS-Branch: master
Date: Sun, 26 May 2024 21:31:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 40ae9c06-4f2b-42c5-b364-ccdd2b5ca17a
X-Archives-Hash: ac6c09a6d3db7580f87a58b573771985
commit: 77f6f2a756d8271d8ebf4344fd12d36b1f6e575b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 26 09:00:58 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun May 26 21:29:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f6f2a7
www-servers/tomcat: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/36820
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../tomcat/files/tomcat-8.5.86-build.xml.patch | 111 ---------------------
.../tomcat/files/tomcat-8.5.95-min.java.patch | 37 -------
2 files changed, 148 deletions(-)
diff --git a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
deleted file mode 100644
index 85ad9ab64682..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.86-build.xml.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -1148,9 +1148,9 @@
-
- <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
- description="Default. Builds a working Tomcat instance">
--
-+<!-- not needed for us
- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
- <!-- Copy scripts -->
- <copy todir="${tomcat.build}/bin">
- <fileset dir="bin">
-@@ -1210,7 +1210,9 @@
- <exclude name="${jdt.jar.filename}"/>
- </fileset>
- </delete>
-+<!-- we provide jdt jar externally
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
-+-->
-
- <!-- Add sources for examples -->
- <antcall target="examples-sources" />
-@@ -1719,7 +1721,7 @@
- <target name="extras-webservices-prepare"
- depends="extras-prepare"
- description="Prepare to build web services extras package">
--
-+<!-- we provide jaxrpc
- <antcall target="downloadfile">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
- <param name="destfile" value="${jaxrpc-lib.jar}"/>
-@@ -1728,7 +1730,8 @@
- <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
- </antcall>
--
-+-->
-+<!-- we provide wsdl4j
- <antcall target="downloadfile">
- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
- <param name="destfile" value="${wsdl4j-lib.jar}"/>
-@@ -1737,11 +1740,13 @@
- <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
- <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
- </antcall>
--
-+-->
-+<!-- ignored above
- <copy file="${jaxrpc-lib.jar}"
- tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
- <copy file="${wsdl4j-lib.jar}"
- tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
-+-->
- </target>
-
- <target name="extras-webservices"
-@@ -1850,11 +1855,12 @@
- </copy>
-
- <!-- Source bundles for native components -->
-+<!-- we provide tomcat native as another package and we don't need commons-daemon
- <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
- file="${tomcat-native.tar.gz}" />
- <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
- file="${commons-daemon.native.src.tgz}" />
--
-+-->
- <!-- platform README files -->
- <echo append="false" file="${tomcat.dist}/bin/x64/README">
- Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
-@@ -2020,8 +2026,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
- <link href="../elapi"/>
- <link href="../websocketapi"/>
- <link href="../jaspicapi"/>
-+<!-- net is not accessed from emerge
- <link href="https://docs.oracle.com/javase/7/docs/api/"/>
- <link href="https://docs.oracle.com/javaee/7/api/"/>
-+-->
- <packageset dir="${tomcat.dist}/src/java/">
- <include name="org/**"/>
- <exclude name="org/apache/el/parser/**"/>
-@@ -2933,6 +2941,7 @@ asf.ldap.username=${release.asfusername}
- description="Download components necessary to compile" >
-
- <!-- Download Commons Daemon -->
-+<!-- not needed
- <antcall target="downloadgz-2">
- <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/>
- <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/>
-@@ -2941,8 +2950,9 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/>
- <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/>
- </antcall>
--
-+-->
- <!-- Download JDT (Eclipse compiler) -->
-+<!-- we provide JDT
- <antcall target="downloadfile-2">
- <param name="sourcefile.1" value="${jdt.loc.1}"/>
- <param name="sourcefile.2" value="${jdt.loc.2}"/>
-@@ -2952,7 +2962,7 @@ asf.ldap.username=${release.asfusername}
- <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/>
- <param name="checksum.value" value="${jdt.checksum.value}"/>
- </antcall>
--
-+-->
- </target>
-
- <target name="download-test-compile"
diff --git a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch b/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
deleted file mode 100644
index 9198ff3a1911..000000000000
--- a/www-servers/tomcat/files/tomcat-8.5.95-min.java.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 723be26..3cf7bb7 100644
---- a/build.xml
-+++ b/build.xml
-@@ -112,8 +112,8 @@
-
- <!-- Java EE 7 platform requires Java 7+ -->
- <!-- Keep in sync with webapps/docs/tomcat-docs.xsl -->
-- <property name="compile.release" value="7"/>
-- <property name="min.java.version" value="7"/>
-+ <property name="compile.release" value="8"/>
-+ <property name="min.java.version" value="8"/>
- <property name="build.java.version" value="11"/>
-
- <!-- Locations to create the JAR artifacts -->
---- a/webapps/docs/tomcat-docs.xsl
-+++ b/webapps/docs/tomcat-docs.xsl
-@@ -39,7 +39,7 @@
- <xsl:param name="version" select="'8.5.x'"/>
- <xsl:param name="majorversion" select="'8'"/>
- <xsl:param name="majorminorversion" select="'8.5'"/>
-- <xsl:param name="minjavaversion" select="'7'"/>
-+ <xsl:param name="minjavaversion" select="'8'"/>
- <xsl:param name="buildjavaversion" select="'11'"/>
- <xsl:param name="antversionrequired" select="'1.9.10'"/>
- <xsl:param name="build-date" select="'MMM d yyyy'"/>
---- a/modules/jdbc-pool/build.properties.default
-+++ b/modules/jdbc-pool/build.properties.default
-@@ -40,7 +40,7 @@ version.suffix=
- # contexts by the various build scripts.
- base.path=${basedir}/includes
-
--compile.release=7
-+compile.release=8
- compile.debug=true
-
- # Do not pass -deprecation (-Xlint:deprecation) flag to javac