From 0af08dc350b3815f9ff206bc0af86b7c65afd6d1 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 31 Aug 2006 20:18:10 +0000 Subject: [PATCH] * Thu Aug 31 2006 Dan Walsh 1.30.27-5 - Change scripts to use /usr/sbin/python --- policycoreutils-rhat.patch | 45 ++++++++++++++++++++++++++++++++++++++ policycoreutils.spec | 5 ++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 24a043d..bd3fb36 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -1,3 +1,21 @@ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.27/audit2allow/audit2allow +--- nsapolicycoreutils/audit2allow/audit2allow 2006-08-28 16:58:19.000000000 -0400 ++++ policycoreutils-1.30.27/audit2allow/audit2allow 2006-08-31 16:11:24.000000000 -0400 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python + # Copyright (C) 2005 Red Hat + # see file 'COPYING' for use and warranty information + # +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/avc.py policycoreutils-1.30.27/audit2allow/avc.py +--- nsapolicycoreutils/audit2allow/avc.py 2006-08-28 16:58:19.000000000 -0400 ++++ policycoreutils-1.30.27/audit2allow/avc.py 2006-08-31 16:12:13.000000000 -0400 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python + # Copyright (C) 2006 Red Hat + # see file 'COPYING' for use and warranty information + # Binary files nsapolicycoreutils/newrole/newrole and policycoreutils-1.30.27/newrole/newrole differ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.27/newrole/newrole.c --- nsapolicycoreutils/newrole/newrole.c 2006-08-28 16:58:20.000000000 -0400 @@ -26535,6 +26553,15 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond. # # Source function library. +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.30.27/scripts/chcat +--- nsapolicycoreutils/scripts/chcat 2006-08-28 16:58:19.000000000 -0400 ++++ policycoreutils-1.30.27/scripts/chcat 2006-08-31 16:11:53.000000000 -0400 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python + # Copyright (C) 2005 Red Hat + # see file 'COPYING' for use and warranty information + # diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.27/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2006-08-28 16:58:19.000000000 -0400 +++ policycoreutils-1.30.27/scripts/fixfiles 2006-08-31 11:04:33.000000000 -0400 @@ -26556,3 +26583,21 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc done exit $? fi +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.27/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2006-08-28 16:58:18.000000000 -0400 ++++ policycoreutils-1.30.27/semanage/semanage 2006-08-31 16:11:11.000000000 -0400 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python + # Copyright (C) 2005 Red Hat + # see file 'COPYING' for use and warranty information + # +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.30.27/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2006-08-28 16:58:18.000000000 -0400 ++++ policycoreutils-1.30.27/semanage/seobject.py 2006-08-31 16:11:40.000000000 -0400 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python + # Copyright (C) 2005 Red Hat + # see file 'COPYING' for use and warranty information + # diff --git a/policycoreutils.spec b/policycoreutils.spec index 627242b..0de7f91 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -5,7 +5,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.30.27 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -119,6 +119,9 @@ fi [ -x /sbin/service ] && /sbin/service restorecond condrestart %changelog +* Thu Aug 31 2006 Dan Walsh 1.30.27-5 +- Change scripts to use /usr/sbin/python + * Thu Aug 31 2006 Dan Walsh 1.30.27-4 - Add -i qualified to restorecon to tell it to ignore files that do not exist - Fixfiles also modified for this change