commit: d1b1bca53fca7815fba48028f5c1eaa746b0908e Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sat Mar 18 16:43:05 2023 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Mar 18 16:43:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b1bca5
media-libs/libextractor: treeclean Bug: https://bugs.gentoo.org/247394 Closes: https://bugs.gentoo.org/767247 Closes: https://bugs.gentoo.org/834382 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-libs/libextractor/Manifest | 1 - .../files/libextractor-1.8-exiv2-0.27.patch | 127 --------------------- .../files/libextractor-1.9-CVE-2019-15531.patch | 15 --- media-libs/libextractor/libextractor-1.9-r5.ebuild | 118 ------------------- media-libs/libextractor/metadata.xml | 13 --- profiles/package.mask | 12 -- 6 files changed, 286 deletions(-) diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest deleted file mode 100644 index 0f0692e6fa95..000000000000 --- a/media-libs/libextractor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149 diff --git a/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch b/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch deleted file mode 100644 index cfdb6426408d..000000000000 --- a/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch +++ /dev/null @@ -1,127 +0,0 @@ -From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlech...@gmail.com> -Date: Sun, 30 Dec 2018 00:46:57 +0100 -Subject: [PATCH] Fix build with exiv2-0.27 - ---- - src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++------- - 1 file changed, 28 insertions(+), 7 deletions(-) - -diff --git a/src/plugins/exiv2_extractor.cc b/src/plugins/exiv2_extractor.cc -index 8741d40..ef402a8 100644 ---- a/src/plugins/exiv2_extractor.cc -+++ b/src/plugins/exiv2_extractor.cc -@@ -27,10 +27,7 @@ - #include <cassert> - #include <cstring> - #include <math.h> --#include <exiv2/exif.hpp> --#include <exiv2/error.hpp> --#include <exiv2/image.hpp> --#include <exiv2/futils.hpp> -+#include <exiv2/exiv2.hpp> - - /** - * Enable debugging to get error messages. -@@ -180,7 +177,7 @@ public: - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - virtual size_t size (void) const; - #else - virtual long int size (void) const; -@@ -316,7 +313,11 @@ ExtractorIO::getb () - const unsigned char *r; - - if (1 != ec->read (ec->cls, &data, 1)) -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError<char> (42 /* error code */); -+#endif - r = (const unsigned char *) data; - return *r; - } -@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) - void - ExtractorIO::transfer (Exiv2::BasicIo& src) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError<char> (42 /* error code */); -+#endif - } - - -@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, - Exiv2::byte * - ExtractorIO::mmap (bool isWritable) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError<char> (42 /* error code */); -+#endif - } - - -@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - size_t - #else - long int -@@ -504,7 +513,11 @@ ExtractorIO::eof () const - std::string - ExtractorIO::path () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError<char> (42 /* error code */); -+#endif - } - - -@@ -517,7 +530,11 @@ ExtractorIO::path () const - std::wstring - ExtractorIO::wpath () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError<char> (42 /* error code */); -+#endif - } - #endif - -@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr - ExtractorIO::temporary () const - { - fprintf (stderr, "throwing temporary error\n"); -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError<char> (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError<char> (42 /* error code */); -+#endif - } - - -@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) - { - try - { --#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION -+#if !EXIV2_TEST_VERSION(0,24,0) - Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); - #endif - std::auto_ptr<Exiv2::BasicIo> eio(new ExtractorIO (ec)); --- -2.20.1 - diff --git a/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch b/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch deleted file mode 100644 index 11344d3946af..000000000000 --- a/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: fix heap-based buffer over-read. -Origin: upstream, commit: d2b032452241708bee68d02aa02092cfbfba951a -Author: Christian Grothoff <christ...@grothoff.org> - ---- a/src/plugins/dvi_extractor.c -+++ b/src/plugins/dvi_extractor.c -@@ -182,6 +182,8 @@ - size = ec->get_size (ec->cls); - if (size > 16 * 1024 * 1024) - return; /* too large */ -+ if (klen + 15 > size) -+ return; /* malformed klen */ - if (NULL == (data = malloc ((size_t) size))) - return; /* out of memory */ - memcpy (data, buf, iret); diff --git a/media-libs/libextractor/libextractor-1.9-r5.ebuild b/media-libs/libextractor/libextractor-1.9-r5.ebuild deleted file mode 100644 index 6645ffc5cc52..000000000000 --- a/media-libs/libextractor/libextractor-1.9-r5.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Library to extract metadata from files of arbitrary type" -HOMEPAGE="https://www.gnu.org/software/libextractor/"; -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ppc ppc64 x86" -IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test - -RESTRICT="test" - -DEPEND=" - app-text/iso-codes - dev-libs/glib:2 - media-gfx/exiv2:= - sys-devel/libtool - virtual/libiconv - virtual/libintl - apparmor? ( sys-libs/libapparmor ) - archive? ( app-arch/libarchive:= ) - bzip2? ( app-arch/bzip2 ) - ffmpeg? ( media-video/ffmpeg:= ) - flac? ( - media-libs/flac:= - media-libs/libogg - ) - gif? ( media-libs/giflib:= ) - gsf? ( gnome-extra/libgsf:= ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - gtk? ( x11-libs/gtk+:3 ) - jpeg? ( media-libs/libjpeg-turbo:= ) - magic? ( sys-apps/file ) - midi? ( media-libs/libsmf ) - mp4? ( media-libs/libmp4v2 ) - mpeg? ( media-libs/libmpeg2 ) - tidy? ( >=app-text/htmltidy-5.0.0 ) - tiff? ( media-libs/tiff:= ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) - zlib? ( sys-libs/zlib ) -" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" -# test? ( app-forensics/zzuf ) -RDEPEND="${DEPEND} - !sci-biology/glimmer -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.8-exiv2-0.27.patch # bug #674046 - "${FILESDIR}"/${P}-CVE-2019-15531.patch -) - -src_prepare() { - default - - # m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs: - sed -i \ - -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \ - configure src/plugins/html_extractor.c || die - - if ! use tidy; then - sed -i -e 's:tidy.h:dIsAbLe&:' configure || die - fi -} - -src_configure() { - e_ac_cv() { - export ac_cv_"$@" - } - - e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no - - e_ac_cv header_FLAC_all_h=$(usex flac) - e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac) - e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac) - - e_ac_cv header_sys_apparmor_h=$(usex apparmor) - e_ac_cv header_archive_h=$(usex archive) - e_ac_cv header_bzlib_h=$(usex bzip2) - e_ac_cv header_gif_lib_h=$(usex gif) - e_ac_cv header_jpeglib_h=$(usex jpeg) - e_ac_cv header_magic_h=$(usex magic) - e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg) - e_ac_cv header_tiffio_h=$(usex tiff) - e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis) - e_ac_cv header_zlib_h=$(usex zlib) - e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4) - e_ac_cv lib_smf_smf_load_from_memory=$(usex midi) - - local myeconfargs=( - --disable-static - --enable-experimental - --enable-glib - --disable-gsf-gnome - $(use_enable ffmpeg) - $(use_enable gsf) - $(use_with gstreamer) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml deleted file mode 100644 index 88d3c6282813..000000000000 --- a/media-libs/libextractor/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!--maintainer-needed--> - <use> - <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag> - <flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-extra/libgsf</pkg></flag> - <flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag> - </use> - <upstream> - <remote-id type="savannah">libextractor</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 4e15e72ac0e4..bc3ce1396cd7 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -293,18 +293,6 @@ acct-group/jabber # lead to build failures. =app-eselect/eselect-wxwidgets-20230114 -# Michał Górny <mgo...@gentoo.org> (2023-01-21) -# Packages that are incompatible with ffmpeg-5. -# -# media-libs/libextractor: no Gentoo maintainer, ver from 2019, bug #834382 -# media-libs/qtav: no Gentoo maintainer, no porting progress, bug #834386 -# media-plugins/vdr-vaapidevice: no activity since 2019, bug #834390 -# media-sound/potamus: last rel. 2018, one commit in 2020, bug #834396 -# media-video/ffmpeg2theora: no activity since 2016, bug #834403 -# -# Removal on 2023-02-20. -media-libs/libextractor - # David Seifert <s...@gentoo.org> (2023-01-14) # Py3.8 only backports dev-python/backports-tempfile
