diff --git a/0001-Remove-Brotli-compressor.patch b/0001-Remove-Brotli-compressor.patch index 5fa1c84..6111698 100644 --- a/0001-Remove-Brotli-compressor.patch +++ b/0001-Remove-Brotli-compressor.patch @@ -1,17 +1,17 @@ -From bba585e9e4fdfc67de3b53b58b8d60923e1ccd0c Mon Sep 17 00:00:00 2001 +From 0b10cc9b13fa782b7e318fdbc0d8c790a472f722 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:53:48 +0100 -Subject: [PATCH 1/2] Remove Brotli compressor +Subject: [PATCH 1/3] Remove Brotli compressor --- - .../commons/compress/compressors/CompressorStreamFactory.java | 7 +------ + .../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 +index ca0973095..2406d5a44 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; +@@ -30,8 +30,6 @@ import java.util.SortedMap; import java.util.TreeMap; @@ -20,7 +20,7 @@ index d730b9d..ab178a9 100644 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 { +@@ -545,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina } if (BROTLI.equalsIgnoreCase(name)) { @@ -33,5 +33,5 @@ index d730b9d..ab178a9 100644 if (XZ.equalsIgnoreCase(name)) { -- -2.14.3 +2.43.0 diff --git a/0002-Remove-ZSTD-compressor.patch b/0002-Remove-ZSTD-compressor.patch index cb3963f..24a8c3a 100644 --- a/0002-Remove-ZSTD-compressor.patch +++ b/0002-Remove-ZSTD-compressor.patch @@ -1,17 +1,17 @@ -From bab91e014f73296a8ac9a3aef2aaa324a85e9b96 Mon Sep 17 00:00:00 2001 +From d80b7b190c789c33a15f56613a21c44827a63c75 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 12 Feb 2018 10:59:55 +0100 -Subject: [PATCH 2/2] Remove ZSTD compressor +Subject: [PATCH 2/3] Remove ZSTD compressor --- - .../compress/compressors/CompressorStreamFactory.java | 14 ++------------ - 1 file changed, 2 insertions(+), 12 deletions(-) + .../compressors/CompressorStreamFactory.java | 22 ++++--------------- + 1 file changed, 4 insertions(+), 18 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 +index 2406d5a44..9ed40a3d7 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; +@@ -53,9 +53,6 @@ import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream; import org.apache.commons.compress.compressors.xz.XZUtils; import org.apache.commons.compress.compressors.z.ZCompressorInputStream; @@ -19,20 +19,40 @@ index ab178a9..3817704 100644 -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 { + import org.apache.commons.compress.utils.Sets; + +@@ -280,10 +277,6 @@ static String detect(final InputStream inputStream, final Set compressor return LZ4_FRAMED; } -- if (ZstdUtils.matches(signature, signatureLength)) { +- if (compressorNames.contains(ZSTANDARD) && 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 { + +@@ -405,10 +398,6 @@ public static String getZ() { + return Z; + } + +- public static String getZstandard() { +- return ZSTANDARD; +- } +- + static void putAll(final Set names, final CompressorStreamProvider provider, final TreeMap map) { + names.forEach(name -> map.put(toKey(name), provider)); + } +@@ -513,7 +502,7 @@ public CompressorInputStream createCompressorInputStream(final InputStream in, f + * Creates a compressor input stream from a compressor name and an input stream. + * + * @param name of the compressor, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #LZMA}, {@value #PACK200}, {@value #SNAPPY_RAW}, +- * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #ZSTANDARD}, {@value #DEFLATE64} or ++ * {@value #SNAPPY_FRAMED}, {@value #Z}, {@value #LZ4_BLOCK}, {@value #LZ4_FRAMED}, {@value #DEFLATE64} or + * {@value #DEFLATE} + * @param in the input stream + * @return compressor input stream +@@ -554,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -44,7 +64,16 @@ index ab178a9..3817704 100644 } if (LZMA.equalsIgnoreCase(name)) { -@@ -714,7 +704,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -614,7 +600,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina + * Creates a compressor output stream from a compressor name and an output stream. + * + * @param name the compressor name, i.e. {@value #GZIP}, {@value #BZIP2}, {@value #XZ}, {@value #PACK200}, {@value #SNAPPY_FRAMED}, {@value #LZ4_BLOCK}, +- * {@value #LZ4_FRAMED}, {@value #ZSTANDARD} or {@value #DEFLATE} ++ * {@value #LZ4_FRAMED} or {@value #DEFLATE} + * @param out the output stream + * @return the compressor output stream + * @throws CompressorException if the archiver name is not known +@@ -665,7 +651,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi } if (ZSTANDARD.equalsIgnoreCase(name)) { @@ -54,5 +83,5 @@ index ab178a9..3817704 100644 } catch (final IOException e) { throw new CompressorException("Could not create CompressorOutputStream", e); -- -2.14.3 +2.43.0 diff --git a/0003-Remove-Pack200-compressor.patch b/0003-Remove-Pack200-compressor.patch index fdf1e87..e9b719d 100644 --- a/0003-Remove-Pack200-compressor.patch +++ b/0003-Remove-Pack200-compressor.patch @@ -1,17 +1,17 @@ -From 9937297a90b43a5e1238932eb8a07c44303056ed Mon Sep 17 00:00:00 2001 +From 77d08229cd95cc948a19996faa8515e0d77d7930 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 6 Aug 2021 13:42:40 +0200 -Subject: [PATCH] Remove Pack200 compressor +Subject: [PATCH 3/3] 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 +index 9ed40a3d7..565aa519e 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 +@@ -44,8 +44,6 @@ import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream; import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream; import org.apache.commons.compress.compressors.lzma.LZMAUtils; @@ -20,18 +20,18 @@ index eee7c31..de7da23 100644 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 { +@@ -249,10 +247,6 @@ static String detect(final InputStream inputStream, final Set compressor return GZIP; } -- if (Pack200CompressorInputStream.matches(signature, signatureLength)) { +- if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) { - return PACK200; - } - - if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { + if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) { return SNAPPY_FRAMED; } -@@ -592,7 +586,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -554,7 +548,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina } if (PACK200.equalsIgnoreCase(name)) { @@ -40,7 +40,7 @@ index eee7c31..de7da23 100644 } if (SNAPPY_RAW.equalsIgnoreCase(name)) { -@@ -673,7 +667,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider { +@@ -627,7 +621,7 @@ public CompressorOutputStream createCompressorOutputStream(final String name, fi } if (PACK200.equalsIgnoreCase(name)) { @@ -50,5 +50,5 @@ index eee7c31..de7da23 100644 if (LZMA.equalsIgnoreCase(name)) { -- -2.31.1 +2.43.0 diff --git a/apache-commons-compress-build.xml b/apache-commons-compress-build.xml index 36a96fe..beea604 100644 --- a/apache-commons-compress-build.xml +++ b/apache-commons-compress-build.xml @@ -9,7 +9,7 @@ - + @@ -24,7 +24,8 @@ - + + @@ -60,6 +61,7 @@ optimize="false" deprecation="true" target="${compiler.target}" + release="${compiler.release}" verbose="false" fork="false" source="${compiler.source}"> diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 685ed47..b5d2677 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package apache-commons-compress # -# Copyright (c) 2022 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 @@ -19,23 +19,24 @@ %global base_name compress %global short_name commons-%{base_name} Name: apache-%{short_name} -Version: 1.21 +Version: 1.26.0 Release: 0 Summary: Java API for working with compressed files and archivers License: Apache-2.0 Group: Development/Libraries/Java URL: https://commons.apache.org/proper/commons-compress/ -Source0: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz -Source1: http://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz.asc +Source0: https://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz +Source1: https://archive.apache.org/dist/commons/compress/source/%{short_name}-%{version}-src.tar.gz.asc Source2: %{name}-build.xml Patch0: 0001-Remove-Brotli-compressor.patch Patch1: 0002-Remove-ZSTD-compressor.patch Patch2: 0003-Remove-Pack200-compressor.patch -Patch3: fix_java_8_compatibility.patch BuildRequires: ant +BuildRequires: commons-codec +BuildRequires: commons-io BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: xz-java Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release} @@ -59,6 +60,8 @@ This package provides %{summary}. %prep %setup -q -n %{short_name}-%{version}-src cp %{SOURCE2} build.xml +mkdir -p lib +build-jar-repository -s lib commons-io commons-codec # Unavailable Google Brotli library (org.brotli.dec) %patch0 -p1 @@ -69,21 +72,15 @@ rm -r src/{main,test}/java/org/apache/commons/compress/compressors/brotli %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 support for pack200 which depends on ancient asm:asm:3.2 %patch2 -p1 -%pom_remove_dep asm:asm rm -r src/{main,test}/java/org/apache/commons/compress/harmony rm -r src/main/java/org/apache/commons/compress/compressors/pack200 rm src/main/java/org/apache/commons/compress/java/util/jar/Pack200.java -rm src/test/java/org/apache/commons/compress/compressors/Pack200TestCase.java rm -r src/test/java/org/apache/commons/compress/compressors/pack200 rm src/test/java/org/apache/commons/compress/java/util/jar/Pack200Test.java -# Restore Java 8 compatibility -%patch3 -p1 - # NPE with jdk10 %pom_remove_plugin :maven-javadoc-plugin @@ -104,7 +101,7 @@ install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{s ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom %add_maven_depmap %{short_name}.pom %{short_name}.jar -a commons:commons-compress,commons-compress:commons-compress # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} diff --git a/commons-compress-1.21-src.tar.gz b/commons-compress-1.21-src.tar.gz deleted file mode 100644 index d419ad0..0000000 --- a/commons-compress-1.21-src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ecb1feb62e5307d0fc865dd0b5a80206758aec1d160d297e5c153cfba5977e6 -size 15165800 diff --git a/commons-compress-1.21-src.tar.gz.asc b/commons-compress-1.21-src.tar.gz.asc deleted file mode 100644 index 4fb9aab..0000000 --- a/commons-compress-1.21-src.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHEEABEKADEWIQTOgHWiUVR77iSbwVGiEVrhX2uLcgUCYOiAPBMcYm9kZXdpZ0Bh -cGFjaGUub3JnAAoJEKIRWuFfa4tyyNwAn1RAMciW7Os/lbwCiQ/RJ64GL+LSAKDB -7ZWg3nXsSSAnuN7K/3doWvLkLQ== -=iHWA ------END PGP SIGNATURE----- diff --git a/commons-compress-1.26.0-src.tar.gz b/commons-compress-1.26.0-src.tar.gz new file mode 100644 index 0000000..203f690 --- /dev/null +++ b/commons-compress-1.26.0-src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:577aa8a0f275f1f55f6b6d7f8095602fee8c7d4bd5bd9aef430b7d8ac2e024be +size 54670636 diff --git a/commons-compress-1.26.0-src.tar.gz.asc b/commons-compress-1.26.0-src.tar.gz.asc new file mode 100644 index 0000000..d5a81b9 --- /dev/null +++ b/commons-compress-1.26.0-src.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELbTx7w+nYezE6pNchv3H4qESYssFAmXRRk8ACgkQhv3H4qES +YstFfwgAjLlBuEN5l1/yolgeRWBm+A/KadE6TXsWSnT3HvqAnaW5YVKRoB/7LBru +QeSi3g+0zbP/wR2qS3NADSLKv50vPENr7PXIEOiBrXNxDODjQadBXSrbt6ENQrYu +XcAIUh2IMUvPZVf0oitPWG8VjZopSPjCin/brYvrZCH+YsYK/bVZNKOqfdTKjFZw +xiSRQtNwnrGic1YFmj5ZjrVkR6l0JLN8h1ECaEsiW3hUXrKL7rXHhEMZBaL9xtY9 +qT9/SVlHgbo8uv3jH4yH58fN1slmkrotUsgDf69QG+LOVxQahLTjTKD4QmJcnwMy +R1eDPkhKXkQtkpJ/21F3CESTX7giNA== +=vqxv +-----END PGP SIGNATURE-----