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 7F77A1396D0 for ; Mon, 11 Sep 2017 17:37:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DBBEE1FC08C; Mon, 11 Sep 2017 17:37:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A96BF1FC08C for ; Mon, 11 Sep 2017 17:37:47 +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 85BCD341799 for ; Mon, 11 Sep 2017 17:37:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BEA29079 for ; Mon, 11 Sep 2017 17:37:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1505151452.ba7ccf31e3da9b82f8dac073ef4eece87b72a43d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/libwpd/files/, app-text/libwpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch app-text/libwpd/libwpd-0.10.1-r1.ebuild X-VCS-Directories: app-text/libwpd/files/ app-text/libwpd/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ba7ccf31e3da9b82f8dac073ef4eece87b72a43d X-VCS-Branch: master Date: Mon, 11 Sep 2017 17:37:44 +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-Archives-Salt: d51eef9a-4728-48c7-bfa6-da6cd3fbe9a1 X-Archives-Hash: 87a665daaf482806df1fd1cabfb9f7a0 commit: ba7ccf31e3da9b82f8dac073ef4eece87b72a43d Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 11 17:35:21 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Sep 11 17:37:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba7ccf31 app-text/libwpd: Security revbump for CVE-2017-14226 Package-Manager: Portage-2.3.6, Repoman-2.3.1 .../files/libwpd-0.10.1-CVE-2017-14226.patch | 50 ++++++++++++++++++++ app-text/libwpd/libwpd-0.10.1-r1.ebuild | 53 ++++++++++++++++++++++ 2 files changed, 103 insertions(+) diff --git a/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch b/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch new file mode 100644 index 00000000000..4a5c0df922f --- /dev/null +++ b/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch @@ -0,0 +1,50 @@ +Gentoo-bug: 630682 (CVE-2017-14226) + +Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1 +Reviewed-on: https://gerrit.libreoffice.org/42054 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +Tested-by: Caolán McNamara + +--- a/src/lib/WP5StylesListener.cpp ++++ b/src/lib/WP5StylesListener.cpp +@@ -85,8 +85,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { +--- a/src/lib/WP42StylesListener.cpp ++++ b/src/lib/WP42StylesListener.cpp +@@ -84,8 +84,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { +--- a/src/lib/WP1StylesListener.cpp ++++ b/src/lib/WP1StylesListener.cpp +@@ -83,8 +83,9 @@ + m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0); + m_currentPage.setPageSpan(1); + +- for (std::vector::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin(); +- HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter) ++ std::vector headerFooterList = m_nextPage.getHeaderFooterList(); ++ for (std::vector::const_iterator HFiter = headerFooterList.begin(); ++ HFiter != headerFooterList.end(); ++HFiter) + { + if ((*HFiter).getOccurrence() != NEVER) + { diff --git a/app-text/libwpd/libwpd-0.10.1-r1.ebuild b/app-text/libwpd/libwpd-0.10.1-r1.ebuild new file mode 100644 index 00000000000..62f8a7d31f2 --- /dev/null +++ b/app-text/libwpd/libwpd-0.10.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit alternatives + +DESCRIPTION="WordPerfect Document import/export library" +HOMEPAGE="http://libwpd.sf.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + +LICENSE="|| ( LGPL-2.1 MPL-2.0 )" +SLOT="0.10" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~x86 ~x86-fbsd" +IUSE="doc +tools" + +RDEPEND="dev-libs/librevenge" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( "${FILESDIR}/${P}-CVE-2017-14226.patch" ) + +src_configure() { + econf \ + --disable-static \ + --disable-werror \ + $(use_with doc docs) \ + $(use_enable tools) \ + --program-suffix=-${SLOT} +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if use tools; then + alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]" + alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]" + alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]" + fi +} + +pkg_postrm() { + if use tools; then + alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]" + alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]" + alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]" + fi +}