rpms/sectool/devel sectool-0.9.1-selinux.patch, NONE, 1.1 sectool-0.9.1-zsh.patch, NONE, 1.1 sectool.spec, 1.20, 1.21

[Peter Vrabec]

Author: pvrabec

Update of /cvs/extras/rpms/sectool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26091

Modified Files:
	sectool.spec 
Added Files:
	sectool-0.9.1-selinux.patch sectool-0.9.1-zsh.patch 
Log Message:
- checking zsh home files (#469913)
- fix selinux test failure (#469910)


sectool-0.9.1-selinux.patch:

--- NEW FILE sectool-0.9.1-selinux.patch ---
diff --git a/tests/selinuxtest.py b/tests/selinuxtest.py
index 1e04813..e4d655b 100755
--- a/tests/selinuxtest.py
+++ b/tests/selinuxtest.py
@@ -108,6 +108,7 @@ def bool_state_to_id(state, was = False):
 
 
 def bools_test():
+	report(INFO, 0, "Starting booleans change test")
 	old_fname = os.path.join(testenv['TDATA_DIR'], testenv['OLDBOOLS_FILE'])
 	bools = get_bools()
 	testname = testenv['NAME']
@@ -134,16 +135,16 @@ def get_msgtype(str):
 	if str == 'HINT'   : return HINT
 	
 def enabled_test():
-	mode = cmd.getoutput('getenforce')
-	if mode != testenv['MODE'] and mode != 'Enforcing':
+	(status, mode) = cmd.getstatusoutput('getenforce')
+	if status != 0 or (mode != testenv['MODE'] and mode != 'Enforcing'):
+		if (mode == ''): mode = 'disabled'
 		report(get_msgtype(testenv['DISABLED_MSGTYPE']), ID_ENABLED, "Selinux is in " + mode + " mode.")
 		report(HINT, ID_ENABLED, "Using Enforing mode is highly recommended. See selinux manual page for switching to Enforcing mode.")
 
 	
 def main():
-	report(INFO, 0, "Starting booleans change test")
-	bools_test()
 	enabled_test()
+	if se.is_selinux_enabled(): bools_test()
 
 if __name__ == '__main__':
 	main()

sectool-0.9.1-zsh.patch:

--- NEW FILE sectool-0.9.1-zsh.patch ---
diff --git a/tests/home_files.sh b/tests/home_files.sh
index 9faaff5..ea016f0 100755
--- a/tests/home_files.sh
+++ b/tests/home_files.sh
@@ -80,7 +80,12 @@ NO_WRITE_FILES="\
     .viminfo \
     .xsession \
     .xinitrc \
-    .Xdefaults"
+    .Xdefaults \
+    .zshenv \
+    .zprofile \
+    .zshrc \
+    .zlogin \
+    .zlogout"
 
 if (( ${REFRESH} == 1 )); then
     test_exit ${E_OK}


Index: sectool.spec
===================================================================
RCS file: /cvs/extras/rpms/sectool/devel/sectool.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sectool.spec	3 Nov 2008 14:25:50 -0000	1.20
+++ sectool.spec	6 Nov 2008 16:56:17 -0000	1.21
@@ -1,13 +1,15 @@
 Summary: A security audit system and intrusion detection system
 Name: sectool
 Version: 0.9.1
-Release: 3
+Release: 4
 URL: https://hosted.fedoraproject.org/sectool/wiki/WikiStart
 Source0: %{name}-%{version}.tar.bz2
 Source1: sectool.log
 Patch1: sectool-0.9.1-cronieReq.patch
 Patch2: sectool-0.9.1-setVar.patch
 Patch3: sectool-0.9.1-getValueFromH.patch
+Patch4: sectool-0.9.1-selinux.patch
+Patch5: sectool-0.9.1-zsh.patch
 License: GPLv2+
 Group: Applications/System
 Requires: gettext coreutils which libselinux
@@ -38,6 +40,8 @@
 %patch1 -p1 -b .cronieReq
 %patch2 -p1 -b .setVar
 %patch3 -p1 -b .getValueFromH
+%patch4 -p1 -b .selinux
+%patch5 -p1 -b .zsh
 
 %build
 make %{?_smp_mflags}
@@ -102,6 +106,10 @@
 
 
 %changelog
+* Mon Nov 03 2008 Peter Vrabec <pvrabec at redhat.com> - 0.9.1-4
+- checking zsh home files (#469913)
+- fix selinux test failure (#469910)
+
 * Mon Nov 03 2008 Peter Vrabec <pvrabec at redhat.com> - 0.9.1-3
 - fix getValueFromH() (#469368)
 - fix GUI: set REFRESH, DEBUG, LEVEL