From 56068178312313f0282e16fc7179728180470c88 Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Tue, 16 May 2023 09:45:48 +0200 Subject: [PATCH] import sources --- .gitignore | 1 + 0003-Remove-Pack200-compressor.patch | 54 ----------- apache-commons-compress.spec | 138 ++++++++++++++++++++++----- sources | 2 +- 4 files changed, 116 insertions(+), 79 deletions(-) delete mode 100644 0003-Remove-Pack200-compressor.patch diff --git a/.gitignore b/.gitignore index 37af642..85b2453 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SOURCES/commons-compress-1.5-src.tar.gz +/commons-compress-1.18-src.tar.gz diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch deleted file mode 100644 index 5aa1b14..0000000 --- a/0003-Remove-Pack200-compressor.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9937297a90b43a5e1238932eb8a07c44303056ed Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Fri, 6 Aug 2021 13:42:40 +0200 -Subject: [PATCH] Remove Pack200 compressor - ---- - .../compress/compressors/CompressorStreamFactory.java | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -index eee7c31..de7da23 100644 ---- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java -@@ -45,8 +45,6 @@ import org.apache.commons.compress.compressors.lz4.FramedLZ4CompressorOutputStre - import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; - import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream; - import org.apache.commons.compress.compressors.lzma.LZMAUtils; --import org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream; --import org.apache.commons.compress.compressors.pack200.Pack200CompressorOutputStream; - import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream; - import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream; - import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream; -@@ -478,10 +476,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider { - return GZIP; - } - -- if (Pack200CompressorInputStream.matches(signature, signatureLength)) { -- return PACK200; -- } -- - if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { - return SNAPPY_FRAMED; - } -@@ -592,7 +586,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { - } - - if (PACK200.equalsIgnoreCase(name)) { -- return new Pack200CompressorInputStream(in); -+ throw new CompressorException("Pack200 compression is not available in this build."); - } - - if (SNAPPY_RAW.equalsIgnoreCase(name)) { -@@ -673,7 +667,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { - } - - if (PACK200.equalsIgnoreCase(name)) { -- return new Pack200CompressorOutputStream(out); -+ throw new CompressorException("Pack200 compression is not available in this build."); - } - - if (LZMA.equalsIgnoreCase(name)) { --- -2.31.1 - diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index b68d7bd..937f5cc 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -2,34 +2,36 @@ %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.5 -Release: 4%{?dist} +Version: 1.18 +Release: 1%{?dist} Summary: Java API for working with compressed files and archivers -Group: Development/Libraries License: ASL 2.0 -URL: http://commons.apache.org/%{base_name}/ -Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +URL: http://commons.apache.org/proper/commons-compress/ BuildArch: noarch -BuildRequires: maven-local -BuildRequires: javapackages-tools >= 0.10.0 -BuildRequires: apache-commons-parent >= 26-7 -BuildRequires: maven-surefire-provider-junit -BuildRequires: xz-java +Source0: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz -Provides: jakarta-%{short_name} = %{version}-%{release} -Obsoletes: jakarta-%{short_name} < 1.0-2 +Patch0: 0001-Remove-Brotli-compressor.patch +Patch1: 0002-Remove-ZSTD-compressor.patch + +BuildRequires: maven-local +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.powermock:powermock-api-mockito) +BuildRequires: mvn(org.powermock:powermock-module-junit4) +BuildRequires: mvn(org.tukaani:xz) %description The Apache Commons Compress library defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200 and bzip2 files. - +In version 1.14 read-only support for Brotli decompression has been added, +but it has been removed form this package. %package javadoc Summary: API documentation for %{name} -Group: Documentation -Provides: jakarta-%{short_name}-javadoc = %{version}-%{release} -Obsoletes: jakarta-%{short_name}-javadoc < 1.0-2 %description javadoc This package provides %{summary}. @@ -37,6 +39,25 @@ This package provides %{summary}. %prep %setup -q -n %{short_name}-%{version}-src +# Unavailable Google Brotli library (org.brotli.dec) +%patch0 -p1 +%pom_remove_dep org.brotli:dec +rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli + +# Unavailable ZSTD JNI library +%patch1 -p1 +%pom_remove_dep :zstd-jni +rm -r src/{main,test}/java/org/apache/commons/compress/compressors/zstandard +rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCase.java + +# remove osgi tests, we don't have deps for them +%pom_remove_dep org.ops4j.pax.exam:::test +%pom_remove_dep :org.apache.felix.framework::test +%pom_remove_dep :javax.inject::test +%pom_remove_dep :slf4j-api::test +rm src/test/java/org/apache/commons/compress/OsgiITest.java + + %build %mvn_file : %{short_name} %{name} %mvn_alias : commons: @@ -51,17 +72,86 @@ This package provides %{summary}. %files javadoc -f .mfiles-javadoc %doc LICENSE.txt NOTICE.txt - %changelog -* Fri Dec 27 2013 Daniel Mach - 1.5-4 -- Mass rebuild 2013-12-27 +* Fri Oct 05 2018 Marian Koncek - 1.18-1 +- Update to upstream version 1.18 +- Resolves: CVE-2018-11771 -* Fri Sep 20 2013 Mikolaj Izdebski - 1.5-3 -- Add BuildRequires on apache-commons-parent >= 26-7 +* Thu Jul 12 2018 Fedora Release Engineering - 1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Fri Jun 28 2013 Mikolaj Izdebski - 1.5-2 -- Rebuild to regenerate API documentation -- Resolves: CVE-2013-1571 +* Tue Jun 05 2018 Michael Simacek - 1.17-1 +- Update to upstream version 1.17 + +* Mon Feb 12 2018 Michael Simacek - 1.16.1-1 +- Update to upstream version 1.16.1 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sun Oct 22 2017 Michael Simacek - 1.15-1 +- Update to upstream version 1.15 + +* Wed Jul 26 2017 Fedora Release Engineering - 1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 14 2017 Roman Vais - 1.14-1 +- Update to upstream version 1.14 +- Remove Brotli support, it is not packaged for fedora + +* Fri Feb 10 2017 Fedora Release Engineering - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 02 2017 Michael Simacek - 1.13-1 +- Update to upstream version 1.13 + +* Wed Jun 22 2016 Michael Simacek - 1.12-1 +- Update to upstream version 1.12 + +* Mon May 02 2016 Michael Simacek - 1.11-1 +- Update to upstream version 1.11 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.10-0.3.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10-0.2.svn1684406 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Jun 9 2015 Mikolaj Izdebski - 1.10-0.1.svn1684406 +- Update to latest upstream snapshot + +* Tue Oct 14 2014 Mikolaj Izdebski - 1.9-2 +- Remove legacy Obsoletes/Provides for jakarta-commons + +* Mon Oct 13 2014 Mikolaj Izdebski - 1.9-1 +- Update to upstream version 1.9 + +* Wed Jul 30 2014 Mikolaj Izdebski - 1.8.1-3 +- Fix build-requires on apache-commons-parent + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 Mikolaj Izdebski - 1.8.1-1 +- Update to upstream version 1.8.1 + +* Mon Mar 17 2014 Mikolaj Izdebski - 1.8-2 +- Remove dependency on maven-scm-publish-plugin + +* Fri Mar 14 2014 Mikolaj Izdebski - 1.8-1 +- Update to upstream version 1.8 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.7-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Jan 20 2014 Mikolaj Izdebski - 1.7-1 +- Update to upstream version 1.7 + +* Tue Oct 29 2013 Mikolaj Izdebski - 1.6-1 +- Update to upstream version 1.6 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Thu Mar 14 2013 Mikolaj Izdebski - 1.5-1 - Update to upstream version 1.5 diff --git a/sources b/sources index f0e67b1..dac24ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA1 (commons-compress-1.5-src.tar.gz) = d042a969f3941c6434dd05084690f2a0f4557613 +SHA512 (commons-compress-1.18-src.tar.gz) = e601e150e58ee453991789e0e58337e71725210fc798d77954ce525ba6fd3312a3b0174aba9f4bfbe7c6bac806a29247ad6a31eca8bd540c6f850777bf8a926d