[truezip] Pay attention and commit the patch file
Gerard Ryan
galileo at fedoraproject.org
Wed Feb 26 21:08:09 UTC 2014
commit f87f67811269fa499d7b5e36057786fd2be3e3e7
Author: Gerard Ryan <gerard at ryan.lt>
Date: Wed Feb 26 21:06:53 2014 +0000
Pay attention and commit the patch file
truezip-bouncycastle-api-change.patch | 54 +++++++++++++++++++++++++++++++++
truezip.spec | 6 ++--
2 files changed, 57 insertions(+), 3 deletions(-)
---
diff --git a/truezip-bouncycastle-api-change.patch b/truezip-bouncycastle-api-change.patch
new file mode 100644
index 0000000..e6f0383
--- /dev/null
+++ b/truezip-bouncycastle-api-change.patch
@@ -0,0 +1,54 @@
+--- truezip-driver/truezip-driver-zip/src/main/java/de/schlichtherle/truezip/zip/WinZipAesEntryOutputStream.java.orig 2014-02-26 20:04:50.806592530 +0000
++++ truezip-driver/truezip-driver-zip/src/main/java/de/schlichtherle/truezip/zip/WinZipAesEntryOutputStream.java 2014-02-26 20:08:54.538585121 +0000
+@@ -19,6 +19,7 @@
+ import org.bouncycastle.crypto.macs.HMac;
+ import org.bouncycastle.crypto.params.KeyParameter;
+ import org.bouncycastle.crypto.params.ParametersWithIV;
++import org.bouncycastle.util.io.TeeOutputStream;
+
+ /**
+ * Encrypts ZIP entry contents according the WinZip AES specification.
+@@ -114,7 +115,8 @@
+
+ // Reinit chain of output streams as Encrypt-then-MAC.
+ this.dos = (LEDataOutputStream) this.delegate;
+- this.delegate = new MacOutputStream(this.dos, mac);
++ MacOutputStream mOut = new MacOutputStream(mac);
++ this.delegate = new TeeOutputStream(this.dos, mOut);
+
+ // Write header.
+ this.dos.write(salt);
+@@ -146,4 +148,4 @@
+ assert bufLength == buf.length;
+ this.dos.write(buf, 0, bufLength / 2);
+ }
+-}
+\ No newline at end of file
++}
+--- truezip-driver/truezip-driver-tzp/src/main/java/de/schlichtherle/truezip/crypto/raes/Type0RaesOutputStream.java.orig 2014-02-26 20:13:22.138753267 +0000
++++ truezip-driver/truezip-driver-tzp/src/main/java/de/schlichtherle/truezip/crypto/raes/Type0RaesOutputStream.java 2014-02-26 20:14:45.804441334 +0000
+@@ -23,6 +23,7 @@
+ import org.bouncycastle.crypto.macs.HMac;
+ import org.bouncycastle.crypto.params.KeyParameter;
+ import org.bouncycastle.crypto.params.ParametersWithIV;
++import org.bouncycastle.util.io.TeeOutputStream;
+
+ /**
+ * Writes a type 0 RAES file.
+@@ -123,7 +124,8 @@
+ this.dos = out instanceof LEDataOutputStream
+ ? (LEDataOutputStream) out
+ : new LEDataOutputStream(out);
+- this.delegate = new MacOutputStream(dos, mac);
++ MacOutputStream mOut = new MacOutputStream(mac);
++ this.delegate = new TeeOutputStream(dos, mOut);
+
+ // Write data envelope header.
+ dos.writeInt(SIGNATURE);
+@@ -182,4 +184,4 @@
+
+ assert dos.size() - trailer == buf.length;
+ }
+-}
+\ No newline at end of file
++}
diff --git a/truezip.spec b/truezip.spec
index 253f646..cd3e8f6 100644
--- a/truezip.spec
+++ b/truezip.spec
@@ -1,6 +1,6 @@
Name: truezip
Version: 7.7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java based VFS for treating archive files as virtual directories
Group: Development/Libraries
@@ -13,7 +13,7 @@ Source0: %{name}-%{version}.tar.gz
Source1: http://www.eclipse.org/legal/epl-v10.html
# bouncycastle-1.50 has some small api changes
-Patch0: %{name}-bouncycastle-api-change.patch
+Patch0: %{name}-bouncycastle-api-change.patch
BuildArch: noarch
@@ -273,7 +273,7 @@ find -name pom.xml -exec \
%files swing -f .mfiles-%{name}-swing
%changelog
-* Wed Feb 26 2014 Gerard Ryan <galileo at fedoraproject.org> - 7.7.5-2
+* Wed Feb 26 2014 Gerard Ryan <galileo at fedoraproject.org> - 7.7.5-3
- Patch to fix bouncycastle API changes
* Tue Feb 25 2014 Gerard Ryan <galileo at fedoraproject.org> - 7.7.5-1
More information about the scm-commits
mailing list