[xca/f21] Patch "openssl101i" for openssl-1.0.1i compatibility.

Wed Oct 15 17:19:53 UTC 2014

commit a5ca39f909e8eca8171ce3a296c7291660e0e068
Author: Patrick Monnerat <pm at datasphere.ch>
Date:   Wed Oct 15 19:19:26 2014 +0200

    Patch "openssl101i" for openssl-1.0.1i compatibility.

 xca-0.9.3-desktopicon.patch |   12 +++++++++++
 xca-0.9.3-openssl101i.patch |   44 +++++++++++++++++++++++++++++++++++++++++++
 xca.spec                    |   20 ++++++++++++------
 3 files changed, 69 insertions(+), 7 deletions(-)
---

diff --git a/xca-0.9.3-desktopicon.patch b/xca-0.9.3-desktopicon.patch
new file mode 100644
index 0000000..5fd97be
--- /dev/null
+++ b/xca-0.9.3-desktopicon.patch
@@ -0,0 +1,12 @@
+diff -Naurp xca-0.9.3.orig/misc/xca.desktop xca-0.9.3.new/misc/xca.desktop
+--- xca-0.9.3.orig/misc/xca.desktop	2012-05-12 11:37:14.000000000 +0200
++++ xca-0.9.3.new/misc/xca.desktop	2014-10-15 14:46:33.113592955 +0200
+@@ -7,7 +7,7 @@ Comment[de]=Eine graphische Oberfläche
+ Comment[fi]=Graafinen X.509-varmenteiden hallintatyökalu
+ Comment[fr]=Création et gestion de certificats conformes à la norme X.509
+ Exec=xca %F
+-Icon=xca-32x32.xpm
++Icon=xca-32x32
+ Terminal=false
+ Categories=Application;Utility;Qt;
+ MimeType=application/x-xca-database;application/x-xca-template;application/x-x509-ca-cert;application/pkcs10;application/x-pkcs7-certificates;application/x-pkcs12;
diff --git a/xca-0.9.3-openssl101i.patch b/xca-0.9.3-openssl101i.patch
new file mode 100644
index 0000000..828acdc
--- /dev/null
+++ b/xca-0.9.3-openssl101i.patch
@@ -0,0 +1,44 @@
+From: Oliver Winker <oliver at oli1170.net>
+Date: Tue, 12 Aug 2014 17:08:05 +0000 (+0200)
+Subject: Fix for openssl 1.0.1i
+X-Git-Url: http://gitweb.hohnstaedt.de/?p=projects%2Fxca.git;a=commitdiff_plain;h=4f7cd417320215c8ed3567536cbf2ca008946c38
+
+Fix for openssl 1.0.1i
+
+Fixes following application error
+
+Errors
+error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding
+error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error
+
+Due to openssl 1.0.1i change:
+
+   commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291
+   Author: Emilia Kasper <emilia at openssl.org>
+   Date:   Wed Jul 2 19:02:33 2014 +0200
+
+Commit messgae amended and
+Signed-off-by: Christian Hohnstaedt <chohnstaedt at innominate.com>
+---
+
+diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
+index cf74c32..d94cbda 100644
+--- a/lib/x509v3ext.cpp
++++ b/lib/x509v3ext.cpp
+@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n)
+ x509v3ext::x509v3ext(const x509v3ext &n)
+ {
+ 	ext = NULL;
++	if (!n.isValid())
++		return;
+ 	set(n.ext);
+ }
+ 
+@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const
+ 
+ bool x509v3ext::isValid() const
+ {
+-	return ext->value->length > 0 &&
++	return ext && ext->value && ext->value->length > 0 &&
+ 		OBJ_obj2nid(ext->object) != NID_undef;
+ }
diff --git a/xca.spec b/xca.spec
index 7e8c974..318b4d9 100644
--- a/xca.spec
+++ b/xca.spec
@@ -1,23 +1,22 @@
-%{!?release_func:%global release_func() %1%{?dist}}
-
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.9.3
-Release:	%release_func 8
-
+Release:	9%{?dist}
 License:	BSD
 Group:		Applications/Productivity
 URL:		http://www.hohnstaedt.de/xca.html
 Source0:	http://downloads.sourceforge.net/sourceforge/xca/%{name}-%{version}.tar.gz
 Source1:	README.update
 Patch1:		xca-0.9.3-french.patch
+Patch2:		xca-0.9.3-openssl101i.patch
+Patch3:		xca-0.9.3-desktopicon.patch
 BuildRequires:	qt4-devel openssl-devel
 BuildRequires:	xdg-utils
 BuildRequires:	ImageMagick
 BuildRequires:	linuxdoc-tools
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	translate-toolkit
-Requires:		hicolor-icon-theme
+Requires:	hicolor-icon-theme
 
 
 %description
@@ -38,6 +37,8 @@ format, portable across operating systems.
 %setup -q
 
 %patch1 -p 1 -b .french
+%patch2 -p 1 -b .openssl101i
+%patch3 -p 1 -b .desktopicon
 
 mkdir -p _tmp_root/usr
 ln -s "/usr/%{_lib}" _tmp_root/usr/lib
@@ -48,7 +49,6 @@ install -p -m 644 "%{SOURCE1}" ./
 
 
 %build
-#test -n "${QTDIR}" || . "%{_sysconfdir}/profile.d/qt.sh"
 export QTDIR="%{_libdir}/qt4"
 CC='%{__cxx}' LD='%{__ld}' CFLAGS="${RPM_OPT_FLAGS}			\
 	-DXCA_DEFAULT_QT_TRANSLATE=\"\\\"%{_datadir}/qt4/translations\\\"\"" \
@@ -134,6 +134,12 @@ fi
 
 
 %changelog
+* Wed Oct 15 2014 Patrick Monnerat <pm at datasphere.ch> 0.9.3-9
+- Patch "openssl101i" for openssl-1.0.1i compatibility.
+  https://bugzilla.redhat.com/show_bug.cgi?id=1152043
+- Patch "desktopicon" removes the icon file extension in desktop entry file.
+  https://sourceforge.net/p/xca/patches/15/
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
@@ -256,7 +262,7 @@ fi
 * Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1-2
 - use %%dist instead of %%disttag
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Tue Mar  8 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1
