From 58f329dd4d241b1ee343957a32ba4da6c6f38da5 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Wed, 7 Dec 2005 16:56:22 +0000
Subject: [PATCH] * Wed Dec 7 2005 Dan Walsh <dwalsh@redhat.com> 1.27.37-1 -
 Update to match NSA - Add chcat to policycoreutils, adding +/- syntax ` * Tue
 Dec 6 2005 Dan Walsh <dwalsh@redhat.com> 1.27.36-2 - Require new version of
 libsemanage

---
 policycoreutils-rhat.patch | 125 +++++++++++++++++++++++++++++++++++--
 policycoreutils.spec       |   2 +
 2 files changed, 121 insertions(+), 6 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 708569c..bf8c222 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,6 +1,109 @@
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/debugfiles.list policycoreutils-1.27.37/debugfiles.list
+--- nsapolicycoreutils/debugfiles.list	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-1.27.37/debugfiles.list	2005-12-07 11:55:05.000000000 -0500
+@@ -0,0 +1,14 @@
++/usr/lib/debug/usr/bin/newrole.debug
++/usr/lib/debug/usr/bin/semodule_link.debug
++/usr/lib/debug/usr/bin/semodule_expand.debug
++/usr/lib/debug/usr/bin/semodule_package.debug
++/usr/lib/debug/usr/sbin/sestatus.debug
++/usr/lib/debug/usr/sbin/setfiles.debug
++/usr/lib/debug/usr/sbin/open_init_pty.debug
++/usr/lib/debug/usr/sbin/run_init.debug
++/usr/lib/debug/usr/sbin/load_policy.debug
++/usr/lib/debug/usr/sbin/semodule.debug
++/usr/lib/debug/usr/sbin/audit2why.debug
++/usr/lib/debug/usr/sbin/setsebool.debug
++/usr/lib/debug/sbin/restorecon.debug
++/usr/src/debug/policycoreutils-1.27.37
+Binary files nsapolicycoreutils/debugsources.list and policycoreutils-1.27.37/debugsources.list differ
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/policycoreutils.lang policycoreutils-1.27.37/policycoreutils.lang
+--- nsapolicycoreutils/policycoreutils.lang	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-1.27.37/policycoreutils.lang	2005-12-07 11:55:05.000000000 -0500
+@@ -0,0 +1,80 @@
++%defattr (644, root, root, 755)
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++%lang(sv) /usr/share/locale/sv/LC_MESSAGES/policycoreutils.mo
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.27.37/scripts/chcat
 --- nsapolicycoreutils/scripts/chcat	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.27.37/scripts/chcat	2005-12-07 11:25:54.000000000 -0500
++++ policycoreutils-1.27.37/scripts/chcat	2005-12-07 11:54:57.000000000 -0500
 @@ -0,0 +1,175 @@
 +#! /usr/bin/env python
 +# Copyright (C) 2005 Red Hat 
@@ -179,7 +282,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycore
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.27.37/scripts/chcat.8
 --- nsapolicycoreutils/scripts/chcat.8	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-1.27.37/scripts/chcat.8	2005-12-07 11:28:01.000000000 -0500
++++ policycoreutils-1.27.37/scripts/chcat.8	2005-12-07 11:54:57.000000000 -0500
 @@ -0,0 +1,29 @@
 +.TH CHCAT "8" "September 2005" "chcat" "User Commands"
 +.SH NAME
@@ -212,17 +315,27 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policyco
 +
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-1.27.37/scripts/Makefile
 --- nsapolicycoreutils/scripts/Makefile	2005-01-28 15:24:12.000000000 -0500
-+++ policycoreutils-1.27.37/scripts/Makefile	2005-12-07 11:20:00.000000000 -0500
-@@ -4,7 +4,7 @@
++++ policycoreutils-1.27.37/scripts/Makefile	2005-12-07 11:56:07.000000000 -0500
+@@ -1,20 +1,23 @@
+ # Installation directories.
+ PREFIX ?= ${DESTDIR}/usr
+-BINDIR ?= $(PREFIX)/sbin
++BINDIR ?= $(PREFIX)/bin
++SBINDIR ?= $(PREFIX)/sbin
  MANDIR ?= $(PREFIX)/share/man
  LOCALEDIR ?= /usr/share/locale
  
 -TARGETS=genhomedircon
-+TARGETS=genhomedircon chcat
++TARGETS=genhomedircon 
  
  all: $(TARGETS) fixfiles
  
-@@ -15,6 +15,7 @@
+ install: all
+ 	-mkdir -p $(BINDIR)
+-	install -m 755 $(TARGETS) $(BINDIR)
++	install -m 755 $(TARGETS) $(SBINDIR)
++	install -m 755 chcat $(BINDIR)
+ 	install -m 755 fixfiles $(DESTDIR)/sbin
  	-mkdir -p $(MANDIR)/man8
  	install -m 644 fixfiles.8 $(MANDIR)/man8/
  	install -m 644 genhomedircon.8 $(MANDIR)/man8/
diff --git a/policycoreutils.spec b/policycoreutils.spec
index a2b85b8..e885ae7 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -70,9 +70,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/open_init_pty
 %{_bindir}/newrole
 %{_bindir}/audit2allow
+%{_bindir}/chcat
 %{_bindir}/semodule_expand
 %{_bindir}/semodule_link
 %{_bindir}/semodule_package
+%{_mandir}/man8/chcat.8.gz
 %{_mandir}/man8/restorecon.8.gz
 %{_mandir}/man8/sestatus.8.gz
 %{_mandir}/man8/semanage.8.gz