From patchwork Mon Jul 25 19:47:33 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: 4019 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 D5B3D27BBEA; Mon, 25 Jul 2022 20:58:17 +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 8D74827BBE9 for ; Mon, 25 Jul 2022 20:58:17 +0100 (BST) Received: from localhost ([::1]:45178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG4DY-0001qN-N7 for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 15:58:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG44d-00068n-5r for guix-patches@gnu.org; Mon, 25 Jul 2022 15:49:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG44c-0002Tl-9Z for guix-patches@gnu.org; Mon, 25 Jul 2022 15:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG44c-0001y3-26 for guix-patches@gnu.org; Mon, 25 Jul 2022 15:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56766] [PATCH] gnu: exiv2: Fix test failure on ppc64-le Resent-From: Marcel van der Boom Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 19:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56766 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56766@debbugs.gnu.org Cc: Marcel van der Boom X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16587784927464 (code B ref -1); Mon, 25 Jul 2022 19:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2022 19:48:12 +0000 Received: from localhost ([127.0.0.1]:51497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG43o-0001wI-3H for submit@debbugs.gnu.org; Mon, 25 Jul 2022 15:48:12 -0400 Received: from lists.gnu.org ([209.51.188.17]:55226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG43l-0001w1-Py for submit@debbugs.gnu.org; Mon, 25 Jul 2022 15:48:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG43l-00066n-Gu for guix-patches@gnu.org; Mon, 25 Jul 2022 15:48:09 -0400 Received: from read.hsdev.com ([209.250.245.235]:50726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG43i-0002Qa-Ul for guix-patches@gnu.org; Mon, 25 Jul 2022 15:48:09 -0400 Received: from hsdev.com (hawking.hsdev.com [213.125.12.142]) by read.hsdev.com (Postfix) with ESMTPA id 9F72020FBD; Mon, 25 Jul 2022 21:47:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hsdev.com; s=201906; t=1658778478; 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=zNjIveHPv6FmvkLMlsWVafRuoHFJmJTu63bATmjspp4=; b=YKVfQ7VYy5qcJaUQQZucWqbpno00wVJxZcAoLwRiowah0Q/mVfI2C6R/JvifICHh6lbssn t8wfQRSqYBsvFXvV5wVSeNTz7TUyPopUtC1cJbzIo8R9j8I6ckbXcT7dtUyeBPhch+dHIk qec5QwQHUkjiE3fhpVgzZcP83yOi62M= Received: by hsdev.com (Postfix, from userid 1000) id 5A13B36A0264; Mon, 25 Jul 2022 21:47:58 +0200 (CEST) From: Marcel van der Boom Date: Mon, 25 Jul 2022 21:47:33 +0200 Message-Id: <2b700a6dc4b5b7dd09465c0ef7c04f73b055d463.1658777229.git.marcel@hsdev.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Received-SPF: pass client-ip=209.250.245.235; envelope-from=mrb@hsdev.com; helo=read.hsdev.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Mon, 25 Jul 2022 15:58:05 -0400 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 ppc64 and arm do not raise exception and thus output and exit code for test is different. * gnu/packages/patches/exiv2-ppc64.patch: Modify test for ppc64 * gnu/packages/image.scm (exiv2): add `patches` field for source if target is ppc64 See: https://github.com/Exiv2/exiv2/issues/365 and https://github.com/Exiv2/exiv2/issues/933 upstream. --- gnu/packages/image.scm | 5 ++++- gnu/packages/patches/exiv2-ppc64.patch | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/exiv2-ppc64.patch base-commit: 212ca81895b2baa819ea11a308ad21880b84a546 diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index d52d57b3b1..dc4bf76790 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1342,7 +1342,10 @@ (define-public exiv2 (uri (string-append "https://www.exiv2.org/builds/exiv2-" version "-Source.tar.gz")) (sha256 - (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m")))) + (base32 "1qm6bvj28l42km009nc60gffn1qhngc0m2wjlhf90si3mcc8d99m")) + (patches + (if (target-ppc64le?) + (list (search-patch "exiv2-ppc64.patch")))))) (build-system cmake-build-system) (arguments '(#:test-target "tests" diff --git a/gnu/packages/patches/exiv2-ppc64.patch b/gnu/packages/patches/exiv2-ppc64.patch new file mode 100644 index 0000000000..a74a7ac1b7 --- /dev/null +++ b/gnu/packages/patches/exiv2-ppc64.patch @@ -0,0 +1,11 @@ +--- /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]