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

DoneSubmitted by Daniel Brooks.
Details
2 participants
  • Daniel Brooks
  • Timothy Sample
Owner
unassigned
Severity
normal
D
D
Daniel Brooks wrote on 11 Nov 2020 15:46
(name . Guix Patches List)(address . guix-patches@gnu.org)
87a6vo7xyu.fsf@db48x.net
From a14efc3664d2eccb49f37cb5b14058261f3c8726 Mon Sep 17 00:00:00 2001From: Daniel Brooks <db48x@db48x.net>Date: Wed, 11 Nov 2020 06:40:58 -0800Subject: [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 variableto the appropriate value. sed's build system is supposed to pass this variablealong form the Makefile, but fails to do so. After several attempts to fix thebuild system, I decided just to fix it the simplest way. This does make theassumption 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
Toggle diff (33 lines)diff --git a/gnu/packages/base.scm b/gnu/packages/base.scmindex 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-inputsdiff --git a/gnu/packages/patches/sed-inplace-selinux-test.patch b/gnu/packages/patches/sed-inplace-selinux-test.patchnew file mode 100644index 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
D
D
Daniel Brooks wrote on 11 Nov 2020 16:19
[PATCH] I forgot to add the patch to gnu/local.mk
(address . 44576@debbugs.gnu.org)
875z6b9b0z.fsf@db48x.net
From ae5d5ce3ff8109d6a7105b60a8f14b957826d7ad Mon Sep 17 00:00:00 2001From: Daniel Brooks <db48x@db48x.net>Date: Wed, 11 Nov 2020 07:10:57 -0800Subject: [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(-)
Toggle diff (35 lines)diff --git a/gnu/local.mk b/gnu/local.mkindex 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.patchindex 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 <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++# 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
T
T
Timothy Sample wrote on 11 Nov 2020 16:37
Re: [bug#44576] [PATCH] gnu: sed: selinux test when running on a foreign os that uses
(name . Daniel Brooks)(address . db48x@db48x.net)(address . 44576-done@debbugs.gnu.org)
87o8k3rjjz.fsf@ngyro.com
Hi Daniel,
Daniel Brooks <db48x@db48x.net> writes:
Toggle quote (6 lines)> From a14efc3664d2eccb49f37cb5b14058261f3c8726 Mon Sep 17 00:00:00 2001> From: Daniel Brooks <db48x@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 requirestoo many rebuilds to fix on “master”.

-- Tim
Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send email to 44576@debbugs.gnu.org