Compare commits

..

No commits in common. 'i8c-stream-202201' and 'c9' have entirely different histories.

2
.gitignore vendored

@ -1 +1 @@
SOURCES/plexus-archiver-4.2.7.tar.gz SOURCES/plexus-archiver-4.2.4.tar.gz

@ -1 +1 @@
f26877c45f2d7c7351741b29931b9a99dca4a756 SOURCES/plexus-archiver-4.2.7.tar.gz a21a59111ef3744829b5adecfdaa2c605a818a4f SOURCES/plexus-archiver-4.2.4.tar.gz

@ -1,4 +1,4 @@
From b9a95a75b6ae83230866787d5b659382457c8ce0 Mon Sep 17 00:00:00 2001 From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com> From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Sat, 23 Sep 2017 11:43:45 +0200 Date: Sat, 23 Sep 2017 11:43:45 +0200
Subject: [PATCH] Remove support for snappy Subject: [PATCH] Remove support for snappy
@ -9,18 +9,18 @@ Subject: [PATCH] Remove support for snappy
2 files changed, 2 insertions(+), 4 deletions(-) 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 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 46978ab9..3d8ffcc8 100644 index 8eec881..be8e7a3 100644
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
@@ -41,7 +41,6 @@ @@ -38,7 +38,6 @@
import org.codehaus.plexus.components.io.resources.PlexusIoResource; import org.codehaus.plexus.components.io.resources.PlexusIoResource;
import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
-import org.iq80.snappy.SnappyOutputStream; -import org.iq80.snappy.SnappyOutputStream;
import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
/** /**
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a> @@ -489,7 +488,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) )
@@ -498,7 +497,7 @@ else if ( TarCompressionMethod.bzip2.equals( tarCompressionMethod ) )
} }
else if ( TarCompressionMethod.snappy.equals( tarCompressionMethod ) ) else if ( TarCompressionMethod.snappy.equals( tarCompressionMethod ) )
{ {
@ -30,18 +30,18 @@ index 46978ab9..3d8ffcc8 100644
else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) ) 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 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 6a5b43c6..a46c3007 100644 index 2316d4e..c2e2b83 100644
--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
+++ b/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 @@ @@ -31,7 +31,6 @@
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.util.Streams; import org.codehaus.plexus.archiver.util.Streams;
import org.codehaus.plexus.components.io.filemappers.FileMapper; import org.codehaus.plexus.components.io.filemappers.FileMapper;
import org.codehaus.plexus.util.IOUtil;
-import org.iq80.snappy.SnappyInputStream; -import org.iq80.snappy.SnappyInputStream;
/** /**
* @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a> * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
@@ -150,7 +149,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) @@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 )
} }
else if ( compression == UntarCompressionMethod.SNAPPY ) else if ( compression == UntarCompressionMethod.SNAPPY )
{ {
@ -51,5 +51,5 @@ index 6a5b43c6..a46c3007 100644
else if ( compression == UntarCompressionMethod.XZ ) else if ( compression == UntarCompressionMethod.XZ )
{ {
-- --
2.35.1 2.21.0

@ -1,22 +1,21 @@
%bcond_with bootstrap %bcond_with bootstrap
Name: plexus-archiver Name: plexus-archiver
Version: 4.2.7 Version: 4.2.4
Release: 4%{?dist} Release: 5%{?dist}
Summary: Plexus Archiver Component Summary: Plexus Archiver Component
License: ASL 2.0 License: ASL 2.0
URL: https://codehaus-plexus.github.io/plexus-archiver URL: https://codehaus-plexus.github.io/plexus-archiver
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz
Patch0: 0001-Remove-support-for-snappy.patch Patch0: 0001-Remove-support-for-snappy.patch
BuildRequires: maven-local
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: javapackages-bootstrap BuildRequires: javapackages-bootstrap
%else %else
BuildRequires: maven-local
BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(com.google.code.findbugs:jsr305)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.commons:commons-compress)
@ -71,30 +70,15 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat
%license LICENSE %license LICENSE
%changelog %changelog
* Tue May 07 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.2.7-4 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.2.4-5
- Rebuilt for MSVSphere 8.9 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Feb 08 2024 Marián Konček <mkoncek@redhat.com> - 4.2.7-4
- Rebuild to regenerate auto-requires
* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.7-3
- Rebuild to regenerate auto-requires
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.7-1
- Update to upstream version 4.2.7
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 4.2.4-5
- Rebuilt for java-17-openjdk as system jdk
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4-4 * Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuild to workaround DistroBaker issue
* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.4-3 * Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-3
- Second attempt - Rebuilt for - Bootstrap Maven for CentOS Stream 9
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-2 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.4-2
- Bootstrap build - Bootstrap build
@ -265,7 +249,7 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat
* Thu Apr 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.3-1 * Thu Apr 11 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:2.3-1
- Update to upstream version 2.3 - Update to upstream version 2.3
- Use apache-commons-compress for bzip2 (de)compression - Use apache-commons-compress for bzip2 (de)compression
- Resolves CVE-2012-2098 - Resolves: CVE-2012-2098
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.2-6 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

Loading…
Cancel
Save