rpms/tqsllib/devel tqsllib-2.0-openssl.patch, 1.2, 1.3 tqsllib.spec, 1.6, 1.7

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	tqsllib-2.0-openssl.patch tqsllib.spec 
Log Message:
* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-9
- rebuilt with new openssl


tqsllib-2.0-openssl.patch:
 openssl_cert.cpp |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Index: tqsllib-2.0-openssl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib-2.0-openssl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tqsllib-2.0-openssl.patch	12 Jan 2009 13:05:08 -0000	1.2
+++ tqsllib-2.0-openssl.patch	22 Aug 2009 20:23:36 -0000	1.3
@@ -1,6 +1,7 @@
---- tqsllib-2.0/openssl_cert.cpp	2005-03-11 14:47:11.000000000 +0200
-+++ tqsllib-2.0-mod/openssl_cert.cpp	2009-01-12 14:58:00.000000000 +0200
-@@ -1178,7 +1178,7 @@
+diff -up tqsllib-2.0/openssl_cert.cpp.openssl tqsllib-2.0/openssl_cert.cpp
+--- tqsllib-2.0/openssl_cert.cpp.openssl	2005-03-11 13:47:11.000000000 +0100
++++ tqsllib-2.0/openssl_cert.cpp	2009-08-22 22:12:52.000000000 +0200
+@@ -1178,7 +1178,7 @@ tqsl_verifyDataBlock(tQSL_Cert cert, con
  	}
  	EVP_VerifyInit(&ctx, EVP_sha1());
  	EVP_VerifyUpdate(&ctx, data, datalen);
@@ -9,12 +10,38 @@
  		tQSL_Error = TQSL_OPENSSL_ERROR;
  		return 1;
  	}
-@@ -1288,7 +1288,7 @@
+@@ -1260,6 +1260,11 @@ tqsl_getCertificateRequestCountry(tQSL_C
+ 	return 0;
+ }
+ 
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define asc2uni OPENSSL_asc2uni
++#define uni2asc OPENSSL_uni2asc
++#endif
++
+ static int
+ tqsl_add_bag_attribute(PKCS12_SAFEBAG *bag, const char *oidname, const string& value) {
+ 	int nid;
+@@ -1288,7 +1293,7 @@ tqsl_add_bag_attribute(PKCS12_SAFEBAG *b
  							sk_ASN1_TYPE_push(attrib->value.set, val);
  #if (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00906000
  							attrib->set = 1;
 -#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00907000
-+#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) == 0x00908000
++#elif (OPENSSL_VERSION_NUMBER & 0xfffff000) >= 0x00908000
  							attrib->single = 0;
  #else
  #error "Unexpected OpenSSL version; check X509_ATTRIBUTE struct compatibility"
+@@ -1479,8 +1484,13 @@ tqsl_exportPKCS12File(tQSL_Cert cert, co
+ 
+ 	/* Form into PKCS12 data */
+ 	p12 = PKCS12_init(NID_pkcs7_data);
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	ASN1_seq_pack((STACK_OF(OPENSSL_BLOCK)*)safes, (int(*)(void*, unsigned char**))i2d_PKCS7, &(p12)->authsafes->d.data->data,
++		&(p12)->authsafes->d.data->length);
++#else
+ 	ASN1_seq_pack_PKCS7(safes, (int(*)())i2d_PKCS7, &(p12)->authsafes->d.data->data,
+ 		&(p12)->authsafes->d.data->length);
++#endif
+ 	sk_PKCS7_pop_free(safes, PKCS7_free);
+ 	safes = 0;
+ 	PKCS12_set_mac(p12, p12password, -1, 0, 0, PKCS12_DEFAULT_ITER, 0);


Index: tqsllib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tqsllib/devel/tqsllib.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tqsllib.spec	21 Aug 2009 16:14:15 -0000	1.6
+++ tqsllib.spec	22 Aug 2009 20:23:36 -0000	1.7
@@ -31,7 +31,7 @@ as well as a static tqsllib library and 
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b openssl
+%patch0 -p1 -b .openssl
 
 %build
 #openssl, expat, zlib detection is broken on other archs
@@ -79,7 +79,7 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-9
+* Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.0-9
 - rebuilt with new openssl
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-8