diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch index f598452..ba556e8 100644 --- a/0001-Remove-support-for-snappy.patch +++ b/0001-Remove-support-for-snappy.patch @@ -1,4 +1,4 @@ -From e922d103d4ca5efb889654c5573d0deec6161b94 Mon Sep 17 00:00:00 2001 +From dc47e7ca10fded81f327cd304c8235e9598509b5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 23 Sep 2017 11:43:45 +0200 Subject: [PATCH 1/2] Remove support for snappy @@ -9,38 +9,38 @@ Subject: [PATCH 1/2] Remove support for snappy 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 cae07804..070849c1 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; - - import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream; +@@ -25,7 +25,6 @@ + import java.nio.file.Files; + import java.util.zip.GZIPOutputStream; +-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 1b0b7950..0ae6e3b4 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; +-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); @@ -51,5 +51,5 @@ index 1b0b7950..0ae6e3b4 100644 return new XZCompressorInputStream(istream); } else if (compression == UntarCompressionMethod.ZSTD) { -- -2.45.2 +2.46.0 diff --git a/plexus-archiver-4.10.0.tar.gz b/plexus-archiver-4.10.0.tar.gz new file mode 100644 index 0000000..6556d33 --- /dev/null +++ b/plexus-archiver-4.10.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b9611281dfb4e0fae306cbc46ef50a6eac104160d15e335eeec53e5a5567f3d +size 312424 diff --git a/plexus-archiver-4.9.2.tar.gz b/plexus-archiver-4.9.2.tar.gz deleted file mode 100644 index 2b775a3..0000000 --- a/plexus-archiver-4.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10c47c18663229c8e107972f3066cce55b9393649106a7b0d2ac66547aa19581 -size 584178 diff --git a/plexus-archiver-build.xml b/plexus-archiver-build.xml index c660bde..ba9ead1 100644 --- a/plexus-archiver-build.xml +++ b/plexus-archiver-build.xml @@ -10,7 +10,7 @@ - + diff --git a/plexus-archiver.changes b/plexus-archiver.changes index ab73959..fdbb766 100644 --- a/plexus-archiver.changes +++ b/plexus-archiver.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Sep 24 19:08:57 UTC 2024 - Fridrich Strba + +- 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 + +- 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 diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 9cc5463..312714a 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -17,7 +17,7 @@ Name: plexus-archiver -Version: 4.9.2 +Version: 4.10.0 Release: 0 Summary: Plexus Archiver Component License: Apache-2.0 @@ -27,6 +27,7 @@ Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexu Source1: %{name}-build.xml Patch0: 0001-Remove-support-for-snappy.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 diff --git a/y2038.patch b/y2038.patch new file mode 100644 index 0000000..4dab3d1 --- /dev/null +++ b/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 ); ++ } ++ } ++ + }