* [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
@ 2016-02-19 1:24 Mike Frysinger
0 siblings, 0 replies; 6+ messages in thread
From: Mike Frysinger @ 2016-02-19 1:24 UTC (permalink / raw
To: gentoo-commits
commit: 6bd37a439b8ad81c4bd536351b5fd7c008b1819e
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 01:23:00 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 01:23:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd37a43
media-libs/libextractor: add upstream giflib-5 fix #571902
| 37 ++++++++++++++++++++++
| 2 ++
2 files changed, 39 insertions(+)
--git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
new file mode 100644
index 0000000..ea0aeeb
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/571902
+
+------------------------------------------------------------------------
+r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line
+
+Add giflib-5.1.0 compatibility
+
+Index: src/plugins/gif_extractor.c
+===================================================================
+--- src/plugins/gif_extractor.c (revision 34094)
++++ src/plugins/gif_extractor.c (revision 34095)
+@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+ if (gif_file == NULL || gif_error != 0)
+ {
+ if (gif_file != NULL)
++#if GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+ EGifCloseFile (gif_file);
++#else
++ EGifCloseFile (gif_file, NULL);
++#endif
+ return; /* not a GIF */
+ }
+ #endif
+@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
+ DGifGetExtensionNext(gif_file, &ext)) &&
+ (NULL != ext) ) ; /* keep going */
+ }
++#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
+ DGifCloseFile (gif_file);
++#else
++ DGifCloseFile (gif_file, NULL);
++#endif
+ }
+
+ /* end of gif_extractor.c */
+
+------------------------------------------------------------------------
--git a/media-libs/libextractor/libextractor-1.3.ebuild b/media-libs/libextractor/libextractor-1.3.ebuild
index 1faf226..08e3508 100644
--- a/media-libs/libextractor/libextractor-1.3.ebuild
+++ b/media-libs/libextractor/libextractor-1.3.ebuild
@@ -55,6 +55,8 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog NEWS README TODO"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-giflib-5.patch #571902
+
# m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
sed -i \
-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
@ 2016-10-25 18:32 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-10-25 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 76b2b785f2e4e336b69af671363ea04f55ed443d
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Mon Oct 24 20:05:15 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 18:31:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b2b785
media-libs/libextractor: ffmpeg 2.9+ fix
Gentoo-bug: 575774
* EAPI=6
* Made PATCHES -p1 compliant
* Add missing sub-slot operators
* Remove .la files unconditionally
* emake fully parallelised now
Closes: https://github.com/gentoo/gentoo/pull/2659
Signed-off-by: David Seifert <soap <AT> gentoo.org>
| 52 ++++++++++
| 4 +-
| 113 +++++++++++++++++++++
3 files changed, 167 insertions(+), 2 deletions(-)
--git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
new file mode 100644
index 00000000..d9e50b6
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
@@ -0,0 +1,52 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
+Last-Update: <2015-11-28>
+
+--- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c
++++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c
+@@ -153,7 +153,7 @@ seek_cb (void *opaque,
+ static size_t
+ create_thumbnail (int src_width, int src_height,
+ int src_stride[],
+- enum PixelFormat src_pixfmt,
++ enum AVPixelFormat src_pixfmt,
+ const uint8_t * const src_data[],
+ int dst_width, int dst_height,
+ uint8_t **output_data,
+@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src
+ if (NULL ==
+ (scaler_ctx =
+ sws_getContext (src_width, src_height, src_pixfmt,
+- dst_width, dst_height, PIX_FMT_RGB24,
++ dst_width, dst_height, AV_PIX_FMT_RGB24,
+ SWS_BILINEAR, NULL, NULL, NULL)))
+ {
+ #if DEBUG
+@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src
+ return 0;
+ }
+ if (NULL == (dst_buffer =
+- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
++ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
+ {
+ #if DEBUG
+ fprintf (stderr,
+@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src
+ return 0;
+ }
+ avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
+- PIX_FMT_RGB24, dst_width, dst_height);
++ AV_PIX_FMT_RGB24, dst_width, dst_height);
+ sws_scale (scaler_ctx,
+ src_data,
+ src_stride,
+@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src
+ }
+ encoder_codec_ctx->width = dst_width;
+ encoder_codec_ctx->height = dst_height;
+- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
++ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
+ opts = NULL;
+ if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
+ {
+
--git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
index ea0aeeb..4893f97 100644
--- a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
+++ b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
@@ -7,8 +7,8 @@ Add giflib-5.1.0 compatibility
Index: src/plugins/gif_extractor.c
===================================================================
---- src/plugins/gif_extractor.c (revision 34094)
-+++ src/plugins/gif_extractor.c (revision 34095)
+--- a/src/plugins/gif_extractor.c (revision 34094)
++++ b/src/plugins/gif_extractor.c (revision 34095)
@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
if (gif_file == NULL || gif_error != 0)
{
--git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild
new file mode 100644
index 00000000..cd34de2
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="A library used 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="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg mp4 +magic midi mpeg tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+RDEPEND="app-text/iso-codes
+ >=dev-libs/glib-2
+ media-gfx/exiv2:=
+ sys-devel/libtool
+ virtual/libiconv
+ virtual/libintl
+ 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:= )
+ gtk? ( x11-libs/gtk+:3 )
+ jpeg? ( virtual/jpeg:0 )
+ mp4? ( media-libs/libmp4v2:0 )
+ magic? ( sys-apps/file )
+ midi? ( media-libs/libsmf )
+ mpeg? ( media-libs/libmpeg2 )
+ tidy? ( app-text/htmltidy )
+ tiff? ( media-libs/tiff:0 )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ zlib? ( sys-libs/zlib )
+ !<app-crypt/pkcrack-1.2.2-r1
+ !sci-biology/glimmer
+ !sci-chemistry/pdb-extract"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+# test? ( app-forensics/zzuf )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-giflib-5.patch #571902
+ "${FILESDIR}"/${P}-ffmpeg-2.9.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 ::' \
+ -e 's:tidy/tidy.h:tidy.h:' \
+ 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_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)
+
+ # gstreamer support is for 1.0, no 0.10 support
+ econf \
+ --disable-static \
+ --enable-experimental \
+ --enable-glib \
+ --with-gtk_version=$(usex gtk 3.0.0 false) \
+ --without-gstreamer \
+ --disable-gsf-gnome \
+ $(use_enable gsf) \
+ $(use_enable ffmpeg)
+}
+
+src_install() {
+ default
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
@ 2017-06-17 20:49 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-06-17 20:49 UTC (permalink / raw
To: gentoo-commits
commit: 00c65df99751d235e08fe2f54613dac2eeb2f80b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 20:36:09 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 20:49:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00c65df9
media-libs/libextractor: Fix build with media-gfx/exiv2-0.26
Gentoo-bug: 621242
Package-Manager: Portage-2.3.5, Repoman-2.3.1
| 27 ++++++++++++++++++++++
| 26 ++++++++++++---------
2 files changed, 42 insertions(+), 11 deletions(-)
--git a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
new file mode 100644
index 00000000000..b6e0b41773b
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
@@ -0,0 +1,27 @@
+--- a/src/plugins/exiv2_extractor.cc 2013-06-25 13:02:05.000000000 +0200
++++ b/src/plugins/exiv2_extractor.cc 2017-06-10 14:22:57.000000000 +0200
+@@ -180,7 +180,11 @@
+ *
+ * @return -1 on error
+ */
++#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
++ virtual size_t size (void) const;
++#else
+ virtual long int size (void) const;
++#endif
+
+ /**
+ * Check if file is open.
+@@ -445,7 +449,11 @@
+ *
+ * @return -1 on error
+ */
+-long int
++#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
++size_t
++#else
++long int
++#endif
+ ExtractorIO::size (void) const
+ {
+ return (long) ec->get_size (ec->cls);
--git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild
index 20c537dc551..dc06475abc4 100644
--- a/media-libs/libextractor/libextractor-1.3-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-DESCRIPTION="A library used to extract metadata from files of arbitrary type"
+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="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg mp4 +magic midi mpeg tidy tiff vorbis +zlib" # test
+IUSE="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
RESTRICT="test"
-RDEPEND="app-text/iso-codes
+COMMON_DEPEND="
+ app-text/iso-codes
>=dev-libs/glib-2
media-gfx/exiv2:=
sys-devel/libtool
@@ -26,33 +27,36 @@ RDEPEND="app-text/iso-codes
flac? (
media-libs/flac
media-libs/libogg
- )
+ )
gif? ( media-libs/giflib:= )
gsf? ( gnome-extra/libgsf:= )
gtk? ( x11-libs/gtk+:3 )
jpeg? ( virtual/jpeg:0 )
- mp4? ( media-libs/libmp4v2:0 )
magic? ( sys-apps/file )
midi? ( media-libs/libsmf )
+ mp4? ( media-libs/libmp4v2:0 )
mpeg? ( media-libs/libmpeg2 )
tidy? ( app-text/htmltidy )
tiff? ( media-libs/tiff:0 )
vorbis? (
media-libs/libogg
media-libs/libvorbis
- )
+ )
zlib? ( sys-libs/zlib )
- !<app-crypt/pkcrack-1.2.2-r1
- !sci-biology/glimmer
- !sci-chemistry/pdb-extract"
-DEPEND="${RDEPEND}
+"
+DEPEND="${COMMON_DEPEND}
sys-devel/gettext
virtual/pkgconfig"
# test? ( app-forensics/zzuf )
+RDEPEND="${COMMON_DEPEND}
+ !sci-biology/glimmer
+ !sci-chemistry/pdb-extract
+"
PATCHES=(
"${FILESDIR}"/${P}-giflib-5.patch #571902
"${FILESDIR}"/${P}-ffmpeg-2.9.patch
+ "${FILESDIR}"/${P}-exiv2-0.26.patch #621242
)
src_prepare() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
@ 2017-12-25 13:53 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-12-25 13:53 UTC (permalink / raw
To: gentoo-commits
commit: 6859a8b699efc9cd61a9eede139220391494d14b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 12:47:15 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 13:53:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6859a8b6
media-libs/libextractor: Patch CVE-2017-17440
Bug: https://bugs.gentoo.org/635362
Package-Manager: Portage-2.3.19, Repoman-2.3.6
| 125 +++++++++++++++++++++
| 2 +
2 files changed, 127 insertions(+)
--git a/media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch b/media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch
new file mode 100644
index 00000000000..1870375664d
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch
@@ -0,0 +1,125 @@
+From 7cc63b001ceaf81143795321379c835486d0c92e Mon Sep 17 00:00:00 2001
+From: Christian Grothoff <christian@grothoff.org>
+Date: Wed, 1 Nov 2017 09:07:35 +0100
+Subject: fix misc NULL pointer exceptions
+
+---
+ src/include/extractor.h | 2 +-
+ src/plugins/gif_extractor.c | 16 +++++++++-------
+ src/plugins/it_extractor.c | 6 +++---
+ src/plugins/nsfe_extractor.c | 8 ++++----
+ src/plugins/s3m_extractor.c | 2 +-
+ src/plugins/sid_extractor.c | 24 ++++++++++++------------
+ src/plugins/xm_extractor.c | 8 ++++----
+ 21 files changed, 169 insertions(+), 162 deletions(-)
+
+* asturm: Cleaned up unrelated whitespace and translations changes.
+
+diff --git a/src/include/extractor.h b/src/include/extractor.h
+index 0325dc6..782134b 100644
+--- a/src/include/extractor.h
++++ b/src/include/extractor.h
+@@ -35,7 +35,7 @@ extern "C" {
+ * 0.2.6-1 => 0x00020601
+ * 4.5.2-0 => 0x04050200
+ */
+-#define EXTRACTOR_VERSION 0x01060000
++#define EXTRACTOR_VERSION 0x01060001
+
+ #include <stdio.h>
+
+diff --git a/src/plugins/gif_extractor.c b/src/plugins/gif_extractor.c
+index aae2b82..8ee5807 100644
+@@ -122,6 +122,8 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ if (GIF_OK !=
+ DGifGetExtension (gif_file, &et, &ext))
+ continue;
++ if (NULL == ext)
++ continue;
+ if (COMMENT_EXT_FUNC_CODE == et)
+ {
+ ec->proc (ec->cls,
+--- a/src/plugins/it_extractor.c
++++ b/src/plugins/it_extractor.c
+@@ -70,7 +70,7 @@ EXTRACTOR_it_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ char itversion[8];
+ const struct Header *head;
+
+- if (HEADER_SIZE >
++ if ((ssize_t) HEADER_SIZE >
+ ec->read (ec->cls,
+ &data,
+ HEADER_SIZE))
+--- a/src/plugins/nsfe_extractor.c
++++ b/src/plugins/nsfe_extractor.c
+@@ -175,7 +175,7 @@ info_extract (struct EXTRACTOR_ExtractContext *ec,
+
+ if (size < 8)
+ return 0;
+- if (size >
++ if ((ssize_t) size >
+ ec->read (ec->cls,
+ &data,
+ size))
+@@ -243,7 +243,7 @@ tlbl_extract (struct EXTRACTOR_ExtractContext *ec,
+ void *data;
+ const char *cdata;
+
+- if (size >
++ if ((ssize_t) size >
+ ec->read (ec->cls,
+ &data,
+ size))
+@@ -285,7 +285,7 @@ auth_extract (struct EXTRACTOR_ExtractContext *ec,
+
+ if (left < 1)
+ return 0;
+- if (size >
++ if ((ssize_t) size >
+ ec->read (ec->cls,
+ &data,
+ size))
+@@ -342,7 +342,7 @@ EXTRACTOR_nsfe_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ uint32_t chunksize;
+ int ret;
+
+- if (sizeof (struct header) >
++ if ((ssize_t) sizeof (struct header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (struct header)))
+--- a/src/plugins/s3m_extractor.c
++++ b/src/plugins/s3m_extractor.c
+@@ -80,7 +80,7 @@ EXTRACTOR_s3m_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ struct S3MHeader header;
+ char song_name_NT[29];
+
+- if (sizeof (header) >
++ if ((ssize_t) sizeof (header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (header)))
+--- a/src/plugins/sid_extractor.c
++++ b/src/plugins/sid_extractor.c
+@@ -176,7 +176,7 @@ EXTRACTOR_sid_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ const struct header *head;
+ void *data;
+
+- if (sizeof (struct header) >
++ if ((ssize_t) sizeof (struct header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (struct header)))
+--- a/src/plugins/xm_extractor.c
++++ b/src/plugins/xm_extractor.c
+@@ -70,7 +70,7 @@ EXTRACTOR_xm_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ char xmversion[8];
+ size_t n;
+
+- if (sizeof (struct Header) >
++ if ((ssize_t) sizeof (struct Header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (struct Header)))
+--
+cgit v1.1
--git a/media-libs/libextractor/libextractor-1.6.ebuild b/media-libs/libextractor/libextractor-1.6.ebuild
index c30658fc5c0..db1013736cf 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -57,6 +57,8 @@ RDEPEND="${COMMON_DEPEND}
!sci-biology/glimmer
"
+PATCHES=( "${FILESDIR}/${P}-CVE-2017-17440.patch" )
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
@ 2018-03-13 9:33 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-03-13 9:33 UTC (permalink / raw
To: gentoo-commits
commit: 68077e8e919bc50122949f64759be12376fb4b68
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 12 18:07:38 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 09:33:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68077e8e
media-libs/libextractor: Non-maintainer security cleanup
Bug: https://bugs.gentoo.org/635362
Package-Manager: Portage-2.3.24, Repoman-2.3.6
| 1 -
| 27 -----
| 52 ---------
| 37 -------
| 117 ---------------------
5 files changed, 234 deletions(-)
--git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index f7a0212670e..3faadb8f17c 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,2 +1 @@
-DIST libextractor-1.3.tar.gz 7942021 BLAKE2B 76856cd70b1981b95db55b7070d5e82574e8842f49dc3ee7cfc6f35f71b66f7b8e642b82cbbaa8446488ab29ca39c9792e4153f3cd9624dde731b3daefe2e86f SHA512 38ed47e5e5f50ddf216408f698a104900baa3b03cc8a81a14e63afd30b3e3922acda17363d88d9ba1356ebf70287c8a5152ff6933a36ec1042ca0d832218d45d
DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
diff --git a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch b/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
deleted file mode 100644
index b6e0b41773b..00000000000
--- a/media-libs/libextractor/files/libextractor-1.3-exiv2-0.26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/plugins/exiv2_extractor.cc 2013-06-25 13:02:05.000000000 +0200
-+++ b/src/plugins/exiv2_extractor.cc 2017-06-10 14:22:57.000000000 +0200
-@@ -180,7 +180,11 @@
- *
- * @return -1 on error
- */
-+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+ virtual size_t size (void) const;
-+#else
- virtual long int size (void) const;
-+#endif
-
- /**
- * Check if file is open.
-@@ -445,7 +449,11 @@
- *
- * @return -1 on error
- */
--long int
-+#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0)
-+size_t
-+#else
-+long int
-+#endif
- ExtractorIO::size (void) const
- {
- return (long) ec->get_size (ec->cls);
diff --git a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch b/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
deleted file mode 100644
index d9e50b698ac..00000000000
--- a/media-libs/libextractor/files/libextractor-1.3-ffmpeg-2.9.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Replace deprecated FFmpeg API
-Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-Last-Update: <2015-11-28>
-
---- libextractor-1.3.orig/src/plugins/thumbnailffmpeg_extractor.c
-+++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c
-@@ -153,7 +153,7 @@ seek_cb (void *opaque,
- static size_t
- create_thumbnail (int src_width, int src_height,
- int src_stride[],
-- enum PixelFormat src_pixfmt,
-+ enum AVPixelFormat src_pixfmt,
- const uint8_t * const src_data[],
- int dst_width, int dst_height,
- uint8_t **output_data,
-@@ -189,7 +189,7 @@ create_thumbnail (int src_width, int src
- if (NULL ==
- (scaler_ctx =
- sws_getContext (src_width, src_height, src_pixfmt,
-- dst_width, dst_height, PIX_FMT_RGB24,
-+ dst_width, dst_height, AV_PIX_FMT_RGB24,
- SWS_BILINEAR, NULL, NULL, NULL)))
- {
- #if DEBUG
-@@ -214,7 +214,7 @@ create_thumbnail (int src_width, int src
- return 0;
- }
- if (NULL == (dst_buffer =
-- av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
-+ av_malloc (avpicture_get_size (AV_PIX_FMT_RGB24, dst_width, dst_height))))
- {
- #if DEBUG
- fprintf (stderr,
-@@ -229,7 +229,7 @@ create_thumbnail (int src_width, int src
- return 0;
- }
- avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
-- PIX_FMT_RGB24, dst_width, dst_height);
-+ AV_PIX_FMT_RGB24, dst_width, dst_height);
- sws_scale (scaler_ctx,
- src_data,
- src_stride,
-@@ -272,7 +272,7 @@ create_thumbnail (int src_width, int src
- }
- encoder_codec_ctx->width = dst_width;
- encoder_codec_ctx->height = dst_height;
-- encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
-+ encoder_codec_ctx->pix_fmt = AV_PIX_FMT_RGB24;
- opts = NULL;
- if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
- {
-
diff --git a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch b/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
deleted file mode 100644
index 4893f9784a5..00000000000
--- a/media-libs/libextractor/files/libextractor-1.3-giflib-5.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/571902
-
-------------------------------------------------------------------------
-r34095 | LRN | 2014-07-31 10:58:51 -0400 (Thu, 31 Jul 2014) | 1 line
-
-Add giflib-5.1.0 compatibility
-
-Index: src/plugins/gif_extractor.c
-===================================================================
---- a/src/plugins/gif_extractor.c (revision 34094)
-+++ b/src/plugins/gif_extractor.c (revision 34095)
-@@ -78,7 +78,11 @@ EXTRACTOR_gif_extract_method (struct EXT
- if (gif_file == NULL || gif_error != 0)
- {
- if (gif_file != NULL)
-+#if GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
- EGifCloseFile (gif_file);
-+#else
-+ EGifCloseFile (gif_file, NULL);
-+#endif
- return; /* not a GIF */
- }
- #endif
-@@ -133,7 +137,11 @@ EXTRACTOR_gif_extract_method (struct EXT
- DGifGetExtensionNext(gif_file, &ext)) &&
- (NULL != ext) ) ; /* keep going */
- }
-+#if defined (GIF_LIB_VERSION) || GIFLIB_MAJOR < 5 || GIFLIB_MINOR < 1
- DGifCloseFile (gif_file);
-+#else
-+ DGifCloseFile (gif_file, NULL);
-+#endif
- }
-
- /* end of gif_extractor.c */
-
-------------------------------------------------------------------------
diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild b/media-libs/libextractor/libextractor-1.3-r1.ebuild
deleted file mode 100644
index dc06475abc4..00000000000
--- a/media-libs/libextractor/libextractor-1.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="+archive +bzip2 ffmpeg flac gif gsf gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
-
-RESTRICT="test"
-
-COMMON_DEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2
- media-gfx/exiv2:=
- sys-devel/libtool
- virtual/libiconv
- virtual/libintl
- 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:= )
- 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/htmltidy )
- tiff? ( media-libs/tiff:0 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-# test? ( app-forensics/zzuf )
-RDEPEND="${COMMON_DEPEND}
- !sci-biology/glimmer
- !sci-chemistry/pdb-extract
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-giflib-5.patch #571902
- "${FILESDIR}"/${P}-ffmpeg-2.9.patch
- "${FILESDIR}"/${P}-exiv2-0.26.patch #621242
-)
-
-src_prepare() {
- default
-
- # m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
- sed -i \
- -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
- -e 's:tidy/tidy.h:tidy.h:' \
- -e 's:tidy/buffio.h:buffio.h:' \
- 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_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)
-
- # gstreamer support is for 1.0, no 0.10 support
- econf \
- --disable-static \
- --enable-experimental \
- --enable-glib \
- --with-gtk_version=$(usex gtk 3.0.0 false) \
- --without-gstreamer \
- --disable-gsf-gnome \
- $(use_enable gsf) \
- $(use_enable ffmpeg)
-}
-
-src_install() {
- default
-
- # package provides .pc files
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
@ 2019-10-26 20:32 Thomas Deutschmann
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Deutschmann @ 2019-10-26 20:32 UTC (permalink / raw
To: gentoo-commits
commit: f03e8e6318164311ede00819aa2cef46ad83cc4b
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 20:32:18 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 20:32:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f03e8e63
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 <AT> gentoo.org>
| 1 +
| 15 +++
| 118 +++++++++++++++++++++
3 files changed, 134 insertions(+)
--git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 5ae63784c0f..56741a26b4c 100644
--- 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
--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
index 00000000000..11344d3946a
--- /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);
--git a/media-libs/libextractor/libextractor-1.9.ebuild b/media-libs/libextractor/libextractor-1.9.ebuild
new file mode 100644
index 00000000000..d95d55c512a
--- /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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-10-26 20:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-13 9:33 [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-10-26 20:32 Thomas Deutschmann
2017-12-25 13:53 Andreas Sturmlechner
2017-06-17 20:49 Andreas Sturmlechner
2016-10-25 18:32 David Seifert
2016-02-19 1:24 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox