rpms/xca/devel xca-0.5.1-gcc41.patch, NONE, 1.1 xca-0.5.1-openssl098.patch, NONE, 1.1 xca-0.5.1-sha1.patch, NONE, 1.1 xca.spec, 1.10, 1.11

Enrico Scholz (ensc) fedora-extras-commits at redhat.com
Sun Dec 25 21:27:44 UTC 2005


Author: ensc

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

Modified Files:
	xca.spec 
Added Files:
	xca-0.5.1-gcc41.patch xca-0.5.1-openssl098.patch 
	xca-0.5.1-sha1.patch 
Log Message:
- fixed compilation with gcc41 and openssl098
- use SHA1 instead of MD5 as the default hashalgo


xca-0.5.1-gcc41.patch:

--- NEW FILE xca-0.5.1-gcc41.patch ---
--- xca-0.5.1/lib/pki_key.h.gcc41	2003-12-10 07:43:05.000000000 +0100
+++ xca-0.5.1/lib/pki_key.h	2005-12-25 17:27:48.000000000 +0100
@@ -83,7 +83,7 @@
 	pki_key(const QString name = "", int type = EVP_PKEY_RSA);
 	pki_key(EVP_PKEY *pkey);
 	// copy constructor
-	pki_key::pki_key(const pki_key *pk);
+	pki_key(const pki_key *pk);
 	/* destructor */
 	~pki_key();
 	
--- xca-0.5.1/lib/db_crl.h.gcc41	2004-04-16 00:31:31.000000000 +0200
+++ xca-0.5.1/lib/db_crl.h	2005-12-25 16:01:56.000000000 +0100
@@ -69,7 +69,7 @@
 	void preprocess();
 	void inToCont(pki_base *pki);
 	pki_base *insert(pki_base *item);
-	void db_crl::deletePKI(pki_base *pki);
+	void deletePKI(pki_base *pki);
     signals:
 	void updateCertView();
 };
--- xca-0.5.1/lib/db_x509.h.gcc41	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/db_x509.h	2005-12-25 16:01:56.000000000 +0100
@@ -84,7 +84,7 @@
 	void writeAllCerts(const QString fname, bool onlyTrusted);
 	pki_x509 *getByIssSerial(const pki_x509 *issuer, const a1int &a);
 	pki_x509 *getBySubject(const x509name &xname, pki_x509 *last = NULL);
-	pki_base *db_x509::insert(pki_base *item);
+	pki_base *insert(pki_base *item);
     public slots:
 	void revokeCert(const x509rev &revok, const pki_x509 *issuer);
     
--- xca-0.5.1/lib/asn1time.h.gcc41	2003-08-06 10:15:37.000000000 +0200
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 16:55:02.000000000 +0100
@@ -75,7 +75,7 @@
 	QString toPlain() const;
 	QString toSortable() const;
 	int ymdg(int *y, int *m, int *d, int *g) const;
-	int a1time::ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
+	int ymdg(int *y, int *m, int *d, int *h, int *M, int *s, int *g) const;
 	ASN1_TIME *get() const;
 	ASN1_TIME *get_utc() const;
 	a1time &now(int delta = 0);

xca-0.5.1-openssl098.patch:

--- NEW FILE xca-0.5.1-openssl098.patch ---
--- xca-0.5.1/lib/x509rev.cpp.openssl098	2003-11-24 14:42:44.000000000 +0100
+++ xca-0.5.1/lib/x509rev.cpp	2005-12-25 21:38:32.000000000 +0100
@@ -50,8 +50,13 @@
 
 #include "x509rev.h"
 
-#define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
+		(d2i_of_void *)d2i_X509_REVOKED,(char *)x5r)
+#else
+#  define X509_REVOKED_dup(x5r) (X509_REVOKED *)ASN1_dup((int (*)())i2d_X509_REVOKED, \
 		(char *(*)())d2i_X509_REVOKED,(char *)x5r)
+#endif
 	
 x509rev::x509rev()
 {
--- xca-0.5.1/lib/openssl-compat.h.openssl098	2005-12-25 21:38:44.000000000 +0100
+++ xca-0.5.1/lib/openssl-compat.h	2005-12-25 21:51:29.000000000 +0100
@@ -0,0 +1,17 @@
+#ifndef H_XCA_LIB_OPENSSL_COMPAT_H
+#define H_XCA_LIB_OPENSSL_COMPAT_H
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+#  define XCA_D2I_F(F,X) \
+inline static X*					\
+d2i_##F(X** a, unsigned char**b, long int c)		\
+{							\
+  return d2i_##F(a, (unsigned char const **) b, c);	\
+}
+#  define XCA_D2I(X)		XCA_D2I_F(X,X)
+#else
+#  define XCA_D2I(X)
+#  define XCA_D2I_F(F,X)
+#endif
+
+#endif
--- xca-0.5.1/lib/asn1time.h.openssl098	2005-12-25 21:33:32.000000000 +0100
+++ xca-0.5.1/lib/asn1time.h	2005-12-25 21:42:47.000000000 +0100
@@ -89,4 +89,7 @@
 	bool const operator != (const a1time &a);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(ASN1_TIME)
+
 #endif
--- xca-0.5.1/lib/pki_x509.h.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_x509.h	2005-12-25 21:43:37.000000000 +0100
@@ -141,4 +141,7 @@
 	   const EVP_MD *getDigest();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509)
