pwouters pushed to xca (epel7). "obsoleted by 0.6.0"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon May 18 20:58:33 UTC 2015


From 434d9011b123727e8bc9b28fcfb3515fd69948a6 Mon Sep 17 00:00:00 2001
From: ensc <ensc at fedoraproject.org>
Date: Sat, 17 Mar 2007 17:08:53 +0000
Subject: obsoleted by 0.6.0


diff --git a/xca-0.5.1-db43.patch b/xca-0.5.1-db43.patch
deleted file mode 100644
index 91fc511..0000000
--- a/xca-0.5.1-db43.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xca-0.5.1/widgets/MainWindow.h.db43	2004-04-15 01:36:56.000000000 +0200
-+++ xca-0.5.1/widgets/MainWindow.h	2005-03-08 17:36:26.000000000 +0100
-@@ -105,6 +105,10 @@ class MainWindow: public MainWindow_UI
- 	static int passRead(char *buf, int size, int rwflag, void *userdata);
- 	static int passWrite(char *buf, int size, int rwflag, void *userdata);
- 	static void dberr(const char *errpfx, char *msg);
-+	static void dberr(DbEnv const *, const char *errpfx, char const *msg)
-+	{
-+	  dberr(errpfx, const_cast<char *>(msg));
-+	}
- 	static NewX509 *newX509();
- 	static QString md5passwd(const char *pass);
- 	static void Error(errorEx &err);
diff --git a/xca-0.5.1-gcc4.patch b/xca-0.5.1-gcc4.patch
deleted file mode 100644
index b99b362..0000000
--- a/xca-0.5.1-gcc4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-===================================================================
-RCS file: /cvsroot/xca/xca/widgets/clicklabel.cpp,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- xca/xca/widgets/clicklabel.cpp	2003/11/26 22:03:18	1.3
-+++ xca/xca/widgets/clicklabel.cpp	2005/02/07 21:56:27	1.4
-@@ -45,7 +45,7 @@
-  * http://www.hohnstaedt.de/xca
-  * email: christian at hohnstaedt.de
-  *
-- * $Id: clicklabel.cpp,v 1.3 2003/11/26 22:03:18 chris2511 Exp $ 
-+ * $Id: clicklabel.cpp,v 1.4 2005/02/07 21:56:27 chris2511 Exp $ 
-  *
-  */                           
- 
-@@ -58,9 +58,9 @@
- ClickLabel::ClickLabel( QWidget* parent,  const char* name, WFlags f )
- 	:QLabel( parent, name, f )
- {
--	QFont font( font() );
--	font.setBold(true);
--	setFont( font );
-+	QFont fnt( font() );
-+	fnt.setBold(true);
-+	setFont( fnt );
- 	setFrameShape( QLabel::Panel );
- 	setFrameShadow( QLabel::Sunken );
- 	setAlignment( int( QLabel::AlignCenter ) );
diff --git a/xca-0.5.1-gcc41.patch b/xca-0.5.1-gcc41.patch
deleted file mode 100644
index 88e2d7a..0000000
--- a/xca-0.5.1-gcc41.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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);
diff --git a/xca-0.5.1-langinst.patch b/xca-0.5.1-langinst.patch
deleted file mode 100644
index 0e1d6e5..0000000
--- a/xca-0.5.1-langinst.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lang/Makefile~	2004-02-18 19:29:50.000000000 +0200
-+++ lang/Makefile	2004-08-27 20:09:02.910204474 +0300
-@@ -3,7 +3,7 @@
- 
- install:
- 	install -m 755 -d $(destdir)$(prefix)/share/xca
--	install -m 644 lang/xca_??.qm $(destdir)$(prefix)/share/xca || true
-+	install -m 644 xca_??.qm $(destdir)$(prefix)/share/xca || true
- 
- include $(TOPDIR)/Local.mak
- 
diff --git a/xca-0.5.1-openssl098.patch b/xca-0.5.1-openssl098.patch
deleted file mode 100644
index 3f1b946..0000000
--- a/xca-0.5.1-openssl098.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- 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
diff --git a/xca-0.5.1-sha1.patch b/xca-0.5.1-sha1.patch
deleted file mode 100644
index 14e9dca..0000000
--- a/xca-0.5.1-sha1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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();
-- 
cgit v0.10.2


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


More information about the scm-commits mailing list