Revision bump unbundles libvncserver, bug #515276.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

4 files changed, 188 insertions, 2 deletions

diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index 84793b58c1bf..21caa648508e 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/krfb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.317 2014/07/23 16:53:05 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.318 2014/07/31 20:46:59 johu Exp $
+
+*krfb-4.12.5-r1 (31 Jul 2014)
+*krfb-4.13.3-r1 (31 Jul 2014)
+
+  31 Jul 2014; Johannes Huber <johu@gentoo.org>
+  +files/krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch,
+  +krfb-4.12.5-r1.ebuild, +krfb-4.13.3-r1.ebuild, -krfb-4.13.3.ebuild:
+  Revision bump unbundles libvncserver, bug #515276.
 
   23 Jul 2014; Johannes Huber <johu@gentoo.org> -krfb-4.13.2.ebuild:
   Remove KDE SC 4.13.2
diff --git a/kde-base/krfb/files/krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch b/kde-base/krfb/files/krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch
new file mode 100644
index 000000000000..32d91a80e823
--- /dev/null
+++ b/kde-base/krfb/files/krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch
@@ -0,0 +1,138 @@
+From 08f7c0c3d122f6096408007a0ac44c586c1c36b7 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 31 Jul 2014 19:41:01 +0200
+Subject: [PATCH] CVE-2014-4607: Unbundle libvncserver
+
+http://seclists.org/oss-sec/2014/q2/676
+
+REVIEW: 119548
+---
+ CMakeLists.txt                       | 12 +++++++----
+ cmake/modules/FindLibVNCServer.cmake | 41 ++++++++++++++++++++++++++++++++++++
+ krfb/CMakeLists.txt                  |  2 ++
+ krfb/rfb.h                           |  2 +-
+ 4 files changed, 52 insertions(+), 5 deletions(-)
+ create mode 100644 cmake/modules/FindLibVNCServer.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 78c19b3..7b0af64 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,13 @@ if(NOT INSIDE_KDENETWORK)
+     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 +42,6 @@ macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM)
+ 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 +50,8 @@ if(Q_WS_X11)
+   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/cmake/modules/FindLibVNCServer.cmake b/cmake/modules/FindLibVNCServer.cmake
+new file mode 100644
+index 0000000..5927ab2
+--- /dev/null
++++ b/cmake/modules/FindLibVNCServer.cmake
+@@ -0,0 +1,41 @@
++# cmake macro to test LIBVNCSERVER LIB
++
++# Copyright (c) 2006, Alessandro Praduroux <pradu@pradu.it>
++# Copyright (c) 2007, Urs Wolfer <uwolfer @ kde.org>
++#
++# 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 --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt
+index bbc508d..08ee30c 100644
+--- a/krfb/CMakeLists.txt
++++ b/krfb/CMakeLists.txt
+@@ -20,6 +20,7 @@ target_link_libraries (krfbprivate
+                        ${QT_QTCORE_LIBRARY}
+                        ${QT_QTGUI_LIBRARY}
+                        ${X11_X11_LIB}
++                       ${LIBVNCSERVER_LIBRARIES}
+ )
+ 
+ set_target_properties (krfbprivate PROPERTIES
+@@ -104,6 +105,7 @@ target_link_libraries (krfb
+                        ${QT_QTNETWORK_LIBRARY}
+                        ${KDE4_KDNSSD_LIBS}
+                        ${KDE4_KDEUI_LIBS}
++                       ${LIBVNCSERVER_LIBRARIES}
+ )
+ 
+ if(TelepathyQt4_FOUND)
+diff --git a/krfb/rfb.h b/krfb/rfb.h
+index 40308a2..fa94eda 100644
+--- a/krfb/rfb.h
++++ b/krfb/rfb.h
+@@ -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
+-- 
+2.0.2
+
diff --git a/kde-base/krfb/krfb-4.12.5-r1.ebuild b/kde-base/krfb/krfb-4.12.5-r1.ebuild
new file mode 100644
index 000000000000..5e20a4d9d165
--- /dev/null
+++ b/kde-base/krfb/krfb-4.12.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.12.5-r1.ebuild,v 1.1 2014/07/31 20:46:59 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="VNC-compatible server to share KDE desktops"
+HOMEPAGE="http://www.kde.org/applications/system/krfb/"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug telepathy"
+
+DEPEND="
+	>=net-libs/libvncserver-0.9.9
+	sys-libs/zlib
+	virtual/jpeg:0
+	!aqua? (
+		x11-libs/libX11
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXtst
+	)
+	telepathy? ( >=net-libs/telepathy-qt-0.9 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2014-4607-unbundle-libvncserver.patch" )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with telepathy TelepathyQt4)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/krfb/krfb-4.13.3.ebuild b/kde-base/krfb/krfb-4.13.3-r1.ebuild
index fe272d342d32..9e8b194961b7 100644
--- a/kde-base/krfb/krfb-4.13.3.ebuild
+++ b/kde-base/krfb/krfb-4.13.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.13.3.ebuild,v 1.1 2014/07/16 17:41:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.13.3-r1.ebuild,v 1.1 2014/07/31 20:46:59 johu Exp $
 
 EAPI=5
 
@@ -13,6 +13,7 @@ KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug telepathy"
 
 DEPEND="
+	>=net-libs/libvncserver-0.9.9
 	sys-libs/zlib
 	virtual/jpeg:0
 	!aqua? (
@@ -25,6 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with telepathy TelepathyQt4)