media-libs/libextractor: bump to v1.9

Bug: https://bugs.gentoo.org/695538
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>

diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 5ae63784c0f6f99b6275a48a43d0e98b46b0eced..56741a26b4c7c97f99eaa8b854df4794110e5add 100644 (file)
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1 +1,2 @@
 DIST libextractor-1.8.tar.gz 8315688 BLAKE2B 2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0 SHA512 770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
+DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149

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
new file mode 100644 (file)
index 0000000..11344d3
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.9-CVE-2019-15531.patch
@@ -0,0 +1,15 @@
+Description: fix heap-based buffer over-read.
+Origin: upstream, commit: d2b032452241708bee68d02aa02092cfbfba951a
+Author: Christian Grothoff <christian@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.ebuild b/media-libs/libextractor/libextractor-1.9.ebuild
new file mode 100644 (file)
index 0000000..d95d55c
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.9.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 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? ( virtual/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? ( virtual/jpeg:0 )
+       magic? ( sys-apps/file )
+       midi? ( media-libs/libsmf )
+       mp4? ( media-libs/libmp4v2:0 )
+       mpeg? ( media-libs/libmpeg2 )
+       tidy? ( app-text/tidy-html5 )
+       tiff? ( media-libs/tiff:0 )
+       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
+}