+
 #endif
--- xca-0.5.1/lib/pki_crl.h.openssl098	2004-02-18 01:03:05.000000000 +0100
+++ xca-0.5.1/lib/pki_crl.h	2005-12-25 21:44:28.000000000 +0100
@@ -97,4 +97,7 @@
 	void updateView();
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_CRL)
+
 #endif
--- xca-0.5.1/lib/pki_x509req.h.openssl098	2004-02-05 21:17:55.000000000 +0100
+++ xca-0.5.1/lib/pki_x509req.h	2005-12-25 21:45:20.000000000 +0100
@@ -95,4 +95,8 @@
 	   void set_spki(NETSCAPE_SPKI *_spki);
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_REQ)
+XCA_D2I(NETSCAPE_SPKI)
+
 #endif
--- xca-0.5.1/lib/pki_key.cpp.openssl098	2004-02-18 01:03:06.000000000 +0100
+++ xca-0.5.1/lib/pki_key.cpp	2005-12-25 21:53:16.000000000 +0100
@@ -58,6 +58,9 @@
 #include <qapplication.h>
 #include <widgets/MainWindow.h>
 
+#include "openssl-compat.h"
+XCA_D2I_F(RSA_PUBKEY,RSA)
+
 char pki_key::passwd[40]="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
 
 QPixmap *pki_key::icon[2]= { NULL, NULL };
@@ -107,7 +110,13 @@
 	if (pk == NULL) return;
 	key->type = pk->key->type;
 	if (key->type == EVP_PKEY_RSA) {
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
+		key->pkey.rsa=((RSA *)ASN1_dup( (i2d_of_void *)i2d_RSAPrivateKey,
+										(d2i_of_void *)d2i_RSAPrivateKey,
+										(char *)pk->key->pkey.rsa));
+#else
 		key->pkey.rsa=((RSA *)ASN1_dup( (int (*)())i2d_RSAPrivateKey, (char *(*)())d2i_RSAPrivateKey,(char *)pk->key->pkey.rsa));
+#endif
 	}
 	// TODO add DSA support.....	
 	openssl_error();
--- xca-0.5.1/lib/x509name.h.openssl098	2003-11-25 16:56:46.000000000 +0100
+++ xca-0.5.1/lib/x509name.h	2005-12-25 21:54:02.000000000 +0100
@@ -87,4 +87,7 @@
 		
 };
 
+#include "openssl-compat.h"
+XCA_D2I(X509_NAME)
+
 #endif

xca-0.5.1-sha1.patch:

--- NEW FILE xca-0.5.1-sha1.patch ---
--- xca-0.5.1/widgets/NewX509.cpp.sha1	2004-05-21 21:07:44.000000000 +0200
+++ xca-0.5.1/widgets/NewX509.cpp	2005-12-25 22:14:07.000000000 +0100
@@ -117,7 +117,7 @@
 	// are there any useable private keys  ?
 	strings = MainWindow::keys->get0PrivateDesc();
 	keyList->insertStringList(strings);
-	hashAlgo->setCurrentItem(1);
+	hashAlgo->setCurrentItem(2);
 	
 	// any PKCS#10 requests to be used ?
 	strings = MainWindow::reqs->getDesc();


Index: xca.spec
===================================================================
RCS file: /cvs/extras/rpms/xca/devel/xca.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xca.spec	21 May 2005 13:46:10 -0000	1.10
+++ xca.spec	25 Dec 2005 21:27:44 -0000	1.11
@@ -5,7 +5,7 @@
 Summary:	Graphical X.509 certificate management tool
 Name:		xca
 Version:	0.5.1
-Release:	%release_func 3
+Release:	%release_func 4
 
 License:	BSD
 Group:		Applications/Productivity
@@ -15,6 +15,9 @@
 # http://cvs.sourceforge.net/viewcvs.py/xca/xca/widgets/clicklabel.cpp?r1=1.3&r2=1.4&diff_format=u
 Patch1:		%name-0.5.1-gcc4.patch
 Patch2:		%name-0.5.1-db43.patch
+Patch3:		%name-0.5.1-gcc41.patch
+Patch4:		%name-0.5.1-openssl098.patch
+Patch5:		%name-0.5.1-sha1.patch
 BuildRoot:	%_tmppath/%name-%version-%release-buildroot
 BuildRequires:	qt-devel openssl-devel
 BuildRequires:	/usr/include/db.h
@@ -35,6 +38,9 @@
 %patch0 -p0 -b .langinst
 %patch1 -p2 -b .gcc4
 %patch2 -p1 -b .db43
+%patch3 -p1 -b .gcc41
+%patch4 -p1 -b .openssl098
+%patch5 -p1 -b .sha1
 
 dblibs=$(echo /usr/%_lib/libdb_cxx*.so | tac | sed -e 's!.*lib\(db[^ ]*\)\.so!\1!g')
 sed -i "s! db_cxx-4 ! ${dblibs} !g" configure
@@ -86,6 +92,10 @@
 
 
 %changelog
+* Sun Dec 25 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1-4
+- fixed compilation with gcc41 and openssl098
+- use SHA1 instead of MD5 as the default hashalgo
+
 * Sat May 21 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.5.1-3
 - generalized db4 detection
 - fixed x86_64 builds




More information about the scm-commits mailing list