commit: 6f492d0793709293271563e8ee7453b0a096187f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Feb 7 19:54:38 2023 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Feb 7 20:08:56 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f492d07
media-libs/exempi: Cleanup vulnerable 2.4.5-r1 Bug: https://bugs.gentoo.org/878757 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/exempi/Manifest | 1 - media-libs/exempi/exempi-2.4.5-r1.ebuild | 61 ---------------------- .../exempi/files/exempi-2.4.5-CVE-2018-12648.patch | 42 --------------- media-libs/exempi/files/exempi-2.4.5-gcc11.patch | 11 ---- 4 files changed, 115 deletions(-) diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest index 7094e24be0f7..c470d9f1e4a4 100644 --- a/media-libs/exempi/Manifest +++ b/media-libs/exempi/Manifest @@ -1,3 +1,2 @@ -DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c DIST exempi-2.6.2.tar.bz2 3709476 BLAKE2B 3b65db1f9e7c2bf050af6e273b8327d70e23d3321d3c280ddf8b36b467e2822b12f93cb14d8d342e2a2974a9b745f13fd98c79d9b67e634da5bc9b5ae71e4918 SHA512 c81c7a5bad1a294ce253d1471c00740679b7fb489658ead68a6892b701cc02a031a5dc69d70045a8276e1e19c716df88e92014df4c2809266a71ff05de9ad57a DIST exempi-2.6.3.tar.xz 2842408 BLAKE2B a3deb86a12161f4a1b7c0bacc4e6b59a5e54df4e5c158b48c8d66dc968e5fb1e210a9fac73e85720b43e9090c38a7023e771054e63a57c618385bb02a525d89e SHA512 517dba7534ac6978083338d3c3bf184c9b0a56e625e714703da71b064b68a8872bdd66673be27a192e7e6a22b9acd8eb1ad447c2a807f564547e765c63fbd2b4 diff --git a/media-libs/exempi/exempi-2.4.5-r1.ebuild b/media-libs/exempi/exempi-2.4.5-r1.ebuild deleted file mode 100644 index 9d36d341cc38..000000000000 --- a/media-libs/exempi/exempi-2.4.5-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Port of the Adobe XMP SDK to work on UNIX" -HOMEPAGE="https://libopenraw.freedesktop.org/wiki/Exempi"; -SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="2/3" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/expat-2:= - sys-libs/zlib - virtual/libiconv" -DEPEND=" - ${RDEPEND} - test? ( dev-libs/boost )" -BDEPEND=" - sys-devel/autoconf-archive - sys-devel/gettext" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.2-iconv.patch - "${FILESDIR}"/${P}-CVE-2018-12648.patch - "${FILESDIR}"/${P}-gcc11.patch -) - -src_prepare() { - default - - config_rpath_update . - eautoreconf -} - -src_configure() { - # Valgrind detection is "disabled" due to bug #295875 - econf \ - --disable-static \ - $(use_enable test unittest) \ - VALGRIND="" -} - -src_install() { - default - - if use examples; then - emake -C samples/source distclean - rm samples/{,source,testfiles}/Makefile* || die - docinto examples - dodoc -r samples/. - fi - - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch b/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch deleted file mode 100644 index 36f0d0734350..000000000000 --- a/media-libs/exempi/files/exempi-2.4.5-CVE-2018-12648.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001 -From: Victor Rodriguez <[email protected]> -Date: Sat, 18 Aug 2018 13:54:55 +0000 -Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The WEBP::GetLE32 function in -XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a -NULL pointer dereference. - -https://bugs.freedesktop.org/show_bug.cgi?id=106981 -https://gitlab.freedesktop.org/libopenraw/exempi/issues/9 - -Signed-off-by: Victor Rodriguez <[email protected]> -Signed-off-by: Hubert Figuière <[email protected]> ---- - XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp -index ffaf220..4fe705b 100644 ---- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp -+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp -@@ -160,9 +160,11 @@ bool VP8XChunk::xmp() - } - void VP8XChunk::xmp(bool hasXMP) - { -- XMP_Uns32 flags = GetLE32(&this->data[0]); -- flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT); -- PutLE32(&this->data[0], flags); -+ if (&this->data[0] != NULL) { -+ XMP_Uns32 flags = GetLE32(&this->data[0]); -+ flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT); -+ PutLE32(&this->data[0], flags); -+ } - } - - Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler) --- -2.18.0 diff --git a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch b/media-libs/exempi/files/exempi-2.4.5-gcc11.patch deleted file mode 100644 index 259c05d5cbd2..000000000000 --- a/media-libs/exempi/files/exempi-2.4.5-gcc11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/XMPFiles/source/FormatSupport/P2_Support.hpp -+++ b/XMPFiles/source/FormatSupport/P2_Support.hpp -@@ -79,7 +79,7 @@ - }; // class P2_Clip - struct P2SpannedClip_Order - { -- bool operator()( P2_Clip* lhs, P2_Clip* rhs) -+ bool operator()( P2_Clip* lhs, P2_Clip* rhs) const - { - return lhs->GetOffsetInShot() < rhs->GetOffsetInShot(); - }
