From 44bb6829765cde97d75b3f40eb725d17665bfa5d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 2 Nov 2009 16:40:00 +0000 Subject: [PATCH] * Fri Oct 30 2009 Dan Walsh 2.0.74-15 - Fix typo in seobject.py --- policycoreutils-rhat.patch | 11 +---------- policycoreutils.spec | 5 ++++- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 538d14f..eff746b 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -2667,7 +2667,7 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po else: diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.74/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2009-09-08 09:03:10.000000000 -0400 -+++ policycoreutils-2.0.74/semanage/seobject.py 2009-10-30 16:31:59.000000000 -0400 ++++ policycoreutils-2.0.74/semanage/seobject.py 2009-11-02 11:39:02.000000000 -0500 @@ -37,40 +37,6 @@ import syslog @@ -3142,15 +3142,6 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.17 --exclude=gui --exclude=po (rc, node) = semanage_node_create(self.sh) if rc < 0: -@@ -1097,7 +1147,7 @@ - if rc < 0: - raise ValueError(_("Could not set role in addr context for %s") % addr) - -- rc = semanage_context_set_type(self.sh, con, ctype) -+So rc = semanage_context_set_type(self.sh, con, ctype) - if rc < 0: - raise ValueError(_("Could not set type in addr context for %s") % addr) - @@ -1120,7 +1170,7 @@ def add(self, addr, mask, proto, serange, ctype): diff --git a/policycoreutils.spec b/policycoreutils.spec index 9b4068a..7a7b169 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -6,7 +6,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.74 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -296,6 +296,9 @@ fi exit 0 %changelog +* Fri Oct 30 2009 Dan Walsh 2.0.74-15 +- Fix typo in seobject.py + * Fri Oct 30 2009 Dan Walsh 2.0.74-14 - Allow semanage -i and semanage -o to generate customization files. - semanage -o will generate a customization file that semanage -i can read and set a machines to the same selinux configuration