Update commons-compress to version 1.28.0

patches/commons-compress/0003-Remove-Brotli-compressor.patch → patches/commons-compress/0001-Remove-Brotli-compressor.patch

@@ -1,18 +1,18 @@
-From 5c306dd138cab7be825b3aa2be24e75286d9bc0d Mon Sep 17 00:00:00 2001
+From 1bc6dadd753f5eb66401d8455bcfc108f1919f74 Mon Sep 17 00:00:00 2001
 From: Michael Simacek <msimacek@redhat.com>
 Date: Mon, 12 Feb 2018 10:53:48 +0100
-Subject: [PATCH 3/4] Remove Brotli compressor
+Subject: [PATCH 1/3] Remove Brotli compressor
 
 Forwarded: not-needed
 ---
  .../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 376253cf2..b3e2d9d8b 100644
+index 9287d99..9a65ba4 100644
 --- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
 +++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
-@@ -30,8 +30,6 @@
+@@ -29,8 +29,6 @@ import java.util.Set;
  import java.util.SortedMap;
  import java.util.TreeMap;
 
@@ -21,18 +21,18 @@ index 376253cf2..b3e2d9d8b 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;
-@@ -545,10 +543,7 @@ public CompressorInputStream createCompressorInputStream(final String name, fina
+@@ -603,10 +601,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+                 return new BZip2CompressorInputStream(in, actualDecompressConcatenated);
              }
-
              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)) {
+                 if (!XZUtils.isXZCompressionAvailable()) {
 -- 
-2.46.0
+2.51.0
 

patches/commons-compress/0002-Remove-ZSTD-compressor.patch

@@ -0,0 +1,106 @@
+From 9a061729b0976ded5a739765fcdfc0c56bd0e46c 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/3] Remove ZSTD compressor
+
+Forwarded: not-needed
+---
+ .../archivers/zip/ZipArchiveInputStream.java        |  3 +--
+ .../commons/compress/archivers/zip/ZipFile.java     |  7 ++++---
+ .../compressors/CompressorStreamFactory.java        | 13 ++-----------
+ 3 files changed, 7 insertions(+), 16 deletions(-)
+
+diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+index b6d0abc..81ddb57 100644
+--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+@@ -45,7 +45,6 @@ import org.apache.commons.compress.archivers.ArchiveEntry;
+ import org.apache.commons.compress.archivers.ArchiveInputStream;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+ import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream;
+-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
+ import org.apache.commons.compress.utils.ArchiveUtils;
+ import org.apache.commons.compress.utils.IOUtils;
+ import org.apache.commons.compress.utils.InputStreamStatistics;
+@@ -522,7 +521,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream<ZipArchiveEntry> i
+      * @since 1.28.0
+      */
+     protected InputStream createZstdInputStream(final InputStream in) throws IOException {
+-        return new ZstdCompressorInputStream(in);
++        throw new IOException("Zstandard compression is not available in this build.");
+     }
+
+     /**
+diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+index 264ac33..5535a57 100644
+--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
++++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
+@@ -55,7 +55,6 @@ import org.apache.commons.compress.archivers.EntryStreamOffsets;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+ import org.apache.commons.compress.compressors.deflate64.Deflate64CompressorInputStream;
+ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
+ import org.apache.commons.compress.utils.BoundedArchiveInputStream;
+ import org.apache.commons.compress.utils.BoundedSeekableByteChannelInputStream;
+ import org.apache.commons.compress.utils.IOUtils;
+@@ -1083,8 +1082,10 @@ public class ZipFile implements Closeable {
+      */
+     @SuppressWarnings("resource")
+     InputStream createZstdInputStream(final InputStream in) throws IOException {
+-        // This method is the only location that references ZstdCompressorInputStream directly to avoid requiring the JAR for all use cases.
+-        return zstdInputStreamFactory != null ? zstdInputStreamFactory.apply(in) : new ZstdCompressorInputStream(in);
++        if (zstdInputStreamFactory == null) {
++            throw new IOException("Zstandard compression is not available in this build.");
++        }
++        return zstdInputStreamFactory.apply(in);
+     }
+
+     private void fillNameMap() {
+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 9a65ba4..a7432c4 100644
+--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
++++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
+@@ -52,9 +52,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.Sets;
+ import org.apache.commons.lang3.StringUtils;
+@@ -266,9 +263,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+         if (compressorNames.contains(LZ4_FRAMED) && FramedLZ4CompressorInputStream.matches(signature, signatureLength)) {
+             return LZ4_FRAMED;
+         }
+-        if (compressorNames.contains(ZSTANDARD) && ZstdUtils.matches(signature, signatureLength)) {
+-            return ZSTANDARD;
+-        }
+         throw new CompressorException("No Compressor found for the stream signature.");
+     }
+
+@@ -616,10 +610,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+                 // @formatter:on
+             }
+             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)) {
+                 if (!LZMAUtils.isLZMACompressionAvailable()) {
+@@ -707,7 +698,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+                 return new FramedLZ4CompressorOutputStream(out);
+             }
+             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.51.0
+

patches/commons-compress/0003-Remove-Pack200-compressor.patch

@@ -0,0 +1,54 @@
+From f5e9621355abba25bf18afb50c75045322617e78 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Mon, 11 Mar 2024 12:16:28 +0100
+Subject: [PATCH 3/3] Remove Pack200 compressor
+
+Forwarded: not-needed
+---
+ .../compress/compressors/CompressorStreamFactory.java    | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 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 a7432c4..3d405e7 100644
+--- a/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
++++ b/src/main/java/org/apache/commons/compress/compressors/CompressorStreamFactory.java
+@@ -43,8 +43,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;
+@@ -242,9 +240,6 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+         if (compressorNames.contains(GZIP) && GzipCompressorInputStream.matches(signature, signatureLength)) {
+             return GZIP;
+         }
+-        if (compressorNames.contains(PACK200) && Pack200CompressorInputStream.matches(signature, signatureLength)) {
+-            return PACK200;
+-        }
+         if (compressorNames.contains(SNAPPY_FRAMED) && FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {
+             return SNAPPY_FRAMED;
+         }
+@@ -619,7 +614,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+                 return LZMACompressorInputStream.builder().setInputStream(in).setMemoryLimitKiB(memoryLimitInKb).get();
+             }
+             if (PACK200.equalsIgnoreCase(name)) {
+-                return new Pack200CompressorInputStream(in);
++                throw new CompressorException("Pack200 compression is not available in this build.");
+             }
+             if (SNAPPY_RAW.equalsIgnoreCase(name)) {
+                 return new SnappyCompressorInputStream(in);
+@@ -680,7 +675,7 @@ public class CompressorStreamFactory implements CompressorStreamProvider {
+                 return new XZCompressorOutputStream(out);
+             }
+             if (PACK200.equalsIgnoreCase(name)) {
+-                return new Pack200CompressorOutputStream(out);
++                throw new CompressorException("Pack200 compression is not available in this build.");
+             }
+             if (LZMA.equalsIgnoreCase(name)) {
+                 return new LZMACompressorOutputStream(out);
+-- 
+2.51.0
+

project/commons-compress.properties

@@ -1,4 +1,4 @@
 url=https://github.com/apache/commons-compress.git
 ref=rel/commons-compress-@.@.@
-version=1.27.1
+version=1.28.0
 rpm_name=apache-commons-compress

project/mbi.xml

@@ -59,6 +59,7 @@
     <dependency>slf4j</dependency>
     <dependency>asm</dependency>
     <dependency>commons-io</dependency>
+    <dependency>commons-lang</dependency>
     <build>
       <compiler>
         <release>11</release>