GNU bug report logs - #44576
[PATCH] gnu: sed: selinux test when running on a foreign os that uses

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Daniel Brooks <db48x <at> db48x.net>
Subject: bug#44576: closed (Re: [bug#44576] [PATCH] gnu: sed: selinux test
 when running on a foreign os that uses)
Date: Wed, 11 Nov 2020 15:38:02 +0000

[Message part 1 (text/plain, inline)]

Your bug report

#44576: [PATCH] gnu: sed: selinux test when running on a foreign os that uses

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 44576 <at> debbugs.gnu.org.

-- 
44576: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=44576
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Timothy Sample <samplet <at> ngyro.com>
To: Daniel Brooks <db48x <at> db48x.net>
Cc: 44576-done <at> debbugs.gnu.org
Subject: Re: [bug#44576] [PATCH] gnu: sed: selinux test when running on a
 foreign os that uses
Date: Wed, 11 Nov 2020 10:37:36 -0500

Hi Daniel,

Daniel Brooks <db48x <at> db48x.net> writes:

> From a14efc3664d2eccb49f37cb5b14058261f3c8726 Mon Sep 17 00:00:00 2001
> From: Daniel Brooks <db48x <at> db48x.net>
> 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
“core-updates” branch <https://issues.guix.gnu.org/41498>.  It requires
too many rebuilds to fix on “master”.


-- Tim

[Message part 3 (message/rfc822, inline)]

From: Daniel Brooks <db48x <at> db48x.net>
To: Guix Patches List <guix-patches <at> gnu.org>
Subject: [PATCH] gnu: sed: selinux test when running on a foreign os that uses
Date: Wed, 11 Nov 2020 06:46:33 -0800

[0001-gnu-sed-selinux-test-when-running-on-a-foreign-os-th.patch (text/x-patch, inline)]

From a14efc3664d2eccb49f37cb5b14058261f3c8726 Mon Sep 17 00:00:00 2001
From: Daniel Brooks <db48x <at> db48x.net>
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 <https://www.gnu.org/licenses/>.
+ . "${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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.