From 3efb40392872b03a2ac47891b671ab6a82cd2e98 Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Fri, 13 Aug 2010 10:03:13 -0400 Subject: [PATCH] - Apply patch to restorecond from Chris Adams, which will cause restorecond - to watch first user that logs in. --- policycoreutils-rhat.patch | 13 +++++++++++++ policycoreutils.spec | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 0876ddd..a726db6 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1180,6 +1180,19 @@ diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po + return 0; +} + +diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/utmpwatcher.c policycoreutils-2.0.83/restorecond/utmpwatcher.c +--- nsapolicycoreutils/restorecond/utmpwatcher.c 2010-05-19 14:45:51.000000000 -0400 ++++ policycoreutils-2.0.83/restorecond/utmpwatcher.c 2010-08-13 10:00:27.000000000 -0400 +@@ -72,8 +72,8 @@ + if (utmp_wd == -1) + exitApp("Error watching utmp file."); + ++ changed = strings_list_diff(prev_utmp_ptr, utmp_ptr); + if (prev_utmp_ptr) { +- changed = strings_list_diff(prev_utmp_ptr, utmp_ptr); + strings_list_free(prev_utmp_ptr); + } + return changed; diff --exclude-from=exclude --exclude=sepolgen-1.0.23 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.83/restorecond/watch.c --- nsapolicycoreutils/restorecond/watch.c 1969-12-31 19:00:00.000000000 -0500 +++ policycoreutils-2.0.83/restorecond/watch.c 2010-07-30 13:50:40.000000000 -0400 diff --git a/policycoreutils.spec b/policycoreutils.spec index 42ee9bb..2d0e50b 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.0.83 -Release: 15%{?dist} +Release: 17%{?dist} License: GPLv2+ Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -81,6 +81,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps %{__mkdir} -p %{buildroot}/%{_sysconfdir}/rc.d/init.d %{__mkdir} -p %{buildroot}%{_datadir}/icons/hicolor/24x24/apps %{__mkdir} -p %{buildroot}%{_datadir}/pixmaps +%{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}-%{version}/ +cp COPYING %{buildroot}/%{_usr}/share/doc/%{name}-%{version}/ make LSPP_PRIV=y DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install make -C sepolgen-%{sepolgenver} DESTDIR="%{buildroot}" LIBDIR="%{buildroot}%{_libdir}" install @@ -293,6 +295,7 @@ rm -rf %{buildroot} %{_mandir}/ru/man1/secon.1* %{_mandir}/man8/seunshare.8* %{_mandir}/man8/genhomedircon.8* +%doc %{_usr}/share/doc/%{name}-%{version} %preun if [ $1 -eq 0 ]; then @@ -312,6 +315,13 @@ fi exit 0 %changelog +* Fri Aug 13 2010 Dan Walsh 2.0.83-17 +- Apply patch to restorecond from Chris Adams, which will cause restorecond +- to watch first user that logs in. + +* Thu Aug 12 2010 Dan Walsh 2.0.83-16 +- Add COPYING file to doc dir + * Thu Aug 5 2010 Dan Walsh 2.0.83-15 - Update po and translations Resolves: #610473 @@ -323,11 +333,11 @@ Resolves: #610473 - Remove requirement to run selinux-polgen as root * Thu Aug 5 2010 Dan Walsh 2.0.83-12 -- Fix selinux-polgen +- Update po and translations +- Fix gui policy generation tools * Wed Aug 4 2010 Dan Walsh 2.0.83-11 - Update po and translations -Resolves: #610473 * Sat Jul 31 2010 David Malcolm - 2.0.83-10 - rebuild against python 2.7