diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index e69de29..2e972ee 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,3 @@ +jdom-1.1.1.tar.gz +jdom-1.1.2.tar.gz +jdom-1.1.3.tar.gz diff --git a/CVE-2021-33813.patch b/CVE-2021-33813.patch new file mode 100644 index 0000000..f850266 --- /dev/null +++ b/CVE-2021-33813.patch @@ -0,0 +1,42 @@ +--- libjdom1-java-1.1.3.orig/src/java/org/jdom/input/SAXBuilder.java ++++ libjdom1-java-1.1.3/src/java/org/jdom/input/SAXBuilder.java +@@ -442,6 +442,11 @@ public class SAXBuilder { + public void setFeature(String name, boolean value) { + // Save the specified feature for later. + features.put(name, value ? Boolean.TRUE : Boolean.FALSE); ++ if (name.equals("http://xml.org/sax/features/external-general-entities")) { ++ // See issue https://github.com/hunterhacker/jdom/issues/189 ++ // And PR https://github.com/hunterhacker/jdom/pull/188 ++ setExpandEntities(value); ++ } + } + + /** +@@ -766,13 +771,6 @@ public class SAXBuilder { + internalSetFeature(parser, name, value.booleanValue(), name); + } + +- // Set any user-specified properties on the parser. +- iter = properties.keySet().iterator(); +- while (iter.hasNext()) { +- String name = (String)iter.next(); +- internalSetProperty(parser, name, properties.get(name), name); +- } +- + if (coreFeatures) { + // Set validation. + try { +@@ -810,6 +808,13 @@ public class SAXBuilder { + } + catch (SAXNotRecognizedException e) { /* Ignore... */ } + catch (SAXNotSupportedException e) { /* Ignore... */ } ++ ++ // Set any user-specified properties on the parser. ++ iter = properties.keySet().iterator(); ++ while (iter.hasNext()) { ++ String name = (String)iter.next(); ++ internalSetProperty(parser, name, properties.get(name), name); ++ } + } + + /** diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..df26947 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional} diff --git a/jdom-1.1-OSGiManifest.patch b/jdom-1.1-OSGiManifest.patch new file mode 100644 index 0000000..5e77ef8 --- /dev/null +++ b/jdom-1.1-OSGiManifest.patch @@ -0,0 +1,20 @@ +diff -up ./package/META-INF/MANIFEST.MF.osgimanifest ./package/META-INF/MANIFEST.MF +--- jdom/package/META-INF/MANIFEST.MF.osgimanifest 2008-07-21 16:00:59.000000000 -0400 ++++ jdom/package/META-INF/MANIFEST.MF 2008-07-21 16:02:20.000000000 -0400 +@@ -1,4 +1,16 @@ + Manifest-Version: 1.0 ++Bundle-RequiredExecutionEnvironment: J2SE-1.4 ++Bundle-SymbolicName: org.jdom ++Bundle-ManifestVersion: 2 ++Bundle-Name: %Bundle-Name.0 ++Bundle-Localization: plugin ++Bundle-Version: 1.1.2 ++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" ++Require-Bundle: org.apache.xerces;resolution:=optional + + Name: org/jdom/ + Specification-Title: JDOM Classes diff --git a/jdom-1.1.3.pom b/jdom-1.1.3.pom new file mode 100644 index 0000000..74b7e28 --- /dev/null +++ b/jdom-1.1.3.pom @@ -0,0 +1,75 @@ + + 4.0.0 + org.jdom + jdom + jar + + JDOM + 1.1.3 + + + A complete, Java-based solution for accessing, manipulating, + and outputting XML data + + http://www.jdom.org + + + JDOM + http://www.jdom.org + + + + + JDOM-interest Mailing List + jdom-interest@jdom.org + http://jdom.markmail.org/ + + + + + + Similar to Apache License but with the acknowledgment clause removed + https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt + repo + + + + + git@github.com:/hunterhacker/jdom + scm:git:git@github.com:hunterhacker/jdom + scm:git:git@github.com:hunterhacker/jdom + + + + + hunterhacker + Jason Hunter + jhunter@servlets.com + + + rolfl + Rolf Lear + jdom@tuis.net + + + + + + jaxen + jaxen + 1.1.3 + true + + + xerces + xercesImpl + 2.10.0 + true + + + + + + 1.2 + + \ No newline at end of file diff --git a/jdom-crosslink.patch b/jdom-crosslink.patch new file mode 100644 index 0000000..7992dc8 --- /dev/null +++ b/jdom-crosslink.patch @@ -0,0 +1,11 @@ +--- jdom/build.xml.orig 2010-02-05 12:37:26.594658382 +0000 ++++ jdom/build.xml 2010-02-05 12:38:09.201658171 +0000 +@@ -277,7 +277,7 @@ + bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved."> + + +- ++ + + + diff --git a/jdom.spec b/jdom.spec new file mode 100644 index 0000000..602d0da --- /dev/null +++ b/jdom.spec @@ -0,0 +1,361 @@ +%bcond_with bootstrap + +# Copyright (c) 2000-2012, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +Name: jdom +Version: 1.1.3 +Release: 42%{?dist} +Summary: Java alternative to DOM and SAX +License: Saxpath +URL: http://www.jdom.org/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: http://jdom.org/dist/binary/archive/jdom-%{version}.tar.gz +Source1: https://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{version}.pom + +Patch: %{name}-crosslink.patch +Patch: %{name}-1.1-OSGiManifest.patch +# Security patches +Patch: CVE-2021-33813.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: javapackages-local +BuildRequires: ant +%endif + +%description +JDOM is, quite simply, a Java representation of an XML document. JDOM +provides a way to represent that document for easy and efficient +reading, manipulation, and writing. It has a straightforward API, is a +lightweight and fast, and is optimized for the Java programmer. It's an +alternative to DOM and SAX, although it integrates well with both DOM +and SAX. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. + +%package demo +Summary: Demos for %{name} +Requires: %{name} = %{version}-%{release} + +%description demo +Demonstrations and samples for %{name}. + +%prep +%autosetup -p1 -n %{name} +# remove all binary libs +find . -name "*.jar" -exec rm -f {} \; +find . -name "*.class" -exec rm -f {} \; + +%build +%ant -Dcompile.source=1.8 -Dcompile.target=1.8 -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link + +%install +%mvn_file : %{name} +%mvn_alias : jdom:jdom +%mvn_artifact %{SOURCE1} build/%{name}-*-snap.jar +%mvn_install -J build/apidocs + +# demo +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name} + +%files -f .mfiles +%license LICENSE.txt +%doc CHANGES.txt COMMITTERS.txt README.txt TODO.txt + +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt + +%files demo +%{_datadir}/%{name} +%license LICENSE.txt + +%changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1.1.3-40 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.3-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Feb 29 2024 Jiri Vanek - 1.1.3-38 +- bump of release for for java-21-openjdk as system jdk + +* Tue Feb 27 2024 Jiri Vanek - 1.1.3-37 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 1.1.3-36 +- Update Java source/target to 1.8 + +* Wed Jan 24 2024 Fedora Release Engineering - 1.1.3-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1.1.3-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.3-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.3-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.1.3-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.1.3-30 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.3-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1.1.3-28 +- Bump Java compiler source/target levels to 1.7 + +* Thu Jul 22 2021 Nicolas Lécureuil - 1.1.3-27 +- Add P100: Fixes CVE-2021-33813 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.3-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.1.3-25 +- Bump release + +* Mon May 17 2021 Mikolaj Izdebski - 1.1.3-20 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 0:1.1.3-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0:1.1.3-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 0:1.1.3-22 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Alexander Kurtakov 0:1.1.3-21 +- Fix compilation with Java 11. + +* Wed Jan 29 2020 Fedora Release Engineering - 0:1.1.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.1.3-19 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 0:1.1.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.1.3-18 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 0:1.1.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Aug 03 2018 Michael Simacek - 0:1.1.3-17 +- Correct license to Saxpath + +* Fri Jul 13 2018 Fedora Release Engineering - 0:1.1.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0:1.1.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0:1.1.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Mar 22 2017 Michael Simacek - 0:1.1.3-13 +- fix JAR installation + +* Wed Mar 22 2017 Michael Simacek - 0:1.1.3-12 +- Install with XMvn + +* Fri Feb 10 2017 Fedora Release Engineering - 0:1.1.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0:1.1.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jul 14 2015 Mikolaj Izdebski - 0:1.1.3-9 +- Add build-requires on javapackages-local + +* Wed Jun 17 2015 Fedora Release Engineering - 0:1.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 0:1.1.3-6 +- Use .mfiles generated during build + +* Sat Aug 03 2013 Fedora Release Engineering - 0:1.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0:1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Dec 14 2012 Stanislav Ochotnicky - 0:1.1.3-3 +- Add jaxen on build classpath to compile full support + +* Thu Jul 19 2012 Fedora Release Engineering - 0:1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Apr 17 2012 Alexander Kurtakov 0:1.1.3-1 +- Update to upstream 1.1.3 release. + +* Fri Apr 13 2012 Krzysztof Daniel 0:1.1.2-3 +- Update OSGI Manifest. + +* Fri Jan 13 2012 Fedora Release Engineering - 0:1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 2 2011 Alexander Kurtakov 0:1.1.2-1 +- New upstream version. +- Adapt to current guidelines. + +* Wed Feb 09 2011 Fedora Release Engineering - 0:1.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 15 2010 Stanislav Ochotnicky - 0:1.1.1-4 +- Add compatibility depmap jdom:jdom +- Versionless jars & javadocs + +* Wed Nov 3 2010 Alexander Kurtakov 0:1.1.1-3 +- Really fix license tag. + +* Mon Nov 1 2010 Alexander Kurtakov 0:1.1.1-2 +- Drop gcj support. +- Fix license tag. +- Fix requires and build requires. + +* Fri Feb 5 2010 Mary Ellen Foster 0:1.1.1-1 +- Update to 1.1.1 bug#316380 +- Add maven dependency information +- Make javadoc and demo subpackages noarch + +* Fri Jul 24 2009 Fedora Release Engineering - 0:1.0-7.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 0:1.0-6.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 21 2008 Andrew Overholt 1.0-5.5 +- Add OSGi manifest information + +* Wed Jul 9 2008 Tom "spot" Callaway - 0:1.0-5.4 +- drop repotag + +* Thu May 29 2008 Tom "spot" Callaway - 0:1.0-5jpp.3 +- fix license tag + +* Mon Feb 18 2008 Fedora Release Engineering - 0:1.0-5jpp.2 +- Autorebuild for GCC 4.3 + +* Thu Sep 20 2007 Deepak Bhole - 0:1.0-4jpp.2 +- Add %%{?dist} as per policy + +* Fri Aug 04 2006 Deepak Bhole - 0:1.0-4jpp.1 +- Added missing requirements. +- Remove jaxen requirement, since we don't have it in fc yet. +- Merge with fc spec. + +* Tue Apr 11 2006 Ralph Apel - 0:1.0-3jpp +- First JPP-1.7 release +- Drop false xalan dependency + +* Tue Oct 11 2005 Ralph Apel - 0:1.0-2jpp +- Add jaxen to Requires and classpath + +* Sat Sep 18 2004 Ralph Apel - 0:1.0-1jpp +- Upgrade to 1.0 final + +* Tue Sep 07 2004 Ralph Apel - 0:1.0-0.rc1.1jpp +- Upgrade to 1.0-rc1 + +* Sun Aug 23 2004 Randy Watler - 0:1.0-0.b9.4jpp +- Rebuild with ant-1.6.2 + +* Mon Jul 19 2004 Ville Skyttä - 0:1.0-0.b9.3jpp +- Add non-versioned javadoc dir symlink. +- Crosslink with local J2SE javadocs. + +* Thu Jan 22 2004 David Walluck 0:1.0-0.b9.2jpp +- fix URL + +* Wed Jan 21 2004 David Walluck 0:1.0-0.b9.1jpp +- b9 +- don't use classic compiler + +* Thu Mar 27 2003 Ville Skyttä - 0:1.0-0.b8.2jpp +- Adapted to JPackage 1.5. +- Use sed instead of bash 2 extension when symlinking jars during build. + +* Wed May 08 2002 Guillaume Rousse 1.0-0.b8.1jpp +- vendor, distribution, group tags + +* Sat Jan 19 2002 Guillaume Rousse 1.0-0.b7.6jpp +- versioned dir for javadoc +- requires xalan-j2 >= 2.2.0 +- no dependencies for javadoc package +- stricter dependency for demo package +- section macro + +* Wed Dec 5 2001 Guillaume Rousse 1.0-0.b7.5jpp +- javadoc into javadoc package + +* Wed Nov 21 2001 Christian Zoffoli 1.0-0.b7.4jpp +- removed packager tag +- new jpp extension +- added xalan 2.2.D13 support + +* Sat Oct 6 2001 Guillaume Rousse 1.0-0.b7.3jpp +- used original tarball + +* Sun Sep 30 2001 Guillaume Rousse 1.0-0.b7.2jpp +- first unified release +- s/jPackage/JPackage + +* Mon Sep 17 2001 Guillaume Rousse 1.0-0.b7.1mdk +- Requires and BuildRequires xalan-j2 +- vendor tag +- packager tag +- s/Copyright/License/ +- truncated description to 72 columns in spec +- spec cleanup +- used versioned jar +- added demo package + +* Sat Feb 17 2001 Guillaume Rousse 1.0b6-1mdk +- first Mandrake release diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8ba3510 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: c9s +execute: + how: tmt diff --git a/sources b/sources new file mode 100644 index 0000000..bd9f542 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (jdom-1.1.3.tar.gz) = a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278