commit: 2a9c1691cbf9d3697e3aceb12d697b7987747023 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Feb 14 17:09:15 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 14 18:36:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9c1691
media-libs/taglib: Drop 1.11.1-r1 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/taglib/Manifest | 1 - .../files/taglib-1.11.1-CVE-2017-12678.patch | 30 ----------- media-libs/taglib/metadata.xml | 3 -- media-libs/taglib/taglib-1.11.1-r1.ebuild | 58 ---------------------- 4 files changed, 92 deletions(-) diff --git a/media-libs/taglib/Manifest b/media-libs/taglib/Manifest index d83fc6fa89d..22540a0665a 100644 --- a/media-libs/taglib/Manifest +++ b/media-libs/taglib/Manifest @@ -1,2 +1 @@ -DIST taglib-1.11.1.tar.gz 1261620 BLAKE2B b33212df2a63d8d6bbca62b175812ec52783fdbfed8fb7bc5dedde845ac01e4f89a64d96b231e1db1e5e609e84dd84d83a2266c1f9ed371f1fad7ffca50486ac SHA512 7846775c4954ea948fe4383e514ba7c11f55d038ee06b6ea5a0a1c1069044b348026e76b27aa4ba1c71539aa8143e1401fab39184cc6e915ba0ae2c06133cb98 DIST taglib-1.11.1_p20181028.tar.gz 1299993 BLAKE2B d281873a87742ba417ea764bb01f9a4c5553a4624d2c257dd82bbb2f0b7e3103ab6ca253f78c0167908f449aac833873ca1cce6f24b1eb5f608131382833262a SHA512 e26439b65ab579455f79e87a94c33a98e17209b31a19b531e5964a2c0ded395c35067655e31ad22b6205149e2e920d7bd145993f064d3ad13e1de8a9f7e37256 diff --git a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch b/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch deleted file mode 100644 index 4b567da1982..00000000000 --- a/media-libs/taglib/files/taglib-1.11.1-CVE-2017-12678.patch +++ /dev/null @@ -1,30 +0,0 @@ -From eb9ded1206f18f2c319157337edea2533a40bea6 Mon Sep 17 00:00:00 2001 -From: "Stephen F. Booth" <[email protected]> -Date: Sun, 23 Jul 2017 10:11:09 -0400 -Subject: [PATCH] Don't assume TDRC is an instance of TextIdentificationFrame - -If TDRC is encrypted, FrameFactory::createFrame() returns UnknownFrame -which causes problems in rebuildAggregateFrames() when it is assumed -that TDRC is a TextIdentificationFrame ---- - taglib/mpeg/id3v2/id3v2framefactory.cpp | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp -index 759a9b7be..9347ab869 100644 ---- a/taglib/mpeg/id3v2/id3v2framefactory.cpp -+++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp -@@ -334,10 +334,11 @@ void FrameFactory::rebuildAggregateFrames(ID3v2::Tag *tag) const - tag->frameList("TDAT").size() == 1) - { - TextIdentificationFrame *tdrc = -- static_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); -+ dynamic_cast<TextIdentificationFrame *>(tag->frameList("TDRC").front()); - UnknownFrame *tdat = static_cast<UnknownFrame *>(tag->frameList("TDAT").front()); - -- if(tdrc->fieldList().size() == 1 && -+ if(tdrc && -+ tdrc->fieldList().size() == 1 && - tdrc->fieldList().front().size() == 4 && - tdat->data().size() >= 5) - { diff --git a/media-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml index cabb8e8cf5a..0d251d573cf 100644 --- a/media-libs/taglib/metadata.xml +++ b/media-libs/taglib/metadata.xml @@ -5,9 +5,6 @@ <email>[email protected]</email> <name>Gentoo KDE Project</name> </maintainer> - <use> - <flag name="boost">Use <pkg>dev-libs/boost</pkg> instead of GCC built-ins</flag> - </use> <upstream> <remote-id type="github">taglib/taglib</remote-id> </upstream> diff --git a/media-libs/taglib/taglib-1.11.1-r1.ebuild b/media-libs/taglib/taglib-1.11.1-r1.ebuild deleted file mode 100644 index ac42c4b3bf4..00000000000 --- a/media-libs/taglib/taglib-1.11.1-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-multilib flag-o-matic - -DESCRIPTION="A library for reading and editing audio meta data" -HOMEPAGE="https://taglib.github.io/"; -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 MPL-1.1" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -SLOT="0" -IUSE="boost debug examples test" - -RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - boost? ( dev-libs/boost:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.11-install-examples.patch - "${FILESDIR}"/${P}-CVE-2017-12678.patch -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/taglib-config -) - -src_prepare() { - cmake-utils_src_prepare - - sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \ - -i CMakeLists.txt \ - -i ConfigureChecks.cmake || die - - # bug 651744 - append-cxxflags -std=c++11 -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=$(multilib_native_usex examples) - $(cmake-utils_use_find_package boost Boost) - -DBUILD_SHARED_LIBS=ON - -DBUILD_TESTS=$(usex test) - ) - - cmake-utils_src_configure -} - -multilib_src_test() { - # ctest does not work - emake -C "${BUILD_DIR}" check -}
