From b14fed28922256823a55199504dfad7804c3b417 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Thu, 15 Sep 2005 20:02:48 +0000
Subject: [PATCH] * Thu Sep 15 2005 Dan Walsh <dwalsh@redhat.com> 1.26-3 - Add
 chcat script for use with chcon.

---
 policycoreutils-rhat.patch | 56 +++++++++++++++++++++++++++++++++-----
 policycoreutils.spec       |  9 ++++--
 2 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 7bdd650..9883393 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,7 +1,6 @@
-Binary files nsapolicycoreutils/restorecon/restorecon and policycoreutils-1.26/restorecon/restorecon differ
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.26/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2005-09-12 16:33:30.000000000 -0400
-+++ policycoreutils-1.26/restorecon/restorecon.c	2005-09-13 12:26:38.452608000 -0400
++++ policycoreutils-1.26/restorecon/restorecon.c	2005-09-13 13:19:58.000000000 -0400
 @@ -259,7 +259,6 @@
  int main(int argc, char **argv) {
    int i=0;
@@ -10,10 +9,53 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c
    int file=0;
    int opt;
    char buf[PATH_MAX];
-Binary files nsapolicycoreutils/restorecon/restorecon.o and policycoreutils-1.26/restorecon/restorecon.o differ
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.26/scripts/chcat
+--- nsapolicycoreutils/scripts/chcat	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-1.26/scripts/chcat	2005-09-15 15:47:46.000000000 -0400
+@@ -0,0 +1,13 @@
++#!/bin/sh
++if [ $# -lt 2 ]; then
++	echo "Usage $0 Category File ..."
++	echo "Usage $0 -d File ..."
++	exit 1
++fi 
++if [ $1 == "-d" ]; then
++shift
++chcon -l "" $*
++else
++chcon -l $*
++fi
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.26/scripts/chcat.8
+--- nsapolicycoreutils/scripts/chcat.8	1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-1.26/scripts/chcat.8	2005-09-15 16:00:05.000000000 -0400
+@@ -0,0 +1,23 @@
++.TH CHCAT "8" "September 2005" "chcat" "User Commands"
++.SH NAME
++chcat \- change file security category
++.SH SYNOPSIS
++.B chcat
++\fICATEGORY FILE\fR...
++.br
++.B chcat
++[\fI-d\fR] \fIFILE\fR...
++.br
++.PP
++Change/Remove the security CATEGORY for each FILE.
++.br
++This script wraps the chcon command.
++.TP
++\fB\-d\fR
++delete the category from each file.
++.SH "SEE ALSO"
++.TP
++chcon(1), selinux(8)
++.SH "FILES"
++/etc/mcs.conf
++
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.26/scripts/fixfiles
---- nsapolicycoreutils/scripts/fixfiles	2005-09-12 16:33:30.000000000 -0400
-+++ policycoreutils-1.26/scripts/fixfiles	2005-09-13 12:24:33.357828000 -0400
+--- nsapolicycoreutils/scripts/fixfiles	2005-09-14 15:32:01.000000000 -0400
++++ policycoreutils-1.26/scripts/fixfiles	2005-09-13 13:19:58.000000000 -0400
 @@ -61,7 +61,11 @@
  if [ -f ${PREFC} -a -x /usr/bin/diff ]; then
  	TEMPFILE=`mktemp ${FC}.XXXXXXXXXX`
@@ -38,7 +80,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc
  #
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.8 policycoreutils-1.26/setfiles/setfiles.8
 --- nsapolicycoreutils/setfiles/setfiles.8	2005-09-12 16:33:30.000000000 -0400
-+++ policycoreutils-1.26/setfiles/setfiles.8	2005-09-13 12:24:33.362823000 -0400
++++ policycoreutils-1.26/setfiles/setfiles.8	2005-09-13 13:19:58.000000000 -0400
 @@ -35,6 +35,9 @@
  .B \-q
  suppress non-error output.
@@ -51,7 +93,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.8 poli
  .TP 
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setfiles/setfiles.c policycoreutils-1.26/setfiles/setfiles.c
 --- nsapolicycoreutils/setfiles/setfiles.c	2005-09-12 16:33:30.000000000 -0400
-+++ policycoreutils-1.26/setfiles/setfiles.c	2005-09-13 12:24:33.369820000 -0400
++++ policycoreutils-1.26/setfiles/setfiles.c	2005-09-13 13:19:58.000000000 -0400
 @@ -198,8 +198,8 @@
  void usage(const char * const name)
  {
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 3d67f13..6e416a2 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,10 +1,10 @@
 %define libselinuxver 1.26-1
-%define libsepolver 1.9.1-1
-%define libsemanagever 1.1.6-1
+%define libsepolver 1.9.3-1
+%define libsemanagever 1.3.1-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.26
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -88,6 +88,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Thu Sep 15 2005 Dan Walsh <dwalsh@redhat.com> 1.26-3
+- Add chcat script for use with chcon.
+
 * Tue Sep 13 2005 Dan Walsh <dwalsh@redhat.com> 1.26-2
 - Fix restorecon to exit with error code