policycoreutils-2.5-2

- policycoreutils/sepolicy: selinux_server.py to use GLib instead of gobject
- policycoreutils-gui requires python-slip-dbus (#1314685)
This commit is contained in:
Petr Lautrbach 2016-03-05 14:26:02 +01:00
parent 8341d78286
commit 5ab4f1c125
2 changed files with 12 additions and 5 deletions

View File

@ -657460,7 +657460,7 @@ index 7f4a91c..238048b 100644
+ except dbus.DBusException as e:
+ print(e)
diff --git policycoreutils-2.5/sepolicy/selinux_server.py policycoreutils-2.5/sepolicy/selinux_server.py
index cdf4d16..f8739b7 100644
index cdf4d16..5c8d08c 100644
--- policycoreutils-2.5/sepolicy/selinux_server.py
+++ policycoreutils-2.5/sepolicy/selinux_server.py
@@ -1,9 +1,9 @@
@ -657548,15 +657548,18 @@ index cdf4d16..f8739b7 100644
#
@slip.dbus.polkit.require_auth("org.selinux.change_default_mode")
@dbus.service.method("org.selinux", in_signature='s')
@@ -126,7 +126,7 @@ class selinux_server(slip.dbus.service.Object):
@@ -126,9 +126,9 @@ class selinux_server(slip.dbus.service.Object):
if os.path.isdir(path):
return self.write_selinux_config(policy=value)
raise ValueError("%s does not exist" % path)
-
+
if __name__ == "__main__":
mainloop = gobject.MainLoop()
- mainloop = gobject.MainLoop()
+ mainloop = GLib.MainLoop()
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
system_bus = dbus.SystemBus()
name = dbus.service.BusName("org.selinux", system_bus)
diff --git policycoreutils-2.5/sepolicy/sepolicy-bash-completion.sh policycoreutils-2.5/sepolicy/sepolicy-bash-completion.sh
index 779fd75..29ccbdf 100644
--- policycoreutils-2.5/sepolicy/sepolicy-bash-completion.sh

View File

@ -7,7 +7,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.5
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv2
Group: System Environment/Base
# https://github.com/SELinuxProject/selinux/wiki/Releases
@ -20,7 +20,7 @@ Source4: sepolicy-icons.tgz
# download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
# run:
# $ VERSION=2.5 ./make-fedora-selinux-patch.sh policycoreutils
# HEAD https://github.com/fedora-selinux/selinux/commit/51852c78f110223be57cd9776069f14703ab49f9
# HEAD https://github.com/fedora-selinux/selinux/commit/1eeb7cfb30f9bd297ef0256d7a080e8429e00153
Patch: policycoreutils-fedora.patch
# $ VERSION=1.2.3 ./make-fedora-selinux-patch.sh sepolgen
Patch1: sepolgen-fedora.patch
@ -408,6 +408,10 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service
%changelog
* Sat Mar 05 2016 Petr Lautrbach <plautrba@redhat.com> 2.5-2
- policycoreutils/sepolicy: selinux_server.py to use GLib instead of gobject
- policycoreutils-gui requires python-slip-dbus (#1314685)
* Tue Feb 23 2016 Petr Lautrbach <plautrba@redhat.com> 2.5-1
- Update to upstream release 2016-02-23