packages: kdelibs/kdelibs.spec, kdelibs/kdelibs-3.5.10-ossl-1.x.patch (NEW)...
glen
glen at pld-linux.org
Thu Apr 22 21:16:39 CEST 2010
Author: glen Date: Thu Apr 22 19:16:39 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- openssl patch from devel-en by Andrzej Augustyński
- arts as bcond; disable arts
- rel 20
---- Files affected:
packages/kdelibs:
kdelibs.spec (1.594 -> 1.595) , kdelibs-3.5.10-ossl-1.x.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kdelibs/kdelibs.spec
diff -u packages/kdelibs/kdelibs.spec:1.594 packages/kdelibs/kdelibs.spec:1.595
--- packages/kdelibs/kdelibs.spec:1.594 Sun Mar 14 21:26:53 2010
+++ packages/kdelibs/kdelibs.spec Thu Apr 22 21:16:33 2010
@@ -2,10 +2,12 @@
#
# Conditional build:
%bcond_without alsa # build without ALSA support
+%bcond_with arts # build with aRts support
%bcond_without apidocs # don't prepare API documentation
%bcond_without autoreqdep # don't care about package name deps generated by rpm
%bcond_without kerberos5 # disable kerberos
%bcond_without hidden_visibility # no gcc hidden visibility
+%bcond_without hidden_visibility # no gcc hidden visibility
#
%define _state stable
%define artsver 13:1.5.10
@@ -19,7 +21,7 @@
Summary(uk.UTF-8): K Desktop Environment - Бібліотеки
Name: kdelibs
Version: 3.5.10
-Release: 19
+Release: 20
Epoch: 9
License: LGPL
Group: X11/Libraries
@@ -52,12 +54,14 @@
Patch15: dcopobject-destruct-crash.patch
Patch16: kdelibs-3.5.10-gcc_4.4-2.patch
Patch17: kdelibs-3.5.10-LDFLAG_fix-1.patch
+# http://www.thel.ro/kde3-fedora/SOURCES/kdelibs-3.5.10-ossl-1.x.patch
+Patch18: kdelibs-3.5.10-ossl-1.x.patch
URL: http://www.kde.org/
BuildRequires: OpenEXR-devel >= 1.4.0.a
BuildRequires: acl-devel
%{?with_alsa:BuildRequires: alsa-lib-devel}
-BuildRequires: arts-qt-devel >= %{artsver}
-BuildRequires: artsc-devel >= %{artsver}
+%{?with_arts:BuildRequires: arts-qt-devel >= %{artsver}}
+%{?with_arts:BuildRequires: artsc-devel >= %{artsver}}
BuildRequires: aspell-devel
BuildRequires: audiofile-devel
BuildRequires: autoconf >= 2.52
@@ -108,7 +112,7 @@
BuildConflicts: kdepim-korganizer-libs
BuildConflicts: kdepim-libkdepim < 3:3.3.0
%endif
-Requires: arts >= %{artsver}
+%{?with_arts:Requires: arts >= %{artsver}}
Requires: cups-lib >= 1:1.3.0
Requires: docbook-dtd412-xml
Requires: docbook-dtd42-xml
@@ -241,8 +245,8 @@
Group: X11/Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: acl-devel
-Requires: arts-qt-devel >= %{artsver}
-Requires: artsc-devel >= %{artsver}
+%{?with_arts:Requires: arts-qt-devel >= %{artsver}}
+%{?with_arts:Requires: artsc-devel >= %{artsver}}
Requires: fam-devel
Requires: libart_lgpl-devel
Requires: libidn-devel
@@ -368,6 +372,7 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
+%patch18 -p1
mv -f configure{,.dist}
@@ -399,6 +404,7 @@
%endif
--enable-mitshm \
--with%{!?with_alsa:out}-alsa \
+ --with%{!?with_arts:out}-arts \
--with-distribution="PLD Linux Distribution" \
--with-ldap=no \
--with-lua-includes=%{_includedir}/lua50 \
@@ -744,7 +750,6 @@
%attr(755,root,root) %{_libdir}/kde3/kdeprint_lpr.so
%attr(755,root,root) %{_libdir}/kde3/kdeprint_rlpr.so
%attr(755,root,root) %{_libdir}/kde3/kdeprint_tool_escputil.so
-%attr(755,root,root) %{_libdir}/kde3/kfileaudiopreview.so
%attr(755,root,root) %{_libdir}/kde3/kgzipfilter.so
%attr(755,root,root) %{_libdir}/kde3/khtmlimagepart.so
%attr(755,root,root) %{_libdir}/kde3/kimg_dds.so
@@ -789,8 +794,6 @@
%attr(755,root,root) %{_libdir}/kde3/wmfthumbnail.so
%attr(755,root,root) %{_libdir}/libDCOP.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libDCOP.so.4
-%attr(755,root,root) %{_libdir}/libartskde.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libartskde.so.1
%attr(755,root,root) %{_libdir}/libkabc.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libkabc.so.1
%attr(755,root,root) %{_libdir}/libkabc_dir.so.*.*.*
@@ -887,18 +890,22 @@
%attr(755,root,root) %{_libdir}/kde3/kabcformat_binary.so
%attr(755,root,root) %{_libdir}/kde3/kcm_kresources.so
+%if %{with arts}
+%attr(755,root,root) %{_libdir}/libartskde.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartskde.so.1
+%attr(755,root,root) %{_libdir}/kde3/kfileaudiopreview.so
+# http://blog.flameeyes.eu/2009/01/02/bundling-libraries-for-despair-and-insecurity
+%endif
+
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/dcopidl
%attr(755,root,root) %{_bindir}/dcopidl2cpp
%attr(755,root,root) %{_bindir}/kconfig_compiler
%{_includedir}/[!a]*
-%{_includedir}/arts/*
%{_libdir}/kde3/plugins/designer/kdewidgets.la
%{_libdir}/libDCOP.la
%attr(755,root,root) %{_libdir}/libDCOP.so
-%{_libdir}/libartskde.la
-%attr(755,root,root) %{_libdir}/libartskde.so
%{_libdir}/libkabc.la
%attr(755,root,root) %{_libdir}/libkabc.so
%{_libdir}/libkabc_dir.la
@@ -975,15 +982,23 @@
%{_libdir}/libvcard.la
%attr(755,root,root) %{_libdir}/libvcard.so
+%if %{with arts}
+%{_libdir}/libartskde.la
+%attr(755,root,root) %{_libdir}/libartskde.so
+%{_includedir}/arts/*
+%endif
+
%if %{with apidocs}
%files apidocs
%defattr(644,root,root,755)
%{_kdedocdir}/en/%{name}*-apidocs
%endif
+%if %{with arts}
%files artsmessage
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/artsmessage
+%endif
%files kgrantpty
%defattr(644,root,root,755)
@@ -995,6 +1010,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.595 2010/04/22 19:16:33 glen
+- openssl patch from devel-en by Andrzej Augustyński
+- arts as bcond; disable arts
+- rel 20
+
Revision 1.594 2010/03/14 20:26:53 glen
- let build section reset install stamps
================================================================
Index: packages/kdelibs/kdelibs-3.5.10-ossl-1.x.patch
diff -u /dev/null packages/kdelibs/kdelibs-3.5.10-ossl-1.x.patch:1.1
--- /dev/null Thu Apr 22 21:16:39 2010
+++ packages/kdelibs/kdelibs-3.5.10-ossl-1.x.patch Thu Apr 22 21:16:33 2010
@@ -0,0 +1,180 @@
+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 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 ,
+ 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;
+@@ -430,9 +435,14 @@ KConfig *cfg;
+ 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");
+@@ -594,7 +604,7 @@ KConfig *cfg;
+ 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
+
+
+@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
+ 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;
+@@ -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;
+ }
+-
++#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 23:10:53.000000000 +0200
+@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
+ #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 @@ public:
+ */
+ 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 @@ public:
+ */
+ 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 @@ public:
+ */
+ 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 @@ public:
+ */
+ 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
+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 23:10:53.000000000 +0200
+@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
+
+
+ STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
+- STACK_OF(X509) *x509 = sk_new(NULL);
++ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
+ KSSLCertificate *cert = certs.first();
+ while(cert) {
+ 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 23:10:53.000000000 +0200
+@@ -1003,17 +1003,31 @@ return qba;
+ 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 *)&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);
++ 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/kdelibs/kdelibs.spec?r1=1.594&r2=1.595&f=u
More information about the pld-cvs-commit
mailing list