From acad49edefd0e0f7b5cb5272806875749441a303 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Wed, 2 Nov 2016 23:04:57 +1100
Subject: kde-apps/kdepimlibs: backport additional commits from upstream to
 resolve CVE-2016-7966

Gentoo-bug: 596224

Package-Manager: portage-2.3.2
---
 .../kdepimlibs-4.14.11_pre20160211-r2.ebuild       | 66 ++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild

(limited to 'kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild')

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild
new file mode 100644
index 000000000000..222a8be31fad
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+COMMIT_ID="a791b69599c3571ff2f4b1cc9033d8fb30f1bc33"
+SRC_URI="https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.1.6
+	>=dev-libs/boost-1.35.0-r5:=
+	dev-libs/libgpg-error
+	>=dev-libs/libical-0.48-r2:=
+	dev-libs/cyrus-sasl
+	>=dev-libs/qjson-0.8.1
+	kde-apps/akonadi:4
+	media-libs/phonon[qt4]
+	x11-misc/shared-mime-info
+	prison? ( media-libs/prison:4 )
+	ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-runtime-4.4.11.1-r2:4
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
+	"${FILESDIR}/${PN}-CVE-2016-7966-r1.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_doc=$(usex handbook)
+		$(cmake-utils_use_find_package ldap Ldap)
+		$(cmake-utils_use_find_package prison Prison)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# Collides with net-im/choqok
+	rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake || die
+
+	# contains constants/defines only
+	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
+}
-- 
cgit v1.2.3