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

16 files changed, 48 insertions, 152 deletions

diff --git a/x11/kde4-l10n-de/distinfo b/x11/kde4-l10n-de/distinfo
index ccef507832c..a3eecda17b1 100644
--- a/x11/kde4-l10n-de/distinfo
+++ b/x11/kde4-l10n-de/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $
 
-SHA1 (kde-l10n-de-4.3.3.tar.bz2) = 70cc4aa8857f67ca7dd675c4c39f0ceac98f8122
-RMD160 (kde-l10n-de-4.3.3.tar.bz2) = 18389eb81e4da8c1a21f0579801606ae1d1d5962
-Size (kde-l10n-de-4.3.3.tar.bz2) = 20265869 bytes
+SHA1 (kde-l10n-de-4.3.4.tar.bz2) = c37c7eea733cfa0927d028fe3dd9a7ecf088a6e8
+RMD160 (kde-l10n-de-4.3.4.tar.bz2) = af1a6dfc9d8fd1cf72249d451cc6916122cd72f7
+Size (kde-l10n-de-4.3.4.tar.bz2) = 20265916 bytes
diff --git a/x11/kde4-l10n-en_GB/PLIST b/x11/kde4-l10n-en_GB/PLIST
index fffdd0de006..2a1e2002702 100644
--- a/x11/kde4-l10n-en_GB/PLIST
+++ b/x11/kde4-l10n-en_GB/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/12/04 22:04:06 markd Exp $
 share/doc/kde/HTML/en_GB/cervisia/common
 share/doc/kde/HTML/en_GB/cervisia/index.cache.bz2
 share/doc/kde/HTML/en_GB/cervisia/index.docbook
@@ -627,6 +627,7 @@ share/locale/en_GB/LC_MESSAGES/kbruch.mo
 share/locale/en_GB/LC_MESSAGES/kbugbuster.mo
 share/locale/en_GB/LC_MESSAGES/kcachegrind.mo
 share/locale/en_GB/LC_MESSAGES/kcachegrind_qt.mo
+share/locale/en_GB/LC_MESSAGES/kcal_akonadi.mo
 share/locale/en_GB/LC_MESSAGES/kcalc.mo
 share/locale/en_GB/LC_MESSAGES/kcertpart.mo
 share/locale/en_GB/LC_MESSAGES/kcharselect.mo
@@ -870,6 +871,7 @@ share/locale/en_GB/LC_MESSAGES/kres_remote.mo
 share/locale/en_GB/LC_MESSAGES/kres_scalix.mo
 share/locale/en_GB/LC_MESSAGES/kres_tvanytime.mo
 share/locale/en_GB/LC_MESSAGES/kres_xmlrpc.mo
+share/locale/en_GB/LC_MESSAGES/kresources_shared_akonadi.mo
 share/locale/en_GB/LC_MESSAGES/kreversi.mo
 share/locale/en_GB/LC_MESSAGES/krfb.mo
 share/locale/en_GB/LC_MESSAGES/kruler.mo
@@ -971,6 +973,7 @@ share/locale/en_GB/LC_MESSAGES/libphonon.mo
 share/locale/en_GB/LC_MESSAGES/libplasma.mo
 share/locale/en_GB/LC_MESSAGES/libplasmaclock.mo
 share/locale/en_GB/LC_MESSAGES/libplasmaweather.mo
+share/locale/en_GB/LC_MESSAGES/librtm.mo
 share/locale/en_GB/LC_MESSAGES/libtaskmanager.mo
 share/locale/en_GB/LC_MESSAGES/lokalize.mo
 share/locale/en_GB/LC_MESSAGES/lskat.mo
@@ -1068,6 +1071,7 @@ share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_dashboard.mo
 share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_googlegadget.mo
 share/locale/en_GB/LC_MESSAGES/plasma_appletscriptengine_qedjescripts.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_kalzium.mo
+share/locale/en_GB/LC_MESSAGES/plasma_engine_keystate.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_kuiserver.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_metadata.mo
 share/locale/en_GB/LC_MESSAGES/plasma_engine_network.mo
