-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch looks good to me. acked.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk9x3s8ACgkQrlYvE4MpobNUJACeL7ekNNgdvXjYk5hi4bjeyGgz
bD4Anj0QYt+Lj979BMj3gaCh5Yq4tqWq
=HGXN
-----END PGP SIGNATURE-----
>From 49039e097531e119b277ad8e5b5c5c52772f18b7 Mon Sep 17 00:00:00 2001
From: Manoj Srivastava <srivasta@xxxxxxxxxx>
Date: Mon, 26 Mar 2012 13:41:24 -0400
Subject: [PATCH 61/73] sepolgen: fix detection of policy loads
I am running into an issue with sepolgen. Debian ships more
than one version of the refpolicy, a default one, and a MLS enabled
one. So, the include files live in either
/usr/share/selinux/{default,mls}/include sepolgen (in
src/sepolgen/defaults.py) sets refpolicy_devel() to a single
location -- and thus, only one version of the security policy may be
supported. So, sepolgen-ifgen from policycoreutils can only work
with one policy, which may not be the one installed on the target
machine. Could this be made configurable, somehow? As far as I can
see, sepolgen's python library does not offer any way to set the
value. This change fixes that. Now you may set the path to look for
development headers in /etc/selinux/sepolgen.conf, in the variable
SELINUX_DEVEL_PATH. The builtin default will have it work on Debian
and fedora machines out of the box.
Signed-off-by: Laurent Bigonville bigon@xxxxxxxxxx
Signed-off-by: Eric Paris <eparis@xxxxxxxxxx>
---
sepolgen/src/sepolgen/defaults.py | 47 +++++++++++++++++++++++++++++++------
1 file changed, 40 insertions(+), 7 deletions(-)
diff --git a/sepolgen/src/sepolgen/defaults.py b/sepolgen/src/sepolgen/defaults.py
index 6d511c3..218bc7c 100644
--- a/sepolgen/src/sepolgen/defaults.py
+++ b/sepolgen/src/sepolgen/defaults.py
@@ -1,6 +1,6 @@
# Authors: Karl MacMillan <kmacmillan@xxxxxxxxxxxxxxxxx>
#
-# Copyright (C) 2006 Red Hat
+# Copyright (C) 2006 Red Hat
# see file 'COPYING' for use and warranty information
#
# This program is free software; you can redistribute it and/or
@@ -17,6 +17,40 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
+import os
+import re
+
+# Select the correct location for the development files based on a
+# path variable (optionally read from a configuration file)
+class PathChoooser(object):
+ def __init__(self, pathname):
+ self.config = dict()
+ if not os.path.exists(pathname):
+ self.config_pathname = "(defaults)"
+ self.config["SELINUX_DEVEL_PATH"] = "/usr/share/selinux/default:/usr/share/selinux/mls:/usr/share/selinux/devel"
+ return
+ self.config_pathname = pathname
+ ignore = re.compile(r"^\s*(?:#.+)?$")
+ consider = re.compile(r"^\s*(\w+)\s*=\s*(.+?)\s*$")
+ for lineno, line in enumerate(open(pathname)):
+ if ignore.match(line): continue
+ mo = consider.match(line)
+ if not mo:
+ raise ValueError, "%s:%d: line is not in key = value format" % (pathname, lineno+1)
+ self.config[mo.group(1)] = mo.group(2)
+
+ # We're only exporting one useful function, so why not be a function
+ def __call__(self, testfilename, pathset="SELINUX_DEVEL_PATH"):
+ paths = self.config.get(pathset, None)
+ if paths is None:
+ raise ValueError, "%s was not in %s" % (pathset, self.config_pathname)
+ paths = paths.split(":")
+ for p in paths:
+ target = os.path.join(p, testfilename)
+ if os.path.exists(target): return target
+ return os.path.join(paths[0], testfilename)
+
+
"""
Various default settings, including file and directory locations.
"""
@@ -33,12 +67,11 @@ def interface_info():
def attribute_info():
return data_dir() + "/attribute_info"
-def refpolicy_devel():
- return "/usr/share/selinux/devel"
-
def refpolicy_makefile():
- return refpolicy_devel() + "/Makefile"
+ chooser = PathChoooser("/etc/selinux/sepolgen.conf")
+ return chooser("Makefile")
def headers():
- return refpolicy_devel() + "/include"
-
+ chooser = PathChoooser("/etc/selinux/sepolgen.conf")
+ return chooser("include")
+
--
1.7.9.3
