From 9ba3cdd05fc49b3d96826bd077c52ceb9d06cead Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Dec 27 2013 21:07:13 +0000 Subject: revert unexplained change to rhat.patch which broke SELinux disablement --- diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index 89dd991..e343ef1 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -511,15 +511,6 @@ index e419f1a..fdeca93 100644 close: close(fd); dlclose: -@@ -410,7 +494,7 @@ int selinux_init_load_policy(int *enforce) - * already mounted and selinuxmnt set above. - */ - -- if (seconfig == -1) { -+ if (*enforce == -1) { - /* Runtime disable of SELinux. */ - rc = security_disable(); - if (rc == 0) { diff --git a/libselinux/src/lsetfilecon.c b/libselinux/src/lsetfilecon.c index fd9bb26..932fc62 100644 --- a/libselinux/src/lsetfilecon.c diff --git a/libselinux.spec b/libselinux.spec index 9c86123..40538a2 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -10,7 +10,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.2.1 -Release: 5%{?dist} +Release: 6%{?dist} License: Public Domain Group: System Environment/Libraries Source: %{name}-%{version}.tgz @@ -243,6 +243,9 @@ rm -rf %{buildroot} %{ruby_sitearch}/selinux.so %changelog +* Fri Dec 27 2013 Adam Williamson - 2.2.1-6 +- revert unexplained change to rhat.patch which broke SELinux disablement + * Mon Dec 23 2013 Dan Walsh - 2.2.1-5 - Verify context is not null when passed into lsetfilecon_raw