From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SPNsG2qqT2AWagAA0tVLHw (envelope-from ) for ; Mon, 15 Mar 2021 18:41:46 +0000 Received: from aspmx2.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id +C0xF2qqT2ABdwAAB5/wlQ (envelope-from ) for ; Mon, 15 Mar 2021 18:41:46 +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 aspmx2.migadu.com (Postfix) with ESMTPS id B97B222792 for ; Mon, 15 Mar 2021 19:41:45 +0100 (CET) Received: from localhost ([::1]:40470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLs9w-0007sX-Sg for larch@yhetil.org; Mon, 15 Mar 2021 14:41:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLrvj-0005qM-D5 for bug-guix@gnu.org; Mon, 15 Mar 2021 14:27:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLrvj-0001d6-4n for bug-guix@gnu.org; Mon, 15 Mar 2021 14:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lLrvj-0005No-1w for bug-guix@gnu.org; Mon, 15 Mar 2021 14:27:03 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#47144: [PATCH 1/1] gnu: patch: Update to 2.7.6-7623b2d [security fixes]. Resent-From: =?UTF-8?Q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 15 Mar 2021 18:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47144 X-GNU-PR-Package: guix X-GNU-PR-Keywords: security To: 47144@debbugs.gnu.org Cc: =?UTF-8?Q?L=C3=A9o?= Le Bouter Received: via spool by 47144-submit@debbugs.gnu.org id=B47144.161583277820632 (code B ref 47144); Mon, 15 Mar 2021 18:27:02 +0000 Received: (at 47144) by debbugs.gnu.org; 15 Mar 2021 18:26:18 +0000 Received: from localhost ([127.0.0.1]:37075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLrv0-0005Mc-2l for submit@debbugs.gnu.org; Mon, 15 Mar 2021 14:26:18 -0400 Received: from mail.zaclys.net ([178.33.93.72]:42759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lLruy-0005MJ-8u for 47144@debbugs.gnu.org; Mon, 15 Mar 2021 14:26:16 -0400 Received: from localhost.localdomain (82-64-145-38.subs.proxad.net [82.64.145.38]) (authenticated bits=0) by mail.zaclys.net (8.14.7/8.14.7) with ESMTP id 12FIQ9uQ017842 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Mon, 15 Mar 2021 19:26:10 +0100 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.zaclys.net 12FIQ9uQ017842 Authentication-Results: mail.zaclys.net; spf=fail smtp.mailfrom=lle-bout@zaclys.net DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zaclys.net; s=default; t=1615832770; bh=QOj4BRk+AUscpF6wkwcItIWRc1DvhgcWiycVrsvjFbU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=btERzpNO+RejlLr9L+6LDF6ta2SobDhLoilOfaBxVAvql5R1Ow7jXRWvbyhMRREP4 Z/NHz9RTvii7HO6keHPsm1mFl7PE7b2SvQ6evYxv7Dq24itQDpP0tDbvQOZVj6RB1Y ZDOSvsUdsth8/UvoYtaAbmmmJQeyrf4u60O1kCLM= Date: Mon, 15 Mar 2021 19:26:05 +0100 Message-Id: <20210315182605.25973-2-lle-bout@zaclys.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315182605.25973-1-lle-bout@zaclys.net> References: <20210315182605.25973-1-lle-bout@zaclys.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: =?UTF-8?Q?L=C3=A9o?= Le Bouter From: =?UTF-8?Q?L=C3=A9o?= Le Bouter via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1615833705; 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-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=QOj4BRk+AUscpF6wkwcItIWRc1DvhgcWiycVrsvjFbU=; b=dNvWH8Y6w0bcvXLNc2q+2SPpRHtGkNkwf57n1XfqMTvLb7fKlnhaRcuv5YOwjkVPiWJOkv nLIS/FjO5/VeYRIxcAeu8mKek+bmIkTEbsOGSXtV0t6BIAHGOsKhpX1OcaV1UFt2c2F8Sz /t3osFDTldNXqRucewt+VqmEJldwdy2Ibya8/ke4dgjefvf+LBis6W5TEznJOV9LyOPzDd 0ekoIg/KoBplT7PcPSEFdqZmU59+G7gJdyQAT1ujEZh+PA7vto+dUjoI2x9api2MBLHi0O QxDVgdgCBiBqk4DcQQ/yeluAiTV28SWaJGOXZd02j9qrzxQbY4PLPZvHiYPCdA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1615833705; a=rsa-sha256; cv=none; b=mGDXtmReHfRc1Q9fVXFGrZLC50/GzkuGYMEEZFzdJqOPL98Die0dAqhdZhGp4OU3AdGwlt RKI57TCoHTi9KVm29XrS97jTs2vIsw7aWvQE4g1SNvMUKP1dC+IfEQdkzNKRC6clT6bfow w39pm184h+iyEAmVEl5+4DWC+PUZW/ZJsrq+vIYV7qPTrd8S+7Ppgk1Fzt45ZwiqHranKS 6r2BCDN+Ok2K/dGCyI4ovY1xzzwnEyPyy1YtFhO0NqqGVHetPDv0aL/YpxKV/mOE+t6BEw QXUfk01SHAwu8xf7D5FA4AuwggE1600rvWUAaizqrIKieC95YCfG0DHBIVox9w== ARC-Authentication-Results: i=1; aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=zaclys.net header.s=default header.b=btERzpNO; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: 1.10 Authentication-Results: aspmx2.migadu.com; dkim=fail ("headers rsa verify failed") header.d=zaclys.net header.s=default header.b=btERzpNO; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx2.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: B97B222792 X-Spam-Score: 1.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: a64CFoD1ogcO * gnu/packages/base.scm (patch/fixed): New variable. (patch)[replacement]: Graft. --- gnu/packages/base.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9aa69cfe77..a71b47ac4f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -46,12 +46,14 @@ #:use-module (gnu packages compression) #:use-module (gnu packages perl) #:use-module (gnu packages linux) + #:use-module (gnu packages autotools) #:use-module (gnu packages pcre) #:use-module (gnu packages texinfo) #:use-module (gnu packages hurd) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages gettext) + #:use-module (gnu packages version-control) #:use-module (guix i18n) #:use-module (guix utils) #:use-module (guix packages) @@ -228,6 +230,7 @@ standard utility.") (base32 "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc")) (patches (search-patches "patch-hurd-path-max.patch")))) + (replacement patch/fixed) (build-system gnu-build-system) (arguments ;; Work around a cross-compilation bug whereby libpatch.a would provide @@ -246,6 +249,42 @@ differences.") (license gpl3+) (home-page "https://savannah.gnu.org/projects/patch/"))) +(define patch/fixed + (let ((commit "7623b2dc0d1837ecfd58f32efc78e35834deeb38")) + (package/inherit patch + (name "patch") + (version "2.7.6") + ;; (version (string-append "2.7.6-" (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/patch.git") + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0k3i95gkbi21lipadlg1zd03d928b65x322q08xgdg461vnw2i6h")) + (patches (search-patches "patch-hurd-path-max.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments patch) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (replace 'bootstrap + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (list "gnulib/gnulib-tool" + "gnulib/build-aux/git-version-gen") + (("/bin/sh") (which "sh"))) + (invoke "bash" "bootstrap" "--no-git" + "--gnulib-srcdir=gnulib") + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("git" ,git-minimal) + ,@(package-native-inputs patch)))))) + (define-public diffutils (package (name "diffutils") -- 2.30.2