pwouters pushed to xca (epel7). "- Add patch by Caolan McNamara (#427619) to build against new openssl"

[notifications at fedoraproject.org]

From 358ab50822e75a4ff9fb269d07609bc023047f68 Mon Sep 17 00:00:00 2001
From: alexlan <alexlan at fedoraproject.org>
Date: Sat, 5 Jan 2008 23:33:28 +0000
Subject: - Add patch by Caolan McNamara (#427619) to build against new openssl


diff --git a/xca-0.6.4-newopenssl.patch b/xca-0.6.4-newopenssl.patch
new file mode 100644
index 0000000..b8ac596
--- /dev/null
+++ b/xca-0.6.4-newopenssl.patch
@@ -0,0 +1,17 @@
+diff -ru xca-0.6.4.orig/lib/x509rev.cpp xca-0.6.4/lib/x509rev.cpp
+--- xca-0.6.4.orig/lib/x509rev.cpp	2007-08-13 19:55:50.000000000 +0100
++++ xca-0.6.4/lib/x509rev.cpp	2008-01-05 14:16:59.000000000 +0000
+@@ -7,7 +7,12 @@
+ 
+ #include "x509rev.h"
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if OPENSSL_VERSION_NUMBER >= 0x0090807fL
++#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup( \
++	(int (*)(void*, unsigned char**))i2d_X509_REVOKED, \
++        (void* (*)(void**, const unsigned char**, long int))d2i_X509_REVOKED, \
++	(char *)x5r)
++#elif OPENSSL_VERSION_NUMBER >= 0x00908000L
+ #define X509_REVOKED_dup(x5r) \
+ 	ASN1_dup_of (X509_REVOKED, i2d_X509_REVOKED, d2i_X509_REVOKED, x5r)
+ 
diff --git a/xca.spec b/xca.spec
index e5cc00f..c3c51ff 100644
--- a/xca.spec
+++ b/xca.spec
@@ -1,11 +1,11 @@
-## $Id: xca.spec,v 1.19 2007/06/30 11:59:20 ensc Exp $
+## $Id: xca.spec,v 1.20 2007/08/25 12:13:40 ensc Exp $
 
 %{!?release_func:%global release_func() %1%{?dist}}
 
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.6.4
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	BSD
 Group:		Applications/Productivity
@@ -14,6 +14,7 @@ Source0:	http://download.sourceforge.net/sourceforge/xca/%name-%version.tar.gz
 Source1:	README.update
 Source4:	xca.xml
 Patch0:		xca-0.6.3-locale.patch
+Patch1:         xca-0.6.4-newopenssl.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt4-devel openssl-devel
 BuildRequires:	db4-devel
@@ -39,6 +40,7 @@ PEM, DER, PKCS#8.
 %prep
 %setup -q
 %patch0 -p1 -b .locale
+%patch0 -p1 -b .newopenssl
 
 mkdir -p _tmp_root/usr 	 
 ln -s /usr/%_lib	_tmp_root/usr/lib 	 
@@ -128,6 +130,9 @@ gtk-update-icon-cache %_datadir/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Jan  5 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.6.4-2
+- Add patch by Caolan McNamara (#427619) to build against new openssl
+
 * Sat Aug 25 2007 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.6.4-1
 - updated to 0.6.4
 - optimized scriptlets which are dealing with the desktop stuff
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xca.git/commit/?h=epel7&id=358ab50822e75a4ff9fb269d07609bc023047f68