Update Miroslav Grepl Patches

* If there is no executable we don't want to print a part of STANDARD FILE CON
  * Add-manpages-for-typealiased-types
  * Make fixfiles_exclude_dirs working if there is a substituion for the given d
This commit is contained in:
Dan Walsh 2014-05-16 11:51:36 -04:00
commit a0f67d4a93
2 changed files with 32 additions and 2 deletions

View File

@ -0,0 +1,27 @@
From cbe5a25fed96d535ba16a936f7347d19ac211fdf Mon Sep 17 00:00:00 2001
From: Miroslav Grepl <mgrepl@redhat.com>
Date: Mon, 12 May 2014 14:11:22 +0200
Subject: [PATCH] If there is no executable we don't want to print a part of
STANDARD FILE CONTEXT
---
policycoreutils/sepolicy/sepolicy/manpage.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/policycoreutils/sepolicy/sepolicy/manpage.py b/policycoreutils/sepolicy/sepolicy/manpage.py
index 835dc43..849eecf 100755
--- a/policycoreutils/sepolicy/sepolicy/manpage.py
+++ b/policycoreutils/sepolicy/sepolicy/manpage.py
@@ -737,7 +737,8 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
.PP
""" % {'domainname':self.domainname, 'equiv': e, 'alt': e.split('/')[-1] })
- self.fd.write(r"""
+ if flist_non_exec:
+ self.fd.write(r"""
.PP
.B STANDARD FILE CONTEXT
--
1.9.0

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.3 Version: 2.3
Release: 2%{?dist} Release: 3%{?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
@ -378,12 +378,15 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service %systemd_postun_with_restart restorecond.service
%changelog %changelog
* Fri May 16 2014 Dan Walsh <dwalsh@redhat.com> - 2.3-2 * Fri May 16 2014 Dan Walsh <dwalsh@redhat.com> - 2.3-3
- Update Miroslav Grepl Patches - Update Miroslav Grepl Patches
* If there is no executable we don't want to print a part of STANDARD FILE CON * If there is no executable we don't want to print a part of STANDARD FILE CON
* Add-manpages-for-typealiased-types * Add-manpages-for-typealiased-types
* Make fixfiles_exclude_dirs working if there is a substituion for the given d * Make fixfiles_exclude_dirs working if there is a substituion for the given d
* Mon May 12 2014 Miroslav Grepl <mgrepl@redhat.com> - 2.3-2
- If there is no executable we don't want to print a part of STANDARD FILE CONTEXT
* Tue May 6 2014 Dan Walsh <dwalsh@redhat.com> - 2.3-1 * Tue May 6 2014 Dan Walsh <dwalsh@redhat.com> - 2.3-1
- Update to upstream - Update to upstream
* Add -P semodule option to man page from Dan Walsh. * Add -P semodule option to man page from Dan Walsh.