rpms/kdebase3/devel kdebase-3.5.10-ossl-1.x.patch, NONE, 1.1 kdebase3.spec, 1.86, 1.87

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13445

Modified Files:
	kdebase3.spec 
Added Files:
	kdebase-3.5.10-ossl-1.x.patch 
Log Message:
- openssl-1.0 build fixes


kdebase-3.5.10-ossl-1.x.patch:
 crypto.cpp |   12 ++++++++++++
 1 file changed, 12 insertions(+)

--- NEW FILE kdebase-3.5.10-ossl-1.x.patch ---
diff -up kdebase-3.5.10/kcontrol/crypto/crypto.cpp.orig kdebase-3.5.10/kcontrol/crypto/crypto.cpp
--- kdebase-3.5.10/kcontrol/crypto/crypto.cpp.orig	2009-09-04 23:03:34.000000000 +0200
+++ kdebase-3.5.10/kcontrol/crypto/crypto.cpp	2009-09-04 23:28:12.000000000 +0200
@@ -2321,7 +2321,11 @@ bool KCryptoConfig::loadCiphers() {
 unsigned int i;
 SSL_CTX *ctx;
 SSL *ssl;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+const SSL_METHOD *meth;
+#else
 SSL_METHOD *meth;
+#endif
 
   SSLv2Box->clear();
   SSLv3Box->clear();
@@ -2337,7 +2341,11 @@ SSL_METHOD *meth;
   CipherItem *item;
   for (i=0; ; i++) {
     int j, k;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER *sc;
+#else
     SSL_CIPHER *sc;
+#endif
     sc = (meth->get_cipher)(i);
     if (!sc)
       break;
@@ -2365,7 +2373,11 @@ SSL_METHOD *meth;
 
   for (i=0; ; i++) {
     int j, k;
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+    const SSL_CIPHER *sc;
+#else
     SSL_CIPHER *sc;
+#endif
     sc = (meth->get_cipher)(i);
     if (!sc)
       break;


Index: kdebase3.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase3/devel/kdebase3.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- kdebase3.spec	21 Aug 2009 14:07:39 -0000	1.86
+++ kdebase3.spec	4 Sep 2009 21:34:30 -0000	1.87
@@ -5,18 +5,13 @@
 %define redhatify 1
 %define make_cvs 1
 %define arts 1
-
-%if 0%{?fedora} > 7
-# make -libs subpkg
 %define libs 1
-%endif
 
 %define _with_samba --with-samba
 
 Version: 3.5.10
-Release: 13%{?dist}
+Release: 14%{?dist}
 
-%if 0%{?fedora} > 8
 Name: kdebase3
 Summary: K Desktop Environment 3 - core files
 Obsoletes: kdebase < 6:%{version}-%{release}
@@ -24,16 +19,6 @@ Provides: kdebase = 6:%{version}-%{relea
 
 # make -pim-ioslaves subpkg
 %define pim 1
-%else
-Epoch: 6
-Name: kdebase
-Summary: K Desktop Environment - core files
-Obsoletes: kdebase3 = %{version}-%{release}
-Provides: kdebase3 = %{version}-%{release}
-
-# make -extras subpkg
-%define extras 1
-%endif
 
 # programs: GPLv2, libs: LGPLv2
 License: GPLv2
@@ -89,6 +74,7 @@ Patch36: kdebase-3.5.9-userdiskmount.pat
 Patch37: kdebase-3.5.10-libkrdb_dep.patch
 # http://aseigo.blogspot.com/2008/10/dear-kde3-kdesktop-users.html
 Patch100: kdebase-3.5.10-minicli-decimal-comma.patch
+Patch101: kdebase-3.5.10-ossl-1.x.patch
 
 # security fixes
 
@@ -322,6 +308,7 @@ Protocol handlers (KIOslaves) for person
 %patch37 -p1 -b .libkrdb_dep
 %endif
 %patch100 -p1 -b .minicli-decimal-comma
+%patch101 -p1 -b .ossl-1.x
 
 %if "%{name}" != "kdebase"
 # hacks to omit stuff that doesn't support DO_NOT_COMPILE
@@ -881,6 +868,9 @@ fi
 
 
 %changelog
+* Fri Sep 04 2009 Than Ngo <than at redhat.com> - 3.5.10-14
+- openssl-1.0 build fixes
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 3.5.10-13
 - rebuilt with new openssl