Make sure that kssl look in the right place for its data.

This fixes the "The server certificate failed the authenticity test"
errors in konqueror when using https.

4 files changed, 52 insertions, 1 deletions

diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index a155a90d787..5e7323cd9c6 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/01/25 19:28:11 skrll Exp $
+$NetBSD: distinfo,v 1.15 2002/02/23 15:24:17 skrll Exp $
 
 SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c
 Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes
@@ -49,3 +49,6 @@ SHA1 (patch-br) = e4098450a416d419a8ac947ad7a2244298c2c011
 SHA1 (patch-bs) = 77b183070cc758feff760ffc44044eb2a6cd5005
 SHA1 (patch-bt) = 96a5b587056abc922957e55898e222910ab98dca
 SHA1 (patch-bu) = dfa7b7e83674ed795af0dc347ed95b1383a7f36d
+SHA1 (patch-bv) = 7cf20147a66d04638226e0488474d300fcde64b4
+SHA1 (patch-bw) = 7c7cef94871b26eda58862711e65b27c6d43bad4
+SHA1 (patch-bx) = 9a8aaeab8852593b1c8f7037ce8a421f9fa8a953
diff --git a/x11/kdelibs2/patches/patch-bv b/x11/kdelibs2/patches/patch-bv
new file mode 100644
index 00000000000..6b795802341
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bv
@@ -0,0 +1,13 @@
+$NetBSD: patch-bv,v 1.1 2002/02/23 15:24:18 skrll Exp $
+
+--- kio/kssld/kssld.cpp.orig	Fri Oct 12 20:16:16 2001
++++ kio/kssld/kssld.cpp
+@@ -61,7 +61,7 @@
+ {
+ // ----------------------- FOR THE CACHE ------------------------------------	
+   cfg = new KSimpleConfig("ksslpolicies", false);
+-  if (!KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl")) {
++  if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
+      //    kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
+   }
+   cacheLoadDefaultPolicies();
diff --git a/x11/kdelibs2/patches/patch-bw b/x11/kdelibs2/patches/patch-bw
new file mode 100644
index 00000000000..41d61a73297
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bw
@@ -0,0 +1,22 @@
+$NetBSD: patch-bw,v 1.1 2002/02/23 15:24:18 skrll Exp $
+
+--- kssl/ksslcertificate.cc.orig	Sat Feb 23 12:21:02 2002
++++ kssl/ksslcertificate.cc
+@@ -79,7 +79,7 @@
+ KSSLCertificate::KSSLCertificate() {
+   d = new KSSLCertificatePrivate;
+   d->m_stateCached = false;
+-  KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl");
++  KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+ #ifdef HAVE_SSL
+   d->m_cert = NULL;
+ #endif
+@@ -447,7 +447,7 @@
+ KSSLCertificate::KSSLCertificate(const KSSLCertificate& x) {
+   d = new KSSLCertificatePrivate;
+   d->m_stateCached = false;
+-  KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl");
++  KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl");
+ #ifdef HAVE_SSL
+   d->m_cert = NULL;
+   setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert()));
diff --git a/x11/kdelibs2/patches/patch-bx b/x11/kdelibs2/patches/patch-bx
new file mode 100644
index 00000000000..6a35b5b1398
--- /dev/null
+++ b/x11/kdelibs2/patches/patch-bx
@@ -0,0 +1,13 @@
+$NetBSD: patch-bx,v 1.1 2002/02/23 15:24:18 skrll Exp $
+
+--- kssl/ksslsettings.cc.orig	Sun Jul 29 05:55:41 2001
++++ kssl/ksslsettings.cc
+@@ -88,7 +88,7 @@
+   d = new KSSLSettingsPrivate;
+   m_cfg = new KConfig("cryptodefaults", false, false);
+ 
+-  if (!KGlobal::dirs()->addResourceType("kssl", "share/apps/kssl")) {
++  if (!KGlobal::dirs()->addResourceType("kssl", KStandardDirs::kde_default("data") + "kssl")) {
+     //kdDebug(7029) << "Error adding (kssl, share/apps/kssl)" << endl;
+   }
+