diff options
| author | wiz <wiz> | 2009-09-01 09:51:02 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-09-01 09:51:02 +0000 |
| commit | a73cd01f9d91f1cb8b54c64339582b82b46dba5d (patch) | |
| tree | ff8d1e3e6331ef32b7301d7001a7091c00561b9d /x11/kdebase3/patches | |
| parent | 90a7db0175fa3cbb6b951496b66e1cd78da42dfd (diff) | |
| download | pkgsrc-a73cd01f9d91f1cb8b54c64339582b82b46dba5d.tar.gz | |
Fix build with openssl-1.0. From markd.
Enable openssl again on NetBSD-current and bump PKGREVISION.
Diffstat (limited to 'x11/kdebase3/patches')
| -rw-r--r-- | x11/kdebase3/patches/patch-ge | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/x11/kdebase3/patches/patch-ge b/x11/kdebase3/patches/patch-ge index 72d11a08f56..ab830491611 100644 --- a/x11/kdebase3/patches/patch-ge +++ b/x11/kdebase3/patches/patch-ge @@ -1,4 +1,4 @@ -$NetBSD: patch-ge,v 1.3 2008/05/18 12:19:01 markd Exp $ +$NetBSD: patch-ge,v 1.4 2009/09/01 09:51:02 wiz Exp $ --- kcontrol/crypto/crypto.cpp.orig 2006-10-02 06:31:49.000000000 +1300 +++ kcontrol/crypto/crypto.cpp @@ -14,3 +14,29 @@ $NetBSD: patch-ge,v 1.3 2008/05/18 12:19:01 markd Exp $ 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*? |