rollback

4 files changed, 115 insertions, 11 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 7c491c2a6853..75c5e613e1c6 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.93 2003/09/27 17:37:34 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.94 2003/09/30 22:08:31 lu_zero Exp $
 
+  30 Sep 2003; Luca Barbato <lu_zero@gentoo.org> files/kdelibs-3.1.2-*:
+  recovered the patches needed by kdelibs-3.1.2-r1
+  
   27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-2.2.2a-r2.ebuild,
   kdelibs-2.2.2a-r2.ebuild, kdelibs-3.0.5b.ebuild, kdelibs-3.0.5b.ebuild,
   kdelibs-3.1.1a.ebuild, kdelibs-3.1.1a.ebuild, kdelibs-3.1.2.ebuild,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index cce430056586..13e7d781e816 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,17 +1,19 @@
+MD5 35a4ec2c84af6d60c990e2ab2fb3bb31 ChangeLog 16271
+MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303
+MD5 5a3b51c5826504ab551b9176905b85be kdelibs-3.0.5b-r1.ebuild 1993
 MD5 c6d6b8ad780f8c1bbc8f3402c6f9c2e4 kdelibs-3.1.2-r1.ebuild 2539
 MD5 604be000d886ae25246c3492b102c8b7 kdelibs-3.1.4.ebuild 2388
-MD5 8a21daa4525f5d8edef9d9be0d4a3354 kdelibs-3.0.4-r1.ebuild 2303
 MD5 cb3a72e767d85f302d891303273d56c3 kdelibs-3.2.0_alpha2.ebuild 2220
-MD5 e907b234e307a34e574f3225b3f7d17b kdelibs-3.0.5b-r1.ebuild 1994
-MD5 5cc50b3c9d19da195599b2d2534d6063 ChangeLog 16143
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
-MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
 MD5 09f2cae6a320fd2baef3d56102cb6f62 files/digest-kdelibs-3.0.5b-r1 68
+MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
+MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
+MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
+MD5 4232704fe9aeecbb09dbed9cb45b8529 files/kdelibs-3.0.5b-khtml.patch 848
+MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.4-kjs-alphaev6-gcc3-workaround.patch 477
+MD5 488126241373edef5f0cd3db16aecc63 files/kdelibs-3.1.2-http.patch 1450
+MD5 c087405ca3581f6493850d59c98dcefa files/kdelibs-3.1.2-khtml.patch 1486
 MD5 762b24559d7e5b32397efa5526d5d15c files/digest-kdelibs-3.2.0_alpha2 69
-MD5 59ee1c9df7f517bf94aa313a96dfc2d6 files/digest-kdelibs-3.1.4 68
+MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
 MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
-MD5 adfd3d17be1f45423f07f22cd0c73427 files/digest-kdelibs-3.1.2-r1 68
-MD5 0599a56d65abe28cd41280572b621d2f files/kdelibs-3.0.5b-http.patch 1639
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch b/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch
new file mode 100644
index 000000000000..2cae6948ddf9
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.1.2-http.patch
@@ -0,0 +1,42 @@
+--- kioslave/http/http.cc	7 May 2003 16:43:40 -0000	1.551.2.15
++++ kioslave/http/http.cc	4 Jul 2003 11:37:27 -0000	1.551.2.21
+@@ -230,19 +229,30 @@
+   kdDebug(7113) << "(" << m_pid << ") ssl_was_in_use = "
+                 << metaData ("ssl_was_in_use") << endl;
+ 
++  m_request.referrer = QString::null;
+   if ( config()->readBoolEntry("SendReferrer", true) &&
+        (m_protocol == "https" || m_protocol == "webdavs" ||
+         metaData ("ssl_was_in_use") != "TRUE" ) )
+-     m_request.referrer = metaData("referrer");
+-  else
+-     m_request.referrer = QString::null;
+-
+-  if (!m_request.referrer.startsWith("http"))
+   {
+-     if (m_request.referrer.startsWith("webdav"))
+-        m_request.referrer.replace(0, 6, "http");
+-     else
+-        m_request.referrer = QString::null;
++     KURL referrerURL = metaData("referrer");
++     if (referrerURL.isValid())
++     {
++        // Sanitize
++        QString protocol = referrerURL.protocol();
++        if (protocol.startsWith("webdav"))
++        {
++           protocol.replace(0, 6, "http");
++           referrerURL.setProtocol(protocol);
++        }
++        
++        if (protocol.startsWith("http"))
++        {
++           referrerURL.setRef(QString::null);
++           referrerURL.setUser(QString::null);
++           referrerURL.setPass(QString::null);
++           m_request.referrer = referrerURL.url();
++        }
++     }
+   }
+ 
+   if ( config()->readBoolEntry("SendLanguageSettings", true) )
diff --git a/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch b/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch
new file mode 100644
index 000000000000..276624135f4b
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.1.2-khtml.patch
@@ -0,0 +1,57 @@
+--- khtml/khtml_part.cpp	3 Jul 2003 17:13:02 -0000	1.770.2.27
++++ khtml/khtml_part.cpp	10 Jul 2003 11:45:10 -0000
+@@ -4171,7 +4171,27 @@
+ 
+ QString KHTMLPart::referrer() const
+ {
+-   return d->m_pageReferrer;
++   return d->m_referrer;
++}
++
++QString KHTMLPart::pageReferrer() const
++{
++   KURL referrerURL = d->m_pageReferrer;
++   if (referrerURL.isValid())
++   {
++      QString protocol = referrerURL.protocol();
++
++      if ((protocol == "http") ||
++         ((protocol == "https") && (m_url.protocol() == "https")))
++      {
++          referrerURL.setRef(QString::null);
++          referrerURL.setUser(QString::null);
++          referrerURL.setPass(QString::null);
++          return referrerURL.url();
++      }
++   }
++   
++   return QString::null;
+ }
+
+ 
+--- khtml/khtml_part.h	18 May 2003 12:34:36 -0000	1.197.2.5
++++ khtml/khtml_part.h	10 Jul 2003 11:45:11 -0000
+@@ -702,6 +702,11 @@
+   QString referrer() const;
+ 
+   /**
++   * Referrer used to obtain this page.
++   */
++  QString pageReferrer() const;
++
++  /**
+    * Last-modified date (in raw string format), if received in the [HTTP] headers.
+    */
+   QString lastModified() const;
+
+--- khtml/html/html_documentimpl.cpp	27 Jun 2003 09:55:33 -0000	1.143.2.6
++++ khtml/html/html_documentimpl.cpp	10 Jul 2003 11:45:11 -0000
+@@ -85,7 +85,7 @@
+ DOMString HTMLDocumentImpl::referrer() const
+ {
+     if ( view() )
+-        return view()->part()->referrer();
++        return view()->part()->pageReferrer();
+     return DOMString();
+ }
+