Import rpm: 9f83850ab29e2e62be34033bf44d15d8a032ce70
This commit is contained in:
James Antill
commit
878c3bdbcf
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/commons-compress-1.18-src.tar.gz
|
||||
37
0001-Remove-Brotli-compressor.patch
Normal file
37
0001-Remove-Brotli-compressor.patch
Normal file
@ -0,0 +1,37 @@
|
||||
From bba585e9e4fdfc67de3b53b58b8d60923e1ccd0c Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Mon, 12 Feb 2018 10:53:48 +0100
|
||||
Subject: [PATCH 1/2] Remove Brotli compressor
|
||||
|
||||
---
|
||||
.../commons/compress/compressors/CompressorStreamFactory.java | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 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 d730b9d..ab178a9 100644
|
||||
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
||||
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
||||
@@ -31,8 +31,6 @@ import java.util.Set;
|
||||
import java.util.SortedMap;
|
||||
import java.util.TreeMap;
|
||||
|
||||
-import org.apache.commons.compress.compressors.brotli.BrotliCompressorInputStream;
|
||||
-import org.apache.commons.compress.compressors.brotli.BrotliUtils;
|
||||
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
|
||||
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
|
||||
import org.apache.commons.compress.compressors.deflate.DeflateCompressorInputStream;
|
||||
@@ -586,10 +584,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
||||
}
|
||||
|
||||
if (BROTLI.equalsIgnoreCase(name)) {
|
||||
- if (!BrotliUtils.isBrotliCompressionAvailable()) {
|
||||
- throw new CompressorException("Brotli compression is not available." + YOU_NEED_BROTLI_DEC);
|
||||
- }
|
||||
- return new BrotliCompressorInputStream(in);
|
||||
+ throw new CompressorException("Brotli compression is not available in this build.");
|
||||
}
|
||||
|
||||
if (XZ.equalsIgnoreCase(name)) {
|
||||
--
|
||||
2.14.3
|
||||
|
||||
58
0002-Remove-ZSTD-compressor.patch
Normal file
58
0002-Remove-ZSTD-compressor.patch
Normal file
@ -0,0 +1,58 @@
|
||||
From bab91e014f73296a8ac9a3aef2aaa324a85e9b96 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Mon, 12 Feb 2018 10:59:55 +0100
|
||||
Subject: [PATCH 2/2] Remove ZSTD compressor
|
||||
|
||||
---
|
||||
.../compress/compressors/CompressorStreamFactory.java | 14 ++------------
|
||||
1 file changed, 2 insertions(+), 12 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 ab178a9..3817704 100644
|
||||
--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
||||
+++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
|
||||
@@ -54,9 +54,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
|
||||
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
|
||||
import org.apache.commons.compress.compressors.xz.XZUtils;
|
||||
import org.apache.commons.compress.compressors.z.ZCompressorInputStream;
|
||||
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
|
||||
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
|
||||
-import org.apache.commons.compress.compressors.zstandard.ZstdUtils;
|
||||
import org.apache.commons.compress.utils.IOUtils;
|
||||
import org.apache.commons.compress.utils.Lists;
|
||||
import org.apache.commons.compress.utils.ServiceLoaderIterator;
|
||||
@@ -516,10 +513,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
||||
return LZ4_FRAMED;
|
||||
}
|
||||
|
||||
- if (ZstdUtils.matches(signature, signatureLength)) {
|
||||
- return ZSTANDARD;
|
||||
- }
|
||||
-
|
||||
throw new CompressorException("No Compressor found for the stream signature.");
|
||||
}
|
||||
/**
|
||||
@@ -595,10 +588,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
||||
}
|
||||
|
||||
if (ZSTANDARD.equalsIgnoreCase(name)) {
|
||||
- if (!ZstdUtils.isZstdCompressionAvailable()) {
|
||||
- throw new CompressorException("Zstandard compression is not available." + YOU_NEED_ZSTD_JNI);
|
||||
- }
|
||||
- return new ZstdCompressorInputStream(in);
|
||||
+ throw new CompressorException("Zstandard compression is not available in this build.");
|
||||
}
|
||||
|
||||
if (LZMA.equalsIgnoreCase(name)) {
|
||||
@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
|
||||
}
|
||||
|
||||
if (ZSTANDARD.equalsIgnoreCase(name)) {
|
||||
- return new ZstdCompressorOutputStream(out);
|
||||
+ throw new CompressorException("Zstandard compression is not available in this build.");
|
||||
}
|
||||
} catch (final IOException e) {
|
||||
throw new CompressorException("Could not create CompressorOutputStream", e);
|
||||
--
|
||||
2.14.3
|
||||
|
||||
54
0003-Remove-Pack200-compressor.patch
Normal file
54
0003-Remove-Pack200-compressor.patch
Normal file
@ -0,0 +1,54 @@
|
||||
From 9937297a90b43a5e1238932eb8a07c44303056ed Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
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
|
||||
|
||||
222
apache-commons-compress.spec
Normal file
222
apache-commons-compress.spec
Normal file
@ -0,0 +1,222 @@
|
||||
%global base_name compress
|
||||
%global short_name commons-%{base_name}
|
||||
|
||||
Name: apache-%{short_name}
|
||||
Version: 1.18
|
||||
Release: 1%{?dist}
|
||||
Summary: Java API for working with compressed files and archivers
|
||||
License: ASL 2.0
|
||||
URL: http://commons.apache.org/proper/commons-compress/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz
|
||||
|
||||
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}
|
||||
|
||||
%description javadoc
|
||||
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:
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -f .mfiles
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%doc LICENSE.txt NOTICE.txt
|
||||
|
||||
%changelog
|
||||
* Fri Oct 05 2018 Marian Koncek <mkoncek@redhat.com> - 1.18-1
|
||||
- Update to upstream version 1.18
|
||||
- Resolves: CVE-2018-11771
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Tue Jun 05 2018 Michael Simacek <msimacek@redhat.com> - 1.17-1
|
||||
- Update to upstream version 1.17
|
||||
|
||||
* Mon Feb 12 2018 Michael Simacek <msimacek@redhat.com> - 1.16.1-1
|
||||
- Update to upstream version 1.16.1
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Oct 22 2017 Michael Simacek <msimacek@redhat.com> - 1.15-1
|
||||
- Update to upstream version 1.15
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 14 2017 Roman Vais <rvais@redhat.com> - 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 <releng@fedoraproject.org> - 1.13-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jan 02 2017 Michael Simacek <msimacek@redhat.com> - 1.13-1
|
||||
- Update to upstream version 1.13
|
||||
|
||||
* Wed Jun 22 2016 Michael Simacek <msimacek@redhat.com> - 1.12-1
|
||||
- Update to upstream version 1.12
|
||||
|
||||
* Mon May 02 2016 Michael Simacek <msimacek@redhat.com> - 1.11-1
|
||||
- Update to upstream version 1.11
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.10-0.3.svn1684406
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10-0.2.svn1684406
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Tue Jun 9 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10-0.1.svn1684406
|
||||
- Update to latest upstream snapshot
|
||||
|
||||
* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-2
|
||||
- Remove legacy Obsoletes/Provides for jakarta-commons
|
||||
|
||||
* Mon Oct 13 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9-1
|
||||
- Update to upstream version 1.9
|
||||
|
||||
* Wed Jul 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8.1-3
|
||||
- Fix build-requires on apache-commons-parent
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 23 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8.1-1
|
||||
- Update to upstream version 1.8.1
|
||||
|
||||
* Mon Mar 17 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-2
|
||||
- Remove dependency on maven-scm-publish-plugin
|
||||
|
||||
* Fri Mar 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-1
|
||||
- Update to upstream version 1.8
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.7-2
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Mon Jan 20 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-1
|
||||
- Update to upstream version 1.7
|
||||
|
||||
* Tue Oct 29 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6-1
|
||||
- Update to upstream version 1.6
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Mar 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-1
|
||||
- Update to upstream version 1.5
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.4.1-5
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Wed Jan 9 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.1-4
|
||||
- Bump release tag
|
||||
|
||||
* Tue Jan 8 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4.1-3
|
||||
- Build with xmvn
|
||||
- Update to current packaging guidelines
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu May 24 2012 Sandro Mathys <red at fedoraproject.org> - 1.4.1-1
|
||||
- Updated to 1.4.1
|
||||
- Fixes CVE-2012-2098 Low: Denial of Service
|
||||
|
||||
* Fri Apr 27 2012 Sandro Mathys <red at fedoraproject.org> - 1.4-1
|
||||
- Updated to 1.4
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Nov 01 2011 Sandro Mathys <red at fedoraproject.org> - 1.3-1
|
||||
- Updated to 1.3
|
||||
|
||||
* Thu Aug 04 2011 Sandro Mathys <red at fedoraproject.org> - 1.2-2
|
||||
- Fixing mistake where different versions of the spec file got mixed up
|
||||
|
||||
* Thu Aug 04 2011 Sandro Mathys <red at fedoraproject.org> - 1.2-1
|
||||
- Updated to 1.2
|
||||
|
||||
* Sat Apr 16 2011 Chris Spike <spike@fedoraproject.org> 1.1-1
|
||||
- Updated to 1.1
|
||||
- Adapted to current java packaging guidelines
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sun Jul 11 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-8
|
||||
- Fixed the Maven depmap line by replacing org.apache.maven by org.apache.commons
|
||||
|
||||
* Mon May 31 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-7
|
||||
- Fixed regression with missing Provides/Obsoletes for javadocs
|
||||
- Fixed changelog format
|
||||
|
||||
* Sun May 23 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-6
|
||||
- Fixed Maven depmap to use commons-compress
|
||||
|
||||
* Thu May 13 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-5
|
||||
- Added missing Provides/Obsoletes for javadocs
|
||||
|
||||
* Mon May 10 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-4
|
||||
- Cleared some problems after the review
|
||||
|
||||
* Thu May 06 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-3
|
||||
- Now using maven2 (mvn-jpp) instead of directly calling javac & co
|
||||
|
||||
* Tue May 04 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-2
|
||||
- Renamed from jakarta-commons-compress
|
||||
8
gating.yaml
Normal file
8
gating.yaml
Normal file
@ -0,0 +1,8 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_contexts:
|
||||
- osci_compose_gate
|
||||
rules:
|
||||
# https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
|
||||
- !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
|
||||
Loading…
Reference in New Issue
Block a user