[policycoreutils/f17] Have sepolgen script specify the pp file with the make command. From mgrepl.
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Mar 28 12:12:56 UTC 2012
commit 1976dcee6a2d110dbe6b7b110b008ec74791fac8
Author: Dan Walsh <dwalsh at redhat.com>
Date: Wed Mar 28 08:12:53 2012 -0400
Have sepolgen script specify the pp file with the make command. From mgrepl.
policycoreutils-gui.patch | 4 ++--
policycoreutils.spec | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/policycoreutils-gui.patch b/policycoreutils-gui.patch
index aadbe82..71f5835 100644
--- a/policycoreutils-gui.patch
+++ b/policycoreutils-gui.patch
@@ -12981,7 +12981,7 @@ diff -up policycoreutils-2.1.10/gui/templates/rw.py.gui policycoreutils-2.1.10/g
+"""
diff -up policycoreutils-2.1.10/gui/templates/script.py.gui policycoreutils-2.1.10/gui/templates/script.py
--- policycoreutils-2.1.10/gui/templates/script.py.gui 2012-02-01 08:39:50.000000000 -0500
-+++ policycoreutils-2.1.10/gui/templates/script.py 2012-02-01 08:39:50.000000000 -0500
++++ policycoreutils-2.1.10/gui/templates/script.py 2012-03-28 08:09:39.353230984 -0400
@@ -0,0 +1,126 @@
+# Copyright (C) 2007-2012 Red Hat
+# see file 'COPYING' for use and warranty information
@@ -13048,7 +13048,7 @@ diff -up policycoreutils-2.1.10/gui/templates/script.py.gui policycoreutils-2.1.
+
+echo "Building and Loading Policy"
+set -x
-+make -f /usr/share/selinux/devel/Makefile || exit
++make -f /usr/share/selinux/devel/Makefile TEMPLATEFILE.pp || exit
+/usr/sbin/semodule -i TEMPLATEFILE.pp
+
+"""
diff --git a/policycoreutils.spec b/policycoreutils.spec
index c20b918..ff06623 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.1.10
-Release: 29%{?dist}
+Release: 30%{?dist}
License: GPLv2
Group: System Environment/Base
# Based on git repository with tag 20101221
@@ -343,6 +343,9 @@ fi
%{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
%changelog
+* Wed Mar 28 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.10-30
+- Have sepolgen script specify the pp file with the make command. From mgrepl.
+
* Wed Mar 21 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.10-29
- Fix sepolgen handling of unit files.
More information about the scm-commits
mailing list