diff --git a/libselinux-fedora.patch b/libselinux-fedora.patch index 8a4d34e..3dca162 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..e46f105 100644 +index 24673dd..e696b94 100644 --- libselinux-2.5/ChangeLog +++ libselinux-2.5/ChangeLog -@@ -1,3 +1,9 @@ +@@ -1,3 +1,10 @@ ++ * Fix multiple spelling errors, from Laurent Bigonville. + * 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. @@ -483,6 +484,54 @@ index 0000000..fed6de8 +func main() { + selinux.Test() +} +diff --git libselinux-2.5/man/man3/avc_add_callback.3 libselinux-2.5/man/man3/avc_add_callback.3 +index dbfe72d..bdbbadf 100644 +--- libselinux-2.5/man/man3/avc_add_callback.3 ++++ libselinux-2.5/man/man3/avc_add_callback.3 +@@ -57,7 +57,7 @@ and will cause any SID to match. + .I callback + is the callback function provided by the userspace object manager. The + .I event +-argument indicates the security event which occured; the remaining arguments ++argument indicates the security event which occurred; the remaining arguments + are interpreted according to the event as described below. The return value + of the callback should be zero on success, \-1 on error with + .I errno +@@ -175,7 +175,7 @@ If the userspace AVC is running in threaded mode, callbacks registered via + may be executed in the context of the netlink handler thread. This will likely introduce synchronization issues requiring the use of locks. See + .BR avc_init (3). + +-Support for dynamic revocation and retained permissions is mostly unimplemented in the SELinux kernel module. The only security event that currently gets excercised is ++Support for dynamic revocation and retained permissions is mostly unimplemented in the SELinux kernel module. The only security event that currently gets exercised is + .BR AVC_CALLBACK_RESET . + . + .SH "AUTHOR" +diff --git libselinux-2.5/man/man3/avc_has_perm.3 libselinux-2.5/man/man3/avc_has_perm.3 +index 7353952..3e9fca8 100644 +--- libselinux-2.5/man/man3/avc_has_perm.3 ++++ libselinux-2.5/man/man3/avc_has_perm.3 +@@ -108,7 +108,7 @@ for the first time. + Using an uninitialized structure will produce undefined behavior. + . + .SH "RETURN VALUE" +-If requested permissions are granted, zero is returned. If requested permissions are denied or an error occured, \-1 is returned and ++If requested permissions are granted, zero is returned. If requested permissions are denied or an error occurred, \-1 is returned and + .I errno + is set appropriately. + +diff --git libselinux-2.5/man/man3/is_selinux_enabled.3 libselinux-2.5/man/man3/is_selinux_enabled.3 +index f02052c..b2df562 100644 +--- libselinux-2.5/man/man3/is_selinux_enabled.3 ++++ libselinux-2.5/man/man3/is_selinux_enabled.3 +@@ -3,7 +3,7 @@ + is_selinux_enabled \- check whether SELinux is enabled + . + .SH "NAME" +-is_selinux_mls_enabled \- check whether SELinux is enabled for (Multi Level Securty) MLS ++is_selinux_mls_enabled \- check whether SELinux is enabled for (Multi Level Security) MLS + . + .SH "SYNOPSIS" + .B #include diff --git libselinux-2.5/man/man3/security_disable.3 libselinux-2.5/man/man3/security_disable.3 index c75ce0d..072923c 100644 --- libselinux-2.5/man/man3/security_disable.3 diff --git a/libselinux.spec b/libselinux.spec index 68ccfd1..12c0814 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -9,7 +9,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.5 -Release: 5%{?dist} +Release: 6%{?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/f900ff37022119de47d516f103ccfd339d52c861 +# HEAD https://github.com/fedora-selinux/selinux/commit/b4fd6cda6dede7a90892aac8f138b86b3ebda3e8 Patch1: libselinux-fedora.patch BuildRequires: pkgconfig python python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig pcre-devel xz-devel %if 0%{?with_python3} @@ -254,6 +254,9 @@ rm -rf %{buildroot} %{ruby_vendorarchdir}/selinux.so %changelog +* Fri May 06 2016 Petr Lautrbach - 2.5-6 +- Fix multiple spelling errors + * Mon May 02 2016 Petr Lautrbach - 2.5-5 - Rebuilt with libsepol-2.5-5