Attachment 871779 Details for Bug 1073775 – fix ftbfs

[patch] fix ftbfs

0001-Port-to-bouncycastle-1.50.patch (text/plain), 3.72 KB, created by Michal Srb on 2014-03-07 07:50:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Srb

Created: 2014-03-07 07:50:20 UTC

Size: 3.72 KB

patch

obsolete

>From 8a4e23d7e3d06bff3b097ddbbdd3eb5a5fdae7b6 Mon Sep 17 00:00:00 2001
>From: Michal Srb <msrb@redhat.com>
>Date: Fri, 7 Mar 2014 08:44:43 +0100
>Subject: [PATCH] Port to bouncycastle 1.50
>
>---
> tika-1.4-bouncycastle-1.50.patch | 43 ++++++++++++++++++++++++++++++++++++++++
> tika.spec                        |  7 ++++++-
> 2 files changed, 49 insertions(+), 1 deletion(-)
> create mode 100644 tika-1.4-bouncycastle-1.50.patch
>
>diff --git a/tika-1.4-bouncycastle-1.50.patch b/tika-1.4-bouncycastle-1.50.patch
>new file mode 100644
>index 0000000..b230035
>--- /dev/null
>+++ b/tika-1.4-bouncycastle-1.50.patch
>@@ -0,0 +1,43 @@
>+From 27cdcfe0e2b39fdc3ac0620cfb94e1910ca467bb Mon Sep 17 00:00:00 2001
>+From: Michal Srb <msrb@redhat.com>
>+Date: Fri, 7 Mar 2014 08:39:06 +0100
>+Subject: [PATCH] bouncycastle 1.50
>+
>+---
>+ .../src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java    | 6 +++++-
>+ 1 file changed, 5 insertions(+), 1 deletion(-)
>+
>+diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java b/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
>+index d66b95e..094659b 100644
>+--- a/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
>++++ b/tika-parsers/src/main/java/org/apache/tika/parser/crypto/Pkcs7Parser.java
>+@@ -31,6 +31,8 @@ import org.apache.tika.parser.Parser;
>+ import org.bouncycastle.cms.CMSException;
>+ import org.bouncycastle.cms.CMSSignedDataParser;
>+ import org.bouncycastle.cms.CMSTypedStream;
>++import org.bouncycastle.operator.OperatorCreationException;
>++import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
>+ import org.xml.sax.ContentHandler;
>+ import org.xml.sax.SAXException;
>+ 
>+@@ -58,7 +60,7 @@ public class Pkcs7Parser extends AbstractParser {
>+             throws IOException, SAXException, TikaException {
>+         try {
>+             CMSSignedDataParser parser =
>+-                    new CMSSignedDataParser(new CloseShieldInputStream(stream));
>++                  new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider("BC").build(), new CloseShieldInputStream(stream));
>+             try {
>+                 CMSTypedStream content = parser.getSignedContent();     
>+                 if (content == null) {
>+@@ -77,6 +79,8 @@ public class Pkcs7Parser extends AbstractParser {
>+             }
>+         } catch (CMSException e) {
>+             throw new TikaException("Unable to parse pkcs7 signed data", e);
>++        } catch (OperatorCreationException e) {
>++            throw new TikaException("Unable to parse pkcs7 signed data", e);
>+         }
>+     }
>+ 
>+-- 
>+1.8.5.3
>+
>diff --git a/tika.spec b/tika.spec
>index 82de14c..b0cc83b 100644
>--- a/tika.spec
>+++ b/tika.spec
>@@ -7,7 +7,7 @@
> 
> Name:          tika
> Version:       1.4
>-Release:       4%{?dist}
>+Release:       5%{?dist}
> Summary:       A content analysis toolkit
> License:       ASL 2.0
> Url:           http://tika.apache.org/
>@@ -17,6 +17,7 @@ Source0:       http://www.apache.org/dist/tika/%{name}-%{version}-src.zip
> # Replace ant-nodeps with ant
> # Fix bouncycastle aId
> Patch0:        %{name}-1.4-fix-build-deps.patch
>+Patch1:        %{name}-1.4-bouncycastle-1.50.patch
> BuildRequires: java-devel
> 
> BuildRequires: mvn(biz.aQute:bndlib)
>@@ -131,6 +132,7 @@ find . -name '*.tbz2' -delete
> find . -name '*.tgz' -delete
> find . -name '*.zip' -delete
> %patch0 -p1
>+%patch1 -p1
> 
> %pom_disable_module %{name}-app
> %pom_disable_module %{name}-bundle
>@@ -208,6 +210,9 @@ rm -r %{name}-parsers/src/test/java/org/apache/tika/parser/microsoft/ProjectPars
> %doc LICENSE.txt NOTICE.txt
> 
> %changelog
>+* Fri Mar 07 2014 Michal Srb <msrb@redhat.com> - 1.4-5
>+- Port to bouncycastle 1.50
>+
> * Tue Nov 19 2013 gil cattaneo <puntogil@libero.it> 1.4-4
> - enable vorbis-java-tika support
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1073775: 871779