head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.1.1.1.0.2
	pkgsrc-2009Q3-base:1.1.1.1
	pkgsrc-base:1.1.1.1
	TNF:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2009.12.04.22.04.07;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2009.10.02.19.18.59;	author markd;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2009.10.02.19.18.59;	author markd;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to kde 4.3.4

KDE SC 4.3.4 has a number of improvements:

 * A bugfix in Plasma's pixmap cache makes the workspace more responsive
 * Okular, the document viewer improved stability in certain situations
 * Marble, the desktop globe has seen some polish
 * Passphrases with non-ASCII characters have been fixed in the KGpg
   encryption tool
@
text
@$NetBSD: patch-ai,v 1.1 2009/10/02 19:18:59 markd Exp $

From https://bugs.kde.org/show_bug.cgi?id=193215

--- kio/kssl/kopenssl.h.orig	2009-05-20 00:06:53.000000000 +1200
+++ kio/kssl/kopenssl.h
@@@@ -43,6 +43,9 @@@@ class KOpenSSLProxyPrivate;
 #include <openssl/evp.h>
 #include <openssl/stack.h>
 #include <openssl/bn.h>
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+typedef _STACK STACK;
+#endif
 #undef crypt
 #endif
 
@@@@ -499,24 +502,50 @@@@ public:
     */
    char *sk_pop(STACK *s);
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+   /*
+    * Pop off the stack with OpenSSL 1.x
+    */
+   char *sk_pop(void *s) { return sk_pop(reinterpret_cast<STACK*>(s)); }
+#endif
+
 
    /*
     *   Free the stack
     */
    void sk_free(STACK *s);
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+   /*
+    * Free the stack with OpenSSL 1.x
+    */
+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
+#endif
+
 
    /*
     *  Number of elements in the stack
     */
    int sk_num(STACK *s);
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+   /*
+    * Number of elements in the stack with OpenSSL 1.x
+    */
+   int sk_num(void *s) { return sk_num(reinterpret_cast<STACK*>(s)); }
+#endif
 
    /*
     *  Value of element n in the stack
     */
    char *sk_value(STACK *s, int n);
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+   /*
+    * Value of element n in the stack with OpenSSL 1.x
+    */
+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
+#endif
 
    /*
     *  Create a new stack
@@@@ -529,12 +558,26 @@@@ public:
     */
    int sk_push(STACK *s, char *d);
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+   /*
+    * Add an element to the stack with OpenSSL 1.x
+    */
+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
+#endif
+
 
    /*
     *  Duplicate the stack
     */
    STACK *sk_dup(STACK *s);
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+   /*
+    * Duplicate the stack with OpenSSL 1.x
+    */
+   STACK *sk_dup(void *s) { return sk_dup(reinterpret_cast<STACK*>(s)); }
+#endif
+
 
    /*
     *  Convert an ASN1_INTEGER to its text form
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.1.1
log
@Import KDE4.3.1 from wip

OKed during freeze by wiz and agc
@
text
@@