From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B46A139694 for ; Thu, 2 Mar 2017 10:18:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80A4521C0A1; Thu, 2 Mar 2017 10:18:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EC3721C0A1 for ; Thu, 2 Mar 2017 10:17:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 85F6C3416C4 for ; Thu, 2 Mar 2017 10:17:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88D4059B1 for ; Thu, 2 Mar 2017 10:17:51 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1488449812.ee9f1937dfcafbac9c687ee2f79d33bd7b54bec2.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: policy/modules/kernel/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: policy/modules/kernel/devices.fc X-VCS-Directories: policy/modules/kernel/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: ee9f1937dfcafbac9c687ee2f79d33bd7b54bec2 X-VCS-Branch: master Date: Thu, 2 Mar 2017 10:17:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3ba8797d-cc77-4b12-99ad-c20ef7a2a68c X-Archives-Hash: 8faa7126684d739516ca7884455dead8 commit: ee9f1937dfcafbac9c687ee2f79d33bd7b54bec2 Author: Nicolas Iooss m4x org> AuthorDate: Mon Feb 27 21:24:02 2017 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Thu Mar 2 10:16:52 2017 +0000 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=ee9f1937 devices: fix Debian file contexts When using setfiles to validate file contexts of Debian modular policy (with DISTRO=debian and MONOLITHIC=n), it fails with: tmp/all_mods.fc: line 527 is missing fields tmp/all_mods.fc: line 527 is missing fields tmp/all_mods.fc: Invalid argument Here is the content of tmp/all_mods.fc around line 527: # this is a static /dev dir "backup mount" # if you want to disable udev, youll have to boot permissive and relabel! /dev/\.static -d system_u:object_r:device_t /dev/\.static/dev -d system_u:object_r:device_t /dev/\.static/dev/(.*)? <> ' The quote of "you'll" has been eaten by m4 and there is a spurious quote on the last line, which is reported by setfiles. Fix this by removing the quote in the comment. Here is an example of a failed build on Travis-CI: https://travis-ci.org/fishilico/selinux-refpolicy-patched/jobs/205951446 policy/modules/kernel/devices.fc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policy/modules/kernel/devices.fc b/policy/modules/kernel/devices.fc index 19cd9724..84219a87 100644 --- a/policy/modules/kernel/devices.fc +++ b/policy/modules/kernel/devices.fc @@ -185,7 +185,7 @@ ifdef(`distro_suse', ` ifdef(`distro_debian',` # this is a static /dev dir "backup mount" -# if you want to disable udev, you'll have to boot permissive and relabel! +# if you want to disable udev, you will have to boot permissive and relabel! /dev/\.static -d gen_context(system_u:object_r:device_t,s0) /dev/\.static/dev -d gen_context(system_u:object_r:device_t,s0) /dev/\.static/dev/(.*)? <>