Author: baggins Date: Tue Oct 5 09:56:29 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 28 - support for openssl 1.0, patch from http://trinity.pearsoncomputing.net/
---- Files affected: packages/kde4-kde3support: kde4-kde3support.spec (1.46 -> 1.47) , openssl1.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kde4-kde3support/kde4-kde3support.spec diff -u packages/kde4-kde3support/kde4-kde3support.spec:1.46 packages/kde4-kde3support/kde4-kde3support.spec:1.47 --- packages/kde4-kde3support/kde4-kde3support.spec:1.46 Mon Oct 4 23:49:45 2010 +++ packages/kde4-kde3support/kde4-kde3support.spec Tue Oct 5 11:56:24 2010 @@ -19,7 +19,7 @@ Summary(uk.UTF-8): K Desktop Environment - Бібліотеки Name: kde4-kde3support Version: 3.5.10 -Release: 27 +Release: 28 License: LGPL Group: X11/Libraries Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{origname}-%{version}.tar.bz2 @@ -34,6 +34,7 @@ Patch5: kdelibs-gcc4.patch Patch6: %{name}-ac.patch Patch7: crystalsvg-theme_index.patch +Patch8: openssl1.patch URL: http://www.kde.org/ BuildRequires: OpenEXR-devel >= 1.4.0.a BuildRequires: acl-devel @@ -236,6 +237,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 mv -f configure{,.dist} @@ -762,6 +764,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.47 2010/10/05 09:56:24 baggins +- rel 28 +- support for openssl 1.0, patch from http://trinity.pearsoncomputing.net/ + Revision 1.46 2010/10/04 21:49:45 baggins - rel 27 ================================================================ Index: packages/kde4-kde3support/openssl1.patch diff -u /dev/null packages/kde4-kde3support/openssl1.patch:1.1 --- /dev/null Tue Oct 5 11:56:29 2010 +++ packages/kde4-kde3support/openssl1.patch Tue Oct 5 11:56:24 2010 @@ -0,0 +1,164 @@ +diff -urN kdelibs-3.5.10/kio/kssl/kopenssl.cc kdelibs-3.5.12/kio/kssl/kopenssl.cc +--- kdelibs-3.5.10/kio/kssl/kopenssl.cc 2006-07-22 10:16:39.000000000 +0200 ++++ kdelibs-3.5.12/kio/kssl/kopenssl.cc 2010-09-29 07:28:27.000000000 +0200 +@@ -96,9 +96,14 @@ + static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *, + const EVP_CIPHER *,unsigned char *,int , + pem_password_cb *, void *) = 0L; ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L; ++static ASN1_ITEM *K_NETSCAPE_X509_it = 0L; ++#else + static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L; + static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L; + static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L; ++#endif + static int (*K_X509_print_fp) (FILE *, X509*) = 0L; + static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L; + static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L; +@@ -196,6 +201,7 @@ + static X509_NAME *(*K_X509_NAME_new)() = 0L; + static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L; + static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L; ++static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L; + static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L; + + #endif +@@ -404,9 +410,14 @@ + K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl"); + K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write"); + K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio"); ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp"); ++ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it"); ++#else + K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth"); + K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp"); + K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER"); ++#endif + K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp"); + K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12"); + K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp"); +@@ -494,6 +505,7 @@ + K_X509_NAME_new = (X509_NAME *(*)()) _cryptoLib->symbol("X509_NAME_new"); + K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) _cryptoLib->symbol("X509_REQ_set_subject_name"); + K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_data"); ++ K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_length"); + #endif + } + +@@ -568,7 +580,7 @@ + K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session"); + K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION"); + K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION"); +- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); ++ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers"); + #endif + + +@@ -956,7 +968,13 @@ + else return -1; + } + +- ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) { ++ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it) ++ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x); ++ else return -1; ++} ++#else + ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) { + if (K_X509_asn1_meth) return (K_X509_asn1_meth)(); + else return 0L; +@@ -968,7 +986,7 @@ + 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); +@@ -1545,6 +1563,11 @@ + return 0L; + } + ++int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) { ++ if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x); ++ return 0L; ++} ++ + STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) { + if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl); + return 0L; +diff -urN kdelibs-3.5.10/kio/kssl/kopenssl.h kdelibs-3.5.12/kio/kssl/kopenssl.h +--- kdelibs-3.5.10/kio/kssl/kopenssl.h 2006-07-22 10:16:39.000000000 +0200 ++++ kdelibs-3.5.12/kio/kssl/kopenssl.h 2010-09-29 07:28:27.000000000 +0200 +@@ -48,6 +48,9 @@ + #include <openssl/stack.h> + #include <openssl/bn.h> + #undef crypt ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++#define STACK _STACK ++#endif + #endif + + #include <kstaticdeleter.h> +@@ -446,12 +449,12 @@ + */ + int PEM_write_bio_X509(BIO *bp, X509 *x); + +- ++#if OPENSSL_VERSION_NUMBER < 0x10000000L + /* + * X509_asn1_meth - used for netscape output + */ + ASN1_METHOD *X509_asn1_meth(); +- ++#endif + + /* + * ASN1_i2d_fp - used for netscape output +@@ -531,6 +534,9 @@ + */ + void sk_free(STACK *s); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); } ++#endif + + /* + * Number of elements in the stack +@@ -543,6 +549,9 @@ + */ + char *sk_value(STACK *s, int n); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); } ++#endif + + /* + * Create a new stack +@@ -555,6 +564,9 @@ + */ + int sk_push(STACK *s, char *d); + ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); } ++#endif + + /* + * Duplicate the stack +@@ -621,6 +633,11 @@ + */ + unsigned char *ASN1_STRING_data(ASN1_STRING *x); + ++ /* ++ * ASN1_STRING_length ++ */ ++ int ASN1_STRING_length(ASN1_STRING *x); ++ + /* + * + */ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kde3support/kde4-kde3support.spec?r1=1.46&r2=1.47&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
