Sync from SUSE:SLFO:Main jdom revision 2925df7907678a3256b89340e4deb1ef

jdom.changes

@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Wed Feb 21 10:46:24 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Thu Aug 24 10:16:57 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
-- Build only the jdom package and drop xom, jaxen and xom into
+- Build only the jdom package and drop xom, jaxen and saxpath into
   separate standalone packages
 - Removed patches:
   * jdom-1.1-build.xml.patch
@@ -9,9 +14,9 @@ Thu Aug 24 10:16:57 UTC 2023 - Fridrich Strba <fstrba@suse.com>
     + not needed with the current package
 - Added patches:
   * CVE-2021-33813.patch
-    + fix CVE-2021-33813: An XXE issue in SAXBuilder in JDOM
-      through 2.0.6 allows attackers to cause a denial of service
-      via a crafted HTTP request.
+    + fix bsc#1187446, CVE-2021-33813: An XXE issue in SAXBuilder
+      in JDOM through 2.0.6 allows attackers to cause a denial of
+      service via a crafted HTTP request.
   * jdom-crosslink.patch
     + do not link to javadocs on web
   * no-jaxen.patch

jdom.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package jdom
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -57,10 +57,10 @@ Demonstrations and samples for %{name}.
 
 %prep
 %setup -q -n %{name}
-%patch0
-%patch1
-%patch2 -p1
-%patch10 -p1
+%patch -P 0
+%patch -P 1
+%patch -P 2 -p1
+%patch -P 10 -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 find . -name "*.class" -exec rm -f {} \;