[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/, 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/, 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/, 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/, 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/, 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