Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-base/krfb
diff options
context:
space:
mode:
Diffstat (limited to 'kde-base/krfb')
-rw-r--r--kde-base/krfb/ChangeLog8
-rw-r--r--kde-base/krfb/Manifest31
-rw-r--r--kde-base/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch133
-rw-r--r--kde-base/krfb/krfb-4.14.0.ebuild42
4 files changed, 199 insertions, 15 deletions
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index df9ca5783417..bc23e35fea4d 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,12 @@
# 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.323 2014/08/09 11:37:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.324 2014/08/20 16:02:41 johu Exp $
+
+*krfb-4.14.0 (20 Aug 2014)
+
+ 20 Aug 2014; Johannes Huber <johu@gentoo.org> +krfb-4.14.0.ebuild,
+ +files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch:
+ Version bump KDE SC 4.14.0
09 Aug 2014; Johannes Huber <johu@gentoo.org> -krfb-4.12.5.ebuild,
krfb-4.12.5-r1.ebuild:
diff --git a/kde-base/krfb/Manifest b/kde-base/krfb/Manifest
index d1f9df67dccc..4f3ce8177ef5 100644
--- a/kde-base/krfb/Manifest
+++ b/kde-base/krfb/Manifest
@@ -2,26 +2,29 @@
Hash: SHA256
AUX krfb-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch 4795 SHA256 108ca633c41fd6df6537acf95ecca8875b5fb98d87eeb73fdf5554cf862f9297 SHA512 a33f47c552c980eb3f3a025386a21363a1f681641c9cd83636ac27012972573338965544954ff2fa4122d6ccad479c6923fa554ae040ed2902b6d52baf4f4ad2 WHIRLPOOL 3d1c638498941fa4d9935a9c363b34df426718e7c27207b7987201f75f214c63095adc74eb23c1a7e38d9ad5e360559fa20888ddb793b731778d54e26bb3043a
+AUX krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch 4598 SHA256 05d88e11630d5f76fb16ed60cef02ecb4c72d32f1f9796ff1b0436280454c551 SHA512 6c0534ff2675c3c38433b0f196b27b4de5613075bd2615b2dd0d7b97747013b05bbaa3daff32fb3648c389f03d42546e67a6e6dc38e371e9f081720d1de7811b WHIRLPOOL 78f95d7b6cbab7cad8d309ee3242cc1c2176b9cef91e27cf24c3949d5451a9210fa3bef2fde8f27315bec8a1d3f905eb3520ecd636583b6b7d5ab06fde813da2
DIST krfb-4.12.5.tar.xz 467852 SHA256 ddbf0deeff35f2a4ff8bdde5cfd6e0639596439f048ec11988d6e2f3307c2c6b SHA512 ea0e96c243885441caa00e3a3bf49a90c2415030d82a3fc2d73de8be8a2838945952cbec59d90f9118bcfa36afd9b097ecbb1050ae8e05b4afe42c28acb8adb8 WHIRLPOOL 762cd750bb6c0bce3ada0aaba2f168981e3e0dfab2457d931f000a4967fa41d2b1af819fba226ff916ce1afdd41c4f3a874e0a7f74aaf0acea8b149dd5389ab8
DIST krfb-4.13.3.tar.xz 467852 SHA256 d264f294c691e014763e869b5655c7f7006342576a838847e0d9a7ac0ee29de6 SHA512 fa290ea325d11790be51981797b6cdcedb5fbfe489b8dc1359cd33b2dcb24a193a4c926cd65e9222410770462ef8df4658d72e5978567860187b12471dd8aaf4 WHIRLPOOL c11722ead6e0392fdd45aba0ecfe35bfee104fc86b59f50a07adace1a4985b34c429accc1e91fa2ec9c5488bb1ed3afced22d0a2aeb61a900ff5986154bddebf
+DIST krfb-4.14.0.tar.xz 474264 SHA256 4d7a6bd27631e447dfb308cf8f0ba4748bd957d7b4ff0eb20c75cca1f2ef8e6e SHA512 b599257b9eeac95a9f8fb1578705b9941c5b882564336bad4bfd56376503e30416b43f0a99a8ef7cbcae1165129869751592f3dc1a68ac4e73cd47ac7400908e WHIRLPOOL a5325a40935dbe789fa3f9671a7bdb175836299b7abc7900d87828e87a8ef0864555bd82cabf163afca825260a78d9f5baf833fd5a34b7042ec55671e584c89c
EBUILD krfb-4.12.5-r1.ebuild 960 SHA256 c35a3acd7d26e33853a1e797cef7dab9e5ea025319d5f6bbfea9867ad86d20a6 SHA512 535f92ff0d8cbfa0245f283b194f31fc034fce169dfc3a4ec117a533aa41eac9e4fe91b6bc3f047a5aee1aa7ecbc20e3c1e8b2366873b1de7fc6d40930ce5406 WHIRLPOOL b09331a255549bed9e77791a22bb91a7a66a83d086116fee26a7dd9889d019acf859b79584de5e17c828e144c8d401e4e674a119e879f360ac15e4b4148a8b4a
EBUILD krfb-4.13.3-r1.ebuild 979 SHA256 9e9e9b79785a93e0dc1169c9899e62462df82b7c1035c791a971a028c6bde6b6 SHA512 f8866baa7190a080fbfc99d07d913a248a54085ac81ef10cbc99f6a9c5d888f8fe8d65ae244c895e49da0ea6d3f7f51bb95e1142b9b1a8401eaf67242f3162c0 WHIRLPOOL c573bf5010b7ec42d268e0ad1d63f954eafd632994ca57a89c8a0fef4c0448d18d000726db3b95217dcc7ec5ae1a83b23819398baab3708eb6f16e752a7b280b
-MISC ChangeLog 36695 SHA256 36cd03a60c966c12dc3f92acb5574c11768963b76ea5197a39632d7d1b5ec611 SHA512 8012fdfaa144351b345c760e6a73d4426250509fe552e495d552139f48b5cec9465fdb2593d120ab311a64297326664afe9dfbfc165dc820f738e7daf0019583 WHIRLPOOL 3a7f939a35ccf4b3d7eef9c6a5d423ec2c77666fa88bc51296f8c1297200b9d2f10d878e3affba0ce62bfea9bf135897341482d9de769fa3d4a88af00c8f700e
+EBUILD krfb-4.14.0.ebuild 975 SHA256 6406ae78946d263ec43447164b7c6c03ccdd381503f984dbd6f98848f50340af SHA512 d84ec50fb0bd1cbf4cd394a4a3d2b4912b9b0fe147e3bc68b724bbce95b5c342866c267b7beb19add15bf9e5146cdfa2098f92623f127828895730cf49085918 WHIRLPOOL 499233911efde32f4bba237827c282eea123c027369768e48723704c5333dd74101c148469a275810ae3ccd3369614d107087c1aa92ac59ae7b14bbcd1214260
+MISC ChangeLog 36886 SHA256 0c8ddffe06114ce9fe3d50c52f8f9cced2d929dcd350052ff0c0e9e0607a4c50 SHA512 355618a4c1b5053da1fb0503aac620c1014b7f07bedb6ae2150be2d82f292603e08aa770711269cc2501f3ebed6257602487bf1d04d37a304421c4f078470f7c WHIRLPOOL 91f7bcd866604054560cf5933e32bcfe8c15845b371d9f74c9eaf23074a58e3a4043ad3657ecf5396b897572dcef458e20ff324a4d80012ac2fa82d94f9e94e1
MISC metadata.xml 250 SHA256 36acd199b95ccbe518e598d952522358044d2c1aca8a35f1b76a91d6309259b9 SHA512 c943e28cc6151d9a668704b895ec01d8be4661761142764320e7fc9dcd26f1b349eb4d6fa6101fa63172141a12cdd0c0bb2ade649958de58d6a6bef1b47cfc61 WHIRLPOOL 33fa8923d34970a6441ebca1e491d380fe1a8f35231f17a4ea4a84fc2898c27cd8c45eb621b6585cd64fb8702e1379ba43fb644561c50f62e4962ab6b9c0fcae
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJT5ggXAAoJEGVpnaTzz9K924YP/A9cbYg59XnqGDi9jT+Smeo5
-yhdQZ0aBCjztgexstUGHtQkyYCTcCu+k9PNiwhQ5NBdylMPsGeaN3onE8cx3gU3h
-vtkqGDlWU+j7pKjSDG6+Cvf37mx6ulJwZt8OldvIWp2EnaIU1a46pwnJe0MK0zE+
-pTXZt/ovRhx7mJWzeVxPxfEHIRVGkzdAotBqP77UibHUc0ZoJeRc2YKN5tIH4Q3Z
-WJVv/rxzKCn6JwiIamS1JrJVO4ZEKFuq0/R5CpHRMHJ9nJmW4UdauEA9tKa897ry
-feAtpsoLZrGqyjA5eUSw17ar9QCN38IIaNnymnnudrlOHUR7P/Y3Hhf4Xea1wXO2
-Uo2STaqQI2p4y956LXnwgI2qRVdNHlqL8Lk5vvuVQL7F5boLWgUexg7dx03Vt8/C
-jPWzMmtHuja5ZaN74Rw2Yai68Pd+JSA3pNux60IZgP20AW1OGjaiX3cBVUTC1G57
-g03uhj+DLUY0BOs6IXMMoJX+tV1VnRx65LMKLju1MKTPisSWgVGad6feV0W/Qsfn
-CEpO3Ywak2BuL4MvWFO7tAOkpU1jxhksWDFsux4nWWPUS1NYHXB0Cf4+XGwVfowX
-hdYccN6coIpuX87+3MXmbQmT++WA8m0/j7hQ/rb3lr/y+DRDKG0f2QCjpY6d+zRK
-Cl/0MC+fCtn/3pKSsp2u
-=0U60
+iQIcBAEBCAAGBQJT9MbgAAoJEGVpnaTzz9K9dm0QAK6x3HLvs/1PIJzoKKNxX6bj
+8Sb9VnGgxTfHI78QhamyO+unEBwPIKrGuu1DxeRiQdpSJJbjLVLI2V8cOuSCo2Hf
+njA51Z8AelHcGFqBKA+JP8NEQKHYEWfVRM0Z5cx/M0ORV05XA+CVOlm2H5Qw6cs8
+BjqNfQ61C3ottxZXvBBODNBkZUFjHO8StVXk0PmPRpouXKVd67zpI7oOBeBr5eY0
+Ce6004djpsBDKvljbaHshMOGh+KMLJ2Fpo3DAfHkSqx67K93JvcwmNFIaGwYOeCP
+YwGQSx9YrzipbcF1W/REIlKzTiJDYPsH3HIJCUSeCPpRxotgi1Q8Wuv0kAaANGe4
+RYapx7PKGNiqh1bzXwRFnLIN3yL13F4zODXdQoZrGFFD9udKpUGOsJjBCoTt0tKK
+KbK7WlxCeyCSO6wv4P2J7Ked3so+trFQPf5Z5mkZIhaRuNON3swj2+Hj8VD1SqCp
+7Ln7aOgvmD2XE5gQSGWxse79X2hQXqvV1LdJbyb5VhnJ6LRwAl9Xbs2rVooRtX7I
+2wB8zrSsANkd+vnNCobRZPcyxS+7d9PiUSUVr5ouBSFbanq34fbUfkFFIk9TOZRO
+ZGxNbdGRhwlCWUtRR65KVUO8mga7twmtYUr2nMCY2RfLidnJdezrmq2QERAHSA8o
+e0wqdvaUePm6jKA0uiR+
+=LIW8
-----END PGP SIGNATURE-----
diff --git a/kde-base/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch b/kde-base/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch
new file mode 100644
index 000000000000..202519b9f152
--- /dev/null
+++ b/kde-base/krfb/files/krfb-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch
@@ -0,0 +1,133 @@
+From 766fc7694a58b7e01c003356db94276f07b791b5 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 | 7 +++---
+ cmake/modules/FindLibVNCServer.cmake | 41 ++++++++++++++++++++++++++++++++++++
+ krfb/CMakeLists.txt | 2 ++
+ krfb/rfb.h | 2 +-
+ 4 files changed, 47 insertions(+), 5 deletions(-)
+ create mode 100644 cmake/modules/FindLibVNCServer.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4aa24dd..0b29da0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,6 +32,8 @@ set(CMAKE_MODULE_PATH
+ ${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.")
+
+@@ -44,8 +46,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)
+@@ -54,9 +54,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 a65eea8..100b49b 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
+@@ -103,6 +104,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.14.0.ebuild b/kde-base/krfb/krfb-4.14.0.ebuild
new file mode 100644
index 000000000000..259dc1425742
--- /dev/null
+++ b/kde-base/krfb/krfb-4.14.0.ebuild
@@ -0,0 +1,42 @@
+# 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.14.0.ebuild,v 1.1 2014/08/20 16:02:41 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}"
+
+src_prepare() {
+ # bug 518824, patch before eclass magic
+ epatch "${FILESDIR}/${PN}-4.14.0-CVE-2014-4607-unbundle-libvncserver.patch"
+
+ kde4-base_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_with telepathy TelepathyQt4)
+ )
+
+ kde4-base_src_configure
+}