[Selinux-commits] SF.net SVN: selinux: [2030] trunk/policycoreutils

[<mad...@us...>]

Revision: 2030
          http://svn.sourceforge.net/selinux/?rev=2030&view=rev
Author:   madmethod
Date:     2006-09-13 14:29:58 -0700 (Wed, 13 Sep 2006)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: Latest policycoreutils.patch
Date: Wed, 13 Sep 2006 13:54:48 -0400

This patch include simple man page fixes and changes the way python 
scripts run to make the somewhat more secure.

Also fixes some missing getopt flags.

Acked-By: Joshua Brindle <jbr...@tr...>
Acked-by:  Stephen Smalley <sd...@ty...>

Modified Paths:
--------------
    trunk/policycoreutils/ChangeLog
    trunk/policycoreutils/VERSION
    trunk/policycoreutils/audit2allow/audit2allow
    trunk/policycoreutils/audit2allow/avc.py
    trunk/policycoreutils/restorecond/restorecond.init
    trunk/policycoreutils/scripts/chcat
    trunk/policycoreutils/scripts/genhomedircon
    trunk/policycoreutils/secon/Makefile
    trunk/policycoreutils/semanage/semanage
    trunk/policycoreutils/semanage/semanage.8
    trunk/policycoreutils/semanage/seobject.py
    trunk/policycoreutils/semodule_link/semodule_link.8
    trunk/policycoreutils/semodule_package/semodule_package.8

Modified: trunk/policycoreutils/ChangeLog
===================================================================
--- trunk/policycoreutils/ChangeLog	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/ChangeLog	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1,3 +1,8 @@
+1.30.29 2006-09-13
+	* Man page corrections from Dan Walsh
+	* Change all python invocations to /usr/bin/python -E
+	* Add missing getopt flags to genhomedircon
+
 1.30.28 2006-09-01
 	* Merged fix for restorecon // handling from Erich Schubert.
 	* Merged translations update and fixfiles fix from Dan Walsh.

Modified: trunk/policycoreutils/VERSION
===================================================================
--- trunk/policycoreutils/VERSION	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/VERSION	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1 +1 @@
-1.30.28
+1.30.29

Modified: trunk/policycoreutils/audit2allow/audit2allow
===================================================================
--- trunk/policycoreutils/audit2allow/audit2allow	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/audit2allow/audit2allow	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
 # Copyright (C) 2005 Red Hat 
 # see file 'COPYING' for use and warranty information
 #

Modified: trunk/policycoreutils/audit2allow/avc.py
===================================================================
--- trunk/policycoreutils/audit2allow/avc.py	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/audit2allow/avc.py	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
 # Copyright (C) 2006 Red Hat 
 # see file 'COPYING' for use and warranty information
 #

Modified: trunk/policycoreutils/restorecond/restorecond.init
===================================================================
--- trunk/policycoreutils/restorecond/restorecond.init	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/restorecond/restorecond.init	2006-09-13 21:29:58 UTC (rev 2030)
@@ -3,9 +3,9 @@
 # restorecond:		Daemo used to maintain path file context
 #
 # chkconfig:	2345 10 90
-# description:	restorecond uses inotify to look for creation of new files listed in the 
-#               /etc/selinux/POLICYTYPE/restorefiles.conf file, and sets the correct security 
-#               context.
+# description:	restorecond uses inotify to look for creation of new files \
+# listed in the /etc/selinux/restorecond.conf file, and restores the \
+# correct security context.
 #
 
 # Source function library.

Modified: trunk/policycoreutils/scripts/chcat
===================================================================
--- trunk/policycoreutils/scripts/chcat	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/scripts/chcat	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
 # Copyright (C) 2005 Red Hat 
 # see file 'COPYING' for use and warranty information
 #

Modified: trunk/policycoreutils/scripts/genhomedircon
===================================================================
--- trunk/policycoreutils/scripts/genhomedircon	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/scripts/genhomedircon	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#! /usr/bin/python -E
 # Copyright (C) 2004 Tresys Technology, LLC
 # see file 'COPYING' for use and warranty information
 #
@@ -356,7 +356,7 @@
 	usepwd = 1
 	directory = "/etc/selinux"
 	type = None
