Hello community,
here is the log from the commit of package kdebase4-runtime for openSUSE:Factory
checked in at Wed Aug 26 14:58:27 CEST 2009.
--------
--- KDE/kdebase4-runtime/kdebase4-runtime.changes 2009-08-19 22:08:42.000000000 +0200
+++ kdebase4-runtime/kdebase4-runtime.changes 2009-08-20 14:15:04.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 20 12:11:25 UTC 2009 - tittiatcoke@gmail.com
+
+- Updated kio_sftp patch to ensure that closeConnection is
+ called after ssh_get_error otherwise ssh_session would be
+ invalid
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.dqAXSt/_old 2009-08-26 14:56:37.000000000 +0200
+++ /var/tmp/diff_new_pack.dqAXSt/_new 2009-08-26 14:56:37.000000000 +0200
@@ -38,7 +38,7 @@
Summary: The KDE Runtime Components
Url: http://www.kde.org/
Version: 4.3.0
-Release: 4
+Release: 5
Source0: kdebase-runtime-%version.tar.bz2
Source1: kde4-essential.menu
Source2: kde-settings.menu
@@ -138,7 +138,7 @@
ln -s %_libdir/kde4/libexec/kdesu $RPM_BUILD_ROOT/usr/bin/kdesu
rm -rf $RPM_BUILD_ROOT/usr/include/KDE
# do something with kdesu.1.gz here?
- %suse_update_desktop_file knetattach System Network
+ %suse_update_desktop_file -r knetattach System Network
%suse_update_desktop_file Help Documentation Viewer
%if %suse_version > 1020
%fdupes -s $RPM_BUILD_ROOT
++++++ kio_sftp_rewrite.patch ++++++
--- /var/tmp/diff_new_pack.dqAXSt/_old 2009-08-26 14:56:37.000000000 +0200
+++ /var/tmp/diff_new_pack.dqAXSt/_new 2009-08-26 14:56:37.000000000 +0200
@@ -4167,8 +4167,8 @@
+ /* try to connect */
+ rc = ssh_connect(ssh_session);
+ if (rc < 0) {
-+ closeConnection();
+ error(ERR_COULD_NOT_CONNECT, QString(ssh_get_error(ssh_session)));
++ closeConnection();
+ return;
+ }
@@ -4187,8 +4187,8 @@
+ /* get the hash */
+ hlen = ssh_get_pubkey_hash(ssh_session, &hash);
+ if (hlen < 0) {
-+ closeConnection();
+ error(ERR_COULD_NOT_CONNECT, QString(ssh_get_error(ssh_session)));
++ closeConnection();
+ return;
+ }
@@ -4212,17 +4212,16 @@
+ break;
+ case SSH_SERVER_FOUND_OTHER:
+ delete hash;
-+ closeConnection();
+ error(ERR_CONNECTION_BROKEN, i18n("The host key for this server was "
+ "not found but an other type of key exists.\n"
+ "An attacker might change the default server key to confuse your "
+ "client into thinking the key does not exist\n"
+ "Please contact your system administrator.\n%1", ssh_get_error(ssh_session)));
++ closeConnection();
+ return;
+ case SSH_SERVER_KNOWN_CHANGED:
+ hexa = ssh_get_hexa(hash, hlen);
+ delete hash;
-+ closeConnection();
+ /* TODO print known_hosts file, port? */
+ error(ERR_CONNECTION_BROKEN, i18n("The host key for the server %1 has changed.\n"
+ "This could either mean that DNS SPOOFING is happening or the IP "
@@ -4230,6 +4229,7 @@
+ "The fingerprint for the key sent by the remote host is:\n %2\n"
+ "Please contact your system administrator.\n%3", mHost, hexa, ssh_get_error(ssh_session)));
+ delete hexa;
++ closeConnection();
+ return;
+ case SSH_SERVER_FILE_NOT_FOUND:
+ case SSH_SERVER_NOT_KNOWN:
@@ -4349,8 +4349,8 @@
+ /* write the known_hosts file */
+ kDebug(KIO_SFTP_DB) << "Adding server to known_hosts file.";
+ if (ssh_write_knownhost(ssh_session) < 0) {
- closeConnection();
+ error(ERR_USER_CANCELED, QString(ssh_get_error(ssh_session)));
+ closeConnection();
return;
- }
+ }
@@ -6881,7 +6881,7 @@
===================================================================
--- kioslave/sftp/kio_sftp.h (revision 1006790)
+++ kioslave/sftp/kio_sftp.h (working copy)
-@@ -1,19 +1,24 @@
+@@ -1,36 +1,43 @@
-/***************************************************************************
- sftpProtocol.h - description
- -------------------
@@ -6921,7 +6921,11 @@
#ifndef __kio_sftp_h__
#define __kio_sftp_h__
-@@ -25,12 +30,17 @@
+-
+-#include <QObject>
+-
+ #include