libselinux package update
Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>master
parent
4c1f4cf95a
commit
90548f20cb
|
@ -645,6 +645,45 @@ index f779dd9..2d44be5 100644
|
|||
and
|
||||
.BR mmap (2)
|
||||
it in read-only mode. The file-descriptor and pointer to the page shall
|
||||
diff --git libselinux-2.5/man/man5/removable_context.5 libselinux-2.5/man/man5/removable_context.5
|
||||
index 60aaa93..f16e8bd 100644
|
||||
--- libselinux-2.5/man/man5/removable_context.5
|
||||
+++ libselinux-2.5/man/man5/removable_context.5
|
||||
@@ -3,8 +3,7 @@
|
||||
removable_context \- The SELinux removable devices context configuration file
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
-This file contains the default label that should be used for removable devices that are not defined in the \fImedia\fR file (that is described in
|
||||
-.BR selabel_media "(5)). "
|
||||
+This file contains the default label that should be used for removable devices.
|
||||
.sp
|
||||
.BR selinux_removable_context_path "(3) "
|
||||
will return the active policy path to this file. The default removable context file is:
|
||||
@@ -34,4 +33,4 @@ A user, role, type and optional range (for MCS/MLS) separated by colons (:) that
|
||||
system_u:object_r:removable_t:s0
|
||||
.
|
||||
.SH "SEE ALSO"
|
||||
-.BR selinux "(8), " selinux_removable_context_path "(3), " selabel_media "(5), " selinux_config "(5) "
|
||||
+.BR selinux "(8), " selinux_removable_context_path "(3), " selinux_config "(5) "
|
||||
diff --git libselinux-2.5/man/man5/selabel_media.5 libselinux-2.5/man/man5/selabel_media.5
|
||||
index 395ed0e..b7c28e3 100644
|
||||
--- libselinux-2.5/man/man5/selabel_media.5
|
||||
+++ libselinux-2.5/man/man5/selabel_media.5
|
||||
@@ -52,8 +52,6 @@ The default media contexts file is:
|
||||
.RE
|
||||
.sp
|
||||
Where \fI{SELINUXTYPE}\fR is the entry from the selinux configuration file \fIconfig\fR (see \fBselinux_config\fR(5)).
|
||||
-.sp
|
||||
-Should there not be a valid entry in the \fImedia\fR file, then the default \fIremovable_context\fR file will be read (see \fBremovable_context\fR(5)).
|
||||
.
|
||||
.SH "FILE FORMAT"
|
||||
Each line within the \fImedia\fR file is as follows:
|
||||
@@ -90,4 +88,4 @@ this is not set, then it is possible for an invalid context to be returned.
|
||||
.SH "SEE ALSO"
|
||||
.ad l
|
||||
.nh
|
||||
-.BR selinux "(8), " selabel_open "(3), " selabel_lookup "(3), " selabel_stats "(3), " selabel_close "(3), " selinux_set_callback "(3), " selinux_media_context_path "(3), " freecon "(3), " selinux_config "(5), " removable_context "(5) "
|
||||
+.BR selinux "(8), " selabel_open "(3), " selabel_lookup "(3), " selabel_stats "(3), " selabel_close "(3), " selinux_set_callback "(3), " selinux_media_context_path "(3), " freecon "(3), " selinux_config "(5) "
|
||||
diff --git libselinux-2.5/man/man8/avcstat.8 libselinux-2.5/man/man8/avcstat.8
|
||||
index 204687d..2c4bce1 100644
|
||||
--- libselinux-2.5/man/man8/avcstat.8
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
%define ruby_inc %(pkg-config --cflags ruby)
|
||||
%define ruby_sitearch %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
|
||||
%define libsepolver 2.5-6
|
||||
%define libsepolver 2.5-10
|
||||
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
||||
|
||||
Summary: SELinux library and simple utilities
|
||||
Name: libselinux
|
||||
Version: 2.5
|
||||
Release: 12%{?dist}
|
||||
Release: 14.1%{?dist}
|
||||
License: Public Domain
|
||||
Group: System Environment/Libraries
|
||||
# https://github.com/SELinuxProject/selinux/wiki/Releases
|
||||
|
@ -18,14 +18,16 @@ Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rele
|
|||
Source1: selinuxconlist.8
|
||||
Source2: selinuxdefcon.8
|
||||
Url: https://github.com/SELinuxProject/selinux/wiki
|
||||
# HEAD fac9844438fe495bd100dda199d2ed76b0003bfe
|
||||
# HEAD 0713edcc60b6c9e487f149af8ecc66206c9274b6
|
||||
Patch1: libselinux-rhel.patch
|
||||
BuildRequires: pkgconfig python python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre-devel xz-devel
|
||||
%if 0%{?with_python3}
|
||||
BuildRequires: python3 python3-devel
|
||||
%endif # if with_python3
|
||||
Requires: libsepol%{?_isa} >= %{libsepolver} pcre
|
||||
Conflicts: filesystem < 3 systemd < 219-20
|
||||
Conflicts: filesystem < 3
|
||||
Conflicts: selinux-policy-base < 3.13.1-66
|
||||
Conflicts: systemd < 219-20
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%description
|
||||
|
@ -253,6 +255,12 @@ rm -rf %{buildroot}
|
|||
%{ruby_vendorarchdir}/selinux.so
|
||||
|
||||
%changelog
|
||||
* Wed Jul 25 2018 Vit Mojzis <vmojzis@redhat.com> - 2.5-14.1
|
||||
- Add conflict with selinux policy from before store migration (#1469571)
|
||||
|
||||
* Mon Apr 30 2018 Vit Mojzis <vmojzis@redhat.com> - 2.5-13
|
||||
- Correct manpages regarding removable_context (#1395621)
|
||||
|
||||
* Tue Oct 17 2017 Vit Mojzis <vmojzis@redhat.com> - 2.5-12
|
||||
- Improve getfilecon man page (#1258513)
|
||||
|
||||
|
|
Loading…
Reference in New Issue