diff --git a/x11/kde4-l10n-en_GB/distinfo b/x11/kde4-l10n-en_GB/distinfo
index df429979134..8f4cc45682a 100644
--- a/x11/kde4-l10n-en_GB/distinfo
+++ b/x11/kde4-l10n-en_GB/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $
 
-SHA1 (kde-l10n-en_GB-4.3.3.tar.bz2) = 43031f21070d563ba02579ce68979fe839e50232
-RMD160 (kde-l10n-en_GB-4.3.3.tar.bz2) = 6efcc9e3c1def8e522ff7adfdac0698972d5d77a
-Size (kde-l10n-en_GB-4.3.3.tar.bz2) = 3867266 bytes
+SHA1 (kde-l10n-en_GB-4.3.4.tar.bz2) = cfe4505d83e7bcba706efd2efb5275ed42a9fa7a
+RMD160 (kde-l10n-en_GB-4.3.4.tar.bz2) = 8bed4d8ceaf978a1336c008ef79ccca82d522ca6
+Size (kde-l10n-en_GB-4.3.4.tar.bz2) = 3872010 bytes
diff --git a/x11/kde4-l10n-nl/distinfo b/x11/kde4-l10n-nl/distinfo
index b59e6609f20..fc522949ca5 100644
--- a/x11/kde4-l10n-nl/distinfo
+++ b/x11/kde4-l10n-nl/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $
 
-SHA1 (kde-l10n-nl-4.3.3.tar.bz2) = 9b7524f6e985b04d3197716cbd81e916ed448fb3
-RMD160 (kde-l10n-nl-4.3.3.tar.bz2) = 27f1d490da9d1d90db54c88b9ddbbad335bb8e6c
-Size (kde-l10n-nl-4.3.3.tar.bz2) = 12994787 bytes
+SHA1 (kde-l10n-nl-4.3.4.tar.bz2) = d532ae5b8b9d0edada461f5d25afa33450701799
+RMD160 (kde-l10n-nl-4.3.4.tar.bz2) = b7fd600ed634ab5d653982da6c9f48fe52d9f828
+Size (kde-l10n-nl-4.3.4.tar.bz2) = 12998981 bytes
diff --git a/x11/kdebase-runtime4/distinfo b/x11/kdebase-runtime4/distinfo
index cc4801443e3..00973f0b48e 100644
--- a/x11/kdebase-runtime4/distinfo
+++ b/x11/kdebase-runtime4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $
 
-SHA1 (kdebase-runtime-4.3.3.tar.bz2) = 43f0b96cbb3c61523fbd283d11c2a5eedde0c9a2
-RMD160 (kdebase-runtime-4.3.3.tar.bz2) = 03dadfbdf036a5a6118b36a943bd1e517cef8534
-Size (kdebase-runtime-4.3.3.tar.bz2) = 7329976 bytes
+SHA1 (kdebase-runtime-4.3.4.tar.bz2) = 871d23457c4a2676704722e2e3b7194d447904ee
+RMD160 (kdebase-runtime-4.3.4.tar.bz2) = 5563dd94d3bd70ec90a44cc295d958ec296eb195
+Size (kdebase-runtime-4.3.4.tar.bz2) = 7333696 bytes
 SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
 SHA1 (patch-ac) = 6bb21775f48d7a7155712524162a2de736391f40
 SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile
index e70dcafcb9c..cbe3cef5282 100644
--- a/x11/kdebase-workspace4/Makefile
+++ b/x11/kdebase-workspace4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2009/11/21 20:15:49 markd Exp $
+# $NetBSD: Makefile,v 1.4 2009/12/04 22:04:06 markd Exp $
 
 DISTNAME=	kdebase-workspace-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	base workspace for the KDE 4 integrated X11 desktop
 
diff --git a/x11/kdebase-workspace4/distinfo b/x11/kdebase-workspace4/distinfo
index 49838a4eb55..276c78e863e 100644
--- a/x11/kdebase-workspace4/distinfo
+++ b/x11/kdebase-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes
 SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
 RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
 Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (kdebase-workspace-4.3.3.tar.bz2) = 2839e913cecef8ead0685bd50e9515ccd8bc0a9d
