diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch index 74d190d..b81ba45 100644 --- a/policycoreutils-rhat.patch +++ b/policycoreutils-rhat.patch @@ -45,10 +45,10 @@ index ef4bec3..9b313ec 100644 return None diff --git a/policycoreutils/gui/Makefile b/policycoreutils/gui/Makefile new file mode 100644 -index 0000000..0d63b78 +index 0000000..53efa84 --- /dev/null +++ b/policycoreutils/gui/Makefile -@@ -0,0 +1,40 @@ +@@ -0,0 +1,38 @@ +# Installation directories. +PREFIX ?= ${DESTDIR}/usr +BINDIR ?= $(PREFIX)/bin @@ -64,14 +64,13 @@ index 0000000..0d63b78 +modulesPage.py \ +polgen.glade \ +portsPage.py \ -+lockdown.glade \ +semanagePage.py \ +statusPage.py \ +system-config-selinux.glade \ +usersPage.py \ +selinux.tbl + -+all: $(TARGETS) system-config-selinux.py polgengui.py templates lockdown.py polgen.py ++all: $(TARGETS) system-config-selinux.py polgengui.py templates polgen.py + +install: all + -mkdir -p $(SHAREDIR)/templates @@ -80,7 +79,6 @@ index 0000000..0d63b78 + install -m 755 polgengui.py $(SHAREDIR) + install -m 755 polgen.py $(SHAREDIR) + (cd $(BINDIR); ln -fs ../share/system-config-selinux/polgen.py sepolgen) -+ install -m 755 lockdown.py $(SHAREDIR) + install -m 644 $(TARGETS) $(SHAREDIR) + install -m 644 templates/*.py $(SHAREDIR)/templates/ + @@ -8955,10 +8953,10 @@ index 0000000..fd6ef4f + diff --git a/policycoreutils/gui/system-config-selinux.glade b/policycoreutils/gui/system-config-selinux.glade new file mode 100644 -index 0000000..4dc5d0b +index 0000000..05a697e --- /dev/null +++ b/policycoreutils/gui/system-config-selinux.glade -@@ -0,0 +1,3024 @@ +@@ -0,0 +1,3005 @@ + + + @@ -10190,7 +10188,6 @@ index 0000000..4dc5d0b + + True + True -+ 0 + + + @@ -10587,24 +10584,6 @@ index 0000000..4dc5d0b + True + + -+ -+ -+ -+ True -+ Run booleans lockdown wizard -+ Lockdown... -+ True -+ gtk-print-error -+ True -+ True -+ False -+ -+ -+ -+ False -+ True -+ -+ + + + 0 diff --git a/policycoreutils.spec b/policycoreutils.spec index 66f70da..94ebf0b 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -7,7 +7,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.1.11 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Base # Based on git repository with tag 20101221 @@ -340,6 +340,9 @@ fi %{_bindir}/systemctl try-restart restorecond.service >/dev/null 2>&1 || : %changelog +* Mon May 1 2012 Dan Walsh - 2.1.11-10 +- Remove lockdown wizard + * Mon Apr 30 2012 Dan Walsh - 2.1.11-9 - Fix semanage fcontext -E to extract the equivalance customizations.