Deal with openssl changes in -current.

4 files changed, 119 insertions, 11 deletions

diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index d00f413e8ba..a5e00ebd491 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2008/04/27 04:14:32 markd Exp $
+$NetBSD: distinfo,v 1.93 2008/05/17 02:28:17 markd Exp $
 
 SHA1 (kdelibs-3.5.9.tar.bz2) = b8197d94075a54f90f08a9ef7bed95ccf53e12ad
 RMD160 (kdelibs-3.5.9.tar.bz2) = 9ac02bf2314de387b2aa9664703c72b0613fcbb3
@@ -16,7 +16,9 @@ SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c
 SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
 SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
-SHA1 (patch-bd) = 2c139b81ff96d1762c14af0bb29275cf66ee8f8d
+SHA1 (patch-bd) = 552c072d9e369420b2a54944cb4b0d0f75555468
+SHA1 (patch-be) = fdf2d64acb70b46ec4c71bed9ee89fa34fd5dd3d
+SHA1 (patch-bf) = 4c74d7a09760a6b3e2fb3e736dd627252a8b372e
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
 SHA1 (patch-cc) = 136bedb27637ab1679871a4940999e8d32c54a09
 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd
index 504ed23c53d..a65920f3383 100644
--- a/x11/kdelibs3/patches/patch-bd
+++ b/x11/kdelibs3/patches/patch-bd
@@ -1,8 +1,23 @@
-$NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
+$NetBSD: patch-bd,v 1.13 2008/05/17 02:28:17 markd Exp $
 
---- kio/kssl/kopenssl.cc.orig	2006-07-22 08:16:39.000000000 +0000
+--- kio/kssl/kopenssl.cc.orig	2006-07-22 20:16:39.000000000 +1200
 +++ kio/kssl/kopenssl.cc
-@@ -217,7 +217,7 @@ void KOpenSSLProxy::destroy() {
+@@ -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;
++static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
++#endif
+ static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
+ static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
+ static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
+@@ -217,7 +222,7 @@ void KOpenSSLProxy::destroy() {
    _me = 0L;
  }
  
@@ -11,7 +26,7 @@ $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
  #include <qdir.h>
  #include <qstring.h>
  #include <qstringlist.h>
-@@ -240,10 +240,20 @@ static QString findMostRecentLib(QString
+@@ -240,10 +245,20 @@ static QString findMostRecentLib(QString
         for (QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                 QString numberpart = (*it).mid(s);
                 uint endmaj = numberpart.find('.');
@@ -35,7 +50,7 @@ $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
                 if (!ok)
                         continue;
                 int min = numberpart.mid(endmaj+1).toInt(&ok);
-@@ -280,42 +290,23 @@ KConfig *cfg;
+@@ -280,42 +295,23 @@ KConfig *cfg;
  
     delete cfg;
  
@@ -84,7 +99,7 @@ $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
  // FIXME: #define here for the various OS types to optimize
     libnamess
  	     #ifdef hpux
-@@ -355,6 +346,11 @@ KConfig *cfg;
+@@ -355,6 +351,11 @@ KConfig *cfg;
     for (QStringList::Iterator it = libpaths.begin();
                                it != libpaths.end();
                                ++it) {
@@ -96,7 +111,7 @@ $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
        for (QStringList::Iterator shit = libnamesc.begin();
                                   shit != libnamesc.end();
                                   ++shit) {
-@@ -368,6 +364,7 @@ KConfig *cfg;
+@@ -368,6 +369,7 @@ KConfig *cfg;
              _cryptoLib = ll->globalLibrary(alib.latin1());
           if (_cryptoLib) break;
        }
@@ -104,7 +119,22 @@ $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
        if (_cryptoLib) break;
     }
  
-@@ -497,16 +494,14 @@ KConfig *cfg;
+@@ -404,9 +406,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;
  #endif
     }
  
@@ -126,7 +156,7 @@ $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
        for (QStringList::Iterator shit = libnamess.begin();
                                   shit != libnamess.end();
                                   ++shit) {
-@@ -520,10 +515,10 @@ KConfig *cfg;
+@@ -520,10 +525,10 @@ KConfig *cfg;
           	_sslLib = ll->globalLibrary(alib.latin1());
           if (_sslLib) break;
        }
@@ -139,3 +169,26 @@ $NetBSD: patch-bd,v 1.12 2006/09/11 19:03:50 joerg Exp $
     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
+ }
+ 
+ 
++#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
+         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) {
diff --git a/x11/kdelibs3/patches/patch-be b/x11/kdelibs3/patches/patch-be
new file mode 100644
index 00000000000..da7862c193d
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-be
@@ -0,0 +1,17 @@
+$NetBSD: patch-be,v 1.6 2008/05/17 02:28:17 markd Exp $
+
+--- kio/kssl/kopenssl.h.orig	2006-07-22 20:16:39.000000000 +1200
++++ kio/kssl/kopenssl.h
+@@ -447,10 +447,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
+ 
+ 
+    /*
diff --git a/x11/kdelibs3/patches/patch-bf b/x11/kdelibs3/patches/patch-bf
new file mode 100644
index 00000000000..94c8310fbe2
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-bf
@@ -0,0 +1,36 @@
+$NetBSD: patch-bf,v 1.4 2008/05/17 02:28:17 markd Exp $
+
+--- kio/kssl/ksslcertificate.cc.orig	2006-01-20 06:06:12.000000000 +1300
++++ kio/kssl/ksslcertificate.cc
+@@ -1003,10 +1003,16 @@ return qba;
+ QByteArray KSSLCertificate::toNetscape() {
+ QByteArray qba;
+ #ifdef KSSL_HAVE_SSL
++#if OPENSSL_VERSION_NUMBER < 0x00909000L
+ ASN1_HEADER ah;
+ ASN1_OCTET_STRING os;
++#else
++NETSCAPE_X509 nx;
++ASN1_OCTET_STRING hdr;
++#endif
+ KTempFile ktf;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x00909000L
+ 	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
+ 	os.length = strlen(NETSCAPE_CERT_HDR);
+ 	ah.header = &os;
+@@ -1014,6 +1020,14 @@ KTempFile ktf;
+ 	ah.meth = d->kossl->X509_asn1_meth();
+ 
+ 	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
++#else
++	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
++	hdr.length = strlen(NETSCAPE_CERT_HDR);
++	nx.header = &hdr;
++	nx.cert = getCert();
++
++	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
++#endif
+ 
+ 	ktf.close();
+