[plexus-archiver] 04/05: Added a patch ensuring the compatibility with plexus-io 1.x

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-archiver.

commit 8cfc9c0b7714dc094fa6a0b20b329f5178238e7c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 5 00:11:26 2015 +0200

    Added a patch ensuring the compatibility with plexus-io 1.x
---
 debian/changelog                                |  1 +
 debian/patches/01-plexus-io-compatibility.patch | 29 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a556e20..af2e663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plexus-archiver (2.2-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release
+    - Added a patch ensuring the compatibility with plexus-io 1.x
   * debian/control:
     - Mark the version 1.2 as breaking libmaven-assembly-plugin (<= 2.2~beta5-2)
     - Updated Standards-Version to 3.9.6 (no changes)
diff --git a/debian/patches/01-plexus-io-compatibility.patch b/debian/patches/01-plexus-io-compatibility.patch
new file mode 100644
index 0000000..caf03d4
--- /dev/null
+++ b/debian/patches/01-plexus-io-compatibility.patch
@@ -0,0 +1,29 @@
+Description: Ensure the compatibility with plexus-io 1.x currently in Debian.
+ This patch can be removed after upgrading plexus-io to the version 2.0 or later.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
++++ b/src/main/java/org/codehaus/plexus/archiver/ArchiveEntry.java
+@@ -163,7 +163,7 @@
+             throw new ArchiverException( "Failed to read filesystem attributes for: " + file, e );
+         }
+         
+-        final PlexusIoFileResource res =  PlexusIoFileResource.existingFile( file, attrs );
++        final PlexusIoFileResource res =  new PlexusIoFileResource( file, attrs);
+         return new ArchiveEntry( target, res, FILE, permissions );
+     }
+ 
+--- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
++++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
+@@ -293,9 +293,9 @@
+                             : options.getUserName() );
+             te.setGroupName( ( attributes != null && attributes.getGroupName() != null ) ? attributes.getGroupName()
+                             : options.getGroup() );
+-            te.setUserId( ( attributes != null && attributes.getUserId() != null) ? attributes.getUserId()
++            te.setUserId( ( attributes != null && attributes.getUserId() != -1) ? attributes.getUserId()
+                             : options.getUid() );
+-            te.setGroupId( ( attributes != null && attributes.getGroupId() != null) ? attributes.getGroupId()
++            te.setGroupId( ( attributes != null && attributes.getGroupId() != -1) ? attributes.getGroupId()
+                             : options.getGid() );
+ 
+             tOut.putNextEntry( te );
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e631fd7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-plexus-io-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-archiver.git