From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- media-libs/libextractor/Manifest | 4 +- .../files/libextractor-1.8-CVE-2018-20430.patch | 49 --------- .../files/libextractor-1.8-CVE-2018-20431.patch | 39 ------- media-libs/libextractor/libextractor-1.9-r1.ebuild | 118 +++++++++++++++++++++ media-libs/libextractor/libextractor-1.9.ebuild | 118 --------------------- 5 files changed, 119 insertions(+), 209 deletions(-) delete mode 100644 media-libs/libextractor/files/libextractor-1.8-CVE-2018-20430.patch delete mode 100644 media-libs/libextractor/files/libextractor-1.8-CVE-2018-20431.patch create mode 100644 media-libs/libextractor/libextractor-1.9-r1.ebuild delete mode 100644 media-libs/libextractor/libextractor-1.9.ebuild (limited to 'media-libs/libextractor') diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest index b956603ac0ed..846ff9b3e6e2 100644 --- a/media-libs/libextractor/Manifest +++ b/media-libs/libextractor/Manifest @@ -1,7 +1,5 @@ -AUX libextractor-1.8-CVE-2018-20430.patch 1405 BLAKE2B be8819430f6a608fe90a16f928d041399932202feb0e0c39885ed197e2f33728bfbaa05257e0b8dbab06866b9d03f413eff2d539e09d3be58135074fbbe3e167 SHA512 c2a4ef23dc856c03c885631be27f108337aa5e4d74f8aa1d4010ad9959694ae8d30896102b6c4067dc6ac3719177d4a7e453ef84c54bad37c5f988990f39be12 -AUX libextractor-1.8-CVE-2018-20431.patch 998 BLAKE2B 44e77c7f53c8ea2b134af14aa0810eb3b2ad1abfd689d1261de4bebd4586b9dd6c7c49f3b51f9d01c0bb6cc5c5bf224f668ed689db1b81fe71a8c144502a309d SHA512 3754ce52998329b70e7220efcdf855ac795010b145278c35c86ae558a50533854c06ad83c8f2b1a3e466a1649ce6a293afbbcbe7fded560cd319158387b1296b AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c AUX libextractor-1.9-CVE-2019-15531.patch 518 BLAKE2B 2310c4863dcce5324706a96fb86cff7b72473d0027027bf8f40453cc863296a5c1880577af8a95f0875522da4d5251690c77cd8571e87d5c048f18240b8aee03 SHA512 5b50c20ce0e77f664578e1383e481694388e6200f01e3eef0029296deb3cc35cc76b2277d4a1f879f3f1d1b4d24235d2e17f26eacf0a5b963f1c1433a615eaa2 DIST libextractor-1.9.tar.gz 8323852 BLAKE2B 71e81e57ce7857b7b7f0180a7b130b0808573d71384c61a1a079b0ce9c02bc4f1386d3b27c68d668b555a692e523a7998d6fbc675d15f8ee26b487b0b5b31927 SHA512 c2539b144d026fb0e871c5776aee4deaad4a987a730350744a7e5e74fbe98a4abb635dbe206b93c3aa9cd676b8797ea0b97271de0c903dfb035e245ab42ea149 -EBUILD libextractor-1.9.ebuild 2825 BLAKE2B 2305da642eacc530b6dedf24ca4dc9b3459f5d1d4f2027b45ff8f615af11ccd97ba84c6dc5d466d6ef56d8a7ac3b1bc0debc4a255b788ca5ee95533779554acc SHA512 ce1bb5f376670968bf39b768a2a88e76f1dbc8e0038ea5ae3200c360ba3b30b276a682e15861b5d834cf4ef4b8a69ea3d54aef0b6ec248b74e88dec296233eb8 +EBUILD libextractor-1.9-r1.ebuild 2829 BLAKE2B ebd8669c31784b07344b99742e9f58c7d87d26ccd05c60152223f5eaf95f5a010769b4b66c0037bb5c3e8dd20c0b4e6d9fe6b41f3c757fb13d3ec7d95e29c933 SHA512 907b84592420ba5bfb440ff8e50a407e0c24c15a45f255dc4487488990e5cebe99cc2b475dc1903fd787b57733a5af4b81e0a0748763d03c49761b3883b46428 MISC metadata.xml 560 BLAKE2B dc882ee2f4322f67c307f2ed919fd25d64505185f8046d94ca2680b060a01ee81a774aba5a96eb86f2a449c503683a2a92b4668e414149ffd109721d3bb7666c SHA512 9a290ce121dfa7d5a96cc3337e936b4cd21755d7becd2ae8fa0ddac07a536c9c05aa2501c5adf136ae454b4a85ded6e0e523fd4be248feec729bbc09f7f7749b 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 d0b5968606ba..000000000000 --- 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 2cd0448ba894..000000000000 --- 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 diff --git a/media-libs/libextractor/libextractor-1.9-r1.ebuild b/media-libs/libextractor/libextractor-1.9-r1.ebuild new file mode 100644 index 000000000000..91c6a2f396fe --- /dev/null +++ b/media-libs/libextractor/libextractor-1.9-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Library to extract metadata from files of arbitrary type" +HOMEPAGE="https://www.gnu.org/software/libextractor/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm ppc ppc64 x86" +IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test + +RESTRICT="test" + +DEPEND=" + app-text/iso-codes + dev-libs/glib:2 + media-gfx/exiv2:= + sys-devel/libtool + virtual/libiconv + virtual/libintl + apparmor? ( sys-libs/libapparmor ) + archive? ( app-arch/libarchive:= ) + bzip2? ( app-arch/bzip2 ) + ffmpeg? ( media-video/ffmpeg ) + flac? ( + media-libs/flac + media-libs/libogg + ) + gif? ( media-libs/giflib:= ) + gsf? ( gnome-extra/libgsf:= ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gtk? ( x11-libs/gtk+:3 ) + jpeg? ( virtual/jpeg:0 ) + magic? ( sys-apps/file ) + midi? ( media-libs/libsmf ) + mp4? ( media-libs/libmp4v2:0 ) + mpeg? ( media-libs/libmpeg2 ) + tidy? ( app-text/tidy-html5 ) + tiff? ( media-libs/tiff:0 ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + zlib? ( sys-libs/zlib ) +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" +# test? ( app-forensics/zzuf ) +RDEPEND="${DEPEND} + !sci-biology/glimmer +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8-exiv2-0.27.patch # bug #674046 + "${FILESDIR}"/${P}-CVE-2019-15531.patch +) + +src_prepare() { + default + + # m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs: + sed -i \ + -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \ + configure src/plugins/html_extractor.c || die + + if ! use tidy; then + sed -i -e 's:tidy.h:dIsAbLe&:' configure || die + fi +} + +src_configure() { + e_ac_cv() { + export ac_cv_"$@" + } + + e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no + + e_ac_cv header_FLAC_all_h=$(usex flac) + e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac) + e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac) + + e_ac_cv header_sys_apparmor_h=$(usex apparmor) + e_ac_cv header_archive_h=$(usex archive) + e_ac_cv header_bzlib_h=$(usex bzip2) + e_ac_cv header_gif_lib_h=$(usex gif) + e_ac_cv header_jpeglib_h=$(usex jpeg) + e_ac_cv header_magic_h=$(usex magic) + e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg) + e_ac_cv header_tiffio_h=$(usex tiff) + e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis) + e_ac_cv header_zlib_h=$(usex zlib) + e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4) + e_ac_cv lib_smf_smf_load_from_memory=$(usex midi) + + local myeconfargs=( + --disable-static + --enable-experimental + --enable-glib + --disable-gsf-gnome + $(use_enable ffmpeg) + $(use_enable gsf) + $(use_with gstreamer) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} diff --git a/media-libs/libextractor/libextractor-1.9.ebuild b/media-libs/libextractor/libextractor-1.9.ebuild deleted file mode 100644 index 6e14cb63b61a..000000000000 --- a/media-libs/libextractor/libextractor-1.9.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}"/${PN}-1.8-exiv2-0.27.patch # bug #674046 - "${FILESDIR}"/${P}-CVE-2019-15531.patch -) - -src_prepare() { - default - - # m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs: - sed -i \ - -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \ - configure src/plugins/html_extractor.c || die - - if ! use tidy; then - sed -i -e 's:tidy.h:dIsAbLe&:' configure || die - fi -} - -src_configure() { - e_ac_cv() { - export ac_cv_"$@" - } - - e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no - - e_ac_cv header_FLAC_all_h=$(usex flac) - e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac) - e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac) - - e_ac_cv header_sys_apparmor_h=$(usex apparmor) - e_ac_cv header_archive_h=$(usex archive) - e_ac_cv header_bzlib_h=$(usex bzip2) - e_ac_cv header_gif_lib_h=$(usex gif) - e_ac_cv header_jpeglib_h=$(usex jpeg) - e_ac_cv header_magic_h=$(usex magic) - e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg) - e_ac_cv header_tiffio_h=$(usex tiff) - e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis) - e_ac_cv header_zlib_h=$(usex zlib) - e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4) - e_ac_cv lib_smf_smf_load_from_memory=$(usex midi) - - local myeconfargs=( - --disable-static - --enable-experimental - --enable-glib - --disable-gsf-gnome - $(use_enable ffmpeg) - $(use_enable gsf) - $(use_with gstreamer) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} -- cgit v1.2.3