packages: kde4-kde3support/kde4-kde3support.spec, kde4-kde3support/openssl1...
baggins
baggins at pld-linux.org
Tue Oct 5 12:06:43 CEST 2010
Author: baggins Date: Tue Oct 5 10:06:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 29
- more openssl 1.0 fixes
---- Files affected:
packages/kde4-kde3support:
kde4-kde3support.spec (1.47 -> 1.48) , openssl1.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/kde4-kde3support/kde4-kde3support.spec
diff -u packages/kde4-kde3support/kde4-kde3support.spec:1.47 packages/kde4-kde3support/kde4-kde3support.spec:1.48
--- packages/kde4-kde3support/kde4-kde3support.spec:1.47 Tue Oct 5 11:56:24 2010
+++ packages/kde4-kde3support/kde4-kde3support.spec Tue Oct 5 12:06:38 2010
@@ -19,7 +19,7 @@
Summary(uk.UTF-8): K Desktop Environment - Бібліотеки
Name: kde4-kde3support
Version: 3.5.10
-Release: 28
+Release: 29
License: LGPL
Group: X11/Libraries
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{origname}-%{version}.tar.bz2
@@ -764,6 +764,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2010/10/05 10:06:38 baggins
+- rel 29
+- more openssl 1.0 fixes
+
Revision 1.47 2010/10/05 09:56:24 baggins
- rel 28
- support for openssl 1.0, patch from http://trinity.pearsoncomputing.net/
================================================================
Index: packages/kde4-kde3support/openssl1.patch
diff -u packages/kde4-kde3support/openssl1.patch:1.1 packages/kde4-kde3support/openssl1.patch:1.2
--- packages/kde4-kde3support/openssl1.patch:1.1 Tue Oct 5 11:56:24 2010
+++ packages/kde4-kde3support/openssl1.patch Tue Oct 5 12:06:38 2010
@@ -162,3 +162,47 @@
/*
*
*/
+diff -urN kdelibs-3.5.10/kio/kssl/ksslcertificate.cc kdelibs-3.5.12/kio/kssl/ksslcertificate.cc
+--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2006-01-19 18:06:12.000000000 +0100
++++ kdelibs-3.5.12/kio/kssl/ksslcertificate.cc 2010-09-29 07:28:27.000000000 +0200
+@@ -1000,17 +1000,31 @@
+ QByteArray KSSLCertificate::toNetscape() {
+ QByteArray qba;
+ #ifdef KSSL_HAVE_SSL
+-ASN1_HEADER ah;
+-ASN1_OCTET_STRING os;
+-KTempFile ktf;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++ NETSCAPE_X509 nx;
++ ASN1_OCTET_STRING hdr;
++#else
++ ASN1_HEADER ah;
++ ASN1_OCTET_STRING os;
++#endif
++ KTempFile ktf;
+
+- os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+- os.length = strlen(NETSCAPE_CERT_HDR);
+- ah.header = &os;
+- ah.data = (char *)getCert();
+- ah.meth = d->kossl->X509_asn1_meth();
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
++ hdr.length = strlen(NETSCAPE_CERT_HDR);
++ nx.header = &hdr;
++ nx.cert = getCert();
+
+- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
++ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
++#else
++ os.data = (unsigned char *)NETSCAPE_CERT_HDR;
++ os.length = strlen(NETSCAPE_CERT_HDR);
++ ah.header = &os;
++ ah.data = (char *)getCert();
++ ah.meth = d->kossl->X509_asn1_meth();
++
++ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
++#endif
+
+ ktf.close();
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kde3support/kde4-kde3support.spec?r1=1.47&r2=1.48&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kde3support/openssl1.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list