-RMD160 (kdebase-workspace-4.3.3.tar.bz2) = 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa
-Size (kdebase-workspace-4.3.3.tar.bz2) = 62496238 bytes
+SHA1 (kdebase-workspace-4.3.4.tar.bz2) = 5b43447139d22247d5bc2deee8e3a944447f0bbf
+RMD160 (kdebase-workspace-4.3.4.tar.bz2) = 665b49b9dd03408ef9ec50e7bd5eb50b993d6138
+Size (kdebase-workspace-4.3.4.tar.bz2) = 62517195 bytes
 SHA1 (patch-ab) = a1dc303cdb27bb4cb3067d347baedabefbca8353
 SHA1 (patch-ac) = 5420c39a055e6208097cf48db5513f7c9db09bef
 SHA1 (patch-ad) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 2a0c03dcb4b..52aa6f1afbf 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2009/11/16 08:55:06 markd Exp $
+# $NetBSD: Makefile,v 1.4 2009/12/04 22:04:06 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Base modules for the KDE 4 integrated X11 desktop
 
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 6be3f92b700..7989b49034e 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/11/16 08:55:06 markd Exp $
+$NetBSD: distinfo,v 1.5 2009/12/04 22:04:06 markd Exp $
 
-SHA1 (kdebase-4.3.3.tar.bz2) = 7459ea75312961b4802626edd22dc291370be329
-RMD160 (kdebase-4.3.3.tar.bz2) = 7fdc0f5cb3574b6707ae8f005eb887126ca2339e
-Size (kdebase-4.3.3.tar.bz2) = 4275500 bytes
+SHA1 (kdebase-4.3.4.tar.bz2) = 7f8637367177c93916dfc2e6a2f6323a5e91c6ce
+RMD160 (kdebase-4.3.4.tar.bz2) = b300e0c11a20e4e9bd68c80dde94cea4c2fa6f15
+Size (kdebase-4.3.4.tar.bz2) = 4150757 bytes
 SHA1 (patch-aa) = 8ab0c0a6f79e871cf869d9aae2331f9ed3f8d366
diff --git a/x11/kdebindings4-python/Makefile b/x11/kdebindings4-python/Makefile
index 07059f4f25d..cc5e3d466b5 100644
--- a/x11/kdebindings4-python/Makefile
+++ b/x11/kdebindings4-python/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2009/11/26 20:00:20 markd Exp $
+# $NetBSD: Makefile,v 1.5 2009/12/04 22:04:06 markd Exp $
 
 PKGNAME=	kdebindings4-python-${_KDE_VERSION}
-PKGREVISION=	2
 DISTNAME=	kdebindings-${_KDE_VERSION}
 CATEGORIES=	misc
 COMMENT=	Python bindings for the KDE integrated X11 desktop
diff --git a/x11/kdebindings4-python/distinfo b/x11/kdebindings4-python/distinfo
index b062556e3ad..6b39cdf11ee 100644
--- a/x11/kdebindings4-python/distinfo
+++ b/x11/kdebindings4-python/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:53 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:06 markd Exp $
 
-SHA1 (kdebindings-4.3.3.tar.bz2) = 34ddcfd5d338962b8623b9dd9c2b850a621e4040
-RMD160 (kdebindings-4.3.3.tar.bz2) = 587fd37cc2369a39fb1cf97e164afc40294f97b2
-Size (kdebindings-4.3.3.tar.bz2) = 4881799 bytes
+SHA1 (kdebindings-4.3.4.tar.bz2) = 0c7bf45bd3d81bf6aa1d2b085c17b4ce925c656b
+RMD160 (kdebindings-4.3.4.tar.bz2) = 71bf95f667a5e3d7b165987e582ef9deafad0145
+Size (kdebindings-4.3.4.tar.bz2) = 4880929 bytes
 SHA1 (patch-aa) = f01b1d350a8e79e639f46c797baf035684275158
 SHA1 (patch-ab) = cae51d216ad914009b4e9c80a17a172ec5a5eaec
diff --git a/x11/kdelibs-experimental4/distinfo b/x11/kdelibs-experimental4/distinfo
index 8bdbccda151..09532236554 100644
--- a/x11/kdelibs-experimental4/distinfo
+++ b/x11/kdelibs-experimental4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:07 markd Exp $
 
