From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 11 09:46:53 2020 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 To: Guix Patches List Subject: [PATCH] gnu: sed: selinux test when running on a foreign os that uses 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-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >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 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 11 10:19:25 2020 Received: (at 44576) by debbugs.gnu.org; 11 Nov 2020 15:19:25 +0000 Received: from localhost ([127.0.0.1]:42586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcru5-0000kz-FM for submit@debbugs.gnu.org; Wed, 11 Nov 2020 10:19:25 -0500 Received: from smtp-out-4.mxes.net ([198.205.123.69]:49146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcru0-0000kg-4x for 44576@debbugs.gnu.org; Wed, 11 Nov 2020 10:19:19 -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 AF71975A17 for <44576@debbugs.gnu.org>; Wed, 11 Nov 2020 10:19:09 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mxes.net; s=mta; t=1605107950; bh=zPs3bZEiMIILJ8l3K7w/YUipDuDf9DLLqn/kJ/c3aVk=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=QvoZycfyrQkAWCaFqrnupzULOO212g/Z3bKBtCUYwY5WSh82ygjkFP8DjcoWzFEdi zKU3o+cgbpQfeB/GeHl+BNny4orz3aDFW1B6ozR+HBVcYuU7rMShAFYswmH7KANzY6 RM0Nr+qZDs6sxYI4rA1Gj4gMZL0Ap1/Y5MtMW1e8= From: Daniel Brooks To: 44576@debbugs.gnu.org Subject: [PATCH] I forgot to add the patch to gnu/local.mk Date: Wed, 11 Nov 2020 07:19:08 -0800 Message-ID: <875z6b9b0z.fsf@db48x.net> MIME-Version: 1.0 Content-Type: text/x-patch Content-Disposition: inline; filename=0001-I-forgot-to-add-the-patch-to-gnu-local.mk.patch Content-Description: [PATCH] I forgot to add the patch to gnu/local.mk X-Sent-To: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44576 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) >From ae5d5ce3ff8109d6a7105b60a8f14b957826d7ad Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Wed, 11 Nov 2020 07:10:57 -0800 Subject: [PATCH] I forgot to add the patch to gnu/local.mk * gnu/packages/patches/sed-inplace-selinux-test.patch: improve explanatory comment * gnu/local.mk (dist_patch_DATA): add patch --- gnu/local.mk | 1 + gnu/packages/patches/sed-inplace-selinux-test.patch | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index c2b2143213..96f65a24ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1427,6 +1427,7 @@ dist_patch_DATA = \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/ppsspp-disable-upgrade-and-gold.patch \ %D%/packages/patches/samba-fix-fcntl-hint-detection.patch \ + %D%/packages/patches/sed-inplace-selinux-test.patch \ %D%/packages/patches/sdcc-disable-non-free-code.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ %D%/packages/patches/sdl-pango-blit_overflow.patch \ diff --git a/gnu/packages/patches/sed-inplace-selinux-test.patch b/gnu/packages/patches/sed-inplace-selinux-test.patch index 16238c119c..f4a22427d0 100644 --- a/gnu/packages/patches/sed-inplace-selinux-test.patch +++ b/gnu/packages/patches/sed-inplace-selinux-test.patch @@ -1,10 +1,13 @@ --- 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 @@ ++++ sed/testsuite/inplace-selinux.sh 2020-11-11 07:03:39.127760794 -0800 +@@ -16,6 +16,11 @@ # 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 ++# This is a hack, but it's easier than trying to decipher sed's build ++# system. require_selinux_ checks the contents of CONFIG_HEADER to ++# see if sed was configured to support selinux; if it cannot find the ++# header, then it bails out with an error. +CONFIG_HEADER=config.h require_selinux_ -- 2.26.2 From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 11 10:37:45 2020 Received: (at 44576-done) by debbugs.gnu.org; 11 Nov 2020 15:37:45 +0000 Received: from localhost ([127.0.0.1]:42618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcsBt-0001EW-0j for submit@debbugs.gnu.org; Wed, 11 Nov 2020 10:37:45 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:45931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kcsBq-0001EI-RU for 44576-done@debbugs.gnu.org; Wed, 11 Nov 2020 10:37:43 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 937EB5C0339; Wed, 11 Nov 2020 10:37:37 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 11 Nov 2020 10:37:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; bh=bPRJUytw98njH3mlkARebcJ1QUvKLWDRi6pSUuOxR Q4=; b=aA01jaUDJRCWEf6FOpsfvaQTXUFgLYZyKZ01IiqETbfMH8oYJql3f7EAt YfzYmBeaxsCFYqDzGKSEn1dNT1OwzWapQZsfmIIK1wcXDo99p+KCse46nJwwS9Ha xoiplIctLG+a94yc3UBo3DQxKe6BKnNZVSprLGKl3HGUlpl/wVScKw0unSgvkftQ DecZLkMVs0aTcs+7+Hz/antH/Etc8Ye2XpdhOJsGgMP9zaHSiDa/M/UGhdyVZHml oU/x9t/RxiqNJxxykkb24sQN8Ki6cLgHb9mOBkeMKuZhDb8/O5yT/MHDB7aj4mr8 a0n9d5giiPnaC2QVwrLHDZQThWPlw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedruddvtddgudejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufhffjgfkfgggtgfgsehtqh ertddtreejnecuhfhrohhmpefvihhmohhthhihucfurghmphhlvgcuoehsrghmphhlvght sehnghihrhhordgtohhmqeenucggtffrrghtthgvrhhnpedvleevhfehgeduveejvdeftd evieelffevheevjeeggfetteetjeetledtfeeuveenucffohhmrghinhepghhnuhdrohhr ghenucfkphepjeegrdduudeirddukeeirdeggeenucevlhhushhtvghrufhiiigvpedtne curfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmphhlvghtsehnghihrhhordgtohhm X-ME-Proxy: Received: from mrblack (74-116-186-44.qc.dsl.ebox.net [74.116.186.44]) by mail.messagingengine.com (Postfix) with ESMTPA id 1FE9E3280064; Wed, 11 Nov 2020 10:37:37 -0500 (EST) From: Timothy Sample To: Daniel Brooks Subject: Re: [bug#44576] [PATCH] gnu: sed: selinux test when running on a foreign os that uses References: <87a6vo7xyu.fsf@db48x.net> Date: Wed, 11 Nov 2020 10:37:36 -0500 In-Reply-To: <87a6vo7xyu.fsf@db48x.net> (Daniel Brooks's message of "Wed, 11 Nov 2020 06:46:33 -0800") Message-ID: <87o8k3rjjz.fsf@ngyro.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 44576-done Cc: 44576-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Daniel, Daniel Brooks writes: > 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 Thanks for the patch! However, this is already fixed on the =E2=80=9Ccore-updates=E2=80=9D branch . = It requires too many rebuilds to fix on =E2=80=9Cmaster=E2=80=9D. -- Tim From unknown Sun Jun 15 08:15:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 10 Dec 2020 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator