rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.81, 1.82 policycoreutils.spec, 1.103, 1.104

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/policycoreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6680

Modified Files:
	policycoreutils-rhat.patch policycoreutils.spec 
Log Message:
* Thu Apr 7 2005 Dan Walsh <dwalsh at redhat.com> 1.23.3-2
- Don't run load_policy on a non SELinux kernel.


policycoreutils-rhat.patch:
 load_policy/load_policy.c |    5 +++++
 restorecon/restorecon.c   |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- policycoreutils-rhat.patch	6 Apr 2005 13:53:13 -0000	1.81
+++ policycoreutils-rhat.patch	7 Apr 2005 21:09:22 -0000	1.82
@@ -1,6 +1,21 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.23.2/restorecon/restorecon.c
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.23.3/load_policy/load_policy.c
+--- nsapolicycoreutils/load_policy/load_policy.c	2005-03-01 22:58:51.000000000 -0500
++++ policycoreutils-1.23.3/load_policy/load_policy.c	2005-04-07 17:01:19.000000000 -0400
+@@ -42,6 +42,11 @@
+ 	textdomain (PACKAGE);
+ #endif
+ 
++	if (is_selinux_enabled() <= 0 ) {
++	    fprintf( stderr, "%s: Requires an enabled SELinux kernel.\n" ); 
++	    exit(1);
++	}
++
+ 	while ((opt = getopt(argc, argv, "qb")) > 0) {
+ 		switch (opt) {
+ 		case 'b':
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.23.3/restorecon/restorecon.c
 --- nsapolicycoreutils/restorecon/restorecon.c	2005-03-08 14:03:04.000000000 -0500
-+++ policycoreutils-1.23.2/restorecon/restorecon.c	2005-04-06 09:42:05.000000000 -0400
++++ policycoreutils-1.23.3/restorecon/restorecon.c	2005-04-07 16:56:57.000000000 -0400
 @@ -211,7 +211,7 @@
        } else 	
  	      if (verbose && 


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- policycoreutils.spec	6 Apr 2005 13:53:13 -0000	1.103
+++ policycoreutils.spec	7 Apr 2005 21:09:22 -0000	1.104
@@ -3,7 +3,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.23.3
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -34,7 +34,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b rhat
+%patch -p1 -b .rhat
 %build
 make CFLAGS="%{optflags}" all 
 
@@ -81,6 +81,9 @@
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Thu Apr 7 2005 Dan Walsh <dwalsh at redhat.com> 1.23.3-2
+- Don't run load_policy on a non SELinux kernel.
+
 * Wed Apr 6 2005 Dan Walsh <dwalsh at redhat.com> 1.23.3-1
 - Update to version from NSA
         * Merged context validation patch for genhomedircon from Eric Paris.