From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B02D138334 for ; Wed, 27 Feb 2019 12:44:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C9CBE08FA; Wed, 27 Feb 2019 12:44:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0ADF8E08FA for ; Wed, 27 Feb 2019 12:44:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DEE7C33D7E3 for ; Wed, 27 Feb 2019 12:44:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6BA8569 for ; Wed, 27 Feb 2019 12:43:57 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1551271184.ca5f5ea5804f18ff2915a4dec97e80400d94419c.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch X-VCS-Directories: gnome-extra/evolution-data-server/files/ gnome-extra/evolution-data-server/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: ca5f5ea5804f18ff2915a4dec97e80400d94419c X-VCS-Branch: master Date: Wed, 27 Feb 2019 12:43:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d6553d15-27a5-4a2f-89b2-df710ebea0cc X-Archives-Hash: cb891c0cf2ebb37024608b2cf52a6981 commit: ca5f5ea5804f18ff2915a4dec97e80400d94419c Author: Mart Raudsepp gentoo org> AuthorDate: Wed Feb 27 12:09:20 2019 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Wed Feb 27 12:39:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5f5ea5 gnome-extra/evolution-data-server: fix libgdata enabling logic, backport a patch ENABLE_GOOGLE needs to be enabled if GOA or OAUTH2 to support google tasks/calendars, not OAUTH2. Backport a patch that is needed by a evolution-ews certificate checking security fix. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> .../evolution-data-server-3.30.5-r1.ebuild | 153 +++++++++++++++++++++ .../files/3.30.5-collection-auth.patch | 35 +++++ 2 files changed, 188 insertions(+) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild new file mode 100644 index 00000000000..df09ff1a91b --- /dev/null +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.30.5-r1.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) +VALA_USE_DEPEND="vapigen" + +inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx + +DESCRIPTION="Evolution groupware backend" +HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" + +# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". +LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" +SLOT="0/62" # subslot = libcamel-1.2 soname version + +IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks +# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512 +# >=libical-3.0.2 present at build-time ensures less memory usage by calendar backend +gdata_depend=">=dev-libs/libgdata-0.17.7:=" +RDEPEND=" + >=app-crypt/gcr-3.4 + >=app-crypt/libsecret-0.5[crypt] + >=dev-db/sqlite-3.7.17:= + >=dev-libs/glib-2.46:2 + >=dev-libs/libical-3.0.2:= + >=dev-libs/libxml2-2 + >=dev-libs/nspr-4.4:= + >=dev-libs/nss-3.9:= + >=net-libs/libsoup-2.42:2.4 + + dev-libs/icu:= + sys-libs/zlib:= + virtual/libiconv + + berkdb? ( >=sys-libs/db-4:= ) + gtk? ( + >=app-crypt/gcr-3.4[gtk] + >=x11-libs/gtk+-3.10:3 + >=media-libs/libcanberra-0.25[gtk3] + ) + oauth? ( + >=dev-libs/json-glib-1.0.4 + >=net-libs/webkit-gtk-2.11.91:4 + ${gdata_depend} + ) + gnome-online-accounts? ( + >=net-libs/gnome-online-accounts-3.8:= + ${gdata_depend} ) + introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) + kerberos? ( virtual/krb5:= ) + ldap? ( >=net-nds/openldap-2:= ) + weather? ( >=dev-libs/libgweather-3.10:2= ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + dev-util/gdbus-codegen + dev-util/glib-utils + dev-util/gperf + gtk-doc? ( >=dev-util/gtk-doc-1.14 ) + >=dev-util/intltool-0.35.5 + >=sys-devel/gettext-0.18.3 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +# Some tests fail due to missing locales. +# Also, dbus tests are flaky, bugs #397975 #501834 +# It looks like a nightmare to disable those for now. +RESTRICT="test !test? ( test )" + +pkg_setup() { + python-any-r1_pkg_setup +} + +# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call +src_prepare() { + eapply "${FILESDIR}"/${PV}-collection-auth.patch # Prerequisite for evolution-ews cert checking fix + use vala && vala_src_prepare + cmake-utils_src_prepare + gnome2_src_prepare + + # Make CMakeLists versioned vala enabled + sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ + -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \ + -i "${S}"/CMakeLists.txt || die +} + +src_configure() { + # /usr/include/db.h is always db-1 on FreeBSD + # so include the right dir in CPPFLAGS + use berkdb && append-cppflags "-I$(db_includedir)" + + local google_enable + if use oauth || use gnome-online-accounts; then + google_enable="ON" + else + google_enable="OFF" + fi + + # phonenumber does not exist in tree + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DENABLE_GTK_DOC=$(usex gtk-doc) + -DWITH_PRIVATE_DOCS=$(usex gtk-doc) + -DENABLE_SCHEMAS_COMPILE=OFF + -DENABLE_INTROSPECTION=$(usex introspection) + -DWITH_KRB5=$(usex kerberos) + -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "") + -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "") + -DWITH_OPENLDAP=$(usex ldap) + -DWITH_PHONENUMBER=OFF + -DENABLE_SMIME=ON + -DENABLE_GTK=$(usex gtk) + -DENABLE_CANBERRA=$(usex gtk) + -DENABLE_OAUTH2=$(usex oauth) + -DENABLE_EXAMPLES=OFF + -DENABLE_GOA=$(usex gnome-online-accounts) + -DENABLE_UOA=OFF + -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF) + # ENABLE_BACKTRACES requires libdwarf ? + -DENABLE_IPV6=$(usex ipv6) + -DENABLE_WEATHER=$(usex weather) + -DENABLE_GOOGLE=${google_enable} + -DENABLE_LARGEFILE=ON + -DENABLE_VALA_BINDINGS=$(usex vala) + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_test() { + virtx cmake-utils_src_test +} + +src_install() { + cmake-utils_src_install + + if use ldap; then + insinto /etc/openldap/schema + doins "${FILESDIR}"/calentry.schema + dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema + fi +} diff --git a/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch b/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch new file mode 100644 index 00000000000..5d1c2780162 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/3.30.5-collection-auth.patch @@ -0,0 +1,35 @@ +From 6672b8236139bd6ef41ecb915f4c72e2a052dba5 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 4 Dec 2018 18:19:30 +0100 +Subject: [PATCH] Let child source with 'none' authentication method use + collection source authentication + +That might be the same as having set NULL authentication method. + +Related to https://gitlab.gnome.org/GNOME/evolution-ews/issues/27 +--- + src/libedataserver/e-data-server-util.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/libedataserver/e-data-server-util.c b/src/libedataserver/e-data-server-util.c +index 47fd4d2ec..bd209c980 100644 +--- a/src/libedataserver/e-data-server-util.c ++++ b/src/libedataserver/e-data-server-util.c +@@ -3259,11 +3259,13 @@ e_util_can_use_collection_as_credential_source (ESource *collection_source, + if (can_use_collection) { + gchar *method_source, *method_collection; + +- /* Also check the method; if different, then rather not use the collection */ ++ /* Also check the method; if different, then rather not use the collection. ++ Consider 'none' method on the child as the same as the collection method. */ + method_source = e_source_authentication_dup_method (auth_source); + method_collection = e_source_authentication_dup_method (auth_collection); + + can_use_collection = !method_source || !method_collection || ++ g_ascii_strcasecmp (method_source, "none") == 0 || + g_ascii_strcasecmp (method_source, method_collection) == 0; + + g_free (method_source); +-- +2.17.0 +