From 33dab9f5f520459efa6e4c91bbe7fa4fb50b72d9 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 27 Feb 2005 07:42:03 +0000
Subject: [PATCH] post-3.3.2-kdelibs-htmlframes2.patch
 post-3.3.2-kdelibs-kio.diff post-3.3.2-kdelibs-kioslave.patch

---
 .../libs3/patches/patch-khtml_khtml_part_cpp  | 21 +++++++++++++++++++
 x11/kde/libs3/patches/patch-kio_kio_job_cpp   | 18 ++++++++++++++++
 .../libs3/patches/patch-kioslave_ftp_ftp_cc   | 18 ++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 x11/kde/libs3/patches/patch-khtml_khtml_part_cpp
 create mode 100644 x11/kde/libs3/patches/patch-kio_kio_job_cpp
 create mode 100644 x11/kde/libs3/patches/patch-kioslave_ftp_ftp_cc

diff --git a/x11/kde/libs3/patches/patch-khtml_khtml_part_cpp b/x11/kde/libs3/patches/patch-khtml_khtml_part_cpp
new file mode 100644
index 00000000000..44208833cde
--- /dev/null
+++ b/x11/kde/libs3/patches/patch-khtml_khtml_part_cpp
@@ -0,0 +1,21 @@
+$OpenBSD: patch-khtml_khtml_part_cpp,v 1.4 2005/02/27 07:42:03 brad Exp $
+--- khtml/khtml_part.cpp.orig	Sun Feb 27 02:32:27 2005
++++ khtml/khtml_part.cpp	Sun Feb 27 02:33:45 2005
+@@ -4758,13 +4758,16 @@ KHTMLPart *
+ KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
+ {
+ #ifdef DEBUG_FINDFRAME
+-  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
++  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
+ #endif
+   // Check access
+   KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
+ 
+   if (!checkFrameAccess(callingHtmlPart))
+      return 0;
++
++  if (!childFrame && !parentPart() && (name() == f))
++     return this;
+ 
+   FrameIt it = d->m_frames.find( f );
+   const FrameIt end = d->m_frames.end();
diff --git a/x11/kde/libs3/patches/patch-kio_kio_job_cpp b/x11/kde/libs3/patches/patch-kio_kio_job_cpp
new file mode 100644
index 00000000000..63480eb5ec7
--- /dev/null
+++ b/x11/kde/libs3/patches/patch-kio_kio_job_cpp
@@ -0,0 +1,18 @@
+$OpenBSD: patch-kio_kio_job_cpp,v 1.1 2005/02/27 07:42:03 brad Exp $
+--- kio/kio/job.cpp.orig	Sun Feb 27 02:34:21 2005
++++ kio/kio/job.cpp	Sun Feb 27 02:35:28 2005
+@@ -3121,10 +3121,10 @@ void CopyJob::copyNextFile()
+                            f.close();
+                            KSimpleConfig config( path );
+                            config.setDesktopGroup();
+-                           config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
+-                           KURL urlName = (*it).uSource;
+-                           urlName.setPass( "" );
+-                           config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
++                           KURL url = (*it).uSource;
++                           url.setPass( "" );
++                           config.writePathEntry( QString::fromLatin1("URL"), url.url() );
++                           config.writeEntry( QString::fromLatin1("Name"), url.url() );
+                            config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
+                            QString protocol = (*it).uSource.protocol();
+                            if ( protocol == QString::fromLatin1("ftp") )
diff --git a/x11/kde/libs3/patches/patch-kioslave_ftp_ftp_cc b/x11/kde/libs3/patches/patch-kioslave_ftp_ftp_cc
new file mode 100644
index 00000000000..53b4bacd614
--- /dev/null
+++ b/x11/kde/libs3/patches/patch-kioslave_ftp_ftp_cc
@@ -0,0 +1,18 @@
+$OpenBSD: patch-kioslave_ftp_ftp_cc,v 1.1 2005/02/27 07:42:03 brad Exp $
+--- kioslave/ftp/ftp.cc.orig	Sun Feb 27 02:35:57 2005
++++ kioslave/ftp/ftp.cc	Sun Feb 27 02:36:44 2005
+@@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
+ {
+   assert(m_control != NULL);    // must have control connection socket
+ 
++  if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
++  {
++    kdWarning(7102) << "Invalid command received (contains CR or LF): "
++                    << cmd.data() << endl;
++    error( ERR_UNSUPPORTED_ACTION, m_host );
++    return false;
++  }
++
+   // Don't print out the password...
+   bool isPassCmd = (cmd.left(4).lower() == "pass");
+   if ( !isPassCmd )