Sync from SUSE:SLFO:Main plexus-archiver revision 659388b4ff67b7f1a9e88793d8392bf9

0001-Remove-support-for-snappy.patch

@@ -1,47 +1,47 @@
-From bd1055a190a1a64374f4aeb3bfde138d9c3d965f Mon Sep 17 00:00:00 2001
+From dc47e7ca10fded81f327cd304c8235e9598509b5 Mon Sep 17 00:00:00 2001
 From: Mikolaj Izdebski <mizdebsk@redhat.com>
 Date: Sat, 23 Sep 2017 11:43:45 +0200
-Subject: [PATCH] Remove support for snappy
+Subject: [PATCH 1/2] Remove support for snappy
 
 ---
- src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java   | 3 +--
- src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +--
+ .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java     | 3 +--
+ .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java   | 3 +--
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-index 398ecf1..0d46cfc 100644
+index ba53a1b9..070849c1 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
-@@ -42,7 +42,6 @@
- import org.codehaus.plexus.components.io.resources.PlexusIoResource;
- import org.codehaus.plexus.util.IOUtil;
- import org.codehaus.plexus.util.StringUtils;
--import org.iq80.snappy.SnappyOutputStream;
+@@ -25,7 +25,6 @@
+ import java.nio.file.Files;
+ import java.util.zip.GZIPOutputStream;
  
- import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
- 
-@@ -426,7 +425,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) )
+-import io.airlift.compress.snappy.SnappyFramedOutputStream;
+ import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+ import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
+@@ -426,7 +425,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
          } else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) {
              return new BZip2CompressorOutputStream(bufferedOutputStream(ostream));
          } else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) {
--            return new SnappyOutputStream(bufferedOutputStream(ostream));
+-            return new SnappyFramedOutputStream(bufferedOutputStream(ostream));
 +            throw new UnsupportedOperationException( "This version of plexus-archiver does not support snappy compression" );
          } else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
              return new XZCompressorOutputStream(bufferedOutputStream(ostream));
          } else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
 diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-index 4bc94a4..15f0494 100644
+index 507cb6cb..0ae6e3b4 100644
 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
 +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
-@@ -32,7 +32,6 @@
- import org.codehaus.plexus.archiver.ArchiverException;
- import org.codehaus.plexus.archiver.util.Streams;
- import org.codehaus.plexus.components.io.filemappers.FileMapper;
--import org.iq80.snappy.SnappyFramedInputStream;
+@@ -23,7 +23,6 @@
+ import java.io.InputStream;
+ import java.util.zip.GZIPInputStream;
  
- import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
- import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
-@@ -137,7 +136,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
+-import io.airlift.compress.snappy.SnappyFramedInputStream;
+ import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+ import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+ import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
+@@ -137,7 +136,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
          } else if (compression == UntarCompressionMethod.BZIP2) {
              return new BZip2CompressorInputStream(istream);
          } else if (compression == UntarCompressionMethod.SNAPPY) {
@@ -51,5 +51,5 @@ index 4bc94a4..15f0494 100644
              return new XZCompressorInputStream(istream);
          } else if (compression == UntarCompressionMethod.ZSTD) {
 -- 
-2.13.5
+2.46.0
 

0002-Remove-support-for-zstd.patch

@@ -1,6 +1,17 @@
-diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
---- plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java	2023-09-04 18:07:46.209959586 +0200
-+++ plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java	2023-09-04 18:14:27.122780479 +0200
+From f703c72614a8d78af30152f83004ac74ec8aadae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Thu, 13 Jun 2024 09:02:59 +0200
+Subject: [PATCH 2/2] Remove support for zstd
+
+---
+ .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java     | 3 +--
+ .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java   | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+index 070849c1..c0f10c60 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
 @@ -29,7 +29,6 @@
  import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
  import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
@@ -9,7 +20,7 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
  import org.codehaus.plexus.archiver.AbstractArchiver;
  import org.codehaus.plexus.archiver.ArchiveEntry;
  import org.codehaus.plexus.archiver.ArchiverException;
-@@ -429,7 +428,7 @@
+@@ -429,7 +428,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
          } else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
              return new XZCompressorOutputStream(bufferedOutputStream(ostream));
          } else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
@@ -18,9 +29,10 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
          }
  
          return ostream;
-diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
---- plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java	2023-09-04 18:07:46.209959586 +0200
-+++ plexus-archiver-4.8.0/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java	2023-09-04 18:13:50.092519851 +0200
+diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+index 0ae6e3b4..8fa6e925 100644
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
 @@ -27,7 +27,6 @@
  import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
  import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
@@ -29,7 +41,7 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
  import org.codehaus.plexus.archiver.AbstractUnArchiver;
  import org.codehaus.plexus.archiver.ArchiverException;
  import org.codehaus.plexus.archiver.util.Streams;
-@@ -140,7 +139,7 @@
+@@ -140,7 +139,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
          } else if (compression == UntarCompressionMethod.XZ) {
              return new XZCompressorInputStream(istream);
          } else if (compression == UntarCompressionMethod.ZSTD) {
@@ -38,3 +50,6 @@ diff -urEbwB plexus-archiver-4.8.0.orig/src/main/java/org/codehaus/plexus/archiv
          }
          return istream;
      }
