From patchwork Wed Jul 27 07:41:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel van der Boom X-Patchwork-Id: 41012 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3CC3827BBEA; Wed, 27 Jul 2022 08:47:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EB1A827BBE9 for ; Wed, 27 Jul 2022 08:47:58 +0100 (BST) Received: from localhost ([::1]:42146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oGblu-0001Nr-3K for patchwork@mira.cbaines.net; Wed, 27 Jul 2022 03:47:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oGbi7-0006F8-O0 for guix-patches@gnu.org; Wed, 27 Jul 2022 03:44:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oGbi5-0003IC-WA for guix-patches@gnu.org; Wed, 27 Jul 2022 03:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oGbi5-0001g7-TE for guix-patches@gnu.org; Wed, 27 Jul 2022 03:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56766] [PATCH] Adjust patch according to review References: <2b700a6dc4b5b7dd09465c0ef7c04f73b055d463.1658777229.git.marcel@hsdev.com> In-Reply-To: <2b700a6dc4b5b7dd09465c0ef7c04f73b055d463.1658777229.git.marcel@hsdev.com> Resent-From: Marcel van der Boom Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Jul 2022 07:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56766@debbugs.gnu.org Cc: Marcel van der Boom Received: via spool by 56766-submit@debbugs.gnu.org id=B56766.16589078036366 (code B ref 56766); Wed, 27 Jul 2022 07:44:01 +0000 Received: (at 56766) by debbugs.gnu.org; 27 Jul 2022 07:43:23 +0000 Received: from localhost ([127.0.0.1]:54991 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGbhT-0001ea-3s for submit@debbugs.gnu.org; Wed, 27 Jul 2022 03:43:23 -0400 Received: from read.hsdev.com ([209.250.245.235]:43508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oGbhL-0001eE-0A for 56766@debbugs.gnu.org; Wed, 27 Jul 2022 03:43:21 -0400 Received: from hsdev.com (hawking.hsdev.com [213.125.12.142]) by read.hsdev.com (Postfix) with ESMTPA id DED582161E; Wed, 27 Jul 2022 09:43:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hsdev.com; s=201906; t=1658907787; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=xpjc18l52QzxepM3scHzLJBDnhsoDP4XgPp3CeqTeYQ=; b=fQC0WBbxxVgLKzMyNLyi7QpDm8jbUsiYJVtYxuzVCnN5y5cRDm+BZ8NyVc5Ra5mxzby4KP jYSIltffWHHx3lQ1vAs7Z06AbFUXkjMNs9/hiETRTHVBmqZMAqoxAa8t0OO/UjHrpKliy6 R8C+iqLUnJPVoETA7o+mbWqne0k3wYI= Received: by hsdev.com (Postfix, from userid 1000) id 9C2D236A2995; Wed, 27 Jul 2022 09:43:07 +0200 (CEST) From: Marcel van der Boom Date: Wed, 27 Jul 2022 09:41:44 +0200 Message-Id: <4af56c93a8d990220918c65bc58c32f1c8c07aa3.1658907553.git.marcel@van-der-boom.nl> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image.scm (exiv3): use substitution instead of patch --- gnu/packages/image.scm | 18 ++++++++++++------ gnu/packages/patches/exiv2-ppc64.patch | 11 ----------- 2 files changed, 12 insertions(+), 17 deletions(-) delete mode 100644 gnu/packages/patches/exiv2-ppc64.patch base-commit: 212ca81895b2baa819ea11a308ad21880b84a546 prerequisite-patch-id: a7093ef8ccbab6d6dd7474a08f75970bcf3b9d4b diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index dc4bf76790..9febb883b4 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1342,13 +1342,10 @@ (define-public exiv2 (uri (string-append "https://www.exiv2.org/builds/exiv2-" version "-Source.tar.gz")) (sha256 - (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m")) - (patches - (if (target-ppc64le?) - (list (search-patch "exiv2-ppc64.patch")))))) + (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m")))) (build-system cmake-build-system) (arguments - '(#:test-target "tests" + `(#:test-target "tests" #:configure-flags (list "-DEXIV2_BUILD_UNIT_TESTS=ON" ;; darktable needs BMFF to support ;; CR3 files. @@ -1359,7 +1356,16 @@ (define-public exiv2 (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) - (for-each delete-file (find-files lib "\\.a$")))))))) + (for-each delete-file (find-files lib "\\.a$"))))) + (add-after 'unpack 'adjust-ppc6-tests + (lambda _ + ,@(if (target-ppc64le?) + ;; Adjust test on ppc64 + ;; See: https://github.com/Exiv2/exiv2/issues/933 + '((substitute* "tests/bugfixes/github/test_CVE_2018_12265.py" + (("\\$uncaught_exception \\$addition_overflow_message\n") "") + (("retval = \\[1\\]") "retval = [0]"))) + '())))))) (propagated-inputs (list expat zlib)) (native-inputs diff --git a/gnu/packages/patches/exiv2-ppc64.patch b/gnu/packages/patches/exiv2-ppc64.patch deleted file mode 100644 index a74a7ac1b7..0000000000 --- a/gnu/packages/patches/exiv2-ppc64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tests/bugfixes/github/test_CVE_2018_12265.py -+++ /tests/bugfixes/github/test_CVE_2018_12265.py -@@ -18,7 +18,6 @@ - Warning: Directory Image, entry 0x0201: Strip 0 is outside of the data area; ignored. - Warning: Directory Image, entry 0x0201: Strip 7 is outside of the data area; ignored. - Error: Offset of directory Thumbnail, entry 0x0201 is out of bounds: Offset = 0x00000000; truncating the entry --$uncaught_exception $addition_overflow_message - """ - ] -- retval = [1] -+ retval = [0]