From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4FVJEnP5q1+6awAA0tVLHw (envelope-from ) for ; Wed, 11 Nov 2020 14:47:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id KI8XDnP5q18qZQAAbx9fmQ (envelope-from ) for ; Wed, 11 Nov 2020 14:47: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 792FA94014A for ; Wed, 11 Nov 2020 14:47:14 +0000 (UTC) Received: from localhost ([::1]:57156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcrOz-0001iE-Dj for larch@yhetil.org; Wed, 11 Nov 2020 09:47:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcrOo-0001hh-9l for guix-patches@gnu.org; Wed, 11 Nov 2020 09:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcrOo-0000tY-0k for guix-patches@gnu.org; Wed, 11 Nov 2020 09:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kcrOn-0007tm-Ti for guix-patches@gnu.org; Wed, 11 Nov 2020 09:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44576] [PATCH] gnu: sed: selinux test when running on a foreign os that uses Resent-From: Daniel Brooks Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Nov 2020 14:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44576@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches List Received: via spool by submit@debbugs.gnu.org id=B.160510601330343 (code B ref -1); Wed, 11 Nov 2020 14:47:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Nov 2020 14:46:53 +0000 Received: from localhost ([127.0.0.1]:40659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcrOa-0007tG-SG for submit@debbugs.gnu.org; Wed, 11 Nov 2020 09:46:53 -0500 Received: from lists.gnu.org ([209.51.188.17]:45916) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcrOY-0007t8-HH for submit@debbugs.gnu.org; Wed, 11 Nov 2020 09:46:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcrOY-0001h8-5z for guix-patches@gnu.org; Wed, 11 Nov 2020 09:46:46 -0500 Received: from smtp-out-4.mxes.net ([2605:d100:2f:10::315]:53878) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcrOV-0000ln-QG for guix-patches@gnu.org; Wed, 11 Nov 2020 09:46:45 -0500 Received: from Customer-MUA (mua.mxes.net [10.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.mxes.net (Postfix) with ESMTPSA id BAA477597A for ; Wed, 11 Nov 2020 09:46:34 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mxes.net; s=mta; t=1605105995; bh=xWwW1tJuNQ3i6XGci3MNKlCOeEx5P03GO0MdqJpweKc=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=0gCMEZWfaOyoexL9HzY3YFztcxn+w7CRp1C9TE85Zv/CUSZEDrSk0UqiM/u0Ipuxp NqKALt+HhGV6M+uvlXAg4AMQ5kZyn0B/l5AFjHxdgZQMVIiAsvPuZYW0BsqMMHx8Bt iSo4ckpQYpM9GSnezO62ShxYI1y7DqVLwwX5IQy4= From: Daniel Brooks Date: Wed, 11 Nov 2020 06:46:33 -0800 Message-ID: <87a6vo7xyu.fsf@db48x.net> MIME-Version: 1.0 Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-sed-selinux-test-when-running-on-a-foreign-os-th.patch Content-Description: [PATCH] gnu: sed: selinux test when running on a foreign os that uses X-Sent-To: Received-SPF: none client-ip=2605:d100:2f:10::315; envelope-from=db48x@db48x.net; helo=smtp-out-4.mxes.net X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=mxes.net header.s=mta header.b=0gCMEZWf; dmarc=none; 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-Spam-Score: -0.01 X-TUID: 92Wmb9p9x+yn >From a14efc3664d2eccb49f37cb5b14058261f3c8726 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Wed, 11 Nov 2020 06:40:58 -0800 Subject: [PATCH] gnu: sed: selinux test when running on a foreign os that uses selinux * gnu/packages/patches/sed-inplace-selinux-test.patch: new patch * gnu/packages/base.scm (sed): add patch that sets the CONFIG_HEADER variable to the appropriate value. sed's build system is supposed to pass this variable along form the Makefile, but fails to do so. After several attempts to fix the build system, I decided just to fix it the simplest way. This does make the assumption that Guix isn't going to override the name of the config header, but that seems like a pretty safe assumption. --- gnu/packages/base.scm | 3 ++- gnu/packages/patches/sed-inplace-selinux-test.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/sed-inplace-selinux-test.patch diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index c83775d8ee..419f6039cc 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -141,7 +141,8 @@ including, for example, recursive directory searching.") ".tar.gz")) (sha256 (base32 - "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")))) + "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")) + (patches (search-patches "sed-inplace-selinux-test.patch")))) (build-system gnu-build-system) (synopsis "Stream editor") (native-inputs diff --git a/gnu/packages/patches/sed-inplace-selinux-test.patch b/gnu/packages/patches/sed-inplace-selinux-test.patch new file mode 100644 index 0000000000..16238c119c --- /dev/null +++ b/gnu/packages/patches/sed-inplace-selinux-test.patch @@ -0,0 +1,11 @@ +--- sed-4.8/testsuite/inplace-selinux.sh 2020-01-01 11:38:19.000000000 -0800 ++++ sed/testsuite/inplace-selinux.sh 2020-11-11 06:35:49.850724638 -0800 +@@ -16,6 +16,8 @@ + # along with this program. If not, see . + . "${srcdir=.}/testsuite/init.sh"; path_prepend_ ./sed + print_ver_ sed ++# this is a hack, but it's easier than trying to decypher sed's build system ++CONFIG_HEADER=config.h + require_selinux_ + + sed --version | grep -q "with SELinux" \ -- 2.26.2