* Thu Sep 27 2007 Dan Walsh <dwalsh@redhat.com> 2.0.27-3

- Fix bug in building policy with polgengui
- Creating ports correctly
This commit is contained in:
Daniel J Walsh 2007-09-27 19:05:27 +00:00
parent a8f58ae116
commit 8f66192228
2 changed files with 10 additions and 9 deletions

View File

@ -3789,7 +3789,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policyc
+ app.stand_alone() + app.stand_alone()
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycoreutils-2.0.27/gui/polgen.py 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 --- 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 @@ @@ -0,0 +1,740 @@
+# Copyright (C) 2007 Red Hat +# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information +# see file 'COPYING' for use and warranty information
@ -3891,15 +3891,15 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
+ end = int (r[0]) + end = int (r[0])
+ else: + else:
+ begin = int (r[0]) + begin = int (r[0])
+ end = int (r[1]) + 1 + end = int (r[1])
+ +
+ if begin > end: + if begin > end:
+ raise ValueError + raise ValueError
+ +
+ for p in range(begin, end): + for p in range(begin, end + 1):
+ if p < 1 or p > max_port: + if p < 1 or p > max_port:
+ raise ValueError + raise ValueError
+ temp.append(p) + temp.append(p)
+ return temp + return temp
+ except ValueError: + except ValueError:
+ raise ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port )) + raise ValueError(_("Ports must be be numbers or ranges of numbers from 1 to %d " % max_port ))
@ -4516,7 +4516,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.py policycore
+ print mypolicy.generate("/var/tmp") + print mypolicy.generate("/var/tmp")
+ +
+ mypolicy = policy("myxuser", XUSER) + 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_in_udp(0, 0, 1, "1513")
+ mypolicy.set_use_uid(True) + mypolicy.set_use_uid(True)
+ mypolicy.set_use_syslog(True) + mypolicy.set_use_syslog(True)

View File

@ -6,7 +6,7 @@
Summary: SELinux policy core utilities Summary: SELinux policy core utilities
Name: policycoreutils Name: policycoreutils
Version: 2.0.27 Version: 2.0.27
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -199,8 +199,9 @@ if [ "$1" -ge "1" ]; then
fi fi
%changelog %changelog
* Thu Sep 27 2007 Dan Walsh <dwalsh@redhat.com> 2.0.27-2 * Thu Sep 27 2007 Dan Walsh <dwalsh@redhat.com> 2.0.27-3
- Fix bug in building policy with polgengui - Fix bug in building policy with polgengui
- Creating ports correctly
* Wed Sep 26 2007 Dan Walsh <dwalsh@redhat.com> 2.0.27-1 * Wed Sep 26 2007 Dan Walsh <dwalsh@redhat.com> 2.0.27-1
- Update to upstream - Update to upstream