-SHA1 (kdelibs-experimental-4.3.3.tar.bz2) = 68a98febc551a7d98a78798864ff85f556fda12b
-RMD160 (kdelibs-experimental-4.3.3.tar.bz2) = 69e868445f706bcf1a90714feafac5a0728f2595
-Size (kdelibs-experimental-4.3.3.tar.bz2) = 26910 bytes
+SHA1 (kdelibs-experimental-4.3.4.tar.bz2) = 43e19c44c3cdc1049c9ee9aca2e2f83a48ffe8bd
+RMD160 (kdelibs-experimental-4.3.4.tar.bz2) = fb8f77e9c728fa2016b9a3710ad91805b11ed924
+Size (kdelibs-experimental-4.3.4.tar.bz2) = 26904 bytes
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index dd4ad03b6cd..41515fc2c5e 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/10/11 08:13:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/12/04 22:04:07 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -2817,6 +2817,7 @@ share/kde/apps/ksgmltools2/customization/pl/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/pl/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/pl/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/pl/lang.entities
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 3c679720ff9..88471d12b06 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.3 2009/11/04 11:05:52 markd Exp $
+$NetBSD: distinfo,v 1.4 2009/12/04 22:04:07 markd Exp $
 
-SHA1 (kdelibs-4.3.3.tar.bz2) = 89b55982e007c44835a9da0f540dd57fa096df45
-RMD160 (kdelibs-4.3.3.tar.bz2) = 3d6a2c971cef12fb2cb9ba64a10200b2cf098043
-Size (kdelibs-4.3.3.tar.bz2) = 10516364 bytes
+SHA1 (kdelibs-4.3.4.tar.bz2) = 1af2d185c88898b71f36b57f033e3a6d9839ab3d
+RMD160 (kdelibs-4.3.4.tar.bz2) = 0719043ddcf251a3fce4c2d4bfb1583e80c4b54d
+Size (kdelibs-4.3.4.tar.bz2) = 10518171 bytes
 SHA1 (patch-aa) = 7146107f78bbc618cf80479195581f29fc6b5977
 SHA1 (patch-ab) = aec1140bef01199f067b079c30d95fea1814839d
-SHA1 (patch-ac) = 223a97a63907477314b69040e1bca3e2ff8cc7b7
+SHA1 (patch-ac) = f90a566c3eb500f01b463e491748bc50ce963682
 SHA1 (patch-ad) = 2a0dfd3dda071654c89b8dda3db8885e2a55ba2b
 SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8
 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed
-SHA1 (patch-ai) = 75b18b8ac0da0eda398d717b9ee3a2af68bcebe4
 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618
diff --git a/x11/kdelibs4/patches/patch-ac b/x11/kdelibs4/patches/patch-ac
index a15a1a169f3..5a5353881c1 100644
--- a/x11/kdelibs4/patches/patch-ac
+++ b/x11/kdelibs4/patches/patch-ac
@@ -1,6 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/10/02 19:19:00 markd Exp $
-
-Includes patch from https://bugs.kde.org/show_bug.cgi?id=193215
+$NetBSD: patch-ac,v 1.2 2009/12/04 22:04:07 markd Exp $
 
 --- kio/kssl/kopenssl.cpp.ORIG	2008-10-23 12:05:00.000000000 +1300
 +++ kio/kssl/kopenssl.cpp
@@ -200,12 +198,3 @@ Includes patch from https://bugs.kde.org/show_bug.cgi?id=193215
  
     if (d->sslLib) {
  #ifdef KSSL_HAVE_SSL
-@@ -622,7 +613,7 @@ KOpenSSLProxy::KOpenSSLProxy()
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) d->sslLib->resolveFunction("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) d->sslLib->resolveFunction("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) d->sslLib->resolveFunction("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) d->sslLib->resolveFunction("SSL_get_ciphers");
- #endif
- 
- 
diff --git a/x11/kdelibs4/patches/patch-ai b/x11/kdelibs4/patches/patch-ai
deleted file mode 100644
index 709287333fb..00000000000
--- a/x11/kdelibs4/patches/patch-ai
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-ai,v 1.1.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