rpms/policycoreutils/devel policycoreutils-gui.patch, 1.36, 1.37 policycoreutils.spec, 1.453, 1.454

[Daniel J Walsh (dwalsh)]

Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25023

Modified Files:
	policycoreutils-gui.patch policycoreutils.spec 
Log Message:
* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-3
- Fix bug in building policy with polgengui
- Creating ports correctly


policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- policycoreutils-gui.patch	27 Sep 2007 15:24:00 -0000	1.36
+++ policycoreutils-gui.patch	27 Sep 2007 19:05:27 -0000	1.37
@@ -3789,7 +3789,7 @@
 +    app.stand_alone()
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.27/gui/polgen.py
 --- nsapolicycoreutils/gui/polgen.py	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 11:21:40.000000000 -0400
++++ policycoreutils-2.0.27/gui/polgen.py	2007-09-27 15:04:11.000000000 -0400
 @@ -0,0 +1,740 @@
 +# Copyright (C) 2007 Red Hat 
 +# see file 'COPYING' for use and warranty information
@@ -3891,15 +3891,15 @@
 +                end = int (r[0])
 +            else:
 +                begin = int (r[0])
-+                end = int (r[1]) + 1
++                end = int (r[1])
 +                
 +                if begin > end:
 +                    raise  ValueError
 +                
-+                for p in range(begin, end):
-+                    if p < 1 or p > max_port:
-+                        raise  ValueError
-+                    temp.append(p)
++            for p in range(begin, end + 1):
++                if p < 1 or p > max_port:
++                    raise  ValueError
++                temp.append(p)
 +        return temp
 +    except ValueError:
 +        raise  ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
@@ -4516,7 +4516,7 @@
 +    print mypolicy.generate("/var/tmp")
 +    
 +    mypolicy = policy("myxuser", XUSER)
-+    mypolicy.set_in_tcp(1, 1, 1, "")
++    mypolicy.set_in_tcp(1, 1, 1, "28920")
 +    mypolicy.set_in_udp(0, 0, 1, "1513")
 +    mypolicy.set_use_uid(True)
 +    mypolicy.set_use_syslog(True)


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -r1.453 -r1.454
--- policycoreutils.spec	27 Sep 2007 15:24:00 -0000	1.453
+++ policycoreutils.spec	27 Sep 2007 19:05:27 -0000	1.454
@@ -6,7 +6,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.0.27
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -199,8 +199,9 @@
 fi
 
 %changelog
-* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-2
+* Thu Sep 27 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-3
 - Fix bug in building policy with polgengui
+- Creating ports correctly
 
 * Wed Sep 26 2007 Dan Walsh <dwalsh at redhat.com> 2.0.27-1
 - Update to upstream