diff --git a/.gitignore b/.gitignore index 90ba514..43a56f0 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /plexus-archiver-4.2.2.tar.gz /plexus-archiver-4.2.3.tar.gz /plexus-archiver-4.2.4.tar.gz +/plexus-archiver-4.2.7.tar.gz diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch index 98920a2..8a684cd 100644 --- a/0001-Remove-support-for-snappy.patch +++ b/0001-Remove-support-for-snappy.patch @@ -1,4 +1,4 @@ -From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001 +From b9a95a75b6ae83230866787d5b659382457c8ce0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 23 Sep 2017 11:43:45 +0200 Subject: [PATCH] Remove support for snappy @@ -9,18 +9,18 @@ Subject: [PATCH] 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 8eec881..be8e7a3 100644 +index 46978ab9..3d8ffcc8 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java -@@ -38,7 +38,6 @@ +@@ -41,7 +41,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; /** -@@ -489,7 +488,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) ) + * @author Emmanuel Venisse +@@ -498,7 +497,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) ) } else if ( TarCompressionMethod.snappy.equals( tarCompressionMethod ) ) { @@ -30,18 +30,18 @@ index 8eec881..be8e7a3 100644 else if ( TarCompressionMethod.xz.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 2316d4e..c2e2b83 100644 +index 6a5b43c6..a46c3007 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java -@@ -31,7 +31,6 @@ +@@ -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.codehaus.plexus.util.IOUtil; -import org.iq80.snappy.SnappyInputStream; /** * @author Emmanuel Venisse -@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) +@@ -150,7 +149,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) } else if ( compression == UntarCompressionMethod.SNAPPY ) { @@ -51,5 +51,5 @@ index 2316d4e..c2e2b83 100644 else if ( compression == UntarCompressionMethod.XZ ) { -- -2.21.0 +2.35.1 diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 328e137..1f8cf18 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: plexus-archiver -Version: 4.2.4 -Release: 5%{?dist} +Version: 4.2.7 +Release: 1%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 URL: https://codehaus-plexus.github.io/plexus-archiver @@ -70,6 +70,9 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Sun Apr 24 2022 Mikolaj Izdebski - 4.2.7-1 +- Update to upstream version 4.2.7 + * Sat Feb 05 2022 Jiri Vanek - 4.2.4-5 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index a0ad484..da52f48 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.2.4.tar.gz) = a550683587bc42650a4b714df68a88c430450c0fba87ce64c7da0dc1380de293ced259e304e33688b594a23f1b1760bba5868e65d8d13d4d9d21fff00f9b1bc8 +SHA512 (plexus-archiver-4.2.7.tar.gz) = 762e8b1be9c653c210c80bcd379336ee5191c21d62d6a839836ea3032361ced7dbe725038a7b25810d9fe22440a7c916b37f19e4ee8c8950d346afb2906064a7