From 74b83a00dc6a6889c232a22b91ba77c1d36625b8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2019 16:23:59 +0000 Subject: import kdenetwork-4.10.5-8.el7_0 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f87b634 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/kdenetwork-4.10.5.tar.xz +SOURCES/krdc-icons.tar.bz2 diff --git a/.kdenetwork.metadata b/.kdenetwork.metadata new file mode 100644 index 0000000..1e4fb19 --- /dev/null +++ b/.kdenetwork.metadata @@ -0,0 +1,2 @@ +3ee86a1a227593e9f37881da3c1db1a3c384b2e4 SOURCES/kdenetwork-4.10.5.tar.xz +166de7b1880553530ea2a4b2a5c3860d69d32a1e SOURCES/krdc-icons.tar.bz2 diff --git a/SOURCES/kdenetwork-4.10.0-kopete_system_iris.patch b/SOURCES/kdenetwork-4.10.0-kopete_system_iris.patch new file mode 100644 index 0000000..99cc7e1 --- /dev/null +++ b/SOURCES/kdenetwork-4.10.0-kopete_system_iris.patch @@ -0,0 +1,61 @@ +diff -up kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt.kopete_system_iris kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt +--- kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt.kopete_system_iris 2013-01-23 16:17:12.000000000 -0600 ++++ kdenetwork-4.10.0/kopete/protocols/jabber/CMakeLists.txt 2013-02-11 09:14:26.067395997 -0600 +@@ -1,19 +1,32 @@ + add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -DIRIS_XMPP_JID_DEPRECATED) + + add_subdirectory( icons ) +-add_subdirectory( libiris ) + + #FIXME:glib : necessary ? + include_directories( + ${KOPETE_INCLUDES} + ${CMAKE_CURRENT_SOURCE_DIR}/ui/ + ${CMAKE_CURRENT_SOURCE_DIR}/tasks/ ++) ++ ++if(USE_SYSTEM_IRIS) ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(IRIS REQUIRED iris irisnet) ++include_directories( ${IRIS_INCLUDE_DIRS} ) ++link_directories( ${IRIS_LIBRARY_DIRS} ) ++else(USE_SYSTEM_IRIS) ++add_subdirectory( libiris ) ++ ++include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/libiris/include/ + ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/ + ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/xmpp/jingle + ${QCA2_INCLUDE_DIR} + ) + ++link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ) ++endif(USE_SYSTEM_IRIS) ++ + if(BUILD_GOOGLETALK) + # We dont need other programs + set ( BUILD_libjingle_natserver false ) +@@ -43,9 +56,6 @@ IF(BUILD_JINGLE) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/jingle) + ENDIF(BUILD_JINGLE) + +-#link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ${CMAKE_CURRENT_BINARY_DIR}/jingle/ ) +-link_directories( ${CMAKE_CURRENT_BINARY_DIR}/libiris/ ) +- + ########### next target ############### + + set(kopete_jabber_ui_SRCS +@@ -178,7 +188,12 @@ endif(BUILD_JINGLE) + kde4_add_plugin(kopete_jabber ${kopete_jabber_PART_SRCS}) + + +-target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} ${KDE4_SOLID_LIBS} kopete iris_kopete) ++target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} ${KDE4_SOLID_LIBS} kopete) ++if(USE_SYSTEM_IRIS) ++target_link_libraries(kopete_jabber ${IRIS_LIBRARIES}) ++else(USE_SYSETM_IRIS) ++target_link_libraries(kopete_jabber iris_kopete) ++endif(USE_SYSTEM_IRIS) + if(BUILD_JINGLE) + target_link_libraries(kopete_jabber ortp asound speex) + endif(BUILD_JINGLE) diff --git a/SOURCES/kdenetwork-4.10.4-krdc_icon.patch b/SOURCES/kdenetwork-4.10.4-krdc_icon.patch new file mode 100644 index 0000000..45876bd --- /dev/null +++ b/SOURCES/kdenetwork-4.10.4-krdc_icon.patch @@ -0,0 +1,18 @@ +diff -up kdenetwork-4.10.4/krdc/CMakeLists.txt.icon kdenetwork-4.10.4/krdc/CMakeLists.txt +--- kdenetwork-4.10.4/krdc/CMakeLists.txt.icon 2013-05-30 16:49:47.000000000 -0500 ++++ kdenetwork-4.10.4/krdc/CMakeLists.txt 2013-06-01 13:38:17.506707887 -0500 +@@ -87,7 +87,7 @@ kde4_add_ui_files(krdc_SRCS + config/general.ui + ) + +-kde4_add_app_icon(krdc_SRCS "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/apps/krdc.png") ++kde4_add_app_icon(krdc_SRCS "hi*-apps-krdc.png") + + kde4_add_executable(krdc ${krdc_SRCS}) + +@@ -124,3 +124,5 @@ endif() + if(NOT INSIDE_KDENETWORK) + macro_display_feature_log() + endif(NOT INSIDE_KDENETWORK) ++ ++kde4_install_icons( ${ICON_INSTALL_DIR} ) diff --git a/SOURCES/kdenetwork-4.10.5-CVE-2014-6055.patch b/SOURCES/kdenetwork-4.10.5-CVE-2014-6055.patch new file mode 100644 index 0000000..92db335 --- /dev/null +++ b/SOURCES/kdenetwork-4.10.5-CVE-2014-6055.patch @@ -0,0 +1,107 @@ +--- kdenetwork-4.10.5/krfb/cmake/modules/FindLibVNCServer.cmake.unbundle_libvncserver 2014-08-06 09:04:40.532236267 -0500 ++++ kdenetwork-4.10.5/krfb/cmake/modules/FindLibVNCServer.cmake 2014-08-06 09:04:40.532236267 -0500 +@@ -0,0 +1,41 @@ ++# cmake macro to test LIBVNCSERVER LIB ++ ++# Copyright (c) 2006, Alessandro Praduroux ++# Copyright (c) 2007, Urs Wolfer ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++INCLUDE(CheckPointerMember) ++ ++IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) ++ # Already in cache, be silent ++ SET(LIBVNCSERVER_FIND_QUIETLY TRUE) ++ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) ++ ++FIND_PATH(LIBVNCSERVER_INCLUDE_DIR rfb/rfb.h) ++ ++FIND_LIBRARY(LIBVNCSERVER_LIBRARIES NAMES vncserver libvncserver) ++ ++# libvncserver and libvncclient are in the same package, so it does ++# not make sense to add a new cmake script for finding libvncclient. ++# instead just find the libvncclient also in this file. ++FIND_PATH(LIBVNCCLIENT_INCLUDE_DIR rfb/rfbclient.h) ++FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAMES vncclient libvncclient) ++ ++IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) ++ SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}") ++ CHECK_POINTER_MEMBER(rfbClient* GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND) ++ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES) ++ ++IF (LIBVNCSERVER_FOUND) ++ IF (NOT LIBVNCSERVER_FIND_QUIETLY) ++ MESSAGE(STATUS "Found LibVNCServer: ${LIBVNCSERVER_LIBRARIES}") ++ ENDIF (NOT LIBVNCSERVER_FIND_QUIETLY) ++ELSE (LIBVNCSERVER_FOUND) ++ IF (LIBVNCSERVER_FIND_REQUIRED) ++ MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibVNCServer (version 0.9 or later required).") ++ ENDIF (LIBVNCSERVER_FIND_REQUIRED) ++ENDIF (LIBVNCSERVER_FOUND) ++ ++MARK_AS_ADVANCED(LIBVNCSERVER_INCLUDE_DIR LIBVNCSERVER_LIBRARIES) +\ No newline at end of file +diff -up krfb-4.13.97/krfb/CMakeLists.txt.unbundle_libvncserver krfb-4.13.97/krfb/CMakeLists.txt +--- kdenetwork-4.10.5/krfb/krfb/CMakeLists.txt.unbundle_libvncserver 2014-04-15 16:12:33.000000000 -0500 ++++ kdenetwork-4.10.5/krfb/krfb/CMakeLists.txt 2014-08-06 09:04:40.533236257 -0500 +@@ -20,6 +20,7 @@ target_link_libraries (krfbprivate + ${QT_QTCORE_LIBRARY} + ${QT_QTGUI_LIBRARY} + ${X11_X11_LIB} ++ ${LIBVNCSERVER_LIBRARIES} + ) + + set_target_properties (krfbprivate PROPERTIES +@@ -103,6 +104,7 @@ target_link_libraries (krfb + ${QT_QTNETWORK_LIBRARY} + ${KDE4_KDNSSD_LIBS} + ${KDE4_KDEUI_LIBS} ++ ${LIBVNCSERVER_LIBRARIES} + ) + + if(TelepathyQt4_FOUND) +--- kdenetwork-4.10.5/krfb/krfb/rfb.h.unbundle_libvncserver 2014-04-15 16:12:33.000000000 -0500 ++++ kdenetwork-4.10.5/krfb/krfb/rfb.h 2014-08-06 09:04:40.533236257 -0500 +@@ -6,7 +6,7 @@ + #ifndef KRFB_RFB_H + #define KRFB_RFB_H + +-#include "../libvncserver/rfb/rfb.h" ++#include "rfb/rfb.h" + + #undef TRUE + #undef FALSE +--- kdenetwork-4.10.5/krfb/CMakeLists.txt.orig 2014-10-31 10:57:00.937181663 +0100 ++++ kdenetwork-4.10.5/krfb/CMakeLists.txt 2014-10-31 10:59:20.966543705 +0100 +@@ -26,6 +26,9 @@ + include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) + endif(NOT INSIDE_KDENETWORK) + ++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) ++find_package(LibVNCServer REQUIRED) ++ + macro_optional_find_package(TelepathyQt4) + macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes support.") + +@@ -35,8 +38,6 @@ + include_directories ("${CMAKE_CURRENT_BINARY_DIR}/krfb" + "${CMAKE_CURRENT_SOURCE_DIR}/krfb" + "${CMAKE_CURRENT_SOURCE_DIR}/krfb/ui" +- "${CMAKE_CURRENT_SOURCE_DIR}/libvncserver/" +- "${CMAKE_CURRENT_BINARY_DIR}/libvncserver/" + ) + + if(Q_WS_X11) +@@ -45,9 +46,8 @@ + endif(NOT X11_XTest_FOUND) + endif(Q_WS_X11) + +-add_subdirectory(libvncserver) + add_subdirectory(krfb) +-add_subdirectory (framebuffers) ++add_subdirectory(framebuffers) + add_subdirectory(doc) + + if (NOT INSIDE_KDENETWORK) diff --git a/SOURCES/kdenetwork-4.10.5-disable-skype.patch b/SOURCES/kdenetwork-4.10.5-disable-skype.patch new file mode 100644 index 0000000..723df42 --- /dev/null +++ b/SOURCES/kdenetwork-4.10.5-disable-skype.patch @@ -0,0 +1,12 @@ +diff -up kdenetwork-4.10.5/kopete/protocols/CMakeLists.txt.orig kdenetwork-4.10.5/kopete/protocols/CMakeLists.txt +--- kdenetwork-4.10.5/kopete/protocols/CMakeLists.txt.orig 2013-07-18 14:30:58.224744212 +0200 ++++ kdenetwork-4.10.5/kopete/protocols/CMakeLists.txt 2013-07-18 14:33:53.009212538 +0200 +@@ -17,7 +17,7 @@ option(WITH_irc "Enable Kopete IRC proto + option(WITH_wlm "Enable Window Live Messenger support" ON) + option(WITH_WLM_MEDIASTREAMER "Enable Windows Live Messenger voice clip support" ON) + option(WITH_meanwhile "Enable Kopete meanwhile protocol" ON) +-option(WITH_skype "Enable Kopete Skype protocol" ON) ++option(WITH_skype "Enable Kopete Skype protocol" OFF) + + if(LIBORTP_FOUND AND SPEEX_FOUND AND ALSA_FOUND AND WITH_JINGLE) + message(STATUS "Building jingle support") diff --git a/SOURCES/kdenetwork-4.10.5-freerdp.patch b/SOURCES/kdenetwork-4.10.5-freerdp.patch new file mode 100644 index 0000000..884d782 --- /dev/null +++ b/SOURCES/kdenetwork-4.10.5-freerdp.patch @@ -0,0 +1,567 @@ +diff -up kdenetwork-4.10.5/krdc/CMakeLists.txt.freerdp kdenetwork-4.10.5/krdc/CMakeLists.txt +--- kdenetwork-4.10.5/krdc/CMakeLists.txt.freerdp 2013-07-04 21:52:45.864029571 +0200 ++++ kdenetwork-4.10.5/krdc/CMakeLists.txt 2013-07-04 22:05:59.950275124 +0200 +@@ -29,7 +29,13 @@ endif(NOT INSIDE_KDENETWORK) + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) + + macro_optional_find_package(LibVNCServer) +-macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/" FALSE "0.9" "Needed to build Krfb and VNC support in Krdc") ++macro_log_feature(LIBVNCSERVER_FOUND "libvncserver" "VNC Server library" "http://libvncserver.sourceforge.net/" FALSE "0.9" "Needed to build Krfb and VNC support in KRDC") ++ ++FIND_PROGRAM(FREERDP_EXECUTABLE xfreerdp) ++if(FREERDP_EXECUTABLE) ++ set(FREERDP_EXECUTABLE_FOUND true) ++endif(FREERDP_EXECUTABLE) ++macro_log_feature(FREERDP_EXECUTABLE_FOUND "freerdp" "A free Remote Desktop Protocol (RDP) Implementation" "http://www.freerdp.com" FALSE "1.0.2" "Needed for RDP support in KRDC (at runtime)") + + # NX support is not ready for KDE 4.2; disabled (uwolfer) + # macro_optional_find_package(LibNXCL) +diff -up kdenetwork-4.10.5/krdc/core/krdc.kcfg.freerdp kdenetwork-4.10.5/krdc/core/krdc.kcfg +--- kdenetwork-4.10.5/krdc/core/krdc.kcfg.freerdp 2013-06-28 20:08:57.390483848 +0200 ++++ kdenetwork-4.10.5/krdc/core/krdc.kcfg 2013-07-04 21:52:45.865029569 +0200 +@@ -83,7 +83,7 @@ + 7 + + +- 0 ++ 2 + + + 0 +@@ -100,6 +100,15 @@ + + true + ++ ++ true ++ ++ ++ 2 ++ ++ ++ /media ++ + + + +diff -up kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt.freerdp kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt +--- kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt.freerdp 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/CMakeLists.txt 2013-07-04 21:52:45.865029569 +0200 +@@ -1,9 +1,9 @@ + + if(Q_WS_X11) +- set(HAVE_RDESKTOP true) # TODO: implement cmake check? ++ set(HAVE_XFREERDP true) + endif(Q_WS_X11) + +-if(HAVE_RDESKTOP) ++if(HAVE_XFREERDP) + add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5012) + + include_directories( +@@ -49,4 +49,4 @@ if(HAVE_RDESKTOP) + + install(FILES rdp.protocol DESTINATION ${SERVICES_INSTALL_DIR}) + install(FILES smb2rdc.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus) +-endif(HAVE_RDESKTOP) ++endif(HAVE_XFREERDP) +diff -up kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp.freerdp kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp +--- kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp.freerdp 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.cpp 2013-07-04 21:52:45.865029569 +0200 +@@ -1,6 +1,7 @@ + /**************************************************************************** + ** +-** Copyright (C) 2007 Urs Wolfer ++** Copyright (C) 2007 - 2012 Urs Wolfer ++** Copyright (C) 2012 AceLan Kao + ** + ** This file is part of KDE. + ** +@@ -108,6 +109,9 @@ QWidget* RdpHostPreferences::createProto + rdpUi.kcfg_Sound->setCurrentIndex(sound()); + rdpUi.kcfg_Console->setChecked(console()); + rdpUi.kcfg_ExtraOptions->setText(extraOptions()); ++ rdpUi.kcfg_RemoteFX->setChecked(remoteFX()); ++ rdpUi.kcfg_Performance->setCurrentIndex(performance()); ++ rdpUi.kcfg_ShareMedia->setText(shareMedia()); + + connect(rdpUi.resolutionComboBox, SIGNAL(currentIndexChanged(int)), SLOT(updateWidthHeight(int))); + +@@ -172,6 +176,9 @@ void RdpHostPreferences::acceptConfig() + setSound(rdpUi.kcfg_Sound->currentIndex()); + setConsole(rdpUi.kcfg_Console->isChecked()); + setExtraOptions(rdpUi.kcfg_ExtraOptions->text()); ++ setRemoteFX(rdpUi.kcfg_RemoteFX->isChecked()); ++ setPerformance(rdpUi.kcfg_Performance->currentIndex()); ++ setShareMedia(rdpUi.kcfg_ShareMedia->text()); + } + + void RdpHostPreferences::setColorDepth(int colorDepth) +@@ -228,4 +235,36 @@ QString RdpHostPreferences::extraOptions + return m_configGroup.readEntry("extraOptions", Settings::extraOptions()); + } + ++void RdpHostPreferences::setRemoteFX(bool remoteFX) ++{ ++ m_configGroup.writeEntry("remoteFX", remoteFX); ++} ++ ++bool RdpHostPreferences::remoteFX() const ++{ ++ return m_configGroup.readEntry("remoteFX", Settings::remoteFX()); ++} ++ ++void RdpHostPreferences::setPerformance(int performance) ++{ ++ if (performance >= 0) ++ m_configGroup.writeEntry("performance", performance); ++} ++ ++int RdpHostPreferences::performance() const ++{ ++ return m_configGroup.readEntry("performance", Settings::performance()); ++} ++ ++void RdpHostPreferences::setShareMedia(const QString &shareMedia) ++{ ++ if (!shareMedia.isNull()) ++ m_configGroup.writeEntry("shareMedia", shareMedia); ++} ++ ++QString RdpHostPreferences::shareMedia() const ++{ ++ return m_configGroup.readEntry("shareMedia", Settings::shareMedia()); ++} ++ + #include "rdphostpreferences.moc" +diff -up kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h.freerdp kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h +--- kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h.freerdp 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/rdphostpreferences.h 2013-07-04 21:52:45.866029567 +0200 +@@ -1,6 +1,7 @@ + /**************************************************************************** + ** +-** Copyright (C) 2007 Urs Wolfer ++** Copyright (C) 2007 - 2012 Urs Wolfer ++** Copyright (C) 2012 AceLan Kao + ** + ** This file is part of KDE. + ** +@@ -45,6 +46,12 @@ public: + bool console() const; + void setExtraOptions(const QString &extraOptions); + QString extraOptions() const; ++ void setRemoteFX(bool remoteFX); ++ bool remoteFX() const; ++ void setPerformance(int performance); ++ int performance() const; ++ void setShareMedia(const QString &shareMedia); ++ QString shareMedia() const; + + protected: + QWidget* createProtocolSpecificConfigPage(); +diff -up kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui.freerdp kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui +--- kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui.freerdp 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/rdppreferences.ui 2013-07-04 21:52:45.866029567 +0200 +@@ -7,7 +7,7 @@ + 0 + 0 + 484 +- 406 ++ 452 + + + +@@ -415,6 +415,12 @@ + + + ++ ++ ++ 280 ++ 0 ++ ++ + + + On This Computer +@@ -432,6 +438,87 @@ + + + ++ ++ ++ ++ Performance: ++ ++ ++ kcfg_Performance ++ ++ ++ ++ ++ ++ ++ ++ 280 ++ 0 ++ ++ ++ ++ ++ Modem ++ ++ ++ ++ ++ Broadband ++ ++ ++ ++ ++ LAN ++ ++ ++ ++ ++ ++ ++ ++ RemoteFX: ++ ++ ++ kcfg_RemoteFX ++ ++ ++ ++ ++ ++ ++ Enable RemoteFX ++ ++ ++ RemoteFX covers a set of technologies that enhance visual experience of the Remote Desktop Protocol. ++ ++ ++ ++ ++ ++ ++ Share Media: ++ ++ ++ kcfg_ShareMedia ++ ++ ++ ++ ++ ++ ++ ++ 280 ++ 0 ++ ++ ++ ++ Share a local media directory with the remote host. ++ ++ ++ true ++ ++ ++ + + + +@@ -541,15 +628,15 @@ + + + +- KLineEdit +- QLineEdit +-
klineedit.h
+- +- + KComboBox + QComboBox +
kcombobox.h
+ ++ ++ KLineEdit ++ QLineEdit ++
klineedit.h
++ + + + resolutionComboBox +@@ -558,6 +645,9 @@ + kcfg_ColorDepth + kcfg_KeyboardLayout + kcfg_Sound ++ kcfg_Performance ++ kcfg_RemoteFX ++ kcfg_ShareMedia + kcfg_Console + kcfg_ExtraOptions + kcfg_DefaultRdpUserName +diff -up kdenetwork-4.10.5/krdc/rdp/rdpview.cpp.freerdp kdenetwork-4.10.5/krdc/rdp/rdpview.cpp +--- kdenetwork-4.10.5/krdc/rdp/rdpview.cpp.freerdp 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/rdpview.cpp 2013-07-04 21:52:45.866029567 +0200 +@@ -1,7 +1,8 @@ + /**************************************************************************** + ** + ** Copyright (C) 2002 Arend van Beelen jr. +-** Copyright (C) 2007 Urs Wolfer ++** Copyright (C) 2007 - 2012 Urs Wolfer ++** Copyright (C) 2012 AceLan Kao + ** + ** This file is part of KDE. + ** +@@ -167,39 +168,72 @@ bool RdpView::start() + arguments << "-X" << QString::number(m_container->winId()); + arguments << "-a" << QString::number((m_hostPreferences->colorDepth() + 1) * 8); + +- QString sound; + switch (m_hostPreferences->sound()) { ++ case 1: ++ arguments << "-o"; ++ break; ++ case 0: ++ arguments << "--plugin" << "rdpsnd"; ++ break; ++ case 2: ++ default: ++ break; ++ } ++ ++ if (!m_hostPreferences->shareMedia().isEmpty()) { ++ QStringList shareMedia; ++ shareMedia << "--plugin" << "rdpdr" << "--data" << "disk:media:" + m_hostPreferences->shareMedia() << "--"; ++ arguments += shareMedia; ++ } ++ ++ QString performance; ++ switch (m_hostPreferences->performance()) { + case 0: +- sound = "local"; ++ performance = "m"; + break; + case 1: +- sound = "remote"; ++ performance = "b"; + break; + case 2: ++ performance = "l"; ++ break; + default: +- sound = "off"; ++ break; + } +- arguments << "-r" << "sound:" + sound; ++ ++ arguments << "-x" << performance; + + if (m_hostPreferences->console()) { + arguments << "-0"; + } + ++ if (m_hostPreferences->remoteFX()) { ++ arguments << "--rfx"; ++ } ++ + if (!m_hostPreferences->extraOptions().isEmpty()) { + const QStringList additionalArguments = KShell::splitArgs(m_hostPreferences->extraOptions()); + arguments += additionalArguments; + } + ++ // krdc has no support for certificate management yet; it would not be possbile to connect to any host: ++ // "The host key for example.com has changed" ... ++ // "Add correct host key in ~/.freerdp/known_hosts to get rid of this message." ++ arguments << "--ignore-certificate"; ++ + arguments << (m_host + ':' + QString::number(m_port)); + ++ kDebug(5012) << "Starting xfreerdp with arguments:" << arguments; ++ + setStatus(Connecting); + + connect(m_process, SIGNAL(error(QProcess::ProcessError)), SLOT(processError(QProcess::ProcessError))); + connect(m_process, SIGNAL(readyReadStandardError()), SLOT(receivedStandardError())); ++ connect(m_process, SIGNAL(readyReadStandardOutput()), SLOT(receivedStandardOutput())); + connect(m_container, SIGNAL(clientClosed()), SLOT(connectionClosed())); + connect(m_container, SIGNAL(clientIsEmbedded()), SLOT(connectionOpened())); + +- m_process->start("rdesktop", arguments); ++ m_process->start("xfreerdp", arguments); + + return true; + } +@@ -242,45 +276,85 @@ void RdpView::connectionClosed() + m_quitFlag = true; + } + ++void RdpView::connectionError() ++{ ++ emit disconnectedError(); ++ connectionClosed(); ++} ++ + void RdpView::processError(QProcess::ProcessError error) + { ++ kDebug(5012) << "processError:" << error; + if (m_quitFlag) // do not try to show error messages while quitting (prevent crashes) + return; + + if (m_status == Connecting) { +- setStatus(Disconnected); +- + if (error == QProcess::FailedToStart) { +- KMessageBox::error(0, i18n("Could not start \"rdesktop\"; make sure rdesktop is properly installed."), ++ KMessageBox::error(0, i18n("Could not start \"xfreerdp\"; make sure xfreerdp is properly installed."), + i18n("RDP Failure")); ++ connectionError(); + return; + } ++ } ++} + +- if (m_clientVersion.isEmpty()) { +- KMessageBox::error(0, i18n("Connection attempt to host failed."), +- i18n("Connection Failure")); +- } else { +- KMessageBox::error(0, i18n("The version of \"rdesktop\" you are using (%1) is too old:\n" +- "rdesktop 1.3.2 or greater is required.", m_clientVersion), ++void RdpView::receivedStandardError() ++{ ++ const QString output(m_process->readAllStandardError()); ++ kDebug(5012) << "receivedStandardError:" << output; ++ QString line; ++ int i = 0; ++ while (!(line = output.section('\n', i, i)).isEmpty()) { ++ ++ // the following error is issued by freerdp because of a bug in freerdp 1.0.1 and below; ++ // see: https://github.com/FreeRDP/FreeRDP/pull/576 ++ //"X Error of failed request: BadWindow (invalid Window parameter) ++ // Major opcode of failed request: 7 (X_ReparentWindow) ++ // Resource id in failed request: 0x71303348 ++ // Serial number of failed request: 36 ++ // Current serial number in output stream: 36" ++ if (line.contains(QLatin1String("X_ReparentWindow"))) { ++ KMessageBox::error(0, i18n("The version of \"xfreerdp\" you are using is too old.\n" ++ "xfreerdp 1.0.2 or greater is required."), + i18n("RDP Failure")); ++ connectionError(); ++ return; + } +- emit disconnectedError(); ++ i++; + } + } + +-void RdpView::receivedStandardError() ++void RdpView::receivedStandardOutput() + { +- const QString output(m_process->readAllStandardError()); ++ const QString output(m_process->readAllStandardOutput()); ++ kDebug(5012) << "receivedStandardOutput:" << output; + QString line; + int i = 0; + while (!(line = output.section('\n', i, i)).isEmpty()) { +- if (line.startsWith(QLatin1String("Version "))) { +- m_clientVersion = line.section(' ', 1, 1); +- m_clientVersion = m_clientVersion.left(m_clientVersion.length() - 1); ++ ++ // full xfreerdp message: "transport_connect: getaddrinfo (Name or service not known)" ++ if (line.contains(QLatin1String("Name or service not known"))) { ++ KMessageBox::error(0, i18n("Name or service not known."), ++ i18n("Connection Failure")); ++ connectionError(); ++ return; ++ ++ // full xfreerdp message: "unable to connect to example.com:3389" ++ } else if (line.contains(QLatin1String("unable to connect to"))) { ++ KMessageBox::error(0, i18n("Connection attempt to host failed."), ++ i18n("Connection Failure")); ++ connectionError(); ++ return; ++ ++ // looks like some generic xfreerdp error message, handle it if nothing was handled: ++ // "Error: protocol security negotiation failure" ++ } else if (line.contains(QLatin1String("Error: protocol security negotiation failure"))) { ++ KMessageBox::error(0, i18n("Connection attempt to host failed."), ++ i18n("Connection Failure")); ++ connectionError(); + return; +- } else { +- kDebug(5012) << "Process error output: " << line; + } ++ + i++; + } + } +diff -up kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp.freerdp kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp +--- kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp.freerdp 2013-06-28 20:08:57.393483968 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.cpp 2013-07-04 21:52:45.867029564 +0200 +@@ -37,7 +37,7 @@ RdpViewFactory::RdpViewFactory(QObject * + + m_connectToolTipString = i18n("Connect to a Windows Remote Desktop (RDP)"); + +- QMetaObject::invokeMethod(this, "checkRdektopAvailability", Qt::DirectConnection); ++ QMetaObject::invokeMethod(this, "checkFreerdpAvailability", Qt::DirectConnection); + } + + RdpViewFactory::~RdpViewFactory() +@@ -80,10 +80,10 @@ QString RdpViewFactory::connectToolTipTe + "Example: rdpserver:3389 (host:port)"); + } + +-void RdpViewFactory::checkRdektopAvailability() ++void RdpViewFactory::checkFreerdpAvailability() + { +- if (KStandardDirs::findExe("rdesktop").isEmpty()) { +- m_connectToolTipString += '\n' + i18n("The application \"rdesktop\" cannot be found on your system; make sure it is properly installed " ++ if (KStandardDirs::findExe("xfreerdp").isEmpty()) { ++ m_connectToolTipString += '\n' + i18n("The application \"xfreerdp\" cannot be found on your system; make sure it is properly installed " + "if you need RDP support."); + } + } +diff -up kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h.freerdp kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h +--- kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h.freerdp 2013-06-28 20:08:57.393483968 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/rdpviewfactory.h 2013-07-04 21:52:45.867029564 +0200 +@@ -53,7 +53,7 @@ public: + virtual QString connectToolTipText() const; + + private Q_SLOTS: +- void checkRdektopAvailability(); ++ void checkFreerdpAvailability(); + + private: + QString m_connectToolTipString; +diff -up kdenetwork-4.10.5/krdc/rdp/rdpview.h.freerdp kdenetwork-4.10.5/krdc/rdp/rdpview.h +--- kdenetwork-4.10.5/krdc/rdp/rdpview.h.freerdp 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/rdp/rdpview.h 2013-07-04 21:52:45.867029564 +0200 +@@ -84,17 +84,18 @@ private: + + // other properties + bool m_quitFlag; // if set: die +- QString m_clientVersion; // version number returned by rdesktop +- QX11EmbedContainer *m_container; // container for the rdesktop window +- QProcess *m_process; // rdesktop process ++ QX11EmbedContainer *m_container; // container for the xfreerdp window ++ QProcess *m_process; // xfreerdp process + + RdpHostPreferences *m_hostPreferences; + + private slots: +- void connectionOpened(); // called if rdesktop started +- void connectionClosed(); // called if rdesktop quits +- void processError(QProcess::ProcessError error); // called if rdesktop dies +- void receivedStandardError(); // catches rdesktop debug output ++ void connectionOpened(); // called if xfreerdp started ++ void connectionClosed(); // called if xfreerdp quits ++ void connectionError(); // called if xfreerdp quits with error ++ void processError(QProcess::ProcessError error); // called if xfreerdp dies ++ void receivedStandardError(); // catches xfreerdp debug output ++ void receivedStandardOutput(); // catches xfreerdp output + }; + + #endif diff --git a/SOURCES/kdenetwork-4.10.5-kget-doc.patch b/SOURCES/kdenetwork-4.10.5-kget-doc.patch new file mode 100644 index 0000000..d484110 --- /dev/null +++ b/SOURCES/kdenetwork-4.10.5-kget-doc.patch @@ -0,0 +1,18 @@ +diff -up kdenetwork-4.10.5/kget/CMakeLists.txt.doc kdenetwork-4.10.5/kget/CMakeLists.txt +--- kdenetwork-4.10.5/kget/CMakeLists.txt.doc 2013-06-28 20:07:00.880861754 +0200 ++++ kdenetwork-4.10.5/kget/CMakeLists.txt 2013-07-04 22:46:57.926817860 +0200 +@@ -100,6 +100,7 @@ add_subdirectory(sounds) + add_subdirectory(desktop) + add_subdirectory(plasma) + add_subdirectory(tests) ++add_subdirectory(doc) + + macro_optional_find_package(KDE4Workspace) + macro_log_feature(KDE4WORKSPACE_FOUND "KDE4Workspace" "KDE4 workspace libraries, part of kdebase-workspace" "http://www.kde.org" FALSE "" "Allows 'shutdown after downloads completed' in kget") +diff -up kdenetwork-4.10.5/kget/doc/CMakeLists.txt.doc kdenetwork-4.10.5/kget/doc/CMakeLists.txt +--- kdenetwork-4.10.5/kget/doc/CMakeLists.txt.doc 2013-07-04 22:52:39.996059175 +0200 ++++ kdenetwork-4.10.5/kget/doc/CMakeLists.txt 2013-07-04 22:53:13.530983851 +0200 +@@ -1,2 +1,2 @@ + ########### install files ############### +-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en) ++kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kget) diff --git a/SOURCES/kdenetwork-4.10.5-krdc-bz#1008890.patch b/SOURCES/kdenetwork-4.10.5-krdc-bz#1008890.patch new file mode 100644 index 0000000..f1abcf8 --- /dev/null +++ b/SOURCES/kdenetwork-4.10.5-krdc-bz#1008890.patch @@ -0,0 +1,272 @@ +--- kdenetwork-4.10.5/krdc/mainwindow.cpp.orig 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/mainwindow.cpp 2013-10-29 09:41:07.000000000 +0100 +@@ -340,8 +340,6 @@ void MainWindow::newConnection(const KUr + connect(view, SIGNAL(statusChanged(RemoteView::RemoteStatus)), this, SLOT(statusChanged(RemoteView::RemoteStatus))); + connect(view, SIGNAL(disconnected()), this, SLOT(disconnectHost())); + +- m_remoteViewList.append(view); +- + QScrollArea *scrollArea = createScrollArea(m_tabWidget, view); + + const int indexOfNewConnectionWidget = m_tabWidget->indexOf(m_newConnectionWidget); +@@ -350,6 +348,7 @@ void MainWindow::newConnection(const KUr + + const int newIndex = m_tabWidget->addTab(scrollArea, KIcon("krdc"), tabName.isEmpty() ? url.prettyUrl(KUrl::RemoveTrailingSlash) : tabName); + m_tabWidget->setCurrentIndex(newIndex); ++ m_remoteViewMap.insert(m_tabWidget->widget(newIndex), view); + tabChanged(newIndex); // force to update m_currentRemoteView (tabChanged is not emitted when start page has been disabled) + + view->start(); +@@ -362,12 +361,13 @@ void MainWindow::openFromRemoteDesktopsM + if (!urlString.isEmpty()) { + const KUrl url(urlString); + // first check if url has already been opened; in case show the tab +- for (int i = 0; i < m_remoteViewList.count(); ++i) { +- if (m_remoteViewList.at(i)->url() == url) { +- m_tabWidget->setCurrentIndex(i); ++ foreach (QWidget *widget, m_remoteViewMap.keys()) { ++ if (m_remoteViewMap.value(widget)->url() == url) { ++ m_tabWidget->setCurrentWidget(widget); + return; + } + } ++ + newConnection(url, false, nameString); + } + } +@@ -469,7 +469,7 @@ void MainWindow::statusChanged(RemoteVie + + void MainWindow::takeScreenshot() + { +- const QPixmap snapshot = m_remoteViewList.at(m_currentRemoteView)->takeScreenshot(); ++ const QPixmap snapshot = currentRemoteView()->takeScreenshot(); + + QApplication::clipboard()->setPixmap(snapshot); + } +@@ -491,8 +491,8 @@ void MainWindow::switchFullscreen() + restoreGeometry(m_mainWindowGeometry); + if (m_systemTrayIcon) m_systemTrayIcon->setAssociatedWidget(this); + +- foreach(RemoteView *currentView, m_remoteViewList) { +- currentView->enableScaling(currentView->hostPreferences()->windowedScale()); ++ foreach (RemoteView * view, m_remoteViewMap.values()) { ++ view->enableScaling(view->hostPreferences()->windowedScale()); + } + + if (m_toolBar) { +@@ -518,7 +518,7 @@ void MainWindow::switchFullscreen() + m_tabWidget->setTabBarHidden(true); + m_tabWidget->setDocumentMode(true); + +- foreach(RemoteView *currentView, m_remoteViewList) { ++ foreach(RemoteView *currentView, m_remoteViewMap) { + currentView->enableScaling(currentView->hostPreferences()->fullscreenScale()); + } + +@@ -572,10 +572,11 @@ void MainWindow::disconnectHost() + QWidget *widgetToDelete; + if (view) { + widgetToDelete = (QWidget*) view->parent()->parent(); +- m_remoteViewList.removeOne(view); ++ m_remoteViewMap.remove(m_remoteViewMap.key(view)); + } else { + widgetToDelete = m_tabWidget->currentWidget(); +- view = m_remoteViewList.takeAt(m_currentRemoteView); ++ view = currentRemoteView(); ++ m_remoteViewMap.remove(m_remoteViewMap.key(view)); + } + + saveHostPrefs(view); +@@ -600,12 +601,10 @@ void MainWindow::disconnectHost() + void MainWindow::closeTab(QWidget *widget) + { + bool isNewConnectionPage = widget == m_newConnectionWidget; +- const int index = m_tabWidget->indexOf(widget); +- +- kDebug(5010) << index; + + if (!isNewConnectionPage) { +- RemoteView *view = m_remoteViewList.takeAt(index); ++ RemoteView *view = m_remoteViewMap.value(widget); ++ m_remoteViewMap.remove(m_remoteViewMap.key(view)); + view->startQuitting(); + #ifdef TELEPATHY_SUPPORT + m_tubesManager->closeTube(view->url()); +@@ -746,7 +745,7 @@ void MainWindow::showLocalCursor(bool sh + { + kDebug(5010) << showLocalCursor; + +- RemoteView* view = m_remoteViewList.at(m_currentRemoteView); ++ RemoteView* view = currentRemoteView(); + view->showDotCursor(showLocalCursor ? RemoteView::CursorOn : RemoteView::CursorOff); + view->hostPreferences()->setShowLocalCursor(showLocalCursor); + saveHostPrefs(view); +@@ -756,7 +755,7 @@ void MainWindow::viewOnly(bool viewOnly) + { + kDebug(5010) << viewOnly; + +- RemoteView* view = m_remoteViewList.at(m_currentRemoteView); ++ RemoteView* view = currentRemoteView(); + view->setViewOnly(viewOnly); + view->hostPreferences()->setViewOnly(viewOnly); + saveHostPrefs(view); +@@ -766,7 +765,7 @@ void MainWindow::grabAllKeys(bool grabAl + { + kDebug(5010); + +- RemoteView* view = m_remoteViewList.at(m_currentRemoteView); ++ RemoteView* view = currentRemoteView(); + view->setGrabAllKeys(grabAllKeys); + view->hostPreferences()->setGrabAllKeys(grabAllKeys); + saveHostPrefs(view); +@@ -776,7 +775,7 @@ void MainWindow::scale(bool scale) + { + kDebug(5010); + +- RemoteView* view = m_remoteViewList.at(m_currentRemoteView); ++ RemoteView* view = currentRemoteView(); + view->enableScaling(scale); + if (m_fullscreenWindow) + view->hostPreferences()->setFullscreenScale(scale); +@@ -854,7 +853,7 @@ void MainWindow::updateActionStatus() + if (m_tabWidget->currentWidget() == m_newConnectionWidget) + enabled = false; + +- RemoteView* view = (m_currentRemoteView >= 0 && enabled) ? m_remoteViewList.at(m_currentRemoteView) : 0; ++ RemoteView* view = (m_currentRemoteView >= 0 && enabled) ? currentRemoteView() : 0; + + actionCollection()->action("take_screenshot")->setEnabled(enabled); + actionCollection()->action("disconnect")->setEnabled(enabled); +@@ -934,15 +933,15 @@ void MainWindow::updateConfiguration() + } + + // Send update configuration message to all views +- for (int i = 0; i < m_remoteViewList.count(); ++i) { +- m_remoteViewList.at(i)->updateConfiguration(); ++ foreach (RemoteView *view, m_remoteViewMap.values()) { ++ view->updateConfiguration(); + } + + } + + void MainWindow::quit(bool systemEvent) + { +- const bool haveRemoteConnections = !m_remoteViewList.isEmpty(); ++ const bool haveRemoteConnections = !m_remoteViewMap.isEmpty(); + if (systemEvent || !haveRemoteConnections || KMessageBox::warningContinueCancel(this, + i18n("Are you sure you want to quit the KDE Remote Desktop Client?"), + i18n("Confirm Quit"), +@@ -951,17 +950,17 @@ void MainWindow::quit(bool systemEvent) + + if (Settings::rememberSessions()) { // remember open remote views for next startup + QStringList list; +- for (int i = 0; i < m_remoteViewList.count(); ++i) { +- kDebug(5010) << m_remoteViewList.at(i)->url(); +- list.append(m_remoteViewList.at(i)->url().prettyUrl(KUrl::RemoveTrailingSlash)); ++ foreach (RemoteView *view, m_remoteViewMap.values()) { ++ kDebug(5010) << view->url(); ++ list.append(view->url().prettyUrl(KUrl::RemoveTrailingSlash)); + } + Settings::setOpenSessions(list); + } + + saveHostPrefs(); + +- for (int i = 0; i < m_remoteViewList.count(); ++i) { +- m_remoteViewList.at(i)->startQuitting(); ++ foreach (RemoteView *view, m_remoteViewMap.values()) { ++ view->startQuitting(); + } + + Settings::self()->writeConfig(); +@@ -1029,9 +1028,9 @@ void MainWindow::saveProperties(KConfigG + + void MainWindow::saveHostPrefs() + { +- for (int i = 0; i < m_remoteViewList.count(); ++i) { +- saveHostPrefs(m_remoteViewList.at(i)); +- m_remoteViewList.at(i)->startQuitting(); ++ foreach (RemoteView *view, m_remoteViewMap.values()) { ++ saveHostPrefs(view); ++ view->startQuitting(); + } + } + +@@ -1172,9 +1171,9 @@ void MainWindow::newConnectionPage(bool + m_addressInput->setFocus(); + } + +-QList MainWindow::remoteViewList() const ++QMap MainWindow::remoteViewList() const + { +- return m_remoteViewList; ++ return m_remoteViewMap; + } + + QList MainWindow::remoteViewFactoriesList() const +@@ -1182,9 +1181,13 @@ QList MainWindow::r + return m_remoteViewFactories.values(); + } + +-int MainWindow::currentRemoteView() const ++RemoteView* MainWindow::currentRemoteView() const + { +- return m_currentRemoteView; ++ if (m_currentRemoteView >= 0) { ++ return m_remoteViewMap.value(m_tabWidget->widget(m_currentRemoteView)); ++ } else { ++ return 0; ++ } + } + + void MainWindow::createDockWidget() +--- kdenetwork-4.10.5/krdc/mainwindow.h.orig 2013-06-28 20:08:57.392483928 +0200 ++++ kdenetwork-4.10.5/krdc/mainwindow.h 2013-10-29 09:41:07.000000000 +0100 +@@ -60,9 +60,9 @@ public: + MainWindow(QWidget *parent = 0); + ~MainWindow(); + +- QList remoteViewList() const; ++ QMap remoteViewList() const; + QList remoteViewFactoriesList() const; +- int currentRemoteView() const; ++ RemoteView* currentRemoteView() const; + + public slots: + void newConnection(const KUrl &newUrl = KUrl(), bool switchFullscreenWhenConnected = false, const QString &tabName = QString()); +@@ -125,7 +125,7 @@ private: + + BookmarkManager *m_bookmarkManager; + +- QList m_remoteViewList; ++ QMap m_remoteViewMap; + QMap m_remoteViewFactories; + + int m_currentRemoteView; +--- kdenetwork-4.10.5/krdc/bookmarkmanager.cpp.orig 2013-06-28 20:08:57.370483046 +0200 ++++ kdenetwork-4.10.5/krdc/bookmarkmanager.cpp 2013-10-29 09:41:07.000000000 +0100 +@@ -114,8 +114,9 @@ bool BookmarkManager::editBookmarkEntry( + + QString BookmarkManager::currentUrl() const + { +- if (m_mainWindow->currentRemoteView() >= 0) +- return urlForView(m_mainWindow->remoteViewList().at(m_mainWindow->currentRemoteView())); ++ RemoteView *view = m_mainWindow->currentRemoteView(); ++ if (view) ++ return urlForView(view); + else + return QString(); + } +@@ -146,10 +147,10 @@ QList > Bookmark + { + QList > list; + +- QListIterator iter(m_mainWindow->remoteViewList()); ++ QMapIterator iter(m_mainWindow->remoteViewList()); + + while (iter.hasNext()) { +- RemoteView *next = iter.next(); ++ RemoteView *next = iter.next().value(); + const QString url = next->url().prettyUrl(KUrl::RemoveTrailingSlash); + list << QPair(url, url); + } diff --git a/SOURCES/kdenetwork-4.3.3-resolv-conf-path.patch b/SOURCES/kdenetwork-4.3.3-resolv-conf-path.patch new file mode 100644 index 0000000..012b8a8 --- /dev/null +++ b/SOURCES/kdenetwork-4.3.3-resolv-conf-path.patch @@ -0,0 +1,21 @@ +diff -up kdenetwork-4.3.3/kppp/connect.cpp.resolv-conf-path kdenetwork-4.3.3/kppp/connect.cpp +--- kdenetwork-4.3.3/kppp/connect.cpp.resolv-conf-path 2008-01-05 00:59:27.000000000 +0100 ++++ kdenetwork-4.3.3/kppp/connect.cpp 2009-11-23 14:42:15.629662654 +0100 +@@ -1491,7 +1491,7 @@ void addpeerdns() { + int fd, fd2; + + if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) { +- if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) { ++ if((fd2 = open("/var/run/ppp/resolv.conf", O_RDONLY)) >= 0) { + char c; + int i = 0; + while(i++ < 100 && read(fd2, &c, 1) == 1) { +@@ -1502,7 +1502,7 @@ void addpeerdns() { + } + close(fd2); + } else +- fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n"); ++ fprintf(stderr, "failed to read from /var/run/ppp/resolv.conf\n"); + close(fd); + } + add_domain(gpppdata.domain()); diff --git a/SOURCES/kdenetwork-4.7.97-fix-for-g++47.patch b/SOURCES/kdenetwork-4.7.97-fix-for-g++47.patch new file mode 100644 index 0000000..45f8b35 --- /dev/null +++ b/SOURCES/kdenetwork-4.7.97-fix-for-g++47.patch @@ -0,0 +1,14 @@ +diff -up kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp.fix-for-g++47 kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp +--- kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp.fix-for-g++47 2011-07-27 20:25:46.000000000 +0200 ++++ kdenetwork-4.7.97/kopete/protocols/qq/evautil.cpp 2012-01-05 14:15:01.660149348 +0100 +@@ -78,7 +78,9 @@ namespace Eva { + plain[0] = ( rand() & 0xf8 ) | pos; + memset( plain_pre, 0, 8 ); + memset( crypted_pre, 0, 8 ); +- memset( plain+1, rand()& 0xff, pos++ ); ++ if( pos ) ++ memset( plain+1, rand()& 0xff, pos ); ++ pos++; + + // pad 2 bytes + for( i = 0; i< 2; i++ ) diff --git a/SOURCES/kdenetwork-4.9.5-libjingle_openssl.patch b/SOURCES/kdenetwork-4.9.5-libjingle_openssl.patch new file mode 100644 index 0000000..946b6f4 --- /dev/null +++ b/SOURCES/kdenetwork-4.9.5-libjingle_openssl.patch @@ -0,0 +1,12 @@ +diff -up kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc.libjingle_openssl kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc +--- kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc.libjingle_openssl 2012-11-29 18:32:55.000000000 -0600 ++++ kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc 2012-12-29 15:54:09.768759196 -0600 +@@ -648,7 +648,7 @@ OpenSSLAdapter::SSLPostConnectionCheck(S + int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension)); + + if (extension_nid == NID_subject_alt_name) { +-#if OPENSSL_VERSION_NUMBER >= 0x1000000fL ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L + const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension); + #else + X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension); diff --git a/SPECS/kdenetwork.spec b/SPECS/kdenetwork.spec new file mode 100644 index 0000000..b285a13 --- /dev/null +++ b/SPECS/kdenetwork.spec @@ -0,0 +1,783 @@ + +Summary: KDE Network Applications +Name: kdenetwork +Epoch: 7 +Version: 4.10.5 +Release: 8%{?dist} + +License: GPLv2 +URL: http://www.kde.org +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable +%else +%global stable stable +%endif +Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +Source1: krdc-icons.tar.bz2 + +# rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf +Patch2: kdenetwork-4.3.3-resolv-conf-path.patch + +# Fix build failure with g++4.7 +Patch3: kdenetwork-4.7.97-fix-for-g++47.patch + +# support USE_SYSTEM_IRIS build option +Patch4: kdenetwork-4.10.0-kopete_system_iris.patch + +# disable skype protocol +Patch6: kdenetwork-4.10.5-disable-skype.patch + +## upstreamable patches +Patch50: kdenetwork-4.9.5-libjingle_openssl.patch +Patch51: kdenetwork-4.10.4-krdc_icon.patch +Patch52: kdenetwork-4.10.5-kget-doc.patch +Patch53: kdenetwork-4.10.5-krdc-bz#1008890.patch + +## upstream patches +Patch100: kdenetwork-4.10.5-freerdp.patch + +## security patches +Patch1000: kdenetwork-4.10.5-CVE-2014-6055.patch + +%if 0%{?fedora} +BuildRequires: openslp-devel +BuildRequires: pkgconfig(avahi-compat-libdns_sd) +BuildRequires: pkgconfig(libgadu) >= 1.8.0 +BuildRequires: pkgconfig(libotr) +BuildRequires: libktorrent-devel +BuildRequires: pkgconfig(nxcl) +%global telepathy 1 +BuildRequires: pkgconfig(TelepathyQt4) +BuildRequires: linphone-devel >= 2.3.0 +%endif +BuildRequires: boost-devel +BuildRequires: expat-devel +BuildRequires: giflib-devel +BuildRequires: gmp-devel +# gnutls-devel is needed for rfbclient +BuildRequires: gnutls-devel +BuildRequires: gpgme-devel +# libkonq +BuildRequires: kde-baseapps-devel >= %{version} +BuildRequires: kde-workspace-devel >= %{version} +BuildRequires: kdepimlibs-devel >= %{version} +BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(jasper) +BuildRequires: pkgconfig(libidn) +BuildRequires: pkgconfig(libmsn) +BuildRequires: pkgconfig(libpcre) +BuildRequires: pkgconfig(libstreamanalyzer) pkgconfig(libstreams) +BuildRequires: pkgconfig(libxslt) +BuildRequires: pkgconfig(meanwhile) +BuildRequires: pkgconfig(ortp) +%if 0%{?use_system_iris:1} +BuildRequires: pkgconfig(iris) >= 2.0.0 +%endif +BuildRequires: pkgconfig(qca2) +BuildRequires: pkgconfig(qimageblitz) +BuildRequires: pkgconfig(soprano) +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(libv4l2) +BuildRequires: libvncserver-devel +BuildRequires: openldap-devel +# freerdp support +BuildRequires: freerdp >= 1.0.2 +#----------------------------------------------------------------------------- +#-- The following OPTIONAL packages could NOT be located on your system. +#-- Consider installing them to enable more features from this software. +#----------------------------------------------------------------------------- +# * XMMS +# X MultiMedia System development libraries +# Used by the Kopete nowlistening plugin to support the XMMS player. + +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-fileshare-samba = %{epoch}:%{version}-%{release} +Requires: %{name}-kdnssd = %{epoch}:%{version}-%{release} +Requires: %{name}-kget = %{epoch}:%{version}-%{release} +Requires: %{name}-kopete = %{epoch}:%{version}-%{release} +Requires: %{name}-krdc = %{epoch}:%{version}-%{release} +Requires: %{name}-krfb = %{epoch}:%{version}-%{release} + +%description +Networking applications, including: +* kget: downloader manager +* kopete: chat client +* krdc: a client for Desktop Sharing and other VNC servers +* krfb: Desktop Sharing server, allow others to access your desktop via VNC + +%package common +Summary: Common files for %{name} +BuildArch: noarch +# when split occurred +Conflicts: kdenetwork < 7:4.6.95-10 +Obsoletes: kdenetwork-libs < 7:4.6.95-10 +%description common +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-kopete-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-krdc-devel = %{epoch}:%{version}-%{release} +BuildArch: noarch +%description devel +%{summary}. + +%package fileshare-samba +Summary: Share files via samba +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: samba +%description fileshare-samba +%{summary}. + +%package strigi-analyzers +Summary: meta information plugin for BitTorrent files +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description strigi-analyzers +%{summary}. + +%package kdnssd +Summary: Kdnssd +Requires: %{name}-common = %{epoch}:%{version}-%{release} +%description kdnssd +%{summary}. + +%package kget +Summary: A downloader manager +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-kget-libs%{?_isa} = %{epoch}:%{version}-%{release} +%description kget +%{summary}. + +%package kget-libs +Summary: Runtime libraries for %{name} +Requires: %{name}-kget = %{epoch}:%{version}-%{release} +%description kget-libs +%{summary}. + +%package kopete +Summary: A chat client +Requires: %{name}-kopete-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: kate-part >= %{version} +Requires: mozilla-filesystem +# jabber +Requires: qca-ossl%{?_isa} +%description kopete +%{summary}. + +%package kopete-libs +Summary: Runtime libraries for %{name} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-kopete = %{epoch}:%{version}-%{release} +%description kopete-libs +%{summary}. + +%package kopete-devel +Summary: Development files for Kopete +Requires: %{name}-kopete-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: kdelibs4-devel +%description kopete-devel +%{summary}. + +%package krdc +Summary: A client for Desktop Sharing and other VNC servers +Requires: %{name}-krdc-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: freerdp +%description krdc +%{summary}. + +%package krdc-libs +Summary: Runtime libraries for %{name} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-krdc = %{epoch}:%{version}-%{release} +%description krdc-libs +%{summary}. + +%package krdc-devel +Summary: Developer files for %{name} +Requires: %{name}-krdc-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: kdelibs4-devel +%description krdc-devel +%{summary}. + +%package krfb +Summary: Desktop Sharing server, allow others to access your desktop via VNC +Requires: %{name}-krfb-libs%{?_isa} = %{epoch}:%{version}-%{release} +# https://bugzilla.redhat.com/655844 +Provides: bundled(libvncserver) +%description krfb +%{summary}. + +%package krfb-libs +Summary: Runtime libraries for %{name} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-krfb = %{epoch}:%{version}-%{release} +%description krfb-libs +%{summary}. + + + +%prep +%setup -q -n kdenetwork-%{version} -a1 +%patch2 -p1 -b .resolv-conf-path +%patch3 -p1 -b .fix-for-g++47 +%patch4 -p1 -b .kopete_system_iris +%patch6 -p1 -b .disable-skype + +%patch50 -p1 -b .libjingle_openssl +%patch51 -p1 -b .krdc_icon +%patch52 -p1 -b .doc +%patch53 -p1 -b .krdc-bz#1008890 +%patch100 -p1 -b .freerdp +%patch1000 -p1 -b .2014-6055 + +%if 0%{?use_system_iris:1} +mv kopete/protocols/jabber/libiris \ + kopete/protocols/jabber/libiris.BAK +%endif + +%if 0%{?rhel} +sed -i 's|macro_optional_add_subdirectory( kdenetwork-strigi-analyzers )|#macro_optional_add_subdirectory( kdenetwork-strigi-analyzers )|g' CMakeLists.txt +sed -i 's|macro_optional_add_subdirectory( kppp )|#macro_optional_add_subdirectory( kppp )|g' CMakeLists.txt +%endif + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%{cmake_kde4} \ + -DWITH_JINGLE=TRUE \ + -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \ + %{?use_system_iris:-DUSE_SYSTEM_IRIS:BOOL=ON} \ + .. +popd + +make %{?_smp_mflags} -C %{_target_platform} + + +%install +rm -rf %{buildroot} + +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} + +# fix documentation multilib conflict in index.cache +for f in kget kopete krdc krfb; do + if [ -f %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2 ] ; then + bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2 + sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache + fi +done + +%find_lang kget --with-kde --without-mo +%find_lang kopete --with-kde --without-mo +%find_lang krdc --with-kde --without-mo +%find_lang krfb --with-kde --without-mo + +# unpackaged files +rm -f %{buildroot}%{_kde4_libdir}/libkgetcore.so + + +%check +for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do + desktop-file-validate $f +done + + +%files +# blank + +%files devel +# blank + +%files common +#doc README COPYING* + +%files fileshare-samba +%{_kde4_libdir}/kde4/sambausershareplugin.so +%{_kde4_datadir}/kde4/services/sambausershareplugin.desktop + +%if 0%{?fedora} +%files strigi-analyzers +%{_kde4_libdir}/strigi/strigita_torrent_analyzer.so +%endif + +%files kdnssd +%{_kde4_datadir}/kde4/services/zeroconf.protocol +%{_kde4_datadir}/kde4/services/kded/dnssdwatcher.desktop +%{_datadir}/dbus-1/interfaces/org.kde.kdnssd.xml +%dir %{_kde4_appsdir}/remoteview/ +%{_kde4_appsdir}/remoteview/zeroconf.desktop +%{_kde4_libdir}/kde4/kded_dnssdwatcher.so +%{_kde4_libdir}/kde4/kio_zeroconf.so + +%post kget +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + +%posttrans kget +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +update-desktop-database -q &> /dev/null ||: + +%postun kget +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: + update-desktop-database -q &> /dev/null ||: +fi + +%files kget -f kget.lang +%{_kde4_bindir}/kget +%{_kde4_appsdir}/dolphinpart/kpartplugins/kget_plug_in.* +%{_kde4_appsdir}/kget/ +%{_kde4_appsdir}/kconf_update/kget* +%{_kde4_appsdir}/khtml/kpartplugins/kget_plug_in.* +%{_kde4_appsdir}/kwebkitpart/kpartplugins/kget_plug_in.* +%{_kde4_iconsdir}/hicolor/*/apps/kget.* +%{_datadir}/dbus-1/services/org.kde.kget.service +%{_kde4_datadir}/applications/kde4/kget.desktop +%{_kde4_datadir}/kde4/services/kget*.desktop +%{_kde4_datadir}/kde4/services/plasma-engine-kget.desktop +%{_kde4_datadir}/kde4/services/plasma-runner-kget.desktop +%{_kde4_datadir}/kde4/servicetypes/kget*.desktop +%{_kde4_datadir}/config.kcfg/kget*.kcfg +%{_kde4_datadir}/ontology/kde/kget* +%{_kde4_libdir}/kde4/kget_*.so +%{_kde4_datadir}/kde4/services/ServiceMenus/kget_download.desktop +%{_kde4_libdir}/kde4/kcm_kget_*.so +%{_kde4_libdir}/kde4/krunner_kget.so +%{_kde4_libdir}/kde4/plasma_engine_kget.so +%{_kde4_libdir}/kde4/plasma_kget_barapplet.so +%{_kde4_libdir}/kde4/plasma_kget_piechart.so + +%post kget-libs -p /sbin/ldconfig +%postun kget-libs -p /sbin/ldconfig + +%files kget-libs +%{_kde4_libdir}/libkgetcore.so.4* + +%post kopete +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: + +%posttrans kopete +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: +update-desktop-database -q &> /dev/null ||: + +%postun kopete +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: + update-desktop-database -q &> /dev/null ||: +fi + +%files kopete -f kopete.lang +%if 0%{?fedora} +%{_kde4_bindir}/googletalk-call +%endif +%{_kde4_bindir}/kopete +%{_kde4_bindir}/winpopup* +%{_kde4_appsdir}/kopete* +%{_kde4_appsdir}/kconf_update/kopete* +%{_kde4_configdir}/kopeterc +%{_datadir}/dbus-1/interfaces/org.kde.Kopete.xml +%{_datadir}/dbus-1/interfaces/org.kde.kopete.*.xml +%{_kde4_datadir}/applications/kde4/kopete.desktop +%{_kde4_datadir}/config.kcfg/kopete* +%{_kde4_datadir}/sounds/Kopete_* +%{_kde4_datadir}/sounds/KDE-Im-Phone-Ring.wav +%{_kde4_datadir}/kde4/services/aim.protocol +%{_kde4_datadir}/kde4/services/chatwindow.desktop +%{_kde4_datadir}/kde4/services/emailwindow.desktop +%{_kde4_datadir}/kde4/services/kopete_*.desktop +%{_kde4_datadir}/kde4/services/kconfiguredialog/ +%{_kde4_datadir}/kde4/services/xmpp.protocol +%{_kde4_datadir}/kde4/servicetypes/kopete*.desktop +%{_kde4_iconsdir}/hicolor/*/apps/kopete*.* +%{_kde4_iconsdir}/oxygen/*/actions/* +%if 0%{?fedora} +%{_kde4_iconsdir}/oxygen/*/status/object-locked*.* +%endif +%{_kde4_libdir}/kde4/kopete_*.so +%{_kde4_libdir}/kde4/kcm_kopete_*.so +%{_kde4_libdir}/libqgroupwise.so +%{_kde4_bindir}/kopete_latexconvert.sh +%{_kde4_libdir}/kde4/libchattexteditpart.so +%{_kde4_datadir}/config.kcfg/historyconfig.kcfg +%{_kde4_datadir}/config.kcfg/latexconfig.kcfg +%{_kde4_datadir}/config.kcfg/nowlisteningconfig.kcfg +%{_kde4_datadir}/config.kcfg/translatorconfig.kcfg +%{_kde4_datadir}/config.kcfg/urlpicpreview.kcfg +%{_kde4_datadir}/config.kcfg/webpresenceconfig.kcfg + +%post kopete-libs -p /sbin/ldconfig +%postun kopete-libs -p /sbin/ldconfig + +%files kopete-libs +%{_kde4_libdir}/kde4/plugins/accessible/ +%{_kde4_libdir}/libkopete*.so.* +%{_kde4_libdir}/libkyahoo.so* +%{_kde4_libdir}/liboscar.so* + +%files kopete-devel +%{_kde4_includedir}/kopete/ +%{_kde4_libdir}/libkopete*.so + +%post krdc +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + +%posttrans krdc +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: + +%postun krdc +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +fi + +%files krdc -f krdc.lang +%{_kde4_bindir}/krdc +%{_kde4_appsdir}/krdc/ +%{_kde4_datadir}/applications/kde4/krdc.desktop +%{_kde4_datadir}/kde4/services/krdc_*.desktop +%{_kde4_datadir}/kde4/services/rdp.protocol +%{_kde4_datadir}/kde4/services/vnc.protocol +%{_kde4_datadir}/kde4/servicetypes/krdc*.desktop +%{_kde4_iconsdir}/hicolor/*/apps/krdc.* +%{_kde4_libdir}/kde4/kcm_krdc*.so +%{_kde4_datadir}/kde4/services/ServiceMenus/smb2rdc.desktop +%{_kde4_datadir}/config.kcfg/krdc.kcfg +%{_kde4_libdir}/kde4/krdc_*.so +%if 0%{?telepathy:1} +%{_kde4_bindir}/krdc_rfb_approver +%{_kde4_appsdir}/krdc_rfb_approver/ +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.krdc_rfb_approver.service +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.krdc_rfb_handler.service +%{_datadir}/telepathy/clients/krdc_rfb_approver.client +%{_datadir}/telepathy/clients/krdc_rfb_handler.client +%endif + +%post krdc-libs -p /sbin/ldconfig +%postun krdc-libs -p /sbin/ldconfig + +%files krdc-libs +%{_kde4_libdir}/libkrdccore.so.4* + +%files krdc-devel +%{_kde4_includedir}/krdc/ +%{_kde4_libdir}/libkrdccore.so + +%files krfb -f krfb.lang +%{_kde4_bindir}/krfb +%{_kde4_appsdir}/krfb/ +%{_kde4_datadir}/applications/kde4/krfb.desktop +%{_kde4_datadir}/kde4/services/krfb_*.desktop +%{_kde4_datadir}/kde4/servicetypes/krfb*.desktop +%{_kde4_libdir}/kde4/krfb_*.so +%if 0%{?telepathy:1} +%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service +%{_datadir}/telepathy/clients/krfb_rfb_handler.client +%endif + +%post krfb-libs -p /sbin/ldconfig +%postun krfb-libs -p /sbin/ldconfig + +%files krfb-libs +%{_kde4_libdir}/libkrfbprivate.so.4* + + +%changelog +* Fri Oct 31 2014 Than Ngo - 7:4.10.5-8 +- Resolves: CVE-2014-6055 + +* Tue Jan 28 2014 Daniel Mach - 7:4.10.5-7 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 7:4.10.5-6 +- Mass rebuild 2013-12-27 + +* Tue Oct 29 2013 Jan Grulich - 7:4.10.5-5 +- Do not crash if closing one of two vnc connection to the same server +- Resolves #1008890 + +* Fri Aug 30 2013 Than Ngo - 7:4.10.5-4 +- fix dep issue + +* Thu Jul 18 2013 Than Ngo - 7:4.10.5-3 +- disable skype protocol + +* Wed Jul 10 2013 Than Ngo - 7:4.10.5-2 +- drop kppp + +* Thu Jul 04 2013 Than Ngo - 7:4.10.5-1 +- 4.10.5 + +* Thu Jun 27 2013 Than Ngo - 7:4.10.4-2 +- backport freerdp support + +* Sat Jun 01 2013 Rex Dieter - 7:4.10.4-1 +- 4.10.4 +- kopete-4.10.3-1 does not connect to Google Talk (#963310) + +* Mon May 06 2013 Than Ngo - 7: 4.10.3-1 +- 4.10.3 +- enable use_system_iris for all Fedora releases +- BR pkgconfig(iris) >= 2.0.0 + +* Thu May 02 2013 Rex Dieter - 7:4.10.2-6 +- try use_system_iris again (#737305) + +* Wed May 01 2013 Rex Dieter - 7:4.10.2-5 +- revert use_system_iris, needs more work + +* Wed May 01 2013 Rex Dieter - 7:4.10.2-4 +- use system iris (#737305, f20+ only for now) +- .spec cleanup + +* Mon Apr 29 2013 Than Ngo - 7:4.10.2-3 +- build kppp with -fno-strict-aliasing +- fix multilib issue + +* Fri Apr 05 2013 Than Ngo - 7:4.10.2-2 +- fix rhel condition + +* Sun Mar 31 2013 Rex Dieter - 7:4.10.2-1 +- 4.10.2 +- kopete FTBFS against recent kernels, uses deprecated v4l interfaces (#946924) + +* Thu Mar 07 2013 Rex Dieter 7:4.10.1-2 +- KGet 4.10 deletes home (kde#316086) + +* Sat Mar 02 2013 Rex Dieter 7:4.10.1-1 +- 4.10.1 + +* Mon Feb 11 2013 Rex Dieter 7:4.10.0-3 +- support USE_SYSTEM_IRIS build option (not used, yet...) + +* Mon Feb 04 2013 Rex Dieter 7:4.10.0-2 +- Unowned directory /usr/share/kde4/apps/krdc_rfb_approver/ (#907664) + +* Fri Feb 01 2013 Rex Dieter - 7:4.10.0-1 +- 4.10.0 + +* Sun Jan 20 2013 Rex Dieter - 7:4.9.98-1 +- 4.9.98 + +* Fri Jan 18 2013 Adam Tkac - 7:4.9.97-2 +- rebuild due to "jpeg8-ABI" feature drop + +* Fri Jan 04 2013 Rex Dieter - 7:4.9.97-1 +- 4.9.97 + +* Sat Dec 29 2012 Rex Dieter 7:4.9.95-2 +- BR: linphone-devel + +* Thu Dec 20 2012 Rex Dieter - 7:4.9.95-1 +- 4.9.95 + +* Wed Dec 05 2012 Rex Dieter - 7:4.9.90-2 +- BR: strigi-devel +- BR: telepathy-qt4-devel + +* Tue Dec 04 2012 Rex Dieter - 7:4.9.90-1 +- 4.9.90 + +* Mon Dec 03 2012 Than Ngo - 4.9.4-1 +- 4.9.4 + +* Sat Nov 03 2012 Rex Dieter - 7:4.9.3-1 +- 4.9.3 + +* Sat Sep 29 2012 Rex Dieter - 7:4.9.2-1 +- 4.9.2 + +* Mon Sep 03 2012 Than Ngo - 7:4.9.1-1 +- 4.9.1 + +* Tue Aug 21 2012 Than Ngo - 7:4.9.0-3 +- add rhel/fedora condition + +* Wed Aug 15 2012 Alexey Kurov 7:4.9.0-2 +- rebuild for libktorrent-1.3rc1 + +* Thu Jul 26 2012 Lukas Tinkl - 7:4.9.0-1 +- 4.9.0 + +* Thu Jul 19 2012 Fedora Release Engineering - 7:4.8.97-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 11 2012 Rex Dieter - 7:4.8.97-1 +- 4.8.97 + +* Wed Jun 27 2012 Jaroslav Reznik - 7:4.8.95-1 +- 4.8.95 + +* Sat Jun 09 2012 Rex Dieter - 7:4.8.90-1 +- 4.8.90 + +* Sun Jun 03 2012 Jaroslav Reznik - 7:4.8.80-1 +- 4.8.80 + +* Mon Apr 30 2012 Jaroslav Reznik - 7:4.8.3-1 +- 4.8.3 + +* Thu Apr 19 2012 Than Ngo - 4.8.2-2 +- add BR gnutls-devel, it's needed for rfbclient + +* Fri Mar 30 2012 Rex Dieter 4.8.2-1 +- 4.8.2 + +* Thu Mar 08 2012 Rex Dieter 4.8.1-1.1 +- rebuild (libktorrent) + +* Mon Mar 05 2012 Rex Dieter 4.8.1-1 +- 4.8.1 + +* Tue Feb 28 2012 Fedora Release Engineering - 7:4.8.0-2 +- Rebuilt for c++ ABI breakage + +* Sun Jan 22 2012 Rex Dieter - 7:4.8.0-1 +- 4.8.0 + +* Sat Jan 7 2012 Alexey Kurov 7:4.7.97-3 +- rebuild for libktorrent-1.2rc1 + +* Thu Jan 05 2012 Radek Novacek 7:4.7.97-2 +- Fix the patch for g++ 4.7 + +* Wed Jan 04 2012 Rex Dieter - 7:4.7.97-1 +- 4.7.97 +- Fix build failure with g++ 4.7 + +* Wed Dec 21 2011 Radek Novacek - 7:4.7.95-1 +- 4.7.95 + +* Sun Dec 04 2011 Rex Dieter - 7:4.7.90-1 +- 4.7.90 + +* Fri Dec 02 2011 Than Ngo - 7:4.7.80-3 +- fix rhel/fedora condition + +* Mon Nov 28 2011 Jaroslav Reznik 7:4.7.80-2 +- move a11y kopete plugin to -libs + +* Mon Nov 28 2011 Jaroslav Reznik 7:4.7.80-1 +- 4.7.80 (beta 1) + +* Sat Oct 29 2011 Rex Dieter 7:4.7.3-1 +- 4.7.3 +- pkgconfig-style deps + +* Sat Oct 08 2011 Rex Dieter 7:4.7.2-2 +- -kopete: build unconditionally, Requires: kate-part + +* Tue Oct 04 2011 Rex Dieter 7:4.7.2-1 +- 4.7.2 + +* Wed Sep 07 2011 Than Ngo - 7:4.7.1-1 +- 4.7.1 + +* Thu Aug 11 2011 Rex Dieter 7:4.7.0-4 +- -krfb-libs: Requires: -krfb (not main pkg) + +* Fri Aug 05 2011 Rex Dieter 7:4.7.0-3 +- kdenetwork(kopete) FTBFS against qt-4.8.0-beta1 (#724846) + +* Fri Aug 05 2011 Rex Dieter 7:4.7.0-2 +- -common: Obsoletes: kdenetwork-libs + +* Tue Jul 26 2011 Jaroslav Reznik 7:4.7.0-1 +- 4.7.0 +- omit FTBFS kopete for now (#724846) + +* Thu Jul 21 2011 Rex Dieter 7:4.6.95-10 +- kdenetwork split packaging (#724053) + +* Mon Jul 11 2011 Jaroslav Reznik 7:4.6.95-1 +- 4.6.95 (rc2) + +* Mon Jun 27 2011 Radek Novacek 7:4.6.90-1 +- Update to 4.6.90 + +* Mon Jun 27 2011 Radek Novacek 7:4.6.80-1 +- Update to 4.6.80 + +* Fri Apr 29 2011 Rex Dieter 7:4.6.3-1 +- 4.6.3 + +* Wed Apr 20 2011 Than Ngo - 7:4.6.2-2 +- security fix for CVE-2010-1000 + +* Wed Apr 06 2011 Than Ngo - 7:4.6.2-1 +- 4.6.2 + +* Wed Mar 16 2011 Rex Dieter 7:4.6.1-3 +- make qca-ossl dep arch'd +- drop some ancient Obsoletes/Provides + +* Thu Mar 03 2011 Rex Dieter 7:4.6.1-2 +- respin tarball + +* Mon Feb 28 2011 Rex Dieter 7:4.6.1-1 +- 4.6.1 + +* Thu Feb 10 2011 Kevin Kofler - 7:4.6.0-3 +- drop v4l1 support from Kopete, keep v4l2 (F15+, fixes FTBFS, patch by nucleo) + +* Mon Feb 07 2011 Fedora Release Engineering - 7:4.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 21 2011 Jaroslav Reznik - 7:4.6.0-1 +- 4.6.0 + +* Sun Jan 09 2011 Rex Dieter 7:4.5.95-2 +- BR: expat-devel kdebase-devel kdebase-workspace-devel libvncserver-devel nxcl-devel + +* Thu Jan 06 2011 Jaroslav Reznik 7:4.5.95-1 +- 4.5.95 (4.6rc2) + +* Fri Dec 31 2010 Alexey Kurov 7:4.5.90-3 +- patch for building against both libktorrent 1.1 and 1.0.x + +* Thu Dec 30 2010 Alexey Kurov 7:4.5.90-2 +- rebuild for libktorrent-1.1beta1 +- drop libktorrent_stable patch + +* Wed Dec 22 2010 Rex Dieter 7:4.5.90-1 +- 4.5.90 (4.6rc1) + +* Wed Dec 08 2010 Thomas Janssen 7:4.5.85-2 +- respun upstream tarball + +* Sat Dec 04 2010 Thomas Janssen 7:4.5.85-1 +- 4.5.85 (4.6beta2) + +* Mon Nov 22 2010 Kevin Kofler - 7:4.5.80-2 +- reenable KGet libktorrent support and make it build + +* Sun Nov 21 2010 Rex Dieter - 7:4.5.80-1 +- 4.5.80 (4.6beta) + +* Fri Nov 19 2010 Rex Dieter - 7:4.5.3-3 +- Kopete ICQ Plugin complains about wrong password (kde#257008) + +* Fri Nov 05 2010 Thomas Janssen - 7:4.5.3-2 +- rebuild for new libxml2 + +* Sun Oct 31 2010 Than Ngo - 7:4.5.3-1 +- 4.5.3 + +* Sat Oct 02 2010 Rex Dieter - 7:4.5.2-1 +- 4.5.2 + +* Fri Aug 27 2010 Jaroslav Reznik - 7:4.5.1-1 +- 4.5.1 + +* Tue Aug 03 2010 Than Ngo - 7:4.5.0-1 +- 4.5.0