From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id GIrtGoKI4F7eXwAA0tVLHw (envelope-from ) for ; Wed, 10 Jun 2020 07:15:14 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wwfKFoKI4F4lQQAAB5/wlQ (envelope-from ) for ; Wed, 10 Jun 2020 07:15:14 +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 C38DE940668 for ; Wed, 10 Jun 2020 07:15:12 +0000 (UTC) Received: from localhost ([::1]:59738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jiux3-0000U8-V6 for larch@yhetil.org; Wed, 10 Jun 2020 03:15:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jiuww-0000Tx-Me for bug-guix@gnu.org; Wed, 10 Jun 2020 03:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49933) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jiuww-0006bu-Bg for bug-guix@gnu.org; Wed, 10 Jun 2020 03:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jiuww-0002Qr-4J for bug-guix@gnu.org; Wed, 10 Jun 2020 03:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41498: sed fails to build on kernels with selinux Resent-From: Chris Marusich Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Wed, 10 Jun 2020 07:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41498 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 41498@debbugs.gnu.org Received: via spool by 41498-submit@debbugs.gnu.org id=B41498.15917732699295 (code B ref 41498); Wed, 10 Jun 2020 07:15:02 +0000 Received: (at 41498) by debbugs.gnu.org; 10 Jun 2020 07:14:29 +0000 Received: from localhost ([127.0.0.1]:33246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiuwJ-0002Pi-Fn for submit@debbugs.gnu.org; Wed, 10 Jun 2020 03:14:28 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:40961) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jiuwG-0002PV-19 for 41498@debbugs.gnu.org; Wed, 10 Jun 2020 03:14:21 -0400 Received: by mail-pl1-f193.google.com with SMTP id y17so610916plb.8 for <41498@debbugs.gnu.org>; Wed, 10 Jun 2020 00:14:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=R3KT8dZSITS4EQxBPx0ti3Efxay7s6tvkocr2ZdNAwU=; b=eFi9//FvV0qJv1GB6KuN+mAyuLSP/b6F0zCMWvP6VbvP6GtnmHKxO6x2T5yPywnEgn xqlBCDRysEaM1dr0wGH6nm2dOCz46hv/ejmVOqx1/6mEp3d+QCihx/97/jMZHapzBaaZ m3Wryt8M3hAl8nJGZ9eL5rELrNDH1QlGpcRWC3u2Pl0f+1co1ZetJfVahaq+kIDpUd7g MWS9wIWfn1g3oF2a2iZlMDG5bnrgdWXfB+qLscCVNEx9YnPXHmaaIFDIBndUr5C73GzR 8puhd7tEsLQBX7n+5g/Unlmvjr8LgOaMAwdiKmCAwNEfIECnSKqRajWtB4sUD+7ZH+oC rwSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=R3KT8dZSITS4EQxBPx0ti3Efxay7s6tvkocr2ZdNAwU=; b=ToG+MOjNWcSvH3vJEHZ0Hg1H1JJ9ACEkbqBcRM/Q8qBGH1akpONcDbN25sPZqqOU1w navZIBAMyOM9ulmDwP6h3JEmxNM1d4n7BENv/4sXuCkNdY1lCCEPY5Fo64QNwWA4bXIF TPst/aZnhNAegRD1x+Ooom20mbmWiWOOSvhjB1uJxJvFy+aoDCoiOd8x09BgTG5rJzHf EN6/S+y8y5ze1uKJPm1GWASW9SbxKmWdq/KK3gcTDqcT/qHsBwr6nf79xiKbaaokwhZT wdsQV/4c/pBMBXbLmzcVCTOiSdQDaP1xksYQATMxpYWnEOx8RDPdtreuQgYPf7Pu0dmZ ouMA== X-Gm-Message-State: AOAM531G0WJp/41ENjih8GRZ4ZRkSRb8rpKkxAqteB7mnEjMXn/ZDoWJ L0cfNflQx6ShHO/X7qAK8How+6BgMWA= X-Google-Smtp-Source: ABdhPJy9uwzQqb0JHGFY6QSKwED+yd867BNEmmOls4tHYyd1UPRP/lLUiXHsy/vKFECMOmdOYS08qA== X-Received: by 2002:a17:902:6b09:: with SMTP id o9mr1900625plk.45.1591773253305; Wed, 10 Jun 2020 00:14:13 -0700 (PDT) Received: from garuda-lan (c-73-97-103-127.hsd1.wa.comcast.net. [73.97.103.127]) by smtp.gmail.com with ESMTPSA id e78sm11855548pfh.50.2020.06.10.00.14.10 for <41498@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jun 2020 00:14:11 -0700 (PDT) From: Chris Marusich References: <87zh9xrbpj.fsf@gmail.com> <87blm5yhgx.fsf@gmail.com> Date: Wed, 10 Jun 2020 00:14:09 -0700 In-Reply-To: <87blm5yhgx.fsf@gmail.com> (Chris Marusich's message of "Sat, 30 May 2020 01:06:38 -0700") Message-ID: <87ftb3crzy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=eFi9//Fv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.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-Spam-Score: -2.01 X-TUID: 5qH1pWDBk5Oy --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Chris Marusich writes: > There is actually a bug report for this here: > > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D36150 > > I have submitted a patch upstream to fix the issue. Upstream hasn't replied yet, but it's only been a week and a few days. In the meantime, here are some patches to pull the fix into Guix. While I was here, I also taught "guix lint" to correctly check the file name of patches when they come from an origin record. I'll commit the sed change to core-updates, and the lint change to master, in the next couple days if nobody has any other comments. =2D-=20 Chris --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-sed-Make-it-build-on-SELinux-enabled-kernels.patch Content-Transfer-Encoding: quoted-printable From=205686aa71488b7ba060b94f8e0c3a857016c0fa9c Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 9 Jun 2020 23:35:56 -0700 Subject: [PATCH 1/2] gnu: sed: Make it build on SELinux-enabled kernels. Fixes: . * gnu/packages/base.scm (sed)[origin][patches]: New field. This adds a patch that was submitted upstream which fixes an issue that prevents sed from building on SELinux-enabled kernels. =2D-- gnu/packages/base.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 279fe9e3d8..f075ee8f74 100644 =2D-- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -15,6 +15,7 @@ ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018, 2019 Ricardo Wurmus ;;; Copyright =C2=A9 2020 Vitaliy Shatrov +;;; Copyright =C2=A9 2020 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -141,7 +142,21 @@ including, for example, recursive directory searching.= ") ".tar.gz")) (sha256 (base32 =2D "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")))) + "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")) + ;; Remove this patch once upstream releases a fixed version. + (patches + (list + (origin + (method url-fetch) + (uri (string-append + "https://debbugs.gnu.org/cgi/bugreport.cgi?" + "att=3D1;msg=3D16;bug=3D36150;filename=3D0001-tests-" + "Export-CONFIG_HEADER-to-test-scripts.patch")) + (file-name + "sed-Export-CONFIG_HEADER-to-test-scripts.patch") + (sha256 + (base32 + "0q78qzc0mv4bmsf7wnqj9fjbrwb71xz18v07h0jz2cwnbbj1nwm9"))= ))))) (build-system gnu-build-system) (synopsis "Stream editor") (native-inputs =2D-=20 2.26.2 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-guix-lint-Support-origins-in-check-patch-file-names.patch Content-Transfer-Encoding: quoted-printable From=20770051777637f2026bcc56a57d30272e082099e6 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Wed, 10 Jun 2020 00:01:50 -0700 Subject: [PATCH 2/2] guix: lint: Support origins in check-patch-file-names. * guix/lint.scm (check-patch-file-names)[starts-with-package-name?]: New procedure, extracted from the existing logic. Using it, add a clause to the match-lambda to handle origin records. =2D-- guix/lint.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 6271894360..627016fae0 100644 =2D-- a/guix/lint.scm +++ b/guix/lint.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2017 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2017, 2018, 2020 Efraim Flashner ;;; Copyright =C2=A9 2018, 2019 Arun Isaac +;;; Copyright =C2=A9 2020 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -669,13 +670,17 @@ patch could not be found." (or (and=3D> (package-source package) origin-patches) '())) =20 + (define (starts-with-package-name? file-name) + (and=3D> (string-contains file-name (package-name package)) + zero?)) + (append (if (every (match-lambda ;patch starts with package name? ((? string? patch) =2D (and=3D> (string-contains (basename patch) =2D (package-name package)) =2D zero?)) =2D (_ #f)) ;must be an or something like th= at. + (starts-with-package-name? (basename patch))) + ((? origin? patch) + (starts-with-package-name? (origin-file-name patch))) + (_ #f)) ;must be some other file-like object patches) '() (list =2D-=20 2.26.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAl7giEEACgkQ3UCaFdgi Rp0ZQA//bp3QljJb8BY/lunAIKZ8jw2xGObr6VPoej70ErGqNz6wgoxqrDiq7Cuj 54zEKWIep7KsYJtPAyYR6Da50+cT9BlpWityWOqWbkCxGo7anEl7LAXpgkhivNO+ C3hktjC+RzaWfMiAVYremP9INcgkPE9y/SkiZ1V9XgfLTxLbV5xuRKEOR0GQnM/P gCNzTa81qqTDtQIBLFtC3kN7Rx/1C0m7ycleg1Rx+EW8YB9VfbPjVwXfPR3QZdjv d3hT6bMuqmoCGWjVqpZ1heqmQIdkIj3g236Fks9+tu/X+WD6Q5N+aD5g5JPT8jSq KeIpCIcAeEHOeklbnP5EC3sheStWTQsJGr7qB+YfNI9ggDMnMkuXHMpv/TC9lmX4 9X/3S1ydwodHWHE5HiJcSEbTu1yXSsRLzb+fj0b6zIvPP3Ob7ZX0lXEW2q5LPUMp g0xyytXU5RWwksLKjwnCe8GbszoDLhLW5qy/LsS1aOnSMcKH0+A2M2EKm2c3002D nN9pNxQ2ZIcmk/0hlBIAHzr9pb1W48hbTbl9SGmnY2MTurhR8hDkl7oU0lkJfYbL mC25OVYf1wxVIQbsb/MGGAKpafKJtSr94vfnJfRWyGUVl3TkVjZ1Ct5hUH5F1n1E /wxHRcYtPZFLScJ0RPXkmmV2eNxhgSmkZ71VdRAyWLXLlXkRidE= =1Du0 -----END PGP SIGNATURE----- --==-=-=--