3 files changed, 32 insertions, 16 deletions
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
deleted file mode 100644
index a94489044d7f..000000000000
--- a/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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/files/jakarta-xml-soap-api-1.4.2-removeSecurityManager.patch b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-removeSecurityManager.patch
new file mode 100644
index 000000000000..fbbaecd6d239
--- /dev/null
+++ b/dev-java/jakarta-xml-soap-api/files/jakarta-xml-soap-api-1.4.2-removeSecurityManager.patch
@@ -0,0 +1,30 @@
+bug #946904
+--- a/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java
++++ b/api/src/test/java/javax/xml/soap/test/SAAJFactoryTest.java
+@@ -101,7 +101,6 @@ public class SAAJFactoryTest {
+                            String spiClass) {
+ 
+         // ensure setup may be done ...
+-        System.setSecurityManager(null);
+ 
+         if (systemProperty != null) {
+             System.setProperty("javax.xml.soap.MessageFactory", systemProperty);
+@@ -154,7 +153,6 @@ public class SAAJFactoryTest {
+ 
+             // unsafe; not running:
+             cleanResource(jdkFile);
+-            System.setSecurityManager(null);
+         }
+     }
+ 
+@@ -165,9 +163,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-r2.ebuild b/dev-java/jakarta-xml-soap-api/jakarta-xml-soap-api-1.4.2-r3.ebuild
index 2f8395024399..c118673def6e 100644
--- 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-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2024 Gentoo Authors
+# Copyright 2022-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/jakarta-xml-soap-api-1.4.2-dropSecurityManager.patch"
+	"${FILESDIR}/jakarta-xml-soap-api-1.4.2-removeSecurityManager.patch"
 )
 
 JAVA_SRC_DIR="api/src/main/java"