[Frugalware-git] wipv: qca-ossl-2.0.0-4-i686

VÖRÖSKŐI András voroskoi at frugalware.org
Sat Jun 12 23:45:57 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=ff98a56bd5040ec5c050c11ff80242312fc73cfa

commit ff98a56bd5040ec5c050c11ff80242312fc73cfa
Author: VÖRÖSKŐI András <voroskoi at frugalware.org>
Date:   Sat Jun 12 23:45:41 2010 +0200

qca-ossl-2.0.0-4-i686

rebuilt with openssl>=1.0.0

diff --git a/source/xlib-extra/qca-ossl/FrugalBuild b/source/xlib-extra/qca-ossl/FrugalBuild
index d457ac0..48c51b2 100644
--- a/source/xlib-extra/qca-ossl/FrugalBuild
+++ b/source/xlib-extra/qca-ossl/FrugalBuild
@@ -4,20 +4,23 @@
pkgname=qca-ossl
pkgver=2.0.0
pkgextraver=-beta3
-pkgrel=3
+pkgrel=4
pkgdesc="This plugin provides features based on OpenSSL for QCA2."
url="http://delta.affinix.com/qca/"
groups=('xlib-extra')
archs=('i686' 'x86_64')
license="LGPLv2.1"
-depends=('qca>=2.0.0' 'openssl')
-source=(http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${pkgver}${pkgextraver}.tar.bz2)
+depends=('qca>=2.0.0' 'openssl>=1.0.0')
+source=(http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${pkgver}${pkgextraver}.tar.bz2 \
+	openssl-1.0.diff)
up2date="Flasttar http://delta.affinix.com/download/qca/2.0/plugins/ |sed s/${pkgextraver}//"
options=('scriptlet')
-sha1sums=('dd925e8732ff76f24f9f90f4094abaf2f0ac27bf')
+sha1sums=('dd925e8732ff76f24f9f90f4094abaf2f0ac27bf' \
+          'aaa0c2d16fed9c0d89a5e39ab8eae58be3598d3d')

build() {
Fcd
+	Fpatchall
./configure || Fdie
make || Fdie
Fmakeinstall INSTALL_ROOT=$Fdestdir
diff --git a/source/xlib-extra/qca-ossl/openssl-1.0.diff b/source/xlib-extra/qca-ossl/openssl-1.0.diff
new file mode 100644
index 0000000..9c8c0ed
--- /dev/null
+++ b/source/xlib-extra/qca-ossl/openssl-1.0.diff
@@ -0,0 +1,136 @@
+diff -aur qca-ossl-2.0.0-beta3/qca-ossl.cpp fw_qca-ossl-2.0.0-beta3//qca-ossl.cpp
+--- qca-ossl-2.0.0-beta3/qca-ossl.cpp	2007-12-11 07:34:57.000000000 +0100
++++ fw_qca-ossl-2.0.0-beta3//qca-ossl.cpp	2010-06-12 23:42:20.000000000 +0200
+@@ -42,6 +42,15 @@
+ #define OSSL_097
+ #endif
+
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
++// OpenSSL 1.0.0 makes a few changes that aren't very C++ friendly...
++// Among other things, CHECKED_PTR_OF returns a void*, but is used in
++// contexts requiring STACK pointers.
++#undef CHECKED_PTR_OF
++#define CHECKED_PTR_OF(type, p) \
++	            ((_STACK*) (1 ? p : (type*)0))
++#endif
++
+ using namespace QCA;
+
+ namespace opensslQCAPlugin {
+@@ -1182,6 +1191,7 @@
+ 	{
+ 		pkey = from.pkey;
+ 		CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
++		raw_type = false;
+ 		state = Idle;
+ 	}
+
+@@ -1226,6 +1236,7 @@
+ 		}
+ 		else
+ 		{
++			raw_type = false;
+ 			EVP_MD_CTX_init(&mdctx);
+ 			if(!EVP_VerifyInit_ex(&mdctx, type, NULL))
+ 				state = VerifyError;
+@@ -1771,8 +1782,10 @@
+ 			md = EVP_sha1();
+ 		else if(alg == EMSA3_MD5)
+ 			md = EVP_md5();
++#ifdef HAVE_OPENSSL_MD2
+ 		else if(alg == EMSA3_MD2)
+ 			md = EVP_md2();
++#endif
+ 		else if(alg == EMSA3_RIPEMD160)
+ 			md = EVP_ripemd160();
+ 		else if(alg == EMSA3_Raw)
+@@ -1789,8 +1802,10 @@
+ 			md = EVP_sha1();
+ 		else if(alg == EMSA3_MD5)
+ 			md = EVP_md5();
++#ifdef HAVE_OPENSSL_MD2
+ 		else if(alg == EMSA3_MD2)
+ 			md = EVP_md2();
++#endif
+ 		else if(alg == EMSA3_RIPEMD160)
+ 			md = EVP_ripemd160();
+ 		else if(alg == EMSA3_Raw)
+@@ -3385,9 +3400,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifdef HAVE_OPENSSL_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -3871,9 +3888,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifdef HAVE_OPENSSL_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -4061,9 +4080,11 @@
+ 		case NID_md5WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD5;
+ 		    break;
++#ifdef HAVE_OPENSSL_MD2
+ 		case NID_md2WithRSAEncryption:
+ 		    p.sigalgo = QCA::EMSA3_MD2;
+ 		    break;
++#endif
+ 		case NID_ripemd160WithRSA:
+ 		    p.sigalgo = QCA::EMSA3_RIPEMD160;
+ 		    break;
+@@ -6582,7 +6603,9 @@
+ 	list += "sha1";
+ 	list += "sha0";
+ 	list += "ripemd160";
++#ifdef HAVE_OPENSSL_MD2
+ 	list += "md2";
++#endif
+ 	list += "md4";
+ 	list += "md5";
+ #ifdef SHA224_DIGEST_LENGTH
+@@ -6757,7 +6780,9 @@
+ 		list += all_hash_types();
+ 		list += all_mac_types();
+ 		list += all_cipher_types();
++#ifdef HAVE_OPENSSL_MD2
+ 		list += "pbkdf1(md2)";
++#endif
+ 		list += "pbkdf1(sha1)";
+ 		list += "pbkdf2(sha1)";
+ 		list += "pkey";
+@@ -6788,8 +6813,10 @@
+ 			return new opensslHashContext( EVP_sha(), this, type);
+ 		else if ( type == "ripemd160" )
+ 			return new opensslHashContext( EVP_ripemd160(), this, type);
++#ifdef HAVE_OPENSSL_MD2
+ 		else if ( type == "md2" )
+ 			return new opensslHashContext( EVP_md2(), this, type);
++#endif
+ 		else if ( type == "md4" )
+ 			return new opensslHashContext( EVP_md4(), this, type);
+ 		else if ( type == "md5" )
+@@ -6816,8 +6843,10 @@
+ #endif
+ 		else if ( type == "pbkdf1(sha1)" )
+ 			return new opensslPbkdf1Context( EVP_sha1(), this, type );
++#ifdef HAVE_OPENSSL_MD2
+ 		else if ( type == "pbkdf1(md2)" )
+ 			return new opensslPbkdf1Context( EVP_md2(), this, type );
++#endif
+ 		else if ( type == "pbkdf2(sha1)" )
+ 			return new opensslPbkdf2Context( this, type );
+ 		else if ( type == "hmac(md5)" )
+Only in fw_qca-ossl-2.0.0-beta3/: qca-ossl.cpp.orig


More information about the Frugalware-git mailing list