rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.410, 1.411 policycoreutils.spec, 1.596, 1.597
Daniel J Walsh
dwalsh at fedoraproject.org
Thu Mar 12 13:30:39 UTC 2009
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19925
Modified Files:
policycoreutils-rhat.patch policycoreutils.spec
Log Message:
* Thu Mar 12 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-5
- Fix semanage transations
policycoreutils-rhat.patch:
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.410
retrieving revision 1.411
diff -u -r1.410 -r1.411
--- policycoreutils-rhat.patch 23 Feb 2009 16:34:14 -0000 1.410
+++ policycoreutils-rhat.patch 12 Mar 2009 13:30:38 -0000 1.411
@@ -30,3 +30,58 @@
done
exit $?
fi
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.62/semanage/semanage
+--- nsapolicycoreutils/semanage/semanage 2009-02-18 16:44:47.000000000 -0500
++++ policycoreutils-2.0.62/semanage/semanage 2009-03-12 09:22:45.000000000 -0400
+@@ -464,10 +464,10 @@
+ else:
+ fd = open(input, 'r')
+ trans = seobject.semanageRecords(store)
+- trans.begin()
++ trans.start()
+ for l in fd.readlines():
+ process_args(mkargv(l))
+- trans.commit()
++ trans.finish()
+ else:
+ process_args(sys.argv[1:])
+
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.62/semanage/seobject.py
+--- nsapolicycoreutils/semanage/seobject.py 2008-11-14 17:10:15.000000000 -0500
++++ policycoreutils-2.0.62/semanage/seobject.py 2009-03-12 09:25:27.000000000 -0400
+@@ -281,15 +281,20 @@
+ global handle
+
+ if handle != None:
+- self.transaction = True
+ self.sh = handle
+ else:
+ self.sh=get_handle(store)
+- self.transaction = False
++ self.transaction = False
+
+ def deleteall(self):
+ raise ValueError(_("Not yet implemented"))
+
++ def start(self):
++ if self.transaction:
++ raise ValueError(_("Semanage transaction already in progress"))
++ self.begin()
++ self.transaction = True
++
+ def begin(self):
+ if self.transaction:
+ return
+@@ -303,6 +308,12 @@
+ if rc < 0:
+ raise ValueError(_("Could not commit semanage transaction"))
+
++ def finish(self):
++ if not self.transaction:
++ raise ValueError(_("Semanage transaction not in progress"))
++ self.transaction = False
++ self.commit()
++
+ class permissiveRecords(semanageRecords):
+ def __init__(self, store):
+ semanageRecords.__init__(self, store)
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.596
retrieving revision 1.597
diff -u -r1.596 -r1.597
--- policycoreutils.spec 7 Mar 2009 18:03:09 -0000 1.596
+++ policycoreutils.spec 12 Mar 2009 13:30:39 -0000 1.597
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.62
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,9 @@
fi
%changelog
+* Thu Mar 12 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-5
+- Fix semanage transations
+
* Sat Mar 7 2009 Dan Walsh <dwalsh at redhat.com> 2.0.62-4
- Update polgengui templates to match current upstream policy
More information about the fedora-extras-commits
mailing list