[69954] trunk/dports/kde/kdebase3

takanori at macports.org takanori at macports.org
Fri Jul 23 07:24:29 PDT 2010


Revision: 69954
          http://trac.macports.org/changeset/69954
Author:   takanori at macports.org
Date:     2010-07-23 07:24:28 -0700 (Fri, 23 Jul 2010)
Log Message:
-----------
kdebase3: allow building with OpenSSL 1.0.0 (#25788)

Modified Paths:
--------------
    trunk/dports/kde/kdebase3/Portfile

Added Paths:
-----------
    trunk/dports/kde/kdebase3/files/patch-kcontrol_crypto_crypto.cpp.diff

Modified: trunk/dports/kde/kdebase3/Portfile
===================================================================
--- trunk/dports/kde/kdebase3/Portfile	2010-07-23 14:03:53 UTC (rev 69953)
+++ trunk/dports/kde/kdebase3/Portfile	2010-07-23 14:24:28 UTC (rev 69954)
@@ -6,7 +6,7 @@
 
 name                    kdebase3
 version                 3.5.10
-revision                6
+revision                7
 set kdeadmin            kde-admindir-1502
 categories              kde kde3
 maintainers             nomaintainer
@@ -60,7 +60,8 @@
 }
 
 patchfiles              kdebase3-unified.patch \
-                        CVE-2010-0436.patch
+                        CVE-2010-0436.patch \
+                        patch-kcontrol_crypto_crypto.cpp.diff
 
 patch {
     foreach f $patchfiles {

Added: trunk/dports/kde/kdebase3/files/patch-kcontrol_crypto_crypto.cpp.diff
===================================================================
--- trunk/dports/kde/kdebase3/files/patch-kcontrol_crypto_crypto.cpp.diff	                        (rev 0)
+++ trunk/dports/kde/kdebase3/files/patch-kcontrol_crypto_crypto.cpp.diff	2010-07-23 14:24:28 UTC (rev 69954)
@@ -0,0 +1,29 @@
+--- kdebase-3.5.10/kcontrol/crypto/crypto.cpp.orig	2006-10-02 02:31:49.000000000 +0900
++++ kdebase-3.5.10/kcontrol/crypto/crypto.cpp	2010-07-23 22:52:51.000000000 +0900
+@@ -2321,7 +2321,7 @@
+ unsigned int i;
+ SSL_CTX *ctx;
+ SSL *ssl;
+-SSL_METHOD *meth;
++const SSL_METHOD *meth;
+ 
+   SSLv2Box->clear();
+   SSLv3Box->clear();
+@@ -2337,7 +2337,7 @@
+   CipherItem *item;
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    const SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+@@ -2365,7 +2365,7 @@
+ 
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    const SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100723/698d80c8/attachment.html>


More information about the macports-changes mailing list