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 D366E138334 for ; Sun, 21 Oct 2018 12:21:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D2332E0831; Sun, 21 Oct 2018 12:21:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 A6898E0831 for ; Sun, 21 Oct 2018 12:21:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D4E7C335D1F for ; Sun, 21 Oct 2018 12:21:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 79090436 for ; Sun, 21 Oct 2018 12:20:58 +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: <1540124449.3b3cd50825ef2f27b4c2b81cd300728743a321fb.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: 3b3cd50825ef2f27b4c2b81cd300728743a321fb X-VCS-Branch: master Date: Sun, 21 Oct 2018 12:20:58 +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: 453065b9-9b79-4655-8892-88d5ac02e960 X-Archives-Hash: 603ebe3ed299021f902a200ef3a3ee0a commit: 3b3cd50825ef2f27b4c2b81cd300728743a321fb Author: Pacho Ramos gentoo org> AuthorDate: Sun Oct 21 12:20:13 2018 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 21 12:20:49 2018 +0000 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..00000000000 --- 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.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 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