From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uISxL0cdOmFLfgAAgWs5BA (envelope-from ) for ; Thu, 09 Sep 2021 16:42:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4PRUK0cdOmH5fQAAB5/wlQ (envelope-from ) for ; Thu, 09 Sep 2021 14:42:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E385A11633 for ; Thu, 9 Sep 2021 16:42:14 +0200 (CEST) Received: from localhost ([::1]:42834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOLFl-0003yt-H9 for larch@yhetil.org; Thu, 09 Sep 2021 10:42:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOLFa-0003yC-TS for guix-patches@gnu.org; Thu, 09 Sep 2021 10:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mOLFa-0001V8-MF for guix-patches@gnu.org; Thu, 09 Sep 2021 10:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mOLFa-00005q-JD for guix-patches@gnu.org; Thu, 09 Sep 2021 10:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50239] [PATCH core-updates-frozen v2] gnu: diffutils: Fix signal processing. Resent-From: Thiago Jung Bauermann Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Sep 2021 14:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50239 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50239@debbugs.gnu.org Cc: Thiago Jung Bauermann Received: via spool by 50239-submit@debbugs.gnu.org id=B50239.1631198518349 (code B ref 50239); Thu, 09 Sep 2021 14:42:02 +0000 Received: (at 50239) by debbugs.gnu.org; 9 Sep 2021 14:41:58 +0000 Received: from localhost ([127.0.0.1]:35900 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOLFW-00005Y-3L for submit@debbugs.gnu.org; Thu, 09 Sep 2021 10:41:58 -0400 Received: from mx.kolabnow.com ([95.128.36.40]:15526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mOLFL-000055-1S for 50239@debbugs.gnu.org; Thu, 09 Sep 2021 10:41:57 -0400 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTP id D0E28417B1 for <50239@debbugs.gnu.org>; Thu, 9 Sep 2021 16:41:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kolabnow.com; h= content-transfer-encoding:content-type:content-type:mime-version :references:in-reply-to:message-id:date:date:subject:subject :from:from:received:received:received; s=dkim20160331; t= 1631198500; x=1633012901; bh=tAU0JJ3TpocDpOzWAaVJNN8+GTYuVkYiCmI IaxGAuRs=; b=q9Wc6dHd2A4N9nZSM2X5mZCnzvxjt9rbQpRlvPTuehj4ZGd6YXh fpmLGOvxw21x/qqRa8udXER8CJ9iMOWS2+ULHUPDNcwpXkK3m3WPcE7eBWDwJqxF BQBMSl46B4TBZxMQ8guMkyAbVx41qpHUvhYczYurh76hbFYmNlUKAJg74ll5lAwr /V5rJn66EzEkUFTBa6z0sW7TcIkCpy7NQeRUyAQ6r7uYybIecCn/Sf36878QSiPt SZNci3J0yihS3D/58ljEIPRL/nBqkzw/GfmRQ75O066QJunQMEIfu72B6Uld3uFl 0y7CXiTksjHo+Sg0XQmn/rq3cYV/Xu4o4AjYSQd0gu6xFGsxJP6X/lBjsRS1Gnxb hM2RyaoPr8c/zYsOPNU+VtEZ4ZpWrxon3upeaPRbkQJKc988DXaR/gLW7V1uRtXG a8SQf2qrHIgj3OhQcahiq3Y/UrvtbEjeV8aXY2w4oU7/4UXcsBYM100/uGK+BnkD F91Vhy9W04udKEHlJUjU5nKg4dNKB8YlpA7ZhDAuG5uMXJM9tHkGLIVKkkZXvFD/ W36tzf8Z9lwv2QAbhmocSnaVqlGhnR4LLLXolLhFu8oAUJkF7MyS15d8Sacr4Beh w0p8sPdb10MgSglznyVfr4oe0sME0RoR9mTlBjENwdWNfPChiFyeKEKc= X-Virus-Scanned: amavisd-new at mykolab.com Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out003.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fOEbZ-IJaQ3O for <50239@debbugs.gnu.org>; Thu, 9 Sep 2021 16:41:40 +0200 (CEST) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out003.mykolab.com (Postfix) with ESMTPS id E6AE540F4E for <50239@debbugs.gnu.org>; Thu, 9 Sep 2021 16:41:39 +0200 (CEST) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id BFB74C0E; Thu, 9 Sep 2021 16:41:38 +0200 (CEST) Date: Thu, 9 Sep 2021 11:41:14 -0300 Message-Id: <20210909144114.5850-1-bauermann@kolabnow.com> In-Reply-To: <877dft9auv.fsf@gnu.org> References: <877dft9auv.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Thiago Jung Bauermann X-ACL-Warn: , Thiago Jung Bauermann via Guix-patches From: Thiago Jung Bauermann via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631198535; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=tAU0JJ3TpocDpOzWAaVJNN8+GTYuVkYiCmIIaxGAuRs=; b=cdUTgV4JUqmcsWUkyo4pxMODpRF9yXlGhG0+sImJurM+B69sYSb0I4jKjUsyof5xtS1Rpt BXOR24ePSanQTyLfYklrOiPXW0ryhZssuc+fJjn8P3z74tow9roSOJzvE4QHBDbKWbQRVI zUad/IQguPVS0cpHOrMrQiQdzWAg3JzrYXd0TCpES7vxKjxScfqHTofw2HkG56DBDHYl8O 8fQ2kBlDzOK2KABUpj0yLK1TdAyxAii5ukIuZIUzzGh3tAC0vpIXfK4uPQBxhl+c+9EljB 2ewaS53hImWH+wuVoW1L3AZCFOJV947L49/6KmKPz6EK+gVVOhDsSLGD25sQww== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631198535; a=rsa-sha256; cv=none; b=NJx50Wi7yUQXjvgdecMbZJWBdxnSo4n8kAVBfKcmtTtq4kpvmOzI18DSQAC/wc6uaU5vBl iS68i5TA4qy8g4d9HLK5yq4Us6vaNzM94iCTgoQNRLOpj6rleoL+uI3vSbVgEE0jUV3Ki2 7RqfzcandqBkmAJgGpqG0BHzAN8JvLjMEvsahUeoLf5hLRBO0rH/PiM3JPZ/82xBNhdoaf qwPrQJf3DcqbdPIXV2TmiAQM/LaNe1Rx5xwbGaWqbUabrI3YYWGElcIvPUAlwLtpfNtO+Z jOH4DDoAkBVNO/3gM8S7i2Bh1MnRfXL3xad1msVjf/nhQEveUMpz2ETaNftDgg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=q9Wc6dHd; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=kolabnow.com header.s=dkim20160331 header.b=q9Wc6dHd; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: E385A11633 X-Spam-Score: -2.91 X-Migadu-Scanner: scn1.migadu.com X-TUID: Kp02abY3Fy5i diffutils has a race condition in its signal processing code which is easy to trigger on powerpc64le-linux. More often than not, it causes the ‘colors’ test to fail and therefore the build of the package fails as well. Add the patch proposed in Debian bug 922552 which fixes the problem. * gnu/packages/patches/diffutils-fix-signal-processing.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/base.scm (diffutils)[source]: Use it. --- Hello, Here is the same patch rebased on top of ‘core-updates-frozen’. I didn’t yet do it in a way that preserves derivations on other platforms because there will be a batch of world-rebuilding changes¹, so depending on how soon the branch is going to be merged into master, it could be a good opportunity to land this fix now. So far, there hasn’t been news from upstream on a fix for the problem, but it’s been only a bit over a week since they last proposed a patch so it’s too early to be worried about anything. I am perfectly fine with skipping this world-rebuilding window and sending a v3 which preserves derivations on other platforms as you suggested. Or even not fixing this bug on ’core-updates-frozen’ if the upstream fix doesn’t arrive by then. As I mentioned earlier, we can just hit the “try again” button until the CI produces a successful build. :-) I’m just sending this version to have the option on the table. Thanks! ¹ https://lists.nongnu.org/archive/html/guix-devel/2021-09/msg00097.html gnu/local.mk | 1 + gnu/packages/base.scm | 3 +- .../diffutils-fix-signal-processing.patch | 58 +++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/diffutils-fix-signal-processing.patch diff --git a/gnu/local.mk b/gnu/local.mk index 07e6787642e9..d37b1b577a04 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -967,6 +967,7 @@ dist_patch_DATA = \ %D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ + %D%/packages/patches/diffutils-fix-signal-processing.patch \ %D%/packages/patches/diffutils-gets-undeclared.patch \ %D%/packages/patches/disarchive-cross-compilation.patch \ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 70eb135a1e41..bfe769fbc4ed 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -274,7 +274,8 @@ differences.") (sha256 (base32 "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk")) - (patches (search-patches "coreutils-gnulib-tests.patch")))) + (patches (search-patches "coreutils-gnulib-tests.patch" + "diffutils-fix-signal-processing.patch")))) (build-system gnu-build-system) (native-inputs (list perl)) (synopsis "Comparing and merging files") diff --git a/gnu/packages/patches/diffutils-fix-signal-processing.patch b/gnu/packages/patches/diffutils-fix-signal-processing.patch new file mode 100644 index 000000000000..134dd3f718bd --- /dev/null +++ b/gnu/packages/patches/diffutils-fix-signal-processing.patch @@ -0,0 +1,58 @@ +Author: Frédéric Bonnard + +Obtained from: + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922552#19 + +Fixes bug reported upstream at: + +https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34519 + +diff --git a/src/diff.c b/src/diff.c +index e2eb32437353..b574e8282dc9 100644 +--- a/src/diff.c ++++ b/src/diff.c +@@ -1451,6 +1451,8 @@ compare_files (struct comparison const *parent, + } + } + ++ final_process_signals (); ++ + /* Now the comparison has been done, if no error prevented it, + and STATUS is the value this function will return. */ + +diff --git a/src/diff.h b/src/diff.h +index 03daaa4a0530..e177fe600a25 100644 +--- a/src/diff.h ++++ b/src/diff.h +@@ -390,6 +390,7 @@ extern enum changes analyze_hunk (struct change *, lin *, lin *, lin *, lin *); + extern void begin_output (void); + extern void debug_script (struct change *); + extern void fatal (char const *) __attribute__((noreturn)); ++extern void final_process_signals (void); + extern void finish_output (void); + extern void message (char const *, char const *, char const *); + extern void message5 (char const *, char const *, char const *, +diff --git a/src/util.c b/src/util.c +index 4f4d9bb285eb..56d292de2927 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -237,6 +237,18 @@ process_signals (void) + } + } + ++/* Process remaining signals once before exit */ ++void ++final_process_signals (void) ++{ ++ static int last = 1; ++ ++ if (last) { ++ process_signals (); ++ last = 0; ++ } ++} ++ + static void + install_signal_handlers (void) + {