rpms/xca/devel xca-0.6.4-newopenssl.patch, NONE, 1.1 xca.spec, 1.20, 1.21

Sat Jan 5 23:34:04 UTC 2008

Author: alexlan

Update of /cvs/pkgs/rpms/xca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10904

Modified Files:
	xca.spec 
Added Files:
	xca-0.6.4-newopenssl.patch 
Log Message:
* 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


xca-0.6.4-newopenssl.patch:

--- NEW FILE xca-0.6.4-newopenssl.patch ---
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)
 


Index: xca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xca/devel/xca.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xca.spec	25 Aug 2007 12:13:40 -0000	1.20
+++ xca.spec	5 Jan 2008 23:33:28 -0000	1.21
@@ -5,7 +5,7 @@
 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 @@
 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 @@
 %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 @@
 
 
 %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


