rpms/libselinux
7
0
Fork 0
Code Issues Pull Requests Releases Activity

libselinux-2.6-8

Browse Source 
- Always unmount selinuxfs for SELINUX=disabled
This commit is contained in:
Petr Lautrbach 2017-07-28 14:05:22 +02:00
parent 54afe11ce5
commit 81b36a1832
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libselinux-fedora.patch
View File

@ -897,6 +897,23 @@ index 52707d0..0cbe12d 100644
if (rc < 0 && errno == ENOTSUP) { if (rc < 0 && errno == ENOTSUP) {
char * ccontext = NULL; char * ccontext = NULL;
int err = errno; int err = errno;
diff --git libselinux-2.6/src/load_policy.c libselinux-2.6/src/load_policy.c
index b7e1a6f..6d74a9a 100644
--- libselinux-2.6/src/load_policy.c
+++ libselinux-2.6/src/load_policy.c
@@ -450,8 +450,11 @@ int selinux_init_load_policy(int *enforce)
}
}
- if (seconfig == -1)
+ if (seconfig == -1) {
+ umount(selinux_mnt);
+ fini_selinuxmnt();
goto noload;
+ }
/* Load the policy. */
return selinux_mkload_policy(0);
diff --git libselinux-2.6/src/lsetfilecon.c libselinux-2.6/src/lsetfilecon.c diff --git libselinux-2.6/src/lsetfilecon.c libselinux-2.6/src/lsetfilecon.c
index 1d3b28a..ea6d70b 100644 index 1d3b28a..ea6d70b 100644
--- libselinux-2.6/src/lsetfilecon.c --- libselinux-2.6/src/lsetfilecon.c

7
libselinux.spec
View File

@ -9,7 +9,7 @@
Summary: SELinux library and simple utilities Summary: SELinux library and simple utilities
Name: libselinux Name: libselinux
Version: 2.6 Version: 2.6
Release: 7%{?dist} Release: 8%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Libraries Group: System Environment/Libraries
# https://github.com/SELinuxProject/selinux/wiki/Releases # 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 # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
# run: # run:
# $ VERSION=2.6 ./make-fedora-selinux-patch.sh libselinux # $ VERSION=2.6 ./make-fedora-selinux-patch.sh libselinux
# HEAD https://github.com/fedora-selinux/selinux/commit/55c710487a365122fc1c961c7b05620defbfe65a # HEAD https://github.com/fedora-selinux/selinux/commit/601a1d1363fe4137ff3a2991c546f7a0ccfec4cb
Patch1: libselinux-fedora.patch Patch1: libselinux-fedora.patch
%if 0%{?fedora} > 25 %if 0%{?fedora} > 25
BuildRequires: pkgconf-pkg-config BuildRequires: pkgconf-pkg-config
@ -262,6 +262,9 @@ rm -rf %{buildroot}
%{ruby_vendorarchdir}/selinux.so %{ruby_vendorarchdir}/selinux.so
%changelog %changelog
* Fri Jul 28 2017 Petr Lautrbach <plautrba@redhat.com> - 2.6-8
- Always unmount selinuxfs for SELINUX=disabled
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-7 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild