From b71bf0b207dce019439f36e73cd5157f47f7cac0 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Wed, 17 May 2006 00:49:24 +0000
Subject: [PATCH] - Upgrade to latest from NSA Merged setrans client cleanup
 patch from Steve Grubb.

---
 .cvsignore      |  1 +
 libselinux.spec | 57 ++++++++++++++++++++++++++-----------------------
 sources         |  2 +-
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 19b6bae..02f9711 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -81,3 +81,4 @@ libselinux-1.30.1.tgz
 libselinux-1.30.3.tgz
 libselinux-1.30.5.tgz
 libselinux-1.30.6.tgz
+libselinux-1.30.7.tgz
diff --git a/libselinux.spec b/libselinux.spec
index 997efeb..3d4e0e9 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -1,8 +1,8 @@
 %define libsepolver 1.12.6-1
 Summary: SELinux library and simple utilities
 Name: libselinux
-Version: 1.30.6
-Release: 2
+Version: 1.30.7
+Release: 1
 License: Public domain (uncopyrighted)
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
@@ -10,8 +10,7 @@ Patch: libselinux-rhat.patch
 
 BuildRequires: libsepol-devel >= %{libsepolver}
 Requires: libsepol >= %{libsepolver} setransd
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Security-enhanced Linux is a feature of the Linux® kernel and a number
@@ -56,33 +55,33 @@ make clean
 make CFLAGS="-g %{optflags}" all pywrap
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}/%{_lib} 
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} 
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir} 
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}/var/run/setrans
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_lib} 
+mkdir -p %{buildroot}/%{_libdir} 
+mkdir -p %{buildroot}%{_includedir} 
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}/var/run/setrans
 
-make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" BINDIR="${RPM_BUILD_ROOT}%{_sbindir}" install install-pywrap
+make DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" SHLIBDIR="%{buildroot}/%{_lib}" BINDIR="%{buildroot}%{_sbindir}" install install-pywrap
 
 # Nuke the files we don't want to distribute
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/compute_*
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/deftype
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/execcon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getcon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getconlist
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getenforcemode
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getfilecon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/getpidcon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/mkdircon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/policyvers
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/setfilecon
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/selinuxconfig
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/selinuxdisable
-rm -f ${RPM_BUILD_ROOT}%{_sbindir}/sgetseuser
+rm -f %{buildroot}%{_sbindir}/compute_*
+rm -f %{buildroot}%{_sbindir}/deftype
+rm -f %{buildroot}%{_sbindir}/execcon
+rm -f %{buildroot}%{_sbindir}/getcon
+rm -f %{buildroot}%{_sbindir}/getconlist
+rm -f %{buildroot}%{_sbindir}/getenforcemode
+rm -f %{buildroot}%{_sbindir}/getfilecon
+rm -f %{buildroot}%{_sbindir}/getpidcon
+rm -f %{buildroot}%{_sbindir}/mkdircon
+rm -f %{buildroot}%{_sbindir}/policyvers
+rm -f %{buildroot}%{_sbindir}/setfilecon
+rm -f %{buildroot}%{_sbindir}/selinuxconfig
+rm -f %{buildroot}%{_sbindir}/selinuxdisable
+rm -f %{buildroot}%{_sbindir}/sgetseuser
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %post
 /sbin/ldconfig
@@ -103,7 +102,7 @@ exit 0
 %defattr(-,root,root)
 %{_libdir}/libselinux.a
 %dir %{_includedir}/selinux
-%{_includedir}/selinux/
+%{_includedir}/selinux/*
 %{_mandir}/man3/*
 
 %files python
@@ -112,6 +111,10 @@ exit 0
 %{_libdir}/python*/site-packages/selinux.py*
 
 %changelog
+* Tue May 16 2006 Dan Walsh <dwalsh@redhat.com> 1.30.7-1
+- Upgrade to latest from NSA
+	* Merged setrans client cleanup patch from Steve Grubb.
+
 * Tue May 9 2006 Dan Walsh <dwalsh@redhat.com> 1.30.6-2
 - Add Russell's AVC patch to handle large numbers
 
diff --git a/sources b/sources
index aee6a62..a64d64e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d05ed6cb416e62e9abb6cacece01e91a  libselinux-1.30.6.tgz
+375224483fb2c19e5cf5c0cd800f6f21  libselinux-1.30.7.tgz