pwouters pushed to xca (epel7). "- rebuilt with new openssl"

[notifications at fedoraproject.org]

From 62616c26d21b82e39367aea6928fe98c6f6830da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz at fedoraproject.org>
Date: Wed, 26 Aug 2009 14:21:51 +0000
Subject: - rebuilt with new openssl


diff --git a/xca-0.6.4-openssl10.patch b/xca-0.6.4-openssl10.patch
new file mode 100644
index 0000000..14e7607
--- /dev/null
+++ b/xca-0.6.4-openssl10.patch
@@ -0,0 +1,15 @@
+diff -up xca-0.6.4/lib/pki_x509req.cpp.openssl xca-0.6.4/lib/pki_x509req.cpp
+--- xca-0.6.4/lib/pki_x509req.cpp.openssl	2007-08-13 20:55:50.000000000 +0200
++++ xca-0.6.4/lib/pki_x509req.cpp	2009-08-26 16:18:58.000000000 +0200
+@@ -335,7 +335,11 @@ void pki_x509req::set_spki(NETSCAPE_SPKI
+ void pki_x509req::load_spkac(const QString filename)
+ {
+ 	STACK_OF(CONF_VALUE) *sk=NULL;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	LHASH_OF(CONF_VALUE) *parms=NULL;
++#else
+ 	LHASH *parms=NULL;
++#endif
+ 	CONF_VALUE *cv=NULL;
+ 	x509name subject;
+ 	char *type,*buf;
diff --git a/xca.spec b/xca.spec
index 4dc0724..a7e68d3 100644
--- a/xca.spec
+++ b/xca.spec
@@ -14,6 +14,7 @@ Source4:	xca.xml
 Patch0:		xca-0.6.3-locale.patch
 Patch1:         xca-0.6.4-newopenssl.patch
 Patch2:         xca-0.6.4-includes.patch
+Patch3:		xca-0.6.4-openssl10.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt4-devel openssl-devel
 BuildRequires:	db4-devel
@@ -41,6 +42,7 @@ PEM, DER, PKCS#8.
 %patch0 -p1 -b .locale
 %patch1 -p1 -b .newopenssl
 %patch2 -p1 -b .includes
+%patch3 -p1 -b .openssl10
 
 mkdir -p _tmp_root/usr 	 
 ln -s /usr/%_lib	_tmp_root/usr/lib 	 
@@ -130,7 +132,7 @@ gtk-update-icon-cache %_datadir/icons/hicolor &>/dev/null || :
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
+* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
 - rebuilt with new openssl
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.4-8
-- 
cgit v0.10.2


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