[man2html] drop SELinux hack

T.C. Hollingsworth patches at fedoraproject.org
Mon Jul 16 12:02:47 UTC 2012


commit 87b4686650f618c752f2a14af84d819002ef18c9
Author: T.C Hollingsworth <tchollingsworth at gmail.com>
Date:   Mon Jul 16 08:02:01 2012 -0400

    drop SELinux hack

 man2html.spec |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/man2html.spec b/man2html.spec
index bad8246..6383744 100644
--- a/man2html.spec
+++ b/man2html.spec
@@ -3,7 +3,7 @@
 
 Name:       man2html
 Version:    1.6
-Release:    7.%{posttag}%{?dist}
+Release:    8.%{posttag}%{?dist}
 Summary:    Convert man pages to HTML - CGI scripts
 
 # man2html.c and debian/sources/man2html.cgi.c are Copyright Only
@@ -114,9 +114,6 @@ BuildRequires:  recode
 Requires:   %{name}-core%{?_isa} = %{version}-%{release}
 Requires:   httpd
 
-Requires(post):     policycoreutils
-Requires(postun):   policycoreutils
-
 %description
 man2html is a man page to HTML converter.
 
@@ -183,16 +180,6 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/man2html
 #clear out the cache directory so all future pages are regenerated with the new build
 rm -f %{_localstatedir}/cache/man2html/* || :
 
-# unconfine CGI scripts from SELinux until selinux-policy is properly patched
-semanage fcontext -a -t httpd_unconfined_script_exec_t '%{_prefix}/lib/man2html/cgi-bin/man/(.*)?' 2>/dev/null || :
-restorecon -R %{_prefix}/lib/man2html || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then  # final removal
-semanage fcontext -d -t httpd_unconfined_script_exec_t '%{_prefix}/lib/man2html/cgi-bin/man/(.*)?' 2>/dev/null || :
-fi
-
 
 %files
 %attr(0755,-,-) %{_bindir}/hman
@@ -210,6 +197,9 @@ fi
 
 
 %changelog
+* Mon Jul 16 2012 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.6-8.g
+- remove SELinux hack; now supported in selinux-policy
+
 * Mon Jul 16 2012 T.C. Hollingsworth <tchollingsworth at gmail.com> - 1.6-7.g
 - restore Italian manpages
 - fix paths in localized manpages


More information about the scm-commits mailing list