From 901f13f120e4576579749f4c68c142401ccb4354 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 11 2014 14:45:52 +0000 Subject: import kdenetwork-4.10.5-8.el7_0 --- 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/SPECS/kdenetwork.spec b/SPECS/kdenetwork.spec index 497f155..b285a13 100644 --- a/SPECS/kdenetwork.spec +++ b/SPECS/kdenetwork.spec @@ -3,7 +3,7 @@ Summary: KDE Network Applications Name: kdenetwork Epoch: 7 Version: 4.10.5 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 URL: http://www.kde.org @@ -38,6 +38,7 @@ Patch53: kdenetwork-4.10.5-krdc-bz#1008890.patch Patch100: kdenetwork-4.10.5-freerdp.patch ## security patches +Patch1000: kdenetwork-4.10.5-CVE-2014-6055.patch %if 0%{?fedora} BuildRequires: openslp-devel @@ -232,6 +233,7 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release} %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 \ @@ -491,6 +493,9 @@ fi %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