commit: ebc4c3a08e9dbdb5846fcd125b390fef2abe3375 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Mar 25 11:44:07 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Mar 26 08:18:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebc4c3a0
dev-java/jaxb-api: 2.3.3-r2 drop SecurityManager Closes: https://bugs.gentoo.org/916476 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../files/jaxb-api-2.3.3-dropSecurityManager.patch | 10 ++++++++++ ...b-api-2.3.3-r1.ebuild => jaxb-api-2.3.3-r2.ebuild} | 19 ++++++++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dev-java/jaxb-api/files/jaxb-api-2.3.3-dropSecurityManager.patch b/dev-java/jaxb-api/files/jaxb-api-2.3.3-dropSecurityManager.patch new file mode 100644 index 000000000000..36fed49987b4 --- /dev/null +++ b/dev-java/jaxb-api/files/jaxb-api-2.3.3-dropSecurityManager.patch @@ -0,0 +1,10 @@ +--- a/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java ++++ b/jaxb-api-test/src/test/java/javax/xml/bind/test/JAXBContextTest.java +@@ -265,7 +265,6 @@ public class JAXBContextTest { + private void enableSM() { + System.setSecurityManager(null); + System.setProperty("java.security.policy", classesDir + "javax/xml/bind/test.policy"); +- System.setSecurityManager(new SecurityManager()); + } + + private void cleanResource(Path resource) { diff --git a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild b/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild similarity index 77% rename from dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild rename to dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild index 179eb6a32e3c..74252fbab260 100644 --- a/dev-java/jaxb-api/jaxb-api-2.3.3-r1.ebuild +++ b/dev-java/jaxb-api/jaxb-api-2.3.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -31,18 +31,23 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} >=virtual/jre-1.8:*" -DOCS=( ../{LICENSE,NOTICE,README}.md ) - +DOCS=( {LICENSE,NOTICE,README}.md ) +PATCHES=( "${FILESDIR}/jaxb-api-2.3.3-dropSecurityManager.patch" ) S="${WORKDIR}/${P}/${PN}" JAVA_GENTOO_CLASSPATH="jakarta-activation-api-1" JAVA_GENTOO_CLASSPATH_EXTRA="jaxb-api.jar" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_RESOURCE_DIRS="${PN}/src/main/resources" +JAVA_SRC_DIR="${PN}/src/main/java" JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="../${PN}-test/src/test/java" -JAVA_TEST_RESOURCE_DIRS="../${PN}-test/src/test/resources" +JAVA_TEST_RESOURCE_DIRS="${PN}-test/src/test/resources" +JAVA_TEST_SRC_DIR="${PN}-test/src/test/java" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare +} src_install() { default
