From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id EEHQKQNCsV9yCAAA0tVLHw (envelope-from ) for ; Sun, 15 Nov 2020 14:58:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +K/rJQNCsV/0PgAA1q6Kng (envelope-from ) for ; Sun, 15 Nov 2020 14:58:11 +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 323F5940657 for ; Sun, 15 Nov 2020 14:58:11 +0000 (UTC) Received: from localhost ([::1]:44900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keJTl-0000lr-0I for larch@yhetil.org; Sun, 15 Nov 2020 09:58:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1keJTd-0000lW-WF for bug-guix@gnu.org; Sun, 15 Nov 2020 09:58:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42388) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1keJTd-0000Mf-Lv for bug-guix@gnu.org; Sun, 15 Nov 2020 09:58:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1keJTd-0004xB-L4 for bug-guix@gnu.org; Sun, 15 Nov 2020 09:58:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#44649: 1.2.0rc0 tarball includes guix-daemon.cil.in Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 15 Nov 2020 14:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44649 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Daniel Brooks , 44649@debbugs.gnu.org Received: via spool by 44649-submit@debbugs.gnu.org id=B44649.160545223418985 (code B ref 44649); Sun, 15 Nov 2020 14:58:01 +0000 Received: (at 44649) by debbugs.gnu.org; 15 Nov 2020 14:57:14 +0000 Received: from localhost ([127.0.0.1]:53934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1keJSn-0004w5-Q4 for submit@debbugs.gnu.org; Sun, 15 Nov 2020 09:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1keJSj-0004vY-MK for 44649@debbugs.gnu.org; Sun, 15 Nov 2020 09:57:08 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:43323) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1keJSc-0008RC-3T; Sun, 15 Nov 2020 09:56:58 -0500 Received: from host-37-191-236-253.lynet.no ([37.191.236.253]:48164 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1keJSZ-0002EM-Bm; Sun, 15 Nov 2020 09:56:56 -0500 From: Marius Bakke In-Reply-To: <87wnyn4f3v.fsf@db48x.net> References: <87wnyn4f3v.fsf@db48x.net> Date: Sun, 15 Nov 2020 15:56:52 +0100 Message-ID: <87ft5abrd7.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -3.61 X-TUID: KC9ffbOzJeOj --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Daniel Brooks 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? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-maint-Install-the-processed-SELinux-policy-file-in-a.patch Content-Transfer-Encoding: quoted-printable From=208b77d853a4c9503df61fb75190d562206d1de1d2 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 15 Nov 2020 15:56:04 +0100 Subject: [PATCH] maint: Install the processed SELinux policy file in additi= on to the template. This fixes . Reported by Daniel Brooks . * Makefile.am (dist_selinux_policy_DATA): New target. =2D-- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5b84d74f08..4c061db3ca 100644 =2D-- a/Makefile.am +++ b/Makefile.am @@ -561,8 +561,10 @@ dist_zshcompletion_DATA =3D etc/completion/zsh/_guix # Fish completion file. dist_fishcompletion_DATA =3D etc/completion/fish/guix.fish =20 =2D# 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 =3D etc/guix-daemon.cil.in +dist_selinux_policy_DATA =3D etc/guix-daemon.cil =20 EXTRA_DIST +=3D \ HACKING \ =2D-=20 2.29.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCgAtFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl+xQbQPHG1hcml1c0Bn bnUub3JnAAoJEKKgbfKjOlT6avoIAJFgPmentThk0fzQF1mEWVgHVKPn9IaTDrI2 UtSs5W87CFmRkfF5VwTP5+L2i0L9pggMXytLvlLG02zmGldlkzG6SUHOHQvr1+Ar qpNdlqD96+80mniIdBOqLrDHNRBUs9XHrTOdFiG/gnLf0332NH2L8ZQud5mTHZyF pWV+dRyF+MX5dByH4dlEax4PnXwkdKTyt2QKYldRzpNrt0OUURFsBb+LXOvWdWxD E4O3ugrbyLZMX0RpmNxUJuqfi6C844aoaEAlYom9T7T5dF2Oet9E+ipQvZnoP0oe DzhaS/MFh/nuem5nqfcPNGNDqIDw89YXUFINjIuCYq/ENFtOEBY= =afba -----END PGP SIGNATURE----- --==-=-=--