From 5fd608ca1e9938bd1b77826372e2aae4b6fe5f8a Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Wed, 27 Mar 2024 15:17:16 +0100 Subject: dev-java/jakarta-xml-soap-api: drop SecurityManager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/923606 Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/35946 Signed-off-by: Miroslav Šulc --- ...ta-xml-soap-api-1.4.2-dropSecurityManager.patch | 14 ++++++ .../jakarta-xml-soap-api-1.4.2-r1.ebuild | 52 -------------------- .../jakarta-xml-soap-api-1.4.2-r2.ebuild | 55 ++++++++++++++++++++++ 3 files changed, 69 insertions(+), 52 deletions(-) create mode 100644 dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch delete mode 100644 dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild create mode 100644 dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild (limited to 'dev-java') diff --git a/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch new file mode 100644 index 000000000000..a94489044d7f --- /dev/null +++ b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch @@ -0,0 +1,14 @@ +bug #923606 +--- a/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java ++++ b/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java +@@ -165,9 +165,7 @@ public class SAAJFactoryTest { + } + + private void enableSM() { +- System.setSecurityManager(null); +- System.setProperty("java.security.policy", classesDir + "javax/xml/soap/test.policy"); +- System.setSecurityManager(new SecurityManager()); ++ // no-op + } + + protected MessageFactory factory() throws Throwable { diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild deleted file mode 100644 index 3186460aa436..000000000000 --- a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" -MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)" -HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws" -SRC_URI="https://github.com/jakartaee/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz" - -# EDL-1.0 equivalent to BSD -# - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers -# - https://www.eclipse.org/org/documents/edl-v10.php -LICENSE="BSD" -# Since version 2.0.0, the namespace has changed to jakarta.xml.soap -SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" - -CP_DEPEND=" - >=dev-java/jakarta-activation-api-1.2.2-r1:1 -" - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -S="${WORKDIR}/saaj-api-${PV}" - -JAVA_SRC_DIR="api/src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="api/src/test/java" -JAVA_TEST_RESOURCE_DIRS=( "api/src/test/resources" ) -JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes ) - -DOCS=( CONTRIBUTING.md NOTICE.md README.md ) - -src_install() { - java-pkg-simple_src_install - einstalldocs # https://bugs.gentoo.org/789582 -} diff --git a/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild new file mode 100644 index 000000000000..fc7c2c78bdec --- /dev/null +++ b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" +MAVEN_ID="jakarta.xml.soap:jakarta.xml.soap-api:1.4.2" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="SOAP with Attachments API for Java (SAAJ) API (Eclipse Project for JAX-WS)" +HOMEPAGE="https://projects.eclipse.org/projects/ee4j.jaxws" +SRC_URI="https://github.com/jakartaee/saaj-api/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/saaj-api-${PV}" + +# EDL-1.0 equivalent to BSD +# - 'SPDX-License-Identifier: BSD-3-Clause' in source files' headers +# - https://www.eclipse.org/org/documents/edl-v10.php +LICENSE="BSD" +# Since version 2.0.0, the namespace has changed to jakarta.xml.soap +SLOT="1" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +CP_DEPEND=" + >=dev-java/jakarta-activation-api-1.2.2-r1:1 +" + +DEPEND=" + >=virtual/jdk-11:* + ${CP_DEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" + +PATCHES=( + "${FILESDIR}/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch" +) + +JAVA_SRC_DIR="api/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_SRC_DIR="api/src/test/java" +JAVA_TEST_RESOURCE_DIRS=( "api/src/test/resources" ) +JAVA_TEST_EXTRA_ARGS=( -Xbootclasspath/a:target/classes ) + +DOCS=( CONTRIBUTING.md NOTICE.md README.md ) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} -- cgit v1.2.3-65-gdbad