diff --git a/jdom-1.1-OSGiManifest.patch b/jdom-1.1-OSGiManifest.patch index b068d0a..a898083 100644 --- a/jdom-1.1-OSGiManifest.patch +++ b/jdom-1.1-OSGiManifest.patch @@ -1,5 +1,4 @@ -diff -up ./package/META-INF/MANIFEST.MF.osgimanifest ./package/META-INF/MANIFEST.MF ---- ./package/META-INF/MANIFEST.MF.osgimanifest 2008-07-21 16:00:59.000000000 -0400 +--- ./package/META-INF/MANIFEST.MF 2008-07-21 16:00:59.000000000 -0400 +++ ./package/META-INF/MANIFEST.MF 2008-07-21 16:02:20.000000000 -0400 @@ -1,4 +1,16 @@ Manifest-Version: 1.0 @@ -8,12 +7,12 @@ diff -up ./package/META-INF/MANIFEST.MF.osgimanifest ./package/META-INF/MANIFEST +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-Localization: plugin -+Bundle-Version: 1.1.2 ++Bundle-Version: 1.1.3 +Bundle-Vendor: %Bundle-Vendor.0 -+Export-Package: org.jdom;version="1.1.2",org.jdom.adapters;version="1. -+ 1.2",org.jdom.filter;version="1.1.2",org.jdom.input;version="1.1.2",o -+ rg.jdom.output;version="1.1.2",org.jdom.transform;version="1.1.2",org -+ .jdom.xpath;version="1.1.2" ++Export-Package: org.jdom;version="1.1.3",org.jdom.adapters;version="1. ++ 1.2",org.jdom.filter;version="1.1.3",org.jdom.input;version="1.1.3",o ++ rg.jdom.output;version="1.1.3",org.jdom.transform;version="1.1.3",org ++ .jdom.xpath;version="1.1.3" +Require-Bundle: org.apache.xerces;resolution:=optional Name: org/jdom/ diff --git a/jdom.changes b/jdom.changes index 02f45d5..33e2e09 100644 --- a/jdom.changes +++ b/jdom.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Aug 24 10:16:57 UTC 2023 - Fridrich Strba + +- Build only the jdom package and drop xom, jaxen and xom into + separate standalone packages +- Removed patches: + * jdom-1.1-build.xml.patch + * jdom-1.1-xom-get-jaxen.patch + + 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. + * jdom-crosslink.patch + + do not link to javadocs on web + * no-jaxen.patch + + do not fail to generate javadoc when jaxen is not present +- Modified patch: + * jdom-1.1-OSGiManifest.patch + + rediff + ------------------------------------------------------------------- Wed Mar 30 09:52:00 UTC 2022 - Fridrich Strba