[libselinux] Update to upstream
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Mar 29 18:43:27 UTC 2012
commit 884d86db5909400d9207d507aaae473363919693
Author: Dan Walsh <dwalsh at redhat.com>
Date: Thu Mar 29 14:43:23 2012 -0400
Update to upstream
* Fix dead links to www.nsa.gov/selinux
* Remove jump over variable declaration
* Fix old style function definitions
* Fix const-correctness
* Remove unused flush_class_cache method
* Add prototype decl for destructor
* Add more printf format annotations
* Add printf format attribute annotation to die() method
* Fix const-ness of parameters & make usage() methods static
* Enable many more gcc warnings for libselinux/src/ builds
* utils: Enable many more gcc warnings for libselinux/utils builds
* Change annotation on include/selinux/avc.h to avoid upsetting SWIG
* Ensure there is a prototype for 'matchpathcon_lib_destructor'
* Update Makefiles to handle /usrmove
* utils: Stop separating out matchpathcon as something special
* pkg-config to figure out where ruby include files are located
* build with either ruby 1.9 or ruby 1.8
* assert if avc_init() not called
* take security_deny_unknown into account
* security_compute_create_name(3)
* Do not link against python library, this is considered
* bad practice in debian
* Hide unnecessarily-exported library destructors
libselinux.spec | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/libselinux.spec b/libselinux.spec
index 2d6d436..bf4a53a 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,6 +1,7 @@
%global with_python3 1
-%define ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+%define ruby_inc %(pkg-config --cflags ruby-1.9)
+%define ruby_sitearch %(ruby -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
%define libsepolver 2.1.5-1
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
@@ -13,7 +14,7 @@ Group: System Environment/Libraries
Source: %{name}-%{version}.tgz
Url: http://oss.tresys.com/git/selinux.git
Patch1: libselinux-rhat.patch
-BuildRequires: python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig
+BuildRequires: pkgconfig python-devel ruby-devel ruby libsepol-static >= %{libsepolver} swig
%if 0%{?with_python3}
BuildRequires: python3-devel
%endif # if with_python3
@@ -120,7 +121,7 @@ BuildPythonWrapper %{__python}
BuildPythonWrapper %{__python3}
%endif # with_python3
-make SHLIBDIR="%{_libdir}" LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" %{?_smp_mflags} rubywrap
+make RUBYINC="%{ruby_inc}" SHLIBDIR="%{_libdir}" LIBDIR="%{_libdir}" CFLAGS="-g %{optflags}" %{?_smp_mflags} rubywrap
%install
InstallPythonWrapper() {
@@ -153,7 +154,7 @@ InstallPythonWrapper %{__python}
InstallPythonWrapper %{__python3}
%endif # with_python3
-make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}%{_libdir}" BINDIR="%{buildroot}%{_bindir}" SBINDIR="%{buildroot}%{_sbindir}" install install-rubywrap
+make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}%{_libdir}" BINDIR="%{buildroot}%{_bindir}" SBINDIR="%{buildroot}%{_sbindir}" RUBYINSTALL=%{buildroot}%{ruby_sitearch} install install-rubywrap
# Nuke the files we don't want to distribute
rm -f %{buildroot}%{_sbindir}/compute_*
@@ -258,6 +259,16 @@ rm -rf %{buildroot}
* bad practice in debian
* Hide unnecessarily-exported library destructors
+* Thu Feb 16 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.9-9
+- Add selinux_current_policy_path to return /sys/fs/selinux/policy if it exists
+- Otherwise search for policy on disk
+
+* Wed Feb 15 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.9-8
+- Change selinux_binary_policy_path to return /sys/fs/selinux/policy
+- Add selinux_installed_policy_path to return what selinux_binary_policy_path used to return
+- avc_has_perm will now return yes if the machine is in permissive mode
+- Make work with ruby-1.9
+
* Fri Feb 3 2012 Dan Walsh <dwalsh at redhat.com> - 2.1.9-7
- avc_netlink_recieve should continue to poll if it receinves an EINTR rather
More information about the scm-commits
mailing list