+-- 
+2.45.2
+

plexus-archiver-build.xml

@@ -10,9 +10,10 @@
 
   <property name="project.groupId" value="org.codehaus.plexus"/>
   <property name="project.artifactId" value="plexus-archiver"/>
-  <property name="project.version" value="4.8.0"/>
+  <property name="project.version" value="4.10.0"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -51,6 +52,7 @@
            encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"

plexus-archiver.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Tue Sep 24 19:08:57 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * y2038.patch
+    + Don't pass possibly negative time to File.setLastModified,
+      where it is explicitly forbidden
+    + Fixes java.lang.IllegalArgumentException: Negative time
+
+-------------------------------------------------------------------
+Thu Sep 19 05:40:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstrem version 4.10.0
+  * New features and improvements
+    + Change Snappy compressor to io.airlift:aircompressor
+    + Fix modular jar final permissions
+- Modified patch:
+  * 0001-Remove-support-for-snappy.patch
+    + rediff to changed context
+
+-------------------------------------------------------------------
+Thu Jun 13 16:12:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 4.9.2
+  * New features and improvements
+    + Allow copy all files without timestamp checking by
+      DirectoryArchiver
+    + Provide fluent setter for usingDefaultExcludes flag in
+      AbstractFileSet
+    + Upgrade many dependencies
+- Modified patches:
+  * 0001-Remove-support-for-snappy.patch
+  * plexus-archiver-4.8.0-no_zstd.patch ->
+    0002-Remove-support-for-zstd.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Tue Feb 20 14:53:23 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

plexus-archiver.spec

@@ -17,7 +17,7 @@
 
 
 Name:           plexus-archiver
-Version:        4.8.0
+Version:        4.10.0
 Release:        0
 Summary:        Plexus Archiver Component
 License:        Apache-2.0
@@ -26,7 +26,8 @@ URL:            https://codehaus-plexus.github.io/plexus-archiver
 Source0:        https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
 Source1:        %{name}-build.xml
 Patch0:         0001-Remove-support-for-snappy.patch
-Patch1:         plexus-archiver-4.8.0-no_zstd.patch
+Patch1:         0002-Remove-support-for-zstd.patch
+Patch2:         y2038.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-compress
 BuildRequires:  apache-commons-io
@@ -60,7 +61,7 @@ Javadoc for %{name}.
 cp %{SOURCE1} build.xml
 
 %patch -P 0 -p1
-%pom_remove_dep org.iq80.snappy:snappy
+%pom_remove_dep io.airlift:aircompressor
 rm -rf src/main/java/org/codehaus/plexus/archiver/snappy
 rm -rf src/test/java/org/codehaus/plexus/archiver/snappy
 rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java
@@ -80,6 +81,8 @@ rm -rf src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarZstdFileResourc
 rm -rf src/main/java/org/codehaus/plexus/archiver/tar/TarZstdArchiver.java
 rm -rf src/test/java/org/codehaus/plexus/archiver/tar/TarZstdUnArchiverTest.java
 
+%patch -P 2 -p1
+
 %build
 mkdir -p lib
 build-jar-repository -s lib atinject slf4j/api org.eclipse.sisu.inject jsr-305 commons-compress commons-io plexus/utils plexus/io

y2038.patch

@@ -0,0 +1,38 @@
+--- plexus-archiver-4.10.0/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java	2024-09-25 07:27:00.833967276 +0200
++++ plexus-archiver-4.10.0/src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java	2024-09-25 08:30:07.036715483 +0200
+@@ -325,7 +325,7 @@
+                 Files.copy(compressedInputStream, targetFileName.toPath(), REPLACE_EXISTING);
+             }
+ 
+-            targetFileName.setLastModified(entryDate.getTime());
++            setTargetLastModified(targetFileName, entryDate.getTime());
+ 
+             if (!isIgnorePermissions() && mode != null && !isDirectory) {
+                 ArchiveEntryUtils.chmod(targetFileName, mode);
+@@ -391,6 +391,10 @@
+         return isOverwrite() || fileOnDiskIsOlderThanEntry;
+     }
+ 
++    protected void setTargetLastModified(File target, long millis) {
++        target.setLastModified(millis);
++    }
++
+     private String normalizedFileSeparator(String pathOrEntry) {
+         return pathOrEntry.replace("/", File.separator);
+     }
+--- plexus-archiver-4.10.0/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java	2024-09-25 07:27:01.097302238 +0200
++++ plexus-archiver-4.10.0/src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipUnArchiver.java	2024-09-25 08:21:11.862993093 +0200
+@@ -193,4 +193,13 @@
+                     "Error while expanding " + getSourceFile().getAbsolutePath(), ioe);
+         }
+     }
++
++    @Override
++    protected void setTargetLastModified(File target, long millis) {
++        if (millis >= 0)
++        {
++            target.setLastModified( millis );
++        }
++    }
++
+ }