Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at Tue Apr 20 02:23:16 CEST 2010. -------- --- KDE/kdebase3/kdebase3.changes 2010-03-23 13:54:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2010-04-19 20:51:34.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 19 18:51:14 UTC 2010 - tittiatcoke@gmail.com + +- Added patch to enable build with openssl 1.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- openssl1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.o6V8qe/_old 2010-04-20 02:23:05.000000000 +0200 +++ /var/tmp/diff_new_pack.o6V8qe/_new 2010-04-20 02:23:05.000000000 +0200 @@ -76,7 +76,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.10.1 -Release: 4 +Release: 5 %define kde_version 3.5.10 Requires: kdebase3-runtime == %{version} Source0: kdebase-%{kde_version}.tar.bz2 @@ -242,6 +242,7 @@ Patch238: knetattach-show.diff Patch239: gcc44.diff Patch240: bnc584223.diff +Patch241: openssl1.patch %description This package contains kdebase, one of the basic packages of the K @@ -498,7 +499,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 573 +Release: 574 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -682,6 +683,7 @@ %patch238 %patch239 %patch240 -p1 +%patch241 -p0 rm -rf kappfinder rm pics/crystalsvg/cr??-*emacs.png cp %SOURCE17 l10n/tw/flag.png ++++++ openssl1.patch ++++++ --- kcontrol/crypto/crypto.cpp.orig 2006-10-02 06:31:49.000000000 +1300 +++ kcontrol/crypto/crypto.cpp @@ -2321,7 +2321,11 @@ bool KCryptoConfig::loadCiphers() { unsigned int i; SSL_CTX *ctx; SSL *ssl; +#if OPENSSL_VERSION_NUMBER < 0x00909000L SSL_METHOD *meth; +#else +const SSL_METHOD *meth; +#endif SSLv2Box->clear(); SSLv3Box->clear(); @@ -2337,8 +2341,10 @@ SSL_METHOD *meth; CipherItem *item; for (i=0; ; i++) { int j, k; - SSL_CIPHER *sc; - sc = (meth->get_cipher)(i); +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L + const +#endif + SSL_CIPHER *sc = (meth->get_cipher)(i); if (!sc) break; // Leak of sc*? @@ -2365,8 +2371,10 @@ SSL_METHOD *meth; for (i=0; ; i++) { int j, k; - SSL_CIPHER *sc; - sc = (meth->get_cipher)(i); +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L + const +#endif + SSL_CIPHER *sc = (meth->get_cipher)(i); if (!sc) break; // Leak of sc*? ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org