Add mgrepl patch to have sepolgen search for -systemd rpm packages

This commit is contained in:
Dan Walsh 2012-04-26 13:55:39 -04:00
parent bd477696df
commit e6f13dc63b
2 changed files with 22 additions and 3 deletions

View File

@ -5948,10 +5948,10 @@ index 0000000..55bad9d
+</glade-interface> +</glade-interface>
diff --git a/policycoreutils/gui/polgen.py b/policycoreutils/gui/polgen.py diff --git a/policycoreutils/gui/polgen.py b/policycoreutils/gui/polgen.py
new file mode 100644 new file mode 100644
index 0000000..533b665 index 0000000..04693e9
--- /dev/null --- /dev/null
+++ b/policycoreutils/gui/polgen.py +++ b/policycoreutils/gui/polgen.py
@@ -0,0 +1,1354 @@ @@ -0,0 +1,1370 @@
+#!/usr/bin/python -Es +#!/usr/bin/python -Es
+# +#
+# Copyright (C) 2007-2012 Red Hat +# Copyright (C) 2007-2012 Red Hat
@ -7094,6 +7094,22 @@ index 0000000..533b665
+ else: + else:
+ self.add_dir(f) + self.add_dir(f)
+ fd.close() + fd.close()
+
+ # some packages have own systemd subpackage
+ # tor-systemd for example
+ binary_name = self.program.split("/")[-1]
+ rc, output = commands.getstatusoutput("rpm -q %s-systemd" % binary_name)
+ if rc == 0:
+ fd = os.popen("rpm -ql %s-systemd" % binary_name)
+ for f in fd.read().split():
+ for b in self.DEFAULT_DIRS:
+ if f.startswith(b):
+ if os.path.isfile(f):
+ self.add_file(f)
+ else:
+ self.add_dir(f)
+ fd.close()
+
+ if os.path.isfile("/var/run/%s.pid" % self.name): + if os.path.isfile("/var/run/%s.pid" % self.name):
+ self.add_file("/var/run/%s.pid" % self.name) + self.add_file("/var/run/%s.pid" % self.name)
+ +

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.1.11 Version: 2.1.11
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
# Based on git repository with tag 20101221 # Based on git repository with tag 20101221
@ -340,6 +340,9 @@ fi
%{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || : %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
%changelog %changelog
* Tue Apr 26 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.11-8
- Add mgrepl patch to have sepolgen search for -systemd rpm packages
* Tue Apr 24 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.11-7 * Tue Apr 24 2012 Dan Walsh <dwalsh@redhat.com> - 2.1.11-7
- Apply Stef Walter patch for semanage man page - Apply Stef Walter patch for semanage man page