From 32fcc2ab90cff9be070653b0d92cf55e899f5926 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 4 Sep 2009 21:16:07 +0000 Subject: [PATCH] openssl-1.0 build fixes --- kdelibs-3.5.10-ossl-1.x.patch | 22 +++++++++------------- kdelibs3.spec | 7 ++++++- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/kdelibs-3.5.10-ossl-1.x.patch b/kdelibs-3.5.10-ossl-1.x.patch index cc52e20..a948b88 100644 --- a/kdelibs-3.5.10-ossl-1.x.patch +++ b/kdelibs-3.5.10-ossl-1.x.patch @@ -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/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ko #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/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ko 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 #include @@ -128,7 +124,7 @@ diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kop * 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/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kss 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; diff --git a/kdelibs3.spec b/kdelibs3.spec index 1543674..01e69c4 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -30,7 +30,7 @@ Summary: K Desktop Environment 3 - Libraries Version: 3.5.10 -Release: 15%{?dist} +Release: 16%{?dist} Name: kdelibs3 Obsoletes: kdelibs < 6:%{version}-%{release} @@ -83,6 +83,7 @@ Patch101: kde-3.5-libtool-shlibext.patch # kget ignores simultaneous download limit (kde #101956) Patch103: kdelibs-3.5.0-101956.patch Patch104: kdelibs-3.5.10-gcc44.patch +Patch105: kdelibs-3.5.10-ossl-1.x.patch ## security fixes # fix CVE-2009-2537 - select length DoS @@ -244,6 +245,7 @@ format for easy browsing %patch100 -p1 -b .kstandarddirs %patch101 -p1 -b .libtool-shlibext %patch104 -p1 -b .gcc44 +%patch105 -p1 -b .ossl-1.x # security fixes %patch200 -p1 -b .cve-2009-2537 @@ -574,6 +576,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %changelog +* Fri Sep 04 2009 Than Ngo - 3.5.10-16 +- openssl-1.0 build fixes + * Fri Sep 04 2009 Than Ngo - 3.5.10-15 - fix for CVE-2009-2702