Mailinglist Archive: opensuse-commit (999 mails)
| < Previous | Next > |
commit kdenetwork4 for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 09 Jul 2009 09:57:55 +0200
- Message-id: <20090709075755.BC4DE6320@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdenetwork4 for openSUSE:Factory
checked in at Thu Jul 9 09:57:55 CEST 2009.
--------
--- KDE/kdenetwork4/kdenetwork4.changes 2009-06-03 18:28:46.000000000 +0200
+++ kdenetwork4/kdenetwork4.changes 2009-07-01 21:00:49.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Jul 1 20:27:48 CEST 2009 - beineri@xxxxxxxxxxxx
+
+- update branch diff to fix Kopete Yahoo protocol (bnc#516347)
+
+-------------------------------------------------------------------
+Wed Jun 24 21:17:02 CEST 2009 - dmueller@xxxxxxx
+
+- update to 4.2.95
+
+-------------------------------------------------------------------
+Sat Jun 20 11:27:34 CEST 2009 - beineri@xxxxxxxxxxxx
+
+- drop kde4- package prefixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdenetwork-4.2.90.tar.bz2
New:
----
kdenetwork-4.2.95.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdenetwork4.spec ++++++
--- /var/tmp/diff_new_pack.Gh7Spz/_old 2009-07-09 09:57:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Gh7Spz/_new 2009-07-09 09:57:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdenetwork4 (Version 4.2.90)
+# spec file for package kdenetwork4 (Version 4.2.95)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,7 +29,7 @@
Group: Productivity/Networking/Other
Summary: KDE Network Base Package
Url: http://www.kde.org
-Version: 4.2.90
+Version: 4.2.95
Release: 1
Source0: kdenetwork-%version.tar.bz2
Patch: 4_3_BRANCH.diff
@@ -42,15 +42,15 @@
%else
%define with_kopete 1
%endif
-Suggests: kde4-kget
+Suggests: kget
%if %with_kopete
-Suggests: kde4-kopete
+Suggests: kopete
%endif
-Suggests: kde4-kppp
-Suggests: kde4-krdc
-Suggests: kde4-krfb
+Suggests: kppp
+Suggests: krdc
+Suggests: krfb
%if %suse_version > 1020
-Suggests: kde4-kdnssd
+Suggests: kdnssd
%endif
Suggests: kdenetwork4-filesharing
Provides: kdenetwork4-devel = 3.95.1
@@ -134,7 +134,7 @@
rm -rf filelists
%if %with_kopete
-%package -n kde4-kopete
+%package -n kopete
License: GPL v2 or later
Group: Productivity/Networking/Instant Messenger
Summary: Instant Messenger
@@ -142,9 +142,11 @@
%kde4_pimlibs_requires
Provides: kdenetwork3-InstantMessenger = 3.5.1
Obsoletes: kdenetwork3-InstantMessenger <= 3.5.1
+Provides: kde4-kopete = 4.3.0
+Obsoletes: kde4-kopete < 4.3.0
%requires_ge libmsn0_1
-%description -n kde4-kopete
+%description -n kopete
Kopete is the KDE instant messenger and supports multiple protocols.
@@ -153,11 +155,11 @@
--------
The KDE Team <kde@xxxxxxx>
-%post -n kde4-kopete -p /sbin/ldconfig
+%post -n kopete -p /sbin/ldconfig
-%postun -n kde4-kopete -p /sbin/ldconfig
+%postun -n kopete -p /sbin/ldconfig
-%files -n kde4-kopete -f filelists/kopete
+%files -n kopete -f filelists/kopete
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%dir /usr/share/kde4/apps/kopete_contactnotes
@@ -177,14 +179,16 @@
%dir /usr/share/kde4/services/kconfiguredialog
%dir /usr/share/kde4/apps/kopete_wlm
-%package -n kde4-kopete-devel
+%package -n kopete-devel
License: GPL v2 or later
Group: Productivity/Networking/Instant Messenger
Summary: Instant Messenger - Development Files
+Provides: kde4-kopete-devel = 4.3.0
+Obsoletes: kde4-kopete-devel < 4.3.0
%kde4_runtime_requires
-Requires: kde4-kopete
+Requires: kopete
-%description -n kde4-kopete-devel
+%description -n kopete-devel
Kopete is the KDE instant messenger and supports multiple protocols.
@@ -193,20 +197,22 @@
--------
The KDE Team <kde@xxxxxxx>
-%files -n kde4-kopete-devel -f filelists/kopete.devel
+%files -n kopete-devel -f filelists/kopete.devel
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%dir /usr/include/kopete
%dir /usr/include/kopete/ui
%endif
-%package -n kde4-kppp
+%package -n kppp
License: GPL v2 or later
Group: Productivity/Networking/Other
Summary: Internet Dial-Up Tool
+Provides: kde4-kppp = 4.3.0
+Obsoletes: kde4-kppp < 4.3.0
%kde4_runtime_requires
-%description -n kde4-kppp
+%description -n kppp
A dialer and front-end to pppd
@@ -215,15 +221,15 @@
--------
The KDE Team <kde@xxxxxxx>
-%post -n kde4-kppp -p /sbin/ldconfig
+%post -n kppp -p /sbin/ldconfig
-%postun -n kde4-kppp -p /sbin/ldconfig
+%postun -n kppp -p /sbin/ldconfig
-%files -n kde4-kppp -f filelists/kppp
+%files -n kppp -f filelists/kppp
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%package -n kde4-krdc
+%package -n krdc
License: GPL v2 or later
Group: Productivity/Networking/Remote Desktop
Summary: Remote Desktop Connection
@@ -231,8 +237,10 @@
Recommends: rdesktop
Provides: kdenetwork3-vnc = 3.5.1
Obsoletes: kdenetwork3-vnc <= 3.5.1
+Provides: kde4-krdc = 4.3.0
+Obsoletes: kde4-krdc < 4.3.0
-%description -n kde4-krdc
+%description -n krdc
Krdc allows to connect to VNC and RDP compatible servers.
@@ -241,24 +249,26 @@
--------
The KDE Team <kde@xxxxxxx>
-%post -n kde4-krdc -p /sbin/ldconfig
+%post -n krdc -p /sbin/ldconfig
-%postun -n kde4-krdc -p /sbin/ldconfig
+%postun -n krdc -p /sbin/ldconfig
-%files -n kde4-krdc -f filelists/krdc
+%files -n krdc -f filelists/krdc
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%dir /usr/include/krdc
/usr/share/icons/hicolor/*/apps/krdc.*
-%package -n kde4-krfb
+%package -n krfb
License: GPL v2 or later
Group: Productivity/Networking/Remote Desktop
Summary: Desktop Sharing
+Provides: kde4-krfb = 4.3.0
+Obsoletes: kde4-krfb < 4.3.0
%kde4_runtime_requires
Provides: kdenetwork3-vnc:/opt/kde3/bin/krfb
-%description -n kde4-krfb
+%description -n krfb
VNC-compatible server to share KDE desktops.
@@ -267,22 +277,24 @@
--------
The KDE Team <kde@xxxxxxx>
-%post -n kde4-krfb -p /sbin/ldconfig
+%post -n krfb -p /sbin/ldconfig
-%postun -n kde4-krfb -p /sbin/ldconfig
+%postun -n krfb -p /sbin/ldconfig
-%files -n kde4-krfb -f filelists/krfb
+%files -n krfb -f filelists/krfb
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
/usr/share/icons/hicolor/*/apps/krfb.*
-%package -n kde4-kdnssd
+%package -n kdnssd
License: GPL v2 or later
Group: Productivity/Networking/System
Summary: Zeroconf Support for KDE
+Provides: kde4-kdnssd = 4.3.0
+Obsoletes: kde4-kdnssd < 4.3.0
%kde4_runtime_requires
-%description -n kde4-kdnssd
+%description -n kdnssd
This package contains the Zeroconf support for KDE.
@@ -291,11 +303,11 @@
--------
The KDE Team <kde@xxxxxxx>
-%post -n kde4-kdnssd -p /sbin/ldconfig
+%post -n kdnssd -p /sbin/ldconfig
-%postun -n kde4-kdnssd -p /sbin/ldconfig
+%postun -n kdnssd -p /sbin/ldconfig
-%files -n kde4-kdnssd -f filelists/kdnssd
+%files -n kdnssd -f filelists/kdnssd
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
@@ -303,7 +315,7 @@
License: GPL v2 or later
Group: Productivity/Networking/System
Summary: KDE Network Libraries
-Enhances: kde4-dolphin
+Enhances: dolphin
%kde4_runtime_requires
%description filesharing
@@ -326,15 +338,17 @@
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
-%package -n kde4-kget
+%package -n kget
License: GPL v2 or later
Group: Productivity/Networking/Other
Summary: Download Manager
%kde4_runtime_requires
Provides: kdenetwork3 = 3.5.1
Obsoletes: kdenetwork3 <= 3.5.1
+Provides: kde4-kget = 4.3.0
+Obsoletes: kde4-kget < 4.3.0
-%description -n kde4-kget
+%description -n kget
An advanced download manager for KDE
@@ -343,11 +357,11 @@
--------
The KDE Team <kde@xxxxxxx>
-%post -n kde4-kget -p /sbin/ldconfig
+%post -n kget -p /sbin/ldconfig
-%postun -n kde4-kget -p /sbin/ldconfig
+%postun -n kget -p /sbin/ldconfig
-%files -n kde4-kget -f filelists/kget
+%files -n kget -f filelists/kget
%defattr(-,root,root)
%doc COPYING COPYING.DOC README
%dir /usr/share/kde4/apps/webkitpart/kpartplugins
@@ -357,213 +371,3 @@
%doc COPYING COPYING.DOC README
%changelog
-* Wed Jun 03 2009 dmueller@xxxxxxx
-- update to 4.2.90
-* Fri May 29 2009 beineri@xxxxxxxxxxxx
-- fix location of brower plugin (bnc#508069)
-* Wed May 27 2009 dmueller@xxxxxxx
-- update to 4.2.88svn973768
-* Thu May 14 2009 dmueller@xxxxxxx
-- update to 4.2.85 (KDE 4.3 Beta1)
-* Thu Apr 30 2009 dmueller@xxxxxxx
-- update to 4.2.3
- * see http://kde.org/announcements/changelogs/changelog4_2_2to4_2_3.php
-* Fri Mar 27 2009 dmueller@xxxxxxx
-- update to 4.2.2
- * see http://kde.org/announcements/changelogs/changelog4_2_1to4_2_2.php
-* Sun Mar 22 2009 beineri@xxxxxxxxxxxx
-- fix build against new webkitkde
-- update branch diff
-* Fri Feb 27 2009 dmueller@xxxxxxx
-- update to 4.2.1
- * see http://kde.org/announcements/changelogs/changelog4_2_0to4_2_1.php
-* Thu Feb 19 2009 stbinner@xxxxxxx
-- update branch diff
-* Fri Feb 06 2009 stbinner@xxxxxxx
-- branch diff update: Kopete bug fixes
-* Thu Jan 22 2009 dmueller@xxxxxxx
-- update to 4.2.0
-* Tue Jan 13 2009 dmueller@xxxxxxx
-- update to 4.1.96
-* Sat Jan 10 2009 dmueller@xxxxxxx
-- update to KDE 4.1.87 (KDE 4.2 Januar snapshot)
-* Tue Dec 16 2008 stbinner@xxxxxxx
-- versionized split-provides are not supported
-* Fri Dec 05 2008 wstephenson@xxxxxxx
-- Fix Kopete mainwindow save/restore (bnc#440801)
-* Thu Nov 20 2008 stbinner@xxxxxxx
-- add SLE provides/obsoletes
-* Tue Nov 18 2008 stbinner@xxxxxxx
-- fix krdc cancelling KDE logout (bnc#442767)
-- update Kopete logout crash fix (bnc#435155)
-* Wed Nov 05 2008 dmueller@xxxxxxx
-- use minimal-toc to fix build for ppc(64)
-* Fri Oct 31 2008 dmueller@xxxxxxx
-- update to 4.1.3
- * see http://kde.org/announcements/changelogs/changelog4_1_2to4_1_3.php
-* Tue Oct 21 2008 stbinner@xxxxxxx
-- update branch diff:
- * remember custom resolution
- * fix some Kopete login and shutdown crashes
-* Sat Sep 27 2008 wstephenson@xxxxxxx
-- Update branch diff
- * fix bnc#396381 kopete crashes on adding groupwise contacts
- * fix bnc#336059 kopete crashes in GW::UserDetailsManager
- * fix bnc#403147 kopete shows '0' in place of contact name for
- off-contact-list incoming messages
-* Thu Sep 25 2008 dmueller@xxxxxxx
-- update to 4.1.2
- * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php
-* Mon Sep 08 2008 stbinner@xxxxxxx
-- branch diff update
-* Thu Sep 04 2008 wstephenson@xxxxxxx
-- Comprehensive lockdown (Kiosk) support for Kopete
-* Thu Aug 28 2008 dmueller@xxxxxxx
-- update to 4.1.1
- * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php
-* Sat Aug 16 2008 stbinner@xxxxxxx
-- branch diff update
-* Thu Jul 31 2008 dmueller@xxxxxxx
-- branch diff update
-* Wed Jul 23 2008 dmueller@xxxxxxx
-- update to 4.1.0
-* Fri Jul 18 2008 dmueller@xxxxxxx
-- update to 4.0.99
-* Fri Jul 11 2008 dmueller@xxxxxxx
-- update to 4.0.98
-* Mon Jul 07 2008 dmueller@xxxxxxx
-- update to 4.0.85
-* Tue Jul 01 2008 dmueller@xxxxxxx
-- update filelist
-* Thu Jun 26 2008 dmueller@xxxxxxx
-- update to 4.0.84
-* Wed Jun 18 2008 dmueller@xxxxxxx
-- update to 4.0.83
-* Tue Jun 10 2008 dmueller@xxxxxxx
-- update to 4.0.82
-* Mon Jun 09 2008 dmueller@xxxxxxx
-- update to 4.0.81
-* Thu Jun 05 2008 wstephenson@xxxxxxx
-- Hint that kdenetwork4-filesharing should be installed to support
- Dolphin's filesharing function. (bnc#396242)
-- Fix crash on incoming offline message (bnc#389408)
-* Wed Jun 04 2008 dmueller@xxxxxxx
-- fix krdc crash on connect (bnc#396760)
-* Tue May 27 2008 stbinner@xxxxxxx
-- don't crash when right-clicking the newsticker (bnc#386611)
-* Tue May 27 2008 dmueller@xxxxxxx
-- fix kdepimlibs requires
-* Sun May 11 2008 wstephenson@xxxxxxx
-- 4_0_BRANCH.diff update:
- * Fix #335679 - unable to add groupwise contact correctly
- * Fix #383679 - crashes on adding contacts to existing groups
- * Fix #378646 - groupwise contacts not shown in contact list
-* Fri May 09 2008 dmueller@xxxxxxx
-- 4_0_BRANCH.diff update:
- * new translations, various groupwise fixes
-* Fri May 09 2008 wstephenson@xxxxxxx
-- Fix GroupWise contacts not appearing on connect (#378646)
-* Thu May 01 2008 dmueller@xxxxxxx
-- update to 4.0.4
- * http://www.kde.org/announcements/changelogs/changelog4_0_3to4_0_4.php
-* Mon Apr 14 2008 dmueller@xxxxxxx
-- update 4_0_BRANCH.diff
-* Thu Mar 27 2008 dmueller@xxxxxxx
-- update to 4.0.3
-* Thu Mar 06 2008 stbinner@xxxxxxx
-- default knewsticker plasmoid to paging style - uses much less cpu
-* Tue Mar 04 2008 stbinner@xxxxxxx
-- update to 4.0.2
-* Mon Feb 18 2008 stbinner@xxxxxxx
-- update branch diff after Plasma backport week-end
-* Sat Feb 16 2008 dmueller@xxxxxxx
-- move kget icon to hicolor
-* Fri Feb 15 2008 dmueller@xxxxxxx
-- update 4_0_BRANCH.diff
-* Thu Jan 31 2008 dmueller@xxxxxxx
-- update to 4.0.1
-* Sun Jan 20 2008 stbinner@xxxxxxx
-- update KDE_4_0_BRANCH.diff
-* Sat Jan 05 2008 stbinner@xxxxxxx
-- update to 4.0 release
-* Wed Jan 02 2008 stbinner@xxxxxxx
-- update to 3.97.2
-* Sun Dec 16 2007 dmueller@xxxxxxx
-- update to 3.97.1
-* Wed Dec 05 2007 dmueller@xxxxxxx
-- update to 3.97.0
-* Tue Dec 04 2007 dmueller@xxxxxxx
-- update to 3.96.3
-* Wed Nov 28 2007 dmueller@xxxxxxx
-- update to 3.96.2
-* Wed Nov 21 2007 dmueller@xxxxxxx
-- update to 3.96.1
-* Wed Nov 14 2007 dmueller@xxxxxxx
-- update to 3.96.0
-* Wed Nov 07 2007 dmueller@xxxxxxx
-- update to 3.95.2
-* Mon Nov 05 2007 dmueller@xxxxxxx
-- fix directory ownership
-* Mon Nov 05 2007 dmueller@xxxxxxx
-- suppress desktop icon errors for now
-* Thu Nov 01 2007 dmueller@xxxxxxx
-- update to 3.95.1
-* Fri Oct 26 2007 dmueller@xxxxxxx
-- update to KDE 4.0 beta4
-* Tue Oct 23 2007 dmueller@xxxxxxx
-- remove reference to uninstalled icon file
-* Thu Oct 18 2007 dmueller@xxxxxxx
-- udpate to 3.94.1
-* Tue Oct 09 2007 dmueller@xxxxxxx
-- update to KDE 4.0 beta3
-* Tue Oct 02 2007 stbinner@xxxxxxx
-- update to 3.93.0.svn720135
-* Wed Sep 26 2007 stbinner@xxxxxxx
-- update to 3.93.0.svn717255
-* Mon Sep 24 2007 stbinner@xxxxxxx
-- two krfb fixes from upstream (#325543):
- * don't crash after deleting the first invitation in the list
- if there are more than one
- * be able to connect to the VNC server right after the invitation
- has been created; don't wait until the dialog has been closed
-* Mon Sep 17 2007 dmueller@xxxxxxx
-- fix threading issues in krdc (#310766)
-* Fri Sep 14 2007 stbinner@xxxxxxx
-- link krfb and krdc icons so that all 10.3 default apps have icons
-* Thu Sep 13 2007 stbinner@xxxxxxx
-- update to 3.93.0.svn712057
-* Tue Sep 04 2007 stbinner@xxxxxxx
-- fix dependencies of kdenetwork4-devel if built without Kopete
-* Thu Aug 30 2007 dmueller@xxxxxxx
-- update to KDE 4.0 Beta 2
-* Thu Aug 23 2007 stbinner@xxxxxxx
-- update to 3.92.0.svn705096
-* Thu Aug 16 2007 stbinner@xxxxxxx
-- update to 3.92.0.svn700763
-* Thu Aug 09 2007 stbinner@xxxxxxx
-- update to 3.92.0.svn697375
-* Mon Aug 06 2007 dmueller@xxxxxxx
-- fix build
-* Sun Jul 29 2007 stbinner@xxxxxxx
-- update to KDE 4.0 Beta 1
-* Thu Jul 19 2007 stbinner@xxxxxxx
-- fix suse_update_desktop_file call
-- fix build after LibVNCServer split
-* Thu Jul 12 2007 stbinner@xxxxxxx
-- update to 3.91.0.svn686458
-* Wed Jun 27 2007 stbinner@xxxxxxx
-- update to 3.90.1.svn672301
-* Mon Jun 25 2007 stbinner@xxxxxxx
-- update to 3.90.1.svn679956
-* Fri Jun 08 2007 stbinner@xxxxxxx
-- update to 3.90.1.svn670093
-* Mon Jun 04 2007 stbinner@xxxxxxx
-- fix build
-* Fri Jun 01 2007 coolo@xxxxxxx
-- simplify spec file by using macros from kde4-filesystem
-* Mon May 28 2007 dmueller@xxxxxxx
-- update to 3.90.1.svn668119
-* Wed May 23 2007 dmueller@xxxxxxx
-- add kdenetwork4-devel subpackage
-* Fri May 18 2007 stbinner@xxxxxxx
-- initial package in abuild
++++++ 4_3_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.Gh7Spz/_old 2009-07-09 09:57:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Gh7Spz/_new 2009-07-09 09:57:17.000000000 +0200
@@ -5,3 +5,396 @@
@@ -0,0 +1,2 @@
+current HEAD: 967942
+svn di between //tags/KDE/4.2.85/kdenetwork and //trunk/KDE/kdenetwork
+Index: kopete/protocols/yahoo/libkyahoo/logintask.h
+===================================================================
+--- kopete/protocols/yahoo/libkyahoo/logintask.h (revision 986794)
++++ kopete/protocols/yahoo/libkyahoo/logintask.h (revision 986795)
+@@ -26,7 +26,13 @@
+
+ class QString;
+ class YMSGTransfer;
++class KJob;
+
++namespace KIO
++{
++ class Job;
++}
++
+ /**
+ @author Duncan Mac-Vicar
+ */
+@@ -58,6 +64,15 @@
+ void sendAuthResp_pre_0x0b(const QString &sn, const QString &seed);
+ void handleAuthResp(YMSGTransfer *transfer);
+ void parseCookies( YMSGTransfer *transfer );
++ void sendAuthSixteenStage1(const QString& sn, const QString& seed);
++ void sendAuthSixteenStage2(const QString& token);
++ void sendAuthSixteenStage3(const QString& cryptString);
++protected Q_SLOTS:
++ void handleAuthSixteenStage1Data(KIO::Job*, const QByteArray& data);
++ void handleAuthSixteenStage1Result(KJob*);
++ void handleAuthSixteenStage2Data(KIO::Job*, const QByteArray& data);
++ void handleAuthSixteenStage2Result(KJob*);
++
+ signals:
+ void haveSessionID( uint );
+ void haveCookies();
+@@ -71,6 +86,10 @@
+ QString m_cCookie;
+ QString m_loginCookie;
+ QString m_verificationWord;
++ QString m_stage1Data;
++ QString m_stage2Data;
++ QString m_challengeString;
++ uint m_sessionID;
+ };
+
+ #endif
+Index: kopete/protocols/yahoo/libkyahoo/logintask.cpp
+===================================================================
+--- kopete/protocols/yahoo/libkyahoo/logintask.cpp (revision 986794)
++++ kopete/protocols/yahoo/libkyahoo/logintask.cpp (revision 986795)
+@@ -3,10 +3,10 @@
+ Handles logging into to the Yahoo service
+
+ Copyright (c) 2004 Duncan Mac-Vicar P. <duncan@xxxxxxx>
+-
+ Copyright (c) 2005-2006 André Duffeck <duffeck@xxxxxxx>
++ Copyright 2009 Matt Rogers <mattr@xxxxxxx>
+
+- Kopete (c) 2002-2006 by the Kopete developers <kopete-devel@xxxxxxx>
++ Kopete (c) 2002-2009 by the Kopete developers <kopete-devel@xxxxxxx>
+
+ *************************************************************************
+ * *
+@@ -28,6 +28,10 @@
+ #include <qstring.h>
+ #include <kdebug.h>
+ #include <stdlib.h>
++
++#include <QCryptographicHash>
++#include <KDE/KJob>
++#include <KDE/KIO/Job>
+ extern "C"
+ {
+ #include "libyahoo.h"
+@@ -177,52 +181,197 @@
+
+ QString sn = t->firstParam( 1 );
+ QString seed = t->firstParam( 94 );
++ m_challengeString = seed;
+ QString version_s = t->firstParam( 13 );
+- uint sessionID = t->id();
++ m_sessionID = t->id();
+ int version = version_s.toInt();
+
+ switch (version)
+ {
+ case 0:
+- kDebug(YAHOO_RAW_DEBUG) << " Version pre 0x0b "<< version_s;
+- break;
++ case 1:
++ case 2:
++ kDebug(YAHOO_RAW_DEBUG) << "Using version 16
authorization" << endl;
++ sendAuthSixteenStage1(sn, seed);
++ break;
+ default:
+- kDebug(YAHOO_RAW_DEBUG) << " Version 0x0b "<< version_s;
+- sendAuthResp_0x0b(sn, seed, sessionID);
++ kWarning(YAHOO_RAW_DEBUG) << "Unknown authentication
method used!"
++ << "Attempting current
authentication anyways";
++ sendAuthSixteenStage1(sn, seed);
+ break;
+ }
+ mState = SentAuthResp;
+
+- emit haveSessionID( sessionID );
++ emit haveSessionID( m_sessionID );
+ }
+
+-void LoginTask::sendAuthResp_0x0b(const QString &sn, const QString &seed,
uint sessionID)
++void LoginTask::sendAuthSixteenStage1(const QString& sn, const QString& seed)
+ {
+- kDebug(YAHOO_RAW_DEBUG) << " with seed " << seed;
+- char *resp_6 = (char *) malloc(100);
+- char *resp_96 = (char *) malloc(100);
+- authresp_0x0b(seed.toLatin1(), sn.toLatin1(),
(client()->password()).toLatin1(), resp_6, resp_96);
+- kDebug(YAHOO_RAW_DEBUG) << "resp_6: " << resp_6 << " resp_69: " <<
resp_96;
++ const QString YahooTokenUrl =
"https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%1&passwd=%2&chal=%3";;
++ kDebug(YAHOO_RAW_DEBUG) << "seed:" << seed;
++ m_stage1Data.clear();
++ /* construct a URL from the seed and request tokens */
++ QByteArray encodedUrl;
++ QString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed);
++ KUrl tokenUrl(fullUrl);
++ KIO::Job* job = KIO::get(tokenUrl, KIO::Reload, KIO::HideProgressInfo);
++ connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)),
++ this, SLOT(handleAuthSixteenStage1Data(KIO::Job*, const
QByteArray&)));
++ connect(job, SIGNAL(result(KJob*)),
++ this, SLOT(handleAuthSixteenStage1Result(KJob*)));
++}
++
++void LoginTask::handleAuthSixteenStage1Data(KIO::Job* job, const QByteArray&
data)
++{
++ kDebug(YAHOO_RAW_DEBUG) << "data:" << data;
++ m_stage1Data.append(data);
++}
++
++void LoginTask::handleAuthSixteenStage1Result(KJob* job)
++{
++ int responseNumber = -1;
++ QString token;
++ int error = job->error();
++ kDebug(YAHOO_RAW_DEBUG) << "error:" << error;
++ if (error == 0)
++ {
++ QStringList responses = m_stage1Data.split("\r\n");
++ if (responses.count() >= 3)
++ {
++ responseNumber = responses[0].toInt();
++ token = responses[1];
++ token.remove("ymsgr=");
++ kDebug(YAHOO_RAW_DEBUG) << "response is:" <<
responseNumber;
++ kDebug(YAHOO_RAW_DEBUG) << "token is:" << token;
++ }
++
++ if (responseNumber != 0)
++ {
++ switch(responseNumber)
++ {
++ case -1:
++ /* error in the received stream */
++ emit loginResponse(Yahoo::LoginSock, QString());
++ kDebug(YAHOO_RAW_DEBUG) << "unknown error
logging in";
++ break;
++ case 1212:
++ /* password incorrect */
++ emit loginResponse(Yahoo::LoginPasswd,
QString());
++ kDebug(YAHOO_RAW_DEBUG) << "password incorrect";
++ break;
++ case 1213:
++ /* security lock */
++ emit loginResponse(Yahoo::LoginLock, QString());
++ break;
++ case 1235:
++ /* username does not exist */
++ emit loginResponse(Yahoo::LoginUname,
QString());
++ kDebug(YAHOO_RAW_DEBUG) << "user does not
exist";
++ break;
++ case 1214:
++ case 1236:
++ emit loginResponse(Yahoo::LoginVerify,
QString());
++ break;
++ case 100: /* username or password missing */
++ /*FIXME handle this */
++ break;
++ default:
++ /* FIXME unknown error. handle it! */
++ break;
++ }
++ }
++ else
++ {
++ /* start stage 2 here */
++ sendAuthSixteenStage2(token);
++ }
++ }
++}
++
++void LoginTask::sendAuthSixteenStage2(const QString& token)
++{
++ const QString YahooLoginUrl =
"https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%1";;
++ kDebug(YAHOO_RAW_DEBUG) << "token:" << token;
++ m_stage2Data.clear();
++ QString fullUrl = YahooLoginUrl.arg(token);
++ KUrl loginUrl(fullUrl);
++ KIO::Job* job = KIO::get(loginUrl, KIO::Reload, KIO::HideProgressInfo);
++ connect(job, SIGNAL(data(KIO::Job*, const QByteArray&)),
++ this, SLOT(handleAuthSixteenStage2Data(KIO::Job*, const
QByteArray&)));
++ connect(job, SIGNAL(result(KJob*)),
++ this, SLOT(handleAuthSixteenStage2Result(KJob*)));
++}
++
++void LoginTask::handleAuthSixteenStage2Data(KIO::Job*, const QByteArray& data)
++{
++ kDebug(YAHOO_RAW_DEBUG) << "data:" << data;
++ m_stage2Data.append(data);
++}
++
++void LoginTask::handleAuthSixteenStage2Result(KJob* job)
++{
++ QString crumb;
++ int responseNumber = -1;
++ int error = job->error();
++ kDebug(YAHOO_RAW_DEBUG) << "error:" << error;
++ if (error == 0)
++ {
++ QStringList responses = m_stage2Data.split("\r\n");
++ kDebug(YAHOO_RAW_DEBUG) << responses;
++ responseNumber = responses[0].toInt();
++ if (responseNumber == 0)
++ {
++ crumb = responses[1];
++ crumb.remove("crumb=");
++ m_yCookie = responses[2].remove(0,2); /* remove Y= */
++ m_tCookie = responses[3].remove(0,2); /* remove T= */
++ }
++
++ if (responseNumber != 0)
++ {
++ switch(responseNumber)
++ {
++ case -1:
++ emit loginResponse(Yahoo::LoginSock, QString());
++ break;
++ case 100:
++ emit loginResponse(Yahoo::LoginSock, QString());
++ break;
++ default: /* try to login anyways */
++ break;
++ }
++ }
++ else
++ {
++ QString cryptString = crumb;
++ cryptString.append(m_challengeString);
++ sendAuthSixteenStage3(cryptString);
++ }
++ }
++}
++
++void LoginTask::sendAuthSixteenStage3(const QString& cryptString)
++{
++ kDebug(YAHOO_RAW_DEBUG) << " with crypt string" << cryptString;
++ QByteArray cryptStringHash = QCryptographicHash::hash(
cryptString.toAscii(),
++
QCryptographicHash::Md5 );
++ cryptStringHash = cryptStringHash.toBase64();
++ cryptStringHash = cryptStringHash.replace('+', '.');
++ cryptStringHash = cryptStringHash.replace('/', '_');
++ cryptStringHash = cryptStringHash.replace('=', '-');
++
+ YMSGTransfer *t = new YMSGTransfer(Yahoo::ServiceAuthResp,
m_stateOnConnect);
+- t->setId( sessionID );
+- t->setParam( 0 , sn.toLocal8Bit());
+- t->setParam( 2 , sn.toLocal8Bit());
++ t->setId( m_sessionID );
++ t->setParam( 1, client()->userId().toLocal8Bit());
++ t->setParam( 0 , client()->userId().toLocal8Bit());
++ t->setParam( 277, m_yCookie.toLocal8Bit() );
++ t->setParam( 278, m_tCookie.toLocal8Bit() );
++ t->setParam( 307, cryptStringHash );
++ t->setParam( 244, 2097087 );
++ t->setParam( 2 , client()->userId().toLocal8Bit());
+ t->setParam( 2, 1 ); // Both parameter 2s wind up in the packet
+- t->setParam( 6 , resp_6);
+- t->setParam( 1, sn.toLocal8Bit());
+- t->setParam( 244, 2097087 );
+ t->setParam( 135, YMSG_PROGRAM_VERSION_STRING );
+- t->setParam( 148, 480 );
+- t->setParam( 59 , "B\\tfckeert1kk1nl&b=2" ); // ???
+
+- if( !m_verificationWord.isEmpty() )
+- {
+- t->setParam( 227 , m_verificationWord.toLocal8Bit() );
+- m_verificationWord.clear();
+- }
+-
+- free(resp_6);
+- free(resp_96);
+ send(t);
+
+ }
+Index: kopete/protocols/yahoo/yahooeditaccount.cpp
+===================================================================
+--- kopete/protocols/yahoo/yahooeditaccount.cpp (revision 986794)
++++ kopete/protocols/yahoo/yahooeditaccount.cpp (revision 986795)
+@@ -63,9 +63,9 @@
+ mAutoConnect->setChecked(acct->excludeConnect());
+ mPasswordWidget->load( &acct->password() );
+
+- QString pagerServer =
account()->configGroup()->readEntry("Server", "scs.msg.yahoo.com");
++ QString pagerServer =
account()->configGroup()->readEntry("Server", "scsa.msg.yahoo.com");
+ int pagerPort = account()->configGroup()->readEntry("Port",
5050);
+- if( pagerServer != "scs.msg.yahoo.com" || pagerPort != 5050 )
++ if( pagerServer != "scsa.msg.yahoo.com" || pagerPort != 5050 )
+ optionOverrideServer->setChecked( true );
+ else
+ optionOverrideServer->setChecked( false );
+@@ -133,7 +133,7 @@
+ }
+ else
+ {
+- yahooAccount->setServer( "scs.msg.yahoo.com" );
++ yahooAccount->setServer( "scsa.msg.yahoo.com" );
+ yahooAccount->setPort( 5050 );
+ }
+
+Index: kopete/protocols/yahoo/yahooaccount.cpp
+===================================================================
+--- kopete/protocols/yahoo/yahooaccount.cpp (revision 986794)
++++ kopete/protocols/yahoo/yahooaccount.cpp (revision 986795)
+@@ -539,7 +539,7 @@
+ return;
+ }
+
+- QString server = configGroup()->readEntry( "Server",
"scs.msg.yahoo.com" );
++ QString server = configGroup()->readEntry( "Server",
"scsa.msg.yahoo.com" );
+ int port = configGroup()->readEntry( "Port", 5050 );
+
+ initConnectionSignals( MakeConnections );
+Index: kopete/kopete/kconf_update/kopete-update_yahoo_server.upd
+===================================================================
+--- kopete/kopete/kconf_update/kopete-update_yahoo_server.upd (revision 0)
++++ kopete/kopete/kconf_update/kopete-update_yahoo_server.upd (revision
986795)
+@@ -0,0 +1,4 @@
++Id=kopete-update-yahoo-server/r1
++File=kopeterc
++Options=overwrite
++Script=kopete-update_yahoo_server.pl,perl
+Index: kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+===================================================================
+--- kopete/kopete/kconf_update/kopete-update_yahoo_server.pl (revision 0)
++++ kopete/kopete/kconf_update/kopete-update_yahoo_server.pl (revision
986795)
+@@ -0,0 +1,20 @@
++#!/usr/bin/perl
++
++# Rename the old Gaim style to Pidgin
++
++my $inYahoo = 0;
++foreach (<>) {
++ $inYahoo = 1 if (/^\[Account_YahooProtocol_.*$/);
++ if ($inYahoo) {
++ if (/^Server\=(.*)/) {
++ my $oldServer = $1;
++ if ($oldServer =~ m/\.yahoo\.com$/) {
++ print "Server=scsa.msg.yahoo.com\n";
++ $inYahoo = 0;
++ next;
++ }
++ }
++ }
++
++ print $_;
++}
+
+Property changes on: kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+___________________________________________________________________
+Added: svn:executable
+ + *
+
+Index: kopete/kopete/kconf_update/CMakeLists.txt
+===================================================================
+--- kopete/kopete/kconf_update/CMakeLists.txt (revision 986794)
++++ kopete/kopete/kconf_update/CMakeLists.txt (revision 986795)
+@@ -4,9 +4,9 @@
+ endif(NOT WIN32)
+
+
+-install( FILES kopete-pluginloader.upd kopete-nameTracking.upd
kopete-initialstatus.upd kopete-gaim_to_pidgin_style.upd DESTINATION
${KCONF_UPDATE_INSTALL_DIR})
++install( FILES kopete-pluginloader.upd kopete-nameTracking.upd
kopete-initialstatus.upd kopete-gaim_to_pidgin_style.upd
kopete-update_yahoo_server.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+
+-install( PROGRAMS kopete-pluginloader.pl
++install( PROGRAMS kopete-pluginloader.pl kopete-update_yahoo_server.pl
+ kopete-account-0.10.pl kopete-initialstatus.pl
kopete-gaim_to_pidgin_style.pl
+ DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+
++++++ kdenetwork-4.2.90.tar.bz2 -> kdenetwork-4.2.95.tar.bz2 ++++++
KDE/kdenetwork4/kdenetwork-4.2.90.tar.bz2 kdenetwork4/kdenetwork-4.2.95.tar.bz2
differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |