From: Marius Bakke <marius@gnu.org>
To: Daniel Brooks <db48x@db48x.net>, 44649@debbugs.gnu.org
Subject: bug#44649: 1.2.0rc0 tarball includes guix-daemon.cil.in
Date: Sun, 15 Nov 2020 15:56:52 +0100 [thread overview]
Message-ID: <87ft5abrd7.fsf@gnu.org> (raw)
In-Reply-To: <87wnyn4f3v.fsf@db48x.net>
[-- Attachment #1.1: Type: text/plain, Size: 439 bytes --]
Daniel Brooks <db48x@db48x.net> writes:
> It should instead include the guix-daemon.cil file which was built from
> it. The .in file has unsubstituted variabels in it which make it useless
> as an SELinux policy.
Actually I think both should be included. The processed file will work
for 99% of users, and the template is needed for the 1% that use a
different store directory.
@Ludo: WDYT about the attached patch for version-1.2.0?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-maint-Install-the-processed-SELinux-policy-file-in-a.patch --]
[-- Type: text/x-patch, Size: 1069 bytes --]
From 8b77d853a4c9503df61fb75190d562206d1de1d2 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sun, 15 Nov 2020 15:56:04 +0100
Subject: [PATCH] maint: Install the processed SELinux policy file in addition
to the template.
This fixes <https://bugs.gnu.org/44649>.
Reported by Daniel Brooks <db48x@db48x.net>.
* Makefile.am (dist_selinux_policy_DATA): New target.
---
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 5b84d74f08..4c061db3ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -561,8 +561,10 @@ dist_zshcompletion_DATA = etc/completion/zsh/_guix
# Fish completion file.
dist_fishcompletion_DATA = etc/completion/fish/guix.fish
-# SELinux policy
+# SELinux policy. Install both the template and the compiled version so
+# it works "out of the box", but can be rebuilt as necessary.
nodist_selinux_policy_DATA = etc/guix-daemon.cil.in
+dist_selinux_policy_DATA = etc/guix-daemon.cil
EXTRA_DIST += \
HACKING \
--
2.29.2
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]
next prev parent reply other threads:[~2020-11-15 14:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-15 0:51 bug#44649: 1.2.0rc0 tarball includes guix-daemon.cil.in Daniel Brooks
2020-11-15 14:56 ` Marius Bakke [this message]
2020-11-15 15:08 ` Daniel Brooks
2020-11-15 21:02 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2020-11-15 20:19 ` Ludovic Courtès
2020-11-15 21:24 ` Daniel Brooks
2020-11-16 8:12 ` Ludovic Courtès
2020-11-16 12:12 ` Daniel Brooks
2020-11-16 12:53 ` Ludovic Courtès
2020-11-16 13:15 ` Daniel Brooks
2020-11-16 16:15 ` Ludovic Courtès
2020-11-15 22:26 ` Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ft5abrd7.fsf@gnu.org \
--to=marius@gnu.org \
--cc=44649@debbugs.gnu.org \
--cc=db48x@db48x.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).