[ocp] fix fcontext regexp for /usr/bin/ocp-[0-9].*
Charles R. Anderson
cra at fedoraproject.org
Mon Jun 6 04:01:41 UTC 2011
commit c3799ec836b37652359237d49cbfa0425c3afc94
Author: Chuck Anderson <cra at wpi.edu>
Date: Mon Jun 6 00:01:27 2011 -0400
fix fcontext regexp for /usr/bin/ocp-[0-9].*
ocp.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ocp.spec b/ocp.spec
index b9636fa..648d148 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,6 +1,6 @@
#define snapshot 20100401
%define version 0.1.20
-%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:7}%{?dist}
+%define release %{?snapshot:0.5.%{snapshot}snap}%{!?snapshot:8}%{?dist}
Name: ocp
Version: %{version}
@@ -155,14 +155,14 @@ semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmix
semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
semanage fcontext -a -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-semanage fcontext -a -t unconfined_execmem_exec_t %{_bindir}/ocp-\d.* 2>/dev/null || :
+semanage fcontext -a -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*' 2>/dev/null || :
%else
# This is the i386 non-assembly version. We don't need nor want to allow text relocations.
semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmix\.so' 2>/dev/null || :
semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
-semanage fcontext -d -t unconfined_execmem_exec_t %{_bindir}/ocp-\d.* 2>/dev/null || :
+semanage fcontext -d -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*' 2>/dev/null || :
%endif
restorecon -R %{_libdir}/ocp-* || :
%endif
@@ -185,7 +185,7 @@ if [ $1 -eq 0 ] ; then # final removal
semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*devwmixf\.so' 2>/dev/null || :
semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mcpbase\.so' 2>/dev/null || :
semanage fcontext -d -t textrel_shlib_t '%{_libdir}/ocp-.*/(autoload/)?.*mixclip\.so' 2>/dev/null || :
- semanage fcontext -d -t unconfined_execmem_exec_t %{_bindir}/ocp-\d.* 2>/dev/null || :
+ semanage fcontext -d -t unconfined_execmem_exec_t '%{_bindir}/ocp-[0-9].*' 2>/dev/null || :
%endif
%endif
fi
@@ -196,6 +196,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sun Jun 05 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-8
+- fix fcontext regexp for /usr/bin/ocp-[0-9].*
+
* Sun Jun 05 2011 Charles R. Anderson <cra at wpi.edu> 0.1.20-7
- also apply unconfined_execmem_exec_t to /usr/bin/ocp-.*
- fix ocp-0.1.20-no-i386-asm.patch to actually work at all
More information about the scm-commits
mailing list