rpms/xca/devel xca-0.6.4-openssl10.patch, NONE, 1.1 xca.spec, 1.29, 1.30

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/xca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19174

Modified Files:
	xca.spec 
Added Files:
	xca-0.6.4-openssl10.patch 
Log Message:
* Wed Aug 26 2009 Tomas Mraz <tmraz at redhat.com> - 0.6.4-9
- rebuilt with new openssl


xca-0.6.4-openssl10.patch:
 pki_x509req.cpp |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE xca-0.6.4-openssl10.patch ---
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;


Index: xca.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xca/devel/xca.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- xca.spec	21 Aug 2009 16:30:31 -0000	1.29
+++ xca.spec	26 Aug 2009 14:21:51 -0000	1.30
@@ -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/hi
 
 
 %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