From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7C845138334 for ; Sat, 20 Oct 2018 20:46:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5835EE0843; Sat, 20 Oct 2018 20:46:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32903E0843 for ; Sat, 20 Oct 2018 20:46:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1DCF335CFD for ; Sat, 20 Oct 2018 20:46:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 753BB455 for ; Sat, 20 Oct 2018 20:46:53 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1540068403.6a2b56c0a796fdb00151ba69fb2c617715307905.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libextractor/, media-libs/libextractor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libextractor/files/libextractor-1.7-segfault.patch media-libs/libextractor/libextractor-1.7.ebuild X-VCS-Directories: media-libs/libextractor/ media-libs/libextractor/files/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 6a2b56c0a796fdb00151ba69fb2c617715307905 X-VCS-Branch: master Date: Sat, 20 Oct 2018 20:46:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d7520384-1045-4406-a5c3-ab13937024a7 X-Archives-Hash: 1970c0aba372c03453f66ce75db851f8 commit: 6a2b56c0a796fdb00151ba69fb2c617715307905 Author: Pacho Ramos gentoo org> AuthorDate: Sat Oct 20 20:46:33 2018 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Oct 20 20:46:43 2018 +0000 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 00000000000..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.000000000 -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