rpms/kdelibs3/devel kdelibs-3.5.10-ossl-1.x.patch,1.1,1.2
Than Ngo
than at fedoraproject.org
Fri Sep 4 21:16:08 UTC 2009
- Previous message (by thread): [pkgdb] ghasher: maximilinux has requested watchbugzilla
- Next message (by thread): rpms/lmms/devel lmms-0.4.5-libdir.patch, NONE, 1.1 lmms-0.4.5-libexecdir.patch, NONE, 1.1 lmms-0.4.5-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 README.fedora, 1.2, 1.3 import.log, 1.4, 1.5 lmms.spec, 1.6, 1.7 sources, 1.5, 1.6 lmms-0.4.4-fltk-1.1.9-consts.patch, 1.1, NONE lmms-0.4.4-fltk-1.1.9-gcc44.patch, 1.1, NONE lmms-0.4.4-libdir.patch, 1.1, NONE lmms-0.4.4-libexecdir.patch, 1.1, NONE lmms-0.4.4-vst-nowine.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/extras/rpms/kdelibs3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7818
Modified Files:
kdelibs-3.5.10-ossl-1.x.patch
Log Message:
openssl-1.0 build fixes
kdelibs-3.5.10-ossl-1.x.patch:
kopenssl.cc | 22 +++++++++++++++++++---
kopenssl.h | 16 ++++++++++++++--
ksmimecrypto.cc | 2 +-
ksslcertificate.cc | 32 +++++++++++++++++++++++---------
4 files changed, 57 insertions(+), 15 deletions(-)
Index: kdelibs-3.5.10-ossl-1.x.patch
===================================================================
RCS file: /cvs/extras/rpms/kdelibs3/devel/kdelibs-3.5.10-ossl-1.x.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdelibs-3.5.10-ossl-1.x.patch 4 Sep 2009 20:19:41 -0000 1.1
+++ kdelibs-3.5.10-ossl-1.x.patch 4 Sep 2009 21:16:07 -0000 1.2
@@ -1,6 +1,6 @@
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 18:59:57.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 22:05:21.000000000 +0200
+--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200
@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons
static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
const EVP_CIPHER *,unsigned char *,int ,
@@ -40,7 +40,7 @@ diff -up kdelibs-3.5.10/kio/kssl/kopenss
#endif
-@@ -982,19 +992,18 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
+@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
else return -1;
}
@@ -55,22 +55,18 @@ diff -up kdelibs-3.5.10/kio/kssl/kopenss
ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
else return 0L;
+@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
+ return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
+ else return -1;
}
-
--
--int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-- if (K_ASN1_i2d_fp && K_i2d_ASN1_HEADER)
-- return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-- else return -1;
--}
--
+#endif
int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
--- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 21:57:38.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200
@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
#include <openssl/stack.h>
#include <openssl/bn.h>
@@ -128,7 +124,7 @@ diff -up kdelibs-3.5.10/kio/kssl/kopenss
* Duplicate the stack
diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 18:59:57.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200
@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
@@ -140,7 +136,7 @@ diff -up kdelibs-3.5.10/kio/kssl/ksmimec
sk_X509_push(x509, cert->getCert());
diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 22:08:34.000000000 +0200
++++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200
@@ -1003,17 +1003,31 @@ return qba;
QByteArray KSSLCertificate::toNetscape() {
QByteArray qba;
- Previous message (by thread): [pkgdb] ghasher: maximilinux has requested watchbugzilla
- Next message (by thread): rpms/lmms/devel lmms-0.4.5-libdir.patch, NONE, 1.1 lmms-0.4.5-libexecdir.patch, NONE, 1.1 lmms-0.4.5-vst-nowine.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 README.fedora, 1.2, 1.3 import.log, 1.4, 1.5 lmms.spec, 1.6, 1.7 sources, 1.5, 1.6 lmms-0.4.4-fltk-1.1.9-consts.patch, 1.1, NONE lmms-0.4.4-fltk-1.1.9-gcc44.patch, 1.1, NONE lmms-0.4.4-libdir.patch, 1.1, NONE lmms-0.4.4-libexecdir.patch, 1.1, NONE lmms-0.4.4-vst-nowine.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list