-	gopts, cmds = getopt.getopt(sys.argv[1:], 'nd:t:', ['help',
+	gopts, cmds = getopt.getopt(sys.argv[1:], 'hnd:t:', ['help',
 						'type=',
 						'nopasswd',
 						'dir='])
@@ -367,7 +367,7 @@
 			usepwd = 0
 		if o == '--dir'  or o == "-d":
 			directory = a
-		if o == '--help':
+		if o == '--help'  or o == "-h":
 			usage()
 
 

Modified: trunk/policycoreutils/secon/Makefile
===================================================================
--- trunk/policycoreutils/secon/Makefile	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/secon/Makefile	2006-09-13 21:29:58 UTC (rev 2030)
@@ -20,8 +20,8 @@
 install: all
 	install -m 755 secon $(BINDIR);
 
-#	test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
-#	install -m 644 ../man/secon.1 $(MANDIR)/man1
+	test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
+	install -m 644 secon.1 $(MANDIR)/man1
 
 relabel:
 	/sbin/restorecon $(BINDIR)/secon

Modified: trunk/policycoreutils/semanage/semanage
===================================================================
--- trunk/policycoreutils/semanage/semanage	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/semanage/semanage	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
 # Copyright (C) 2005 Red Hat 
 # see file 'COPYING' for use and warranty information
 #

Modified: trunk/policycoreutils/semanage/semanage.8
===================================================================
--- trunk/policycoreutils/semanage/semanage.8	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/semanage/semanage.8	2006-09-13 21:29:58 UTC (rev 2030)
@@ -88,9 +88,9 @@
 # View SELinux user mappings
 $ semanage user -l
 # Allow joe to login as staff_u
-$ semanage login -a -s staff_u
+$ semanage login -a -s staff_u joe
 # Add file-context for everything under /web (used by restorecon)
-$ semanage fcontext -a -t httpd_sys_content_t '/web(/.*)?'
+$ semanage fcontext -a -t httpd_sys_content_t "/web(/.*)?"
 # Allow Apache to listen on port 81
 $ semanage port -a -t http_port_t -p tcp 81
 .fi

Modified: trunk/policycoreutils/semanage/seobject.py
===================================================================
--- trunk/policycoreutils/semanage/seobject.py	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/semanage/seobject.py	2006-09-13 21:29:58 UTC (rev 2030)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python -E
 # Copyright (C) 2005 Red Hat 
 # see file 'COPYING' for use and warranty information
 #

Modified: trunk/policycoreutils/semodule_link/semodule_link.8
===================================================================
--- trunk/policycoreutils/semodule_link/semodule_link.8	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/semodule_link/semodule_link.8	2006-09-13 21:29:58 UTC (rev 2030)
@@ -3,7 +3,7 @@
 semodule_link \- Link SELinux policy module packages together
 
 .SH SYNOPSIS
-.B semodule_link [-V] [-o outfile] basemodpkg modpkg1 [modpkg2]...
+.B semodule_link [-Vv] [-o outfile] basemodpkg modpkg1 [modpkg2]...
 .br
 .SH DESCRIPTION
 .PP
@@ -17,9 +17,12 @@
 .SH "OPTIONS"
 .TP
 .B \-V
+show version
+.TP
+.B \-v
 verbose mode
 .TP
-.B \-o \-\-outfile <output file> 
+.B \-o <output file> 
 Linked policy module package generated by this tool.
 
 

Modified: trunk/policycoreutils/semodule_package/semodule_package.8
===================================================================
--- trunk/policycoreutils/semodule_package/semodule_package.8	2006-09-13 15:14:00 UTC (rev 2029)
+++ trunk/policycoreutils/semodule_package/semodule_package.8	2006-09-13 21:29:58 UTC (rev 2030)
@@ -28,11 +28,20 @@
 .B \-o \-\-outfile <output file> 
 Policy module package file generated by this tool.
 .TP
+.B  \-s \-\-seuser <seuser file>
+seuser file to be included in the package.
+.TP
+.B  \-u \-\-user_extra <user extra file>
+user_extra file to be included in the package.
+.TP
 .B  \-m \-\-module <Module file>
 Policy module file to be included in the package.
 .TP
 .B  \-f \-\-fc	<File context file>
 File contexts file for the module (optional).
+.TP
+.B  \-n \-\-nc <netfilter context file>
+netfilter context file to be included in the package.
 
 .SH SEE ALSO
 .B checkmodule(8), semodule(8)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.