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

[<ssm...@us...>]

Revision: 2124
          http://svn.sourceforge.net/selinux/?rev=2124&view=rev
Author:   ssmalley
Date:     2007-01-04 08:57:22 -0800 (Thu, 04 Jan 2007)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: Policycoreutils patches
Date: Wed, 03 Jan 2007 13:05:22 -0500

Bunch of patches separated so you can approve/deny them separately.

avc patch Removes optional_policy name from audit2allow

pyver patch removes hardcoding of python version from makefile.  Will 
use version of installed python version.

newrole patch to use O_RDWR for terminals to fix more problem.

Modified Paths:
--------------
    trunk/policycoreutils/ChangeLog
    trunk/policycoreutils/VERSION
    trunk/policycoreutils/audit2allow/Makefile
    trunk/policycoreutils/audit2allow/avc.py
    trunk/policycoreutils/newrole/newrole.c
    trunk/policycoreutils/semanage/Makefile

Modified: trunk/policycoreutils/ChangeLog
===================================================================
--- trunk/policycoreutils/ChangeLog	2007-01-04 16:50:14 UTC (rev 2123)
+++ trunk/policycoreutils/ChangeLog	2007-01-04 16:57:22 UTC (rev 2124)
@@ -1,4 +1,10 @@
-1.33.7 2007-1-3
+1.33.8 2007-01-04
+	* Merged patches from Dan Walsh to:
+	  - omit the optional name from audit2allow
+	  - use the installed python version in the Makefiles
+	  - re-open the tty with O_RDWR in newrole
+
+1.33.7 2007-01-03
 	* Patch from Dan Walsh to correctly suppress warnings in load_policy.
 	
 1.33.6 2006-11-29

Modified: trunk/policycoreutils/VERSION
===================================================================
--- trunk/policycoreutils/VERSION	2007-01-04 16:50:14 UTC (rev 2123)
+++ trunk/policycoreutils/VERSION	2007-01-04 16:57:22 UTC (rev 2124)
@@ -1 +1 @@
-1.33.7
+1.33.8

Modified: trunk/policycoreutils/audit2allow/Makefile
===================================================================
--- trunk/policycoreutils/audit2allow/Makefile	2007-01-04 16:50:14 UTC (rev 2123)
+++ trunk/policycoreutils/audit2allow/Makefile	2007-01-04 16:57:22 UTC (rev 2124)
@@ -4,7 +4,7 @@
 LIBDIR ?= $(PREFIX)/lib
 MANDIR ?= $(PREFIX)/share/man
 LOCALEDIR ?= /usr/share/locale
-PYLIBVER ?= python2.4
+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
 PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
 
 TARGETS=audit2allow

Modified: trunk/policycoreutils/audit2allow/avc.py
===================================================================
--- trunk/policycoreutils/audit2allow/avc.py	2007-01-04 16:50:14 UTC (rev 2123)
+++ trunk/policycoreutils/audit2allow/avc.py	2007-01-04 16:57:22 UTC (rev 2124)
@@ -231,7 +231,7 @@
 		else:
 			file = m[0][1]
 			ret = "\n#%s\n"% self.out()
-			ret += "optional_policy(`%s', `\n" % m[0][1]
+			ret += "optional_policy(`\n" 
 			first = True
 			for i in m:
 				if file != i[1]:

Modified: trunk/policycoreutils/newrole/newrole.c
===================================================================
--- trunk/policycoreutils/newrole/newrole.c	2007-01-04 16:50:14 UTC (rev 2123)
+++ trunk/policycoreutils/newrole/newrole.c	2007-01-04 16:57:22 UTC (rev 2124)
@@ -1120,10 +1120,10 @@
 	fd = open(ttyn, O_RDONLY);
 	if (fd != 0)
 		goto err_close_pam;
-	fd = open(ttyn, O_WRONLY);
+	fd = open(ttyn, O_RDWR);
 	if (fd != 1)
 		goto err_close_pam;
-	fd = open(ttyn, O_WRONLY);
+	fd = open(ttyn, O_RDWR);
 	if (fd != 2)
 		goto err_close_pam;
 

Modified: trunk/policycoreutils/semanage/Makefile
===================================================================
--- trunk/policycoreutils/semanage/Makefile	2007-01-04 16:50:14 UTC (rev 2123)
+++ trunk/policycoreutils/semanage/Makefile	2007-01-04 16:57:22 UTC (rev 2124)
@@ -3,7 +3,7 @@
 LIBDIR ?= $(PREFIX)/lib
 SBINDIR ?= $(PREFIX)/sbin
 MANDIR = $(PREFIX)/share/man
-PYLIBVER ?= python2.4
+PYLIBVER ?= $(shell python -c 'import sys;print "python%d.%d" % sys.version_info[0:2]')
 PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER)
 
 TARGETS=semanage


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