[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/, profiles/
commit: d1b1bca53fca7815fba48028f5c1eaa746b0908e
Author: David Seifert gentoo org>
AuthorDate: Sat Mar 18 16:43:05 2023 +
Commit: David Seifert gentoo org>
CommitDate: Sat Mar 18 16:43:05 2023 +
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 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..
--- 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..
--- 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
-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
- #include
- #include
--#include
--#include
--#include
--#include
-+#include
-
- /**
- * 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 (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
-+#else
- throw Exiv2::BasicError (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 eio(new ExtractorIO (ec));
--
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 35b15ba0f869f147afe9d02d554f5df5efc1f75d Author: Jakov Smolić gentoo org> AuthorDate: Wed Nov 10 12:25:20 2021 + Commit: Jakov Smolić gentoo org> CommitDate: Wed Nov 10 12:48:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b15ba0 media-libs/libextractor: Remove app-text/tidy-html5 dep Signed-off-by: Jakov Smolić gentoo.org> media-libs/libextractor/libextractor-1.9-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libextractor/libextractor-1.9-r2.ebuild b/media-libs/libextractor/libextractor-1.9-r2.ebuild index 38f88b87e42..0fdd4b76eed 100644 --- a/media-libs/libextractor/libextractor-1.9-r2.ebuild +++ b/media-libs/libextractor/libextractor-1.9-r2.ebuild @@ -41,7 +41,7 @@ DEPEND=" midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) - tidy? ( || ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 ) ) + tidy? ( >=app-text/htmltidy-5.0.0 ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 42ef13e23dc5317360ff2f0b962862999e71d5cd
Author: Sam James gentoo org>
AuthorDate: Sun Aug 29 18:28:10 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 29 18:29:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42ef13e2
media-libs/libextractor: [QA] revbump for changed RDEPEND
It's necessary to have a revision bump for changes in RDEPEND,
but especially where we're changing the providers of an
any-of || ( ... ) dependency.
In this case, if one already has edbrowse installed,
once/if tidy-html5 is masked for removal (which seems to be
the plan), there's no reason the package manage is obligated
to realise that the existing ebuild was modified to allow
htmltidy instead. Hence, a revision bump is required
to apply the metadata change.
Signed-off-by: Sam James gentoo.org>
.../{libextractor-1.9-r1.ebuild => libextractor-1.9-r2.ebuild}| 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-libs/libextractor/libextractor-1.9-r1.ebuild
b/media-libs/libextractor/libextractor-1.9-r2.ebuild
similarity index 100%
rename from media-libs/libextractor/libextractor-1.9-r1.ebuild
rename to media-libs/libextractor/libextractor-1.9-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 809db0c556b7621a4d8e19447d7ed5b2d669fd6b Author: Marek Szuba gentoo org> AuthorDate: Fri Aug 27 10:28:20 2021 + Commit: Marek Szuba gentoo org> CommitDate: Fri Aug 27 10:28:20 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809db0c5 media-libs/libextractor: allow both htmltidy-5+ and tidy-html5 Signed-off-by: Marek Szuba gentoo.org> media-libs/libextractor/libextractor-1.9-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/libextractor/libextractor-1.9-r1.ebuild b/media-libs/libextractor/libextractor-1.9-r1.ebuild index 91c6a2f396f..38f88b87e42 100644 --- a/media-libs/libextractor/libextractor-1.9-r1.ebuild +++ b/media-libs/libextractor/libextractor-1.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,7 +41,7 @@ DEPEND=" midi? ( media-libs/libsmf ) mp4? ( media-libs/libmp4v2:0 ) mpeg? ( media-libs/libmpeg2 ) - tidy? ( app-text/tidy-html5 ) + tidy? ( || ( app-text/tidy-html5 >=app-text/htmltidy-5.0.0 ) ) tiff? ( media-libs/tiff:0 ) vorbis? ( media-libs/libogg
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/
commit: 444d786f136ea61c25851212d25809d65a1e1fad
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Tue May 5 12:56:08 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed May 6 11:51:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=444d786f
media-libs/libextractor: remove unused patches
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger gmail.com>
Signed-off-by: Joonas Niilola gentoo.org>
.../files/libextractor-1.8-CVE-2018-20430.patch| 49 --
.../files/libextractor-1.8-CVE-2018-20431.patch| 39 -
2 files changed, 88 deletions(-)
diff --git
a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
deleted file mode 100644
index d0b5968606b..000
--- a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From b405d707b36e0654900cba78e89f49779efea110 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff
-Date: Thu, 20 Dec 2018 22:47:53 +0100
-Subject: fix #5493 (out of bounds read)
-
- src/common/convert.c | 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/common/convert.c b/src/common/convert.c
-index c0edf21..2be2108 100644
a/src/common/convert.c
-+++ b/src/common/convert.c
-@@ -36,8 +36,8 @@
- * string is returned.
- */
- char *
--EXTRACTOR_common_convert_to_utf8 (const char *input,
--size_t len,
-+EXTRACTOR_common_convert_to_utf8 (const char *input,
-+size_t len,
- const char *charset)
- {
- #if HAVE_ICONV
-@@ -52,7 +52,7 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
- i = input;
- cd = iconv_open ("UTF-8", charset);
- if (cd == (iconv_t) - 1)
--return strdup (i);
-+return strndup (i, len);
- if (len > 1024 * 1024)
- {
- iconv_close (cd);
-@@ -67,11 +67,11 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
- }
- itmp = tmp;
- finSize = tmpSize;
-- if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == SIZE_MAX)
-+ if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == ((size_t) -1))
- {
- iconv_close (cd);
- free (tmp);
-- return strdup (i);
-+ return strndup (i, len);
- }
- ret = malloc (tmpSize - finSize + 1);
- if (ret == NULL)
---
-cgit v1.1
diff --git
a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
deleted file mode 100644
index 2cd0448ba89..000
--- a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 489c4a540bb2c4744471441425b8932b97a153e7 Mon Sep 17 00:00:00 2001
-From: Christian Grothoff
-Date: Thu, 20 Dec 2018 23:02:28 +0100
-Subject: fix #5494
-
- ChangeLog| 3 ++-
- src/plugins/ole2_extractor.c | 9 +++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
-index 53fa1b9..a48b726 100644
a/src/plugins/ole2_extractor.c
-+++ b/src/plugins/ole2_extractor.c
-@@ -173,7 +173,7 @@ struct ProcContext
- EXTRACTOR_MetaDataProcessor proc;
-
- /**
-- * Closure for 'proc'.
-+ * Closure for @e proc.
-*/
- void *proc_cls;
-
-@@ -213,7 +213,12 @@ process_metadata (gpointer key,
-
- if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
- {
-- contents = strdup (g_value_get_string (gval));
-+ const char *gvals;
-+
-+ gvals = g_value_get_string (gval);
-+ if (NULL == gvals)
-+return;
-+ contents = strdup (gvals);
- }
- else
- {
---
-cgit v1.1
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 98320daf3fd44885a8c68abac8b4bcef76172ea2
Author: David Seifert gentoo org>
AuthorDate: Sun Apr 26 10:34:53 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Apr 26 10:34:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98320daf
media-libs/libextractor: Replace virtual/ffmpeg
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert gentoo.org>
.../{libextractor-1.9.ebuild => libextractor-1.9-r1.ebuild} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/libextractor/libextractor-1.9.ebuild
b/media-libs/libextractor/libextractor-1.9-r1.ebuild
similarity index 97%
rename from media-libs/libextractor/libextractor-1.9.ebuild
rename to media-libs/libextractor/libextractor-1.9-r1.ebuild
index 6e14cb63b61..91c6a2f396f 100644
--- a/media-libs/libextractor/libextractor-1.9.ebuild
+++ b/media-libs/libextractor/libextractor-1.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,7 +24,7 @@ DEPEND="
apparmor? ( sys-libs/libapparmor )
archive? ( app-arch/libarchive:= )
bzip2? ( app-arch/bzip2 )
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( media-video/ffmpeg )
flac? (
media-libs/flac
media-libs/libogg
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 6bfcfe0e2e9ff16339f5799db47ca978381ae095
Author: Sam James (sam_c) cmpct info>
AuthorDate: Fri Mar 20 00:03:29 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Mar 20 01:10:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bfcfe0e
media-libs/libextractor: Cleanup vulnerable version
Bug: https://bugs.gentoo.org/695538
Signed-off-by: Sam James (sam_c) cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/15019
Signed-off-by: Thomas Deutschmann gentoo.org>
media-libs/libextractor/Manifest | 1 -
media-libs/libextractor/libextractor-1.8-r1.ebuild | 118 -
2 files changed, 119 deletions(-)
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 56741a26b4c..0f0692e6fa9 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,2 +1 @@
-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/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
deleted file mode 100644
index ef7838245be..000
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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}"/${P}-CVE-2018-2043{0,1}.patch # bug #673742
- "${FILESDIR}"/${P}-exiv2-0.27.patch # bug #674046
-)
-
-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=(
- --disab
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 8fbe27c6cb0e678dab188e367e6a7bb55d54b78c
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Nov 1 23:29:59 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Nov 1 23:29:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fbe27c6
media-libs/libextractor: stable 1.9 for ppc/ppc64, bug #695538
Tested-by: ernsteiswuerfel
Package-Manager: Portage-2.3.78, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/libextractor/libextractor-1.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.9.ebuild
b/media-libs/libextractor/libextractor-1.9.ebuild
index 4667224262c..6e14cb63b61 100644
--- a/media-libs/libextractor/libextractor-1.9.ebuild
+++ b/media-libs/libextractor/libextractor-1.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 4403f8aae73fcab55a33ddb44c010772274a8587
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Oct 28 09:43:30 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Oct 28 09:43:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4403f8aa
media-libs/libextractor: amd64 stable wrt bug #695538
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-libs/libextractor/libextractor-1.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.9.ebuild
b/media-libs/libextractor/libextractor-1.9.ebuild
index 66612e13317..4667224262c 100644
--- a/media-libs/libextractor/libextractor-1.9.ebuild
+++ b/media-libs/libextractor/libextractor-1.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: c0569cc1d7636cc7eb17f0f4a15fdfd8439eccde
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun Oct 27 23:17:18 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun Oct 27 23:17:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0569cc1
media-libs/libextractor: x86 stable (bug #695538)
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann gentoo.org>
media-libs/libextractor/libextractor-1.9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.9.ebuild
b/media-libs/libextractor/libextractor-1.9.ebuild
index d95d55c512a..66612e13317 100644
--- a/media-libs/libextractor/libextractor-1.9.ebuild
+++ b/media-libs/libextractor/libextractor-1.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
commit: f03e8e6318164311ede00819aa2cef46ad83cc4b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Oct 26 20:32:18 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Oct 26 20:32:39 2019 +
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 gentoo.org>
media-libs/libextractor/Manifest | 1 +
.../files/libextractor-1.9-CVE-2019-15531.patch| 15 +++
media-libs/libextractor/libextractor-1.9.ebuild| 118 +
3 files changed, 134 insertions(+)
diff --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
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
index 000..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
+
+--- 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
index 000..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)
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: c5b3828293e9a7a6e46cb02c346b025a2fe4907e
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Jan 14 15:59:07 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Jan 14 15:59:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5b38282
media-libs/libextractor: security cleanup
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-libs/libextractor/Manifest| 1 -
media-libs/libextractor/libextractor-1.7.ebuild | 113
2 files changed, 114 deletions(-)
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 7e7cdee03de..5ae63784c0f 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,2 +1 @@
-DIST libextractor-1.7.tar.gz 8075299 BLAKE2B
ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07
SHA512
00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
DIST libextractor-1.8.tar.gz 8315688 BLAKE2B
2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0
SHA512
770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
deleted file mode 100644
index 02ba88e54be..000
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 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/htmltidy )
- 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
-"
-
-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/tidybuffio.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_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)
-
- econf \
- --disable-static \
- --enable-experimental \
- --enable-glib \
- --disable-gsf-gnome \
- $(use_enable ffmpeg) \
- $
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: f0b4d92f6941d5805ab5582fe3682b02b98ea288
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Jan 14 15:57:20 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Jan 14 15:57:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b4d92f
media-libs/libextractor: amd64 stable wrt bug #673742
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-libs/libextractor/libextractor-1.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index 7a2375985ad..ef7838245be 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: fbea3fa0188fe08fc6e1f11deae243b9154409d6
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Jan 9 01:30:21 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Jan 9 01:35:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbea3fa0
media-libs/libextractor: x86 stable (bug #673742)
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
media-libs/libextractor/libextractor-1.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index f89c255307a..7a2375985ad 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 08034a63d1e45eac1a6c6aac17a6a911e2ddaaa5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 2 09:02:59 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 2 09:03:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08034a63 media-libs/libextractor: Lift media-gfx/exiv2 restriction Closes: https://bugs.gentoo.org/674046 Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 media-libs/libextractor/libextractor-1.8-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild b/media-libs/libextractor/libextractor-1.8-r1.ebuild index 059ee80633d..f89c255307a 100644 --- a/media-libs/libextractor/libextractor-1.8-r1.ebuild +++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild @@ -17,7 +17,7 @@ RESTRICT="test" DEPEND=" app-text/iso-codes dev-libs/glib:2 -
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 13f81511b4f876d7df9e5b1e1cba95e0f027
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Jan 1 12:13:40 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Jan 1 12:13:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f8
media-libs/libextractor: stable 1.8-r1 for ppc64, bug #673742
Package-Manager: Portage-2.3.53, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/libextractor/libextractor-1.8-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index ffc3d9fc1b1..059ee80633d 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: ac57aed9aba8ca2c105f786705ce8690ef452c0b
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Jan 1 12:12:09 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Jan 1 12:12:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac57aed9
media-libs/libextractor: stable 1.8-r1 for ppc, bug #673742
Package-Manager: Portage-2.3.53, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/libextractor/libextractor-1.8-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index d9044a2c01d..ffc3d9fc1b1 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 1dc297d559d093b4eeb4881db4e272a3b01da86c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 29 23:50:52 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 29 23:52:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc297d5
media-libs/libextractor: Drop 1.8 (r0)
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/libextractor/libextractor-1.8.ebuild | 115
1 file changed, 115 deletions(-)
diff --git a/media-libs/libextractor/libextractor-1.8.ebuild
b/media-libs/libextractor/libextractor-1.8.ebuild
deleted file mode 100644
index 3458e295fdd..000
--- a/media-libs/libextractor/libextractor-1.8.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 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/htmltidy )
- 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
-"
-
-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/tidybuffio.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_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
-}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/
commit: 7621a65d7bbacc22afdeefbf647be9623f932104
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 29 23:50:19 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 29 23:52:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7621a65d
media-libs/libextractor: Fix build with exiv2-0.27
Closes: https://bugs.gentoo.org/674046
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/libextractor-1.8-exiv2-0.27.patch| 127 +
media-libs/libextractor/libextractor-1.8-r1.ebuild | 5 +-
2 files changed, 131 insertions(+), 1 deletion(-)
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
new file mode 100644
index 000..cfdb6426408
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.8-exiv2-0.27.patch
@@ -0,0 +1,127 @@
+From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+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
+ #include
+ #include
+-#include
+-#include
+-#include
+-#include
++#include
+
+ /**
+ * 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 (Exiv2::kerDecodeLangAltQualifierFailed);
++#else
+ throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
++#else
+ throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
++#else
+ throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
++#else
+ throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
++#else
+ throw Exiv2::BasicError (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 (Exiv2::kerDecodeLangAltQualifierFailed);
++#else
+ throw Exiv2::BasicError (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 eio(new ExtractorIO (ec));
+--
+2.20.1
+
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index d63f5cb7945..d9044a2c01d 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -58,7 +58,10 @@ RDEPEND="${DEPEND}
!sci-biology/glimmer
"
-PATCHES=( "${FILESDIR}"/${P}-CVE-2018-2043{0,1}.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-CVE-2018-2043{0,1}.patch # bug #673742
+ "${FILESDIR}"/${P}-exiv2-0.27.patch # bug #674046
+)
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 774ab13b6fe0ff1bf25afa7553b97e2a6e599865
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 29 22:34:02 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 29 22:34:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774ab13b
media-libs/libextractor: Fix build against app-text/tidy-html5
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/libextractor/libextractor-1.8-r1.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index 45171230791..d63f5cb7945 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -66,8 +66,6 @@ src_prepare() {
# 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/tidybuffio.h:buffio.h:' \
configure src/plugins/html_extractor.c || die
if ! use tidy; then
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/
commit: 10ca5198d87e67194880e4421dc4a3d348211008
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 29 20:21:07 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 29 22:02:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10ca5198
media-libs/libextractor: Fix CVE-2018-20430, CVE-2018-20431
Bug: https://bugs.gentoo.org/673742
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../files/libextractor-1.8-CVE-2018-20430.patch| 49 +
.../files/libextractor-1.8-CVE-2018-20431.patch| 39 +++
media-libs/libextractor/libextractor-1.8-r1.ebuild | 117 +
3 files changed, 205 insertions(+)
diff --git
a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
new file mode 100644
index 000..d0b5968606b
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch
@@ -0,0 +1,49 @@
+From b405d707b36e0654900cba78e89f49779efea110 Mon Sep 17 00:00:00 2001
+From: Christian Grothoff
+Date: Thu, 20 Dec 2018 22:47:53 +0100
+Subject: fix #5493 (out of bounds read)
+
+---
+ src/common/convert.c | 10 +-
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/common/convert.c b/src/common/convert.c
+index c0edf21..2be2108 100644
+--- a/src/common/convert.c
b/src/common/convert.c
+@@ -36,8 +36,8 @@
+ * string is returned.
+ */
+ char *
+-EXTRACTOR_common_convert_to_utf8 (const char *input,
+-size_t len,
++EXTRACTOR_common_convert_to_utf8 (const char *input,
++size_t len,
+ const char *charset)
+ {
+ #if HAVE_ICONV
+@@ -52,7 +52,7 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
+ i = input;
+ cd = iconv_open ("UTF-8", charset);
+ if (cd == (iconv_t) - 1)
+-return strdup (i);
++return strndup (i, len);
+ if (len > 1024 * 1024)
+ {
+ iconv_close (cd);
+@@ -67,11 +67,11 @@ EXTRACTOR_common_convert_to_utf8 (const char *input,
+ }
+ itmp = tmp;
+ finSize = tmpSize;
+- if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == SIZE_MAX)
++ if (iconv (cd, (char **) &input, &len, &itmp, &finSize) == ((size_t) -1))
+ {
+ iconv_close (cd);
+ free (tmp);
+- return strdup (i);
++ return strndup (i, len);
+ }
+ ret = malloc (tmpSize - finSize + 1);
+ if (ret == NULL)
+--
+cgit v1.1
diff --git
a/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
new file mode 100644
index 000..2cd0448ba89
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch
@@ -0,0 +1,39 @@
+From 489c4a540bb2c4744471441425b8932b97a153e7 Mon Sep 17 00:00:00 2001
+From: Christian Grothoff
+Date: Thu, 20 Dec 2018 23:02:28 +0100
+Subject: fix #5494
+
+---
+ ChangeLog| 3 ++-
+ src/plugins/ole2_extractor.c | 9 +++--
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/ole2_extractor.c b/src/plugins/ole2_extractor.c
+index 53fa1b9..a48b726 100644
+--- a/src/plugins/ole2_extractor.c
b/src/plugins/ole2_extractor.c
+@@ -173,7 +173,7 @@ struct ProcContext
+ EXTRACTOR_MetaDataProcessor proc;
+
+ /**
+- * Closure for 'proc'.
++ * Closure for @e proc.
+*/
+ void *proc_cls;
+
+@@ -213,7 +213,12 @@ process_metadata (gpointer key,
+
+ if (G_VALUE_TYPE(gval) == G_TYPE_STRING)
+ {
+- contents = strdup (g_value_get_string (gval));
++ const char *gvals;
++
++ gvals = g_value_get_string (gval);
++ if (NULL == gvals)
++return;
++ contents = strdup (gvals);
+ }
+ else
+ {
+--
+cgit v1.1
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild
b/media-libs/libextractor/libextractor-1.8-r1.ebuild
new file mode 100644
index 000..45171230791
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 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
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 3583ff09eb407021a6903284110c8ba63188c31f
Author: Lars Wendler gentoo org>
AuthorDate: Tue Dec 4 09:55:56 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Dec 4 10:06:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3583ff09
media-libs/libextractor: Bump to version 1.8
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
media-libs/libextractor/Manifest| 1 +
media-libs/libextractor/libextractor-1.8.ebuild | 115
2 files changed, 116 insertions(+)
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 2b3e4e92b8b..7e7cdee03de 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1 +1,2 @@
DIST libextractor-1.7.tar.gz 8075299 BLAKE2B
ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07
SHA512
00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
+DIST libextractor-1.8.tar.gz 8315688 BLAKE2B
2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0
SHA512
770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
diff --git a/media-libs/libextractor/libextractor-1.8.ebuild
b/media-libs/libextractor/libextractor-1.8.ebuild
new file mode 100644
index 000..3458e295fdd
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.8.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 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/htmltidy )
+ 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
+"
+
+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/tidybuffio.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_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)
+
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/
commit: 8a6d0f53c0cb347e8ed56aee90f5ff5d4b1e95f7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Nov 9 18:49:17 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Nov 9 18:54:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6d0f53
media-libs/libextractor: Drop 1.6
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-libs/libextractor/Manifest | 1 -
.../files/libextractor-1.6-CVE-2017-17440.patch| 125 -
.../files/libextractor-1.6-ffmpeg-4.patch | 20
media-libs/libextractor/libextractor-1.6.ebuild| 119
4 files changed, 265 deletions(-)
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 30c0448cfce..2b3e4e92b8b 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,2 +1 @@
-DIST libextractor-1.6.tar.gz 8053454 BLAKE2B
cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c
SHA512
1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
DIST libextractor-1.7.tar.gz 8075299 BLAKE2B
ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07
SHA512
00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
diff --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
deleted file mode 100644
index 1870375664d..000
--- a/media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 7cc63b001ceaf81143795321379c835486d0c92e Mon Sep 17 00:00:00 2001
-From: Christian Grothoff
-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 0x0106
-+#define EXTRACTOR_VERSION 0x01060001
-
- #include
-
-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,
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: d6a7935ea4e905ef7bcaeabc350970425ae2ba5a
Author: Mikle Kolyada gentoo org>
AuthorDate: Fri Nov 9 17:51:59 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Nov 9 17:52:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6a7935e
media-libs/libextractor: amd64 stable wrt bug #670328
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
media-libs/libextractor/libextractor-1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
index 10c24f5ec2f..02ba88e54be 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 27df0d30104ca0d014d20ff15a3da6912d0e8d7b
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Nov 7 23:33:05 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Nov 7 23:33:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27df0d30
media-libs/libextractor: x86 stable (bug #670328)
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
media-libs/libextractor/libextractor-1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
index c9a5b0b69fb..10c24f5ec2f 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: f4c632a2475c2b920a53d29c9c8175904c0b9438
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Nov 7 23:17:40 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Nov 7 23:17:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c632a2
media-libs/libextractor: stable 1.7 for ppc64, bug #670328
Package-Manager: Portage-2.3.51, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/libextractor/libextractor-1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
index f55f70f7c7b..c9a5b0b69fb 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ~ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: e7a7996ba3b09a6dd71d834eeb434f51da958cbf
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Nov 7 22:52:31 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Nov 7 22:59:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a7996b
media-libs/libextractor: stable 1.7 for ppc, bug #670328
Package-Manager: Portage-2.3.51, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-libs/libextractor/libextractor-1.7.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
index 74dc8b4f10b..f55f70f7c7b 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/
commit: 3b3cd50825ef2f27b4c2b81cd300728743a321fb
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Oct 21 12:20:13 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Oct 21 12:20:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3cd508
Revert "media-libs/libextractor: Fix gcc-8 segfault (#668044 by Toralf Förster)"
This reverts commit 6a2b56c0a796fdb00151ba69fb2c617715307905.
Bug: https://bugs.gentoo.org/668044
Signed-off-by: Pacho Ramos gentoo.org>
.../files/libextractor-1.7-segfault.patch | 19 ---
media-libs/libextractor/libextractor-1.7.ebuild | 5 -
2 files changed, 24 deletions(-)
diff --git a/media-libs/libextractor/files/libextractor-1.7-segfault.patch
b/media-libs/libextractor/files/libextractor-1.7-segfault.patch
deleted file mode 100644
index 8b44238bf07..000
--- a/media-libs/libextractor/files/libextractor-1.7-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** a/src/plugins/ole2_extractor.c~2018-06-20 15:02:55.0 -0500
b/src/plugins/ole2_extractor.c 2018-07-18 15:21:13.411495048 -0500
-***
-*** 336,342
-(buf[1] != 0x0) ||
-(0 != strncmp (&buf[2],
- "SfxDocumentInfo",
-! strlen ("SfxDocumentInfo"))) ||
-(buf[0x11] != 0x0B) ||
-(buf[0x13] != 0x00) || /* pw protected! */
-(buf[0x12] != 0x00) )
336,342
-(buf[1] != 0x0) ||
-(0 != strncmp (&buf[2],
- "SfxDocumentInfo",
-! strlen ("SfxDocumentInfo") + 1)) ||
-(buf[0x11] != 0x0B) ||
-(buf[0x13] != 0x00) || /* pw protected! */
-(buf[0x12] != 0x00) )
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
index 76dde5f2ac4..74dc8b4f10b 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -58,11 +58,6 @@ RDEPEND="${DEPEND}
!sci-biology/glimmer
"
-PATCHES=(
- # From Fedora
- "${FILESDIR}"/${P}-segfault.patch
-)
-
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/
commit: 6a2b56c0a796fdb00151ba69fb2c617715307905
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Oct 20 20:46:33 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Oct 20 20:46:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a2b56c0
media-libs/libextractor: Fix gcc-8 segfault (#668044 by Toralf Förster)
Closes: https://bugs.gentoo.org/668044
Signed-off-by: Pacho Ramos gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../files/libextractor-1.7-segfault.patch | 19 +++
media-libs/libextractor/libextractor-1.7.ebuild | 5 +
2 files changed, 24 insertions(+)
diff --git a/media-libs/libextractor/files/libextractor-1.7-segfault.patch
b/media-libs/libextractor/files/libextractor-1.7-segfault.patch
new file mode 100644
index 000..8b44238bf07
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.7-segfault.patch
@@ -0,0 +1,19 @@
+*** a/src/plugins/ole2_extractor.c~2018-06-20 15:02:55.0 -0500
+--- b/src/plugins/ole2_extractor.c 2018-07-18 15:21:13.411495048 -0500
+***
+*** 336,342
+(buf[1] != 0x0) ||
+(0 != strncmp (&buf[2],
+ "SfxDocumentInfo",
+! strlen ("SfxDocumentInfo"))) ||
+(buf[0x11] != 0x0B) ||
+(buf[0x13] != 0x00) || /* pw protected! */
+(buf[0x12] != 0x00) )
+--- 336,342
+(buf[1] != 0x0) ||
+(0 != strncmp (&buf[2],
+ "SfxDocumentInfo",
+! strlen ("SfxDocumentInfo") + 1)) ||
+(buf[0x11] != 0x0B) ||
+(buf[0x13] != 0x00) || /* pw protected! */
+(buf[0x12] != 0x00) )
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
index 74dc8b4f10b..76dde5f2ac4 100644
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -58,6 +58,11 @@ RDEPEND="${DEPEND}
!sci-biology/glimmer
"
+PATCHES=(
+ # From Fedora
+ "${FILESDIR}"/${P}-segfault.patch
+)
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: db460d3532d873f64c4cae3a075acbf9b817ed84
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Oct 8 18:49:57 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Oct 9 08:03:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db460d35
media-libs/libextractor: 1.7 version bump
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-libs/libextractor/Manifest| 1 +
media-libs/libextractor/libextractor-1.7.ebuild | 113
2 files changed, 114 insertions(+)
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 3faadb8f17c..30c0448cfce 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1 +1,2 @@
DIST libextractor-1.6.tar.gz 8053454 BLAKE2B
cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c
SHA512
1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
+DIST libextractor-1.7.tar.gz 8075299 BLAKE2B
ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07
SHA512
00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild
b/media-libs/libextractor/libextractor-1.7.ebuild
new file mode 100644
index 000..74dc8b4f10b
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.7.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 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/htmltidy )
+ 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
+"
+
+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/tidybuffio.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_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)
+
+ econf \
+ --disable-static \
+ --enable-experimental \
+ --enable-glib \
+ --disable-gsf-gnome \
+ $(use_enable ffmpe
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/
commit: f4bdd7b8461e2224d8e121341137cf3ba8bc65e7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Sep 16 11:41:48 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Sep 16 11:42:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bdd7b8
media-libs/libextractor: Fix build with ffmpeg-4
Closes: https://bugs.gentoo.org/666162
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../files/libextractor-1.6-ffmpeg-4.patch| 20
media-libs/libextractor/libextractor-1.6.ebuild | 5 -
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch
b/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch
new file mode 100644
index 000..90360afd60a
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.6-ffmpeg-4.patch
@@ -0,0 +1,20 @@
+--- a/src/plugins/thumbnailffmpeg_extractor.c 2018-05-09
23:14:02.721105141 +0200
b/src/plugins/thumbnailffmpeg_extractor.c 2018-05-09
23:14:48.491629162 +0200
+@@ -107,7 +107,7 @@
+ /**
+ * Number of bytes to feed to libav in one go, with padding (padding is
zeroed).
+ */
+-#define PADDED_BUFFER_SIZE (BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)
++#define PADDED_BUFFER_SIZE (BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)
+
+ /**
+ * Global handle to MAGIC data.
+@@ -355,7 +355,7 @@
+encoder_codec_ctx->mb_lmin = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+encoder_codec_ctx->mb_lmax = encoder_codec_ctx->qmax * FF_QP2LAMBDA;
+ #endif
+- encoder_codec_ctx->flags = CODEC_FLAG_QSCALE;
++ encoder_codec_ctx->flags = AV_CODEC_FLAG_QSCALE;
+encoder_codec_ctx->global_quality = encoder_codec_ctx->qmin * FF_QP2LAMBDA;
+
+dst_frame->pts = 1;
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index cf862f1f85c..e870331de79 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${COMMON_DEPEND}
!sci-biology/glimmer
"
-PATCHES=( "${FILESDIR}/${P}-CVE-2017-17440.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-CVE-2017-17440.patch"
+ "${FILESDIR}/${P}-ffmpeg-4.patch"
+)
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
commit: 68077e8e919bc50122949f64759be12376fb4b68
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Mar 12 18:07:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Mar 13 09:33:25 2018 +
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
media-libs/libextractor/Manifest | 1 -
.../files/libextractor-1.3-exiv2-0.26.patch| 27 -
.../files/libextractor-1.3-ffmpeg-2.9.patch| 52 -
.../files/libextractor-1.3-giflib-5.patch | 37 ---
media-libs/libextractor/libextractor-1.3-r1.ebuild | 117 -
5 files changed, 234 deletions(-)
diff --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..000
--- 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.0 +0200
-+++ b/src/plugins/exiv2_extractor.cc 2017-06-10 14:22:57.0 +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..000
--- 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
-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.pa
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: be6568d45fbbba313d76f79b85c576db30619ef9
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 12 01:52:48 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 12 01:55:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be6568d4
media-libs/libextractor-1.6: ppc64 stable, bug 635362
media-libs/libextractor/libextractor-1.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index d52277c895c..cf862f1f85c 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 5749cad866570c08ca5485ea31ae91d9961a307d
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Mar 6 07:59:11 2018 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Mar 6 07:59:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5749cad8
media-libs/libextractor: stable 1.6 for ppc, bug #635362
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"
media-libs/libextractor/libextractor-1.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index d58d7c9b37d..d52277c895c 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 5f4d2f10f3fb826805e865e86900f536f01aa49d
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Feb 10 00:20:21 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Feb 10 00:20:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4d2f10
media-libs/libextractor: x86 stable (bug #635362)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-libs/libextractor/libextractor-1.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index 6c5ae4ca713..d58d7c9b37d 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 16ef1831dfe0ca1e7588b4931f648aa07075da11
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Feb 9 08:38:49 2018 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Feb 9 08:38:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16ef1831
media-libs/libextractor: amd64 stable wrt bug #635362
Signed-off-by: Agostino Sarubbo gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"
media-libs/libextractor/libextractor-1.6.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index db1013736cf..6c5ae4ca713 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 2166ff20af181bdecf4d315d69645e544b0a0033
Author: Bob Brooks cool fr nf>
AuthorDate: Wed Oct 25 19:46:07 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 25 13:52:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2166ff20
media-libs/libextractor: version bump to 1.6
Bug: https://bugs.gentoo.org/635362
Closes: https://github.com/gentoo/gentoo/pull/6055
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/libextractor/Manifest| 1 +
media-libs/libextractor/libextractor-1.6.ebuild | 110
2 files changed, 111 insertions(+)
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 5141313113d..f7a0212670e 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1 +1,2 @@
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/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
new file mode 100644
index 000..55e0250cb2f
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -0,0 +1,110 @@
+# 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
+"
+
+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 \
+ --without-gstreamer \
+ --disable-gsf-gnome \
+ $(use_enable gsf) \
+ $(use_enable ffmpeg)
+}
+
+src_in
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: cfad7524e69a1c9f793156a5a0c207004c3b0d63
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 25 11:05:55 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 25 13:53:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfad7524
media-libs/libextractor: Drop ancient blocker
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/libextractor/libextractor-1.6.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index 55e0250cb2f..d99a626f21b 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -50,7 +50,6 @@ DEPEND="${COMMON_DEPEND}
# test? ( app-forensics/zzuf )
RDEPEND="${COMMON_DEPEND}
!sci-biology/glimmer
- !sci-chemistry/pdb-extract
"
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 5d8121bb17a428dadb74497a612e4e0f9ffd457f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 25 12:08:07 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 25 13:53:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8121bb
media-libs/libextractor: Re-add USE=gstreamer
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/libextractor/libextractor-1.6.ebuild | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index d99a626f21b..624482596d9 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -10,7 +10,7 @@ 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
+IUSE="+archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4
mpeg tidy tiff vorbis +zlib" # test
RESTRICT="test"
@@ -30,6 +30,10 @@ COMMON_DEPEND="
)
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 )
@@ -90,14 +94,13 @@ src_configure() {
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 \
- --without-gstreamer \
--disable-gsf-gnome \
$(use_enable gsf) \
+ $(use_with gstreamer) \
$(use_enable ffmpeg)
}
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
commit: 6859a8b699efc9cd61a9eede139220391494d14b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 25 12:47:15 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 25 13:53:02 2017 +
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
.../files/libextractor-1.6-CVE-2017-17440.patch| 125 +
media-libs/libextractor/libextractor-1.6.ebuild| 2 +
2 files changed, 127 insertions(+)
diff --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 000..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
+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 0x0106
++#define EXTRACTOR_VERSION 0x01060001
+
+ #include
+
+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
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index c30658fc5c0..db1013736cf 100644
--- a/media-libs/libextract
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: f144d034d3f2b2f9551dfb341d1b6dcdb2a4aabf
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 25 13:08:41 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 25 13:53:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f144d034
media-libs/libextractor: Fix USE=tidy
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/libextractor/libextractor-1.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index 3f80bc169d5..c30658fc5c0 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -64,7 +64,7 @@ src_prepare() {
sed -i \
-e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
-e 's:tidy/tidy.h:tidy.h:' \
- -e 's:tidy/buffio.h:buffio.h:' \
+ -e 's:tidy/tidybuffio.h:buffio.h:' \
configure src/plugins/html_extractor.c || die
if ! use tidy; then
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 26b21b170d77a21ffbbd755947bf7ab2bb7944e7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Dec 25 12:17:27 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Dec 25 13:53:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b21b17
media-libs/libextractor: Add USE=apparmor
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-libs/libextractor/libextractor-1.6.ebuild | 4 +++-
media-libs/libextractor/metadata.xml| 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild
b/media-libs/libextractor/libextractor-1.6.ebuild
index 624482596d9..3f80bc169d5 100644
--- a/media-libs/libextractor/libextractor-1.6.ebuild
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -10,7 +10,7 @@ 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 gstreamer gtk jpeg +magic midi mp4
mpeg tidy tiff vorbis +zlib" # test
+IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic
midi mp4 mpeg tidy tiff vorbis +zlib" # test
RESTRICT="test"
@@ -21,6 +21,7 @@ COMMON_DEPEND="
sys-devel/libtool
virtual/libiconv
virtual/libintl
+ apparmor? ( sys-libs/libapparmor )
archive? ( app-arch/libarchive:= )
bzip2? ( app-arch/bzip2 )
ffmpeg? ( virtual/ffmpeg )
@@ -82,6 +83,7 @@ src_configure() {
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)
diff --git a/media-libs/libextractor/metadata.xml
b/media-libs/libextractor/metadata.xml
index 7df945748e3..63d0717ca8c 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -2,6 +2,7 @@
http://www.gentoo.org/dtd/metadata.dtd";>
+Enable apparmor support using
sys-libs/libapparmor
Enable archive support using
app-arch/libarchive
Enable OLE2 (MS Office) plug-in support using
gnome-extra/libgsf
Enable magic support using
sys-apps/file
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: cc37e9296d035bf0ee185f523e4318929c499ea0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 17 20:37:00 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 17 20:49:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc37e929
media-libs/libextractor: Drop old
Package-Manager: Portage-2.3.5, Repoman-2.3.1
media-libs/libextractor/Manifest | 1 -
media-libs/libextractor/libextractor-1.0.1.ebuild | 128 --
media-libs/libextractor/libextractor-1.3.ebuild | 115 ---
3 files changed, 244 deletions(-)
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index af9a5afd2eb..2ebf5d3ae93 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,2 +1 @@
-DIST libextractor-1.0.1.tar.gz 7894265 SHA256
3251cbb4324defee1e641de44afb11156b13d676e27e01e031c6e06d904e1ece SHA512
616db2880cfc3b8974107b24346472e5650c5ce4b7580c4b78bcbff41bb1eea313a732891d1eced74a7d90518be7da481859dff98365212cd728d0d19447619c
WHIRLPOOL
c83561506e3f98f5b212bea23bce44ed42287fde03dbcf2ab2f5cec4ff37a1dba2fc9a2cf1beb984e96518b12ae5ac4561a2acc3b949acb9307bd26eda9006d5
DIST libextractor-1.3.tar.gz 7942021 SHA256
868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f SHA512
38ed47e5e5f50ddf216408f698a104900baa3b03cc8a81a14e63afd30b3e3922acda17363d88d9ba1356ebf70287c8a5152ff6933a36ec1042ca0d832218d45d
WHIRLPOOL
aeb8305d9efbe6e52632bb7281ea6df26c417c8bbe1398fdc0106653e3b4109095ea734c84f92ede03bd6406c69b362ee4590a0c964c550d8878f890b32b52d9
diff --git a/media-libs/libextractor/libextractor-1.0.1.ebuild
b/media-libs/libextractor/libextractor-1.0.1.ebuild
deleted file mode 100644
index 30688b936e5..000
--- a/media-libs/libextractor/libextractor-1.0.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-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 qt4
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 )
- mp4? ( media-libs/libmp4v2:0 )
- magic? ( sys-apps/file )
- midi? ( media-libs/libsmf )
- mpeg? ( media-libs/libmpeg2 )
- qt4? (
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- )
- tidy? ( app-text/htmltidy )
- tiff? ( media-libs/tiff:0 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- zlib? ( sys-libs/zlib )
- !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 )
- 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 )
- !
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
commit: 00c65df99751d235e08fe2f54613dac2eeb2f80b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 17 20:36:09 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 17 20:49:35 2017 +
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
.../files/libextractor-1.3-exiv2-0.26.patch| 27 ++
media-libs/libextractor/libextractor-1.3-r1.ebuild | 26 -
2 files changed, 42 insertions(+), 11 deletions(-)
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
new file mode 100644
index 000..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.0 +0200
b/src/plugins/exiv2_extractor.cc 2017-06-10 14:22:57.0 +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/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 )
- !
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 1f21d3b5fba9e8869b98b195b9a0b7b1d85bd7a9
Author: Felix Janda posteo de>
AuthorDate: Sat Nov 26 22:43:42 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sun Nov 27 08:38:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f21d3b5
media-libs/libextractor: fix compilation with USE=tidy
Gentoo-Bug: https://bugs.gentoo.org/600470
Closes: https://github.com/gentoo/gentoo/pull/2923
media-libs/libextractor/libextractor-1.3-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild
b/media-libs/libextractor/libextractor-1.3-r1.ebuild
index cd34de2..e686395 100644
--- a/media-libs/libextractor/libextractor-1.3-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.3-r1.ebuild
@@ -63,6 +63,7 @@ src_prepare() {
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
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
commit: 76b2b785f2e4e336b69af671363ea04f55ed443d
Author: Craig Andrews integralblue com>
AuthorDate: Mon Oct 24 20:05:15 2016 +
Commit: David Seifert gentoo org>
CommitDate: Tue Oct 25 18:31:30 2016 +
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 gentoo.org>
.../files/libextractor-1.3-ffmpeg-2.9.patch| 52 ++
.../files/libextractor-1.3-giflib-5.patch | 4 +-
media-libs/libextractor/libextractor-1.3-r1.ebuild | 113 +
3 files changed, 167 insertions(+), 2 deletions(-)
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
new file mode 100644
index ..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
+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
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)
{
diff --git a/media-libs/libextractor/libextractor-1.3-r1.ebuild
b/media-libs/libextractor/libextractor-1.3-r1.ebuild
new file mode 100644
index ..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 )
+ fla
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/
commit: 1e6928647cfd7d6f77d8416c95bae7f3853a6cc1 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Apr 20 15:11:39 2016 + Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Apr 20 15:11:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e692864 media-libs/libextractor: fix references in metadata.xml Package-Manager: portage-2.2.26 media-libs/libextractor/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml index 0b241b9..096dcf4 100644 --- a/media-libs/libextractor/metadata.xml +++ b/media-libs/libextractor/metadata.xml @@ -7,7 +7,7 @@ Enable archive support using app-arch/libarchive -Enable OLE2 (MS Office) plug-in support using gnome-base/libgsf +Enable OLE2 (MS Office) plug-in support using gnome-extra/libgsf Enable magic support using sys-apps/file Enable MIDI support through media-libs/libsmf
[gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/files/, media-libs/libextractor/
commit: 6bd37a439b8ad81c4bd536351b5fd7c008b1819e
Author: Mike Frysinger gentoo org>
AuthorDate: Fri Feb 19 01:23:00 2016 +
Commit: Mike Frysinger gentoo org>
CommitDate: Fri Feb 19 01:23:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd37a43
media-libs/libextractor: add upstream giflib-5 fix #571902
.../files/libextractor-1.3-giflib-5.patch | 37 ++
media-libs/libextractor/libextractor-1.3.ebuild| 2 ++
2 files changed, 39 insertions(+)
diff --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 000..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 */
+
+
diff --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 ::' \
