 @@ -1,34 +1,35 @@
-# $NetBSD: Makefile,v 1.144 2009/08/29 11:26:29 wiz Exp $
+# $NetBSD: Makefile,v 1.145 2009/08/31 20:54:26 wiz Exp $
 DISTNAME=	kdelibs-${_KDE_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 CONFLICTS+=	koffice3<=1.1.1
 CONFLICTS=	kdelibs4-[0-9]*
 USE_TOOLS+=		iceauth:run perl:run pkg-config
 MAKE_DIRS+=		${PKG_SYSCONFDIR}/xdg/menus
 CONF_FILES+=		${PREFIX}/share/examples/kdelibs3/applications.menu \
 			${PKG_SYSCONFDIR}/xdg/menus/applications.menu
 CONFIGURE_ARGS+=	--with-distribution="NetBSD pkgsrc"
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 SGML_CATALOGS=		${PREFIX}/share/kde/apps/ksgmltools2/customization/catalog
 SGML_CATALOGS+=		${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.1.2/docbook.cat
 SGML_CATALOGS+=		${PREFIX}/share/kde/apps/ksgmltools2/docbook/xml-dtd-4.2/docbook.cat
 .include "../../mk/bsd.prefs.mk"
 LIBS.NetBSD+=		${EXPORT_SYMBOLS_LDFLAGS}
 REPLACE_PERL+= \
 	dcop/dcopidlng/kalyptus \
 	kio/proxytype.pl \
 	kio/useragent.pl \
 @@ -82,47 +83,40 @@ PLIST.kded=		yes
 CONFIGURE_ARGS+=	--with-gssapi=yes
 post-install:
 .if ${OPSYS} == "NetBSD"
 .  if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
 	@${RM} ${PREFIX}/lib/kded.*
 .  endif
 .endif
 .if ${MACHINE_ARCH} == "alpha"
 GCC_REQD+=		2.95
 .endif
 .if ${OPSYS} == "NetBSD" && (${OS_VERSION:M5.99.1[5-9]*} || ${OS_VERSION:M5.99[2-9]*} || ${OS_VERSION:M[6-9]*})
 # no openssl for us due to incompatible API changes (STACK, ...)
 CONFIGURE_ARGS+=	--without-ssl
 .else
 CONFIGURE_ARGS+=	--with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
 .include "../../security/openssl/buildlink3.mk"
 .endif
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/arts/buildlink3.mk"
 .include "../../audio/libaudiofile/buildlink3.mk"
 .include "../../devel/libidn/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 # XXX On NetBSD, the egcs and gcc-2.95.3 for:
 # XXX
 # XXX     alpha and sparc
 # XXX
 # XXX has an optimization bug when compiling with -O2 that is tickled by

 @@ -1,28 +1,29 @@
-$NetBSD: distinfo,v 1.95 2009/08/18 11:57:33 markd Exp $
+$NetBSD: distinfo,v 1.96 2009/08/31 20:54:26 wiz Exp $
 SHA1 (kdelibs-3.5.10.tar.bz2) = c930a25f4419134def55b8466c3a6f737227fb82
 RMD160 (kdelibs-3.5.10.tar.bz2) = 4c960664283c83ebc8e68932ca9044336fcff223
 Size (kdelibs-3.5.10.tar.bz2) = 15614607 bytes
 SHA1 (post-kde-3.5.5-kinit.diff) = 35147db4d6791e4c98d7cec5e72509547813dd98
 RMD160 (post-kde-3.5.5-kinit.diff) = e5e7dc462c88ad45ac7051261aaec5b83c64d59e
 Size (post-kde-3.5.5-kinit.diff) = 3964 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
 SHA1 (patch-ac) = 205f99e8749c32bf445e23f6076dd642c10c8186
 SHA1 (patch-ad) = d8ddcea1a281474b7694979b14744c5e06b56b65
 SHA1 (patch-ae) = b609ee21da08885fd359b9a163d428cbb3955e74
 SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec
 SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
 SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
 SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
 SHA1 (patch-aq) = 18f3885a73cd9169cf4f9c9d97420e639f7fec3c
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
-SHA1 (patch-bd) = 552c072d9e369420b2a54944cb4b0d0f75555468
+SHA1 (patch-bd) = 852a12b66968595bf1be4538f8ebf88f031592a4
-SHA1 (patch-be) = fdf2d64acb70b46ec4c71bed9ee89fa34fd5dd3d
+SHA1 (patch-be) = b7c2ed2856565ef3c831046a909e289409199e48
 SHA1 (patch-bf) = 4c74d7a09760a6b3e2fb3e736dd627252a8b372e
 SHA1 (patch-bg) = 403db490f848a2937af4d27cba3beaae17dbe791
 SHA1 (patch-bv) = ad0cd6ff687785bb9395608d07d0001309c9c6a6
 SHA1 (patch-cc) = 136bedb27637ab1679871a4940999e8d32c54a09
 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
 SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522
 SHA1 (patch-da) = ac1888a52f22ac81c0fb51dda48c8e168516a229
 SHA1 (patch-db) = bba958ba9f3059074fd97174dacab2bf47801fa8

 @@ -1,14 +1,14 @@
-$NetBSD: patch-bd,v 1.13 2008/05/17 02:28:17 markd Exp $
+$NetBSD: patch-bd,v 1.14 2009/08/31 20:54:27 wiz Exp $
 --- kio/kssl/kopenssl.cc.orig	2006-07-22 20:16:39.000000000 +1200
 +++ kio/kssl/kopenssl.cc
 @@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
  static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
                                     const EVP_CIPHER *,unsigned char *,int ,
                                              pem_password_cb *, void *) = 0L;
 +#if OPENSSL_VERSION_NUMBER < 0x00909000L
  static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
  static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
  static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
 +#else
 +static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
 @@ -89,106 +89,140 @@ $NetBSD: patch-bd,v 1.13 2008/05/17 02:2
  	    << "/usr/ssl/lib" KDELIBSUFF "/"
  	    << "/usr/local/lib" KDELIBSUFF "/"
              << "/usr/local/openssl/lib" KDELIBSUFF "/"
              << "/usr/local/ssl/lib" KDELIBSUFF "/"
  	    << "/opt/openssl/lib" KDELIBSUFF "/"
  	    << "/lib" KDELIBSUFF "/"
 +#endif
              << "";
 +#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
  // FIXME: #define here for the various OS types to optimize
     libnamess
  	     #ifdef hpux
-@@ -355,6 +351,11 @@ KConfig *cfg;
+@@ -330,8 +326,12 @@ KConfig *cfg;
               << "libssl.so." SHLIB_VERSION_NUMBER
               #endif
               << "libssl.so"
 +             #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
 +             << "libssl.so.1"
 +             #else
  	     << "libssl.so.0"
               #endif
 +             #endif
+ 	     ;
     libnamesc
@@ -347,14 +347,23 @@ KConfig *cfg;
               << "libcrypto.so." SHLIB_VERSION_NUMBER
               #endif
               << "libcrypto.so"
 +             #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
 +             << "libcrypto.so.1"
 +             #else
  	     << "libcrypto.so.0"
               #endif
 +             #endif
+ 	     ;
  #endif
     for (QStringList::Iterator it = libpaths.begin();
                                it != libpaths.end();
                                ++it) {
 +#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 +	QString libname = findMostRecentLib(*it, "crypto");
 +	if (!libname.isNull())
 +		_cryptoLib = ll->globalLibrary(libname.latin1());
 +#else
        for (QStringList::Iterator shit = libnamesc.begin();
                                   shit != libnamesc.end();
                                   ++shit) {
-@@ -368,6 +369,7 @@ KConfig *cfg;
+@@ -368,6 +377,7 @@ KConfig *cfg;
              _cryptoLib = ll->globalLibrary(alib.latin1());
           if (_cryptoLib) break;
+       }
 +#endif
        if (_cryptoLib) break;
+    }
-@@ -404,9 +406,14 @@ KConfig *cfg;
+@@ -404,9 +414,14 @@ KConfig *cfg;
        K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
        K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
        K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
 +#if OPENSSL_VERSION_NUMBER < 0x00909000L
        K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
        K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
        K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
 +#else
 +      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
 +      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
 +#endif
        K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
        K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
        K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -497,16 +504,14 @@ KConfig *cfg;
+@@ -497,16 +512,14 @@ KConfig *cfg;
  #endif
+    }
 -#ifdef __OpenBSD__
 -   {
 -   QString libname = findMostRecentLib("/usr/lib", "ssl");
 -   if (!libname.isNull())
 -         _sslLib = ll->globalLibrary(libname.latin1());
 -   }
 -#else
     for (QStringList::Iterator it = libpaths.begin();
                                it != libpaths.end();
                                ++it) {
 +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 +      QString libname = findMostRecentLib(*it, "ssl");
 +      if (!libname.isNull())
 +           _sslLib = ll->globalLibrary(libname.latin1());
 +#else
        for (QStringList::Iterator shit = libnamess.begin();
                                   shit != libnamess.end();
                                   ++shit) {
-@@ -520,10 +525,10 @@ KConfig *cfg;
+@@ -520,10 +533,10 @@ KConfig *cfg;
           	_sslLib = ll->globalLibrary(alib.latin1());
           if (_sslLib) break;
+       }
 +#endif
        if (_sslLib) break;
+    }
 -#endif
+-
++
     if (_sslLib) {
  #ifdef KSSL_HAVE_SSL
        // stand back from your monitor and look at this.  it's fun! :)
-@@ -957,6 +962,8 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
+@@ -568,7 +581,7 @@ KConfig *cfg;
        K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
        K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
        K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
 -      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
 +      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
  #endif
@@ -957,6 +970,8 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
+ }
 +#if OPENSSL_VERSION_NUMBER < 0x00909000L
++
  ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
     if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
     else return 0L;
-@@ -968,6 +975,13 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
+@@ -968,6 +983,13 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
          return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
     else return -1;
+ }
 +#else
 +int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
 +   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
 +        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
 +   else return -1;
 +}
 +#endif
  int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {

 @@ -1,17 +1,107 @@
-$NetBSD: patch-be,v 1.6 2008/05/17 02:28:17 markd Exp $
+$NetBSD: patch-be,v 1.7 2009/08/31 20:54:27 wiz Exp $
 --- kio/kssl/kopenssl.h.orig	2006-07-22 20:16:39.000000000 +1200
 +++ kio/kssl/kopenssl.h
-@@ -447,10 +447,12 @@ public:
+@@ -47,6 +47,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
@@ -447,10 +450,12 @@ public:
     int PEM_write_bio_X509(BIO *bp, X509 *x);
 +#if OPENSSL_VERSION_NUMBER < 0x00909000L
     /*
      *   X509_asn1_meth - used for netscape output
      */
     ASN1_METHOD *X509_asn1_meth();
 +#endif
     /*
@@ -525,24 +530,52 @@ 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
@@ -555,12 +588,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 it's text form