diff --git a/libselinux-fedora.patch b/libselinux-fedora.patch index 29c73d0..8a4d34e 100644 --- a/libselinux-fedora.patch +++ b/libselinux-fedora.patch @@ -1,8 +1,9 @@ diff --git libselinux-2.5/ChangeLog libselinux-2.5/ChangeLog -index 24673dd..1d6ac57 100644 +index 24673dd..e46f105 100644 --- libselinux-2.5/ChangeLog +++ libselinux-2.5/ChangeLog -@@ -1,3 +1,8 @@ +@@ -1,3 +1,9 @@ ++ * Fix typo in sefcontext_compile.8, from Petr Lautrbach and Milos Malik + * Fix location of selinuxfs mount point, from Dan Walsh. + * Only mount /proc if necessary, from Stephen Smalley. + * procattr: return einval for <= 0 pid args, from Daniel Cashman. @@ -530,6 +531,27 @@ index 204687d..2c4bce1 100644 . .SH AUTHOR This manual page was written by Dan Walsh . +diff --git libselinux-2.5/man/man8/sefcontext_compile.8 libselinux-2.5/man/man8/sefcontext_compile.8 +index b77ff3a..4eae173 100644 +--- libselinux-2.5/man/man8/sefcontext_compile.8 ++++ libselinux-2.5/man/man8/sefcontext_compile.8 +@@ -13,14 +13,14 @@ sefcontext_compile \- compile file context regular expression files + .SH "DESCRIPTION" + .B sefcontext_compile + is used to compile file context regular expressions into +-.BR prce (3) ++.BR pcre (3) + format. + .sp + The compiled file is used by libselinux file labeling functions. + .sp + By default + .B sefcontext_compile +-writes the compiled prce file with the ++writes the compiled pcre file with the + .B .bin + suffix appended (e.g. \fIinputfile\fB.bin\fR). + .SH OPTIONS diff --git libselinux-2.5/man/man8/selinux.8 libselinux-2.5/man/man8/selinux.8 index 6f1034b..c9f188c 100644 --- libselinux-2.5/man/man8/selinux.8 diff --git a/libselinux.spec b/libselinux.spec index 698d545..61a7761 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -9,7 +9,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.5 -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: System Environment/Libraries # https://github.com/SELinuxProject/selinux/wiki/Releases @@ -20,7 +20,7 @@ Url: https://github.com/SELinuxProject/selinux/wiki # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh # run: # $ VERSION=2.5 ./make-fedora-selinux-patch.sh libselinux -# HEAD https://github.com/fedora-selinux/selinux/commit/4bfb84c7ff7b33cf06b9a6b2317d24054b9db562 +# HEAD https://github.com/fedora-selinux/selinux/commit/f900ff37022119de47d516f103ccfd339d52c861 Patch1: libselinux-fedora.patch BuildRequires: pkgconfig python python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre-devel xz-devel %if 0%{?with_python3} @@ -255,6 +255,9 @@ rm -rf %{buildroot} %{ruby_vendorarchdir}/selinux.so %changelog +* Fri Apr 29 2016 Petr Lautrbach - 2.5-4 +- Fix typo in sefcontext_compile.8 + * Fri Apr 08 2016 Petr Lautrbach - 2.5-3 - Fix location of selinuxfs mount point - Only mount /proc if necessary