rpms/policycoreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

SELinux userspace 2.9-rc2 release

Browse Source
This commit is contained in:
Petr Lautrbach 2019-03-11 17:01:59 +01:00
parent 67598f5a41
commit 8478235a3c
10 changed files with 238 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@ -287,3 +287,10 @@ policycoreutils-2.0.83.tgz
/selinux-dbus-2.9-rc1.tar.gz
/semodule-utils-2.9-rc1.tar.gz
/restorecond-2.9-rc1.tar.gz
/policycoreutils-2.9-rc2.tar.gz
/restorecond-2.9-rc2.tar.gz
/selinux-dbus-2.9-rc2.tar.gz
/selinux-gui-2.9-rc2.tar.gz
/selinux-python-2.9-rc2.tar.gz
/selinux-sandbox-2.9-rc2.tar.gz
/semodule-utils-2.9-rc2.tar.gz

22
policycoreutils-fedora.patch
View File

@ -1,7 +1,7 @@
diff --git policycoreutils-2.9-rc1/po/Makefile policycoreutils-2.9-rc1/po/Makefile
diff --git policycoreutils-2.9-rc2/po/Makefile policycoreutils-2.9-rc2/po/Makefile
index 575e143..18bc1df 100644
--- policycoreutils-2.9-rc1/po/Makefile
+++ policycoreutils-2.9-rc1/po/Makefile
--- policycoreutils-2.9-rc2/po/Makefile
+++ policycoreutils-2.9-rc2/po/Makefile
@@ -3,7 +3,6 @@
#
@ -97,11 +97,11 @@ index 575e143..18bc1df 100644
refresh-po: Makefile
for cat in $(POFILES); do \
diff --git policycoreutils-2.9-rc1/po/POTFILES policycoreutils-2.9-rc1/po/POTFILES
diff --git policycoreutils-2.9-rc2/po/POTFILES policycoreutils-2.9-rc2/po/POTFILES
new file mode 100644
index 0000000..12237dc
--- /dev/null
+++ policycoreutils-2.9-rc1/po/POTFILES
+++ policycoreutils-2.9-rc2/po/POTFILES
@@ -0,0 +1,9 @@
+../run_init/open_init_pty.c
+../run_init/run_init.c
@ -112,10 +112,10 @@ index 0000000..12237dc
+../semodule/semodule.c
+../setfiles/setfiles.c
+../secon/secon.c
diff --git policycoreutils-2.9-rc1/scripts/fixfiles policycoreutils-2.9-rc1/scripts/fixfiles
diff --git policycoreutils-2.9-rc2/scripts/fixfiles policycoreutils-2.9-rc2/scripts/fixfiles
index b277958..53d28c7 100755
--- policycoreutils-2.9-rc1/scripts/fixfiles
+++ policycoreutils-2.9-rc1/scripts/fixfiles
--- policycoreutils-2.9-rc2/scripts/fixfiles
+++ policycoreutils-2.9-rc2/scripts/fixfiles
@@ -108,6 +108,7 @@ exclude_dirs_from_relabelling() {
fullFlag=0
BOOTTIME=""
@ -124,10 +124,10 @@ index b277958..53d28c7 100755
FORCEFLAG=""
RPMFILES=""
PREFC=""
diff --git policycoreutils-2.9-rc1/setfiles/setfiles.8 policycoreutils-2.9-rc1/setfiles/setfiles.8
diff --git policycoreutils-2.9-rc2/setfiles/setfiles.8 policycoreutils-2.9-rc2/setfiles/setfiles.8
index ccaaf4d..a8a76c8 100644
--- policycoreutils-2.9-rc1/setfiles/setfiles.8
+++ policycoreutils-2.9-rc1/setfiles/setfiles.8
--- policycoreutils-2.9-rc2/setfiles/setfiles.8
+++ policycoreutils-2.9-rc2/setfiles/setfiles.8
@@ -57,7 +57,7 @@ check the validity of the contexts against the specified binary policy.
.TP
.B \-d

123
policycoreutils.spec
View File

@ -1,7 +1,7 @@
%global libauditver 2.1.3-4
%global libsepolver 2.9-0
%global libsemanagever 2.9-0
%global libselinuxver 2.9-0
%global libsepolver 2.9-0.rc2
%global libsemanagever 2.9-0.rc2
%global libselinuxver 2.9-0.rc2
%global sepolgenver 2.9
%global generatorsdir %{_prefix}/lib/systemd/system-generators
@ -12,18 +12,17 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.9
Release: 0.rc1.1%{?dist}.1
Release: 0.rc2.1%{?dist}
License: GPLv2
# https://github.com/SELinuxProject/selinux/wiki/Releases
Source0: https://github.com/SELinuxProject/selinux/releases/download/20190125/policycoreutils-2.9-rc1.tar.gz
Source1: https://github.com/SELinuxProject/selinux/releases/download/20190125/selinux-python-2.9-rc1.tar.gz
Source2: https://github.com/SELinuxProject/selinux/releases/download/20190125/selinux-gui-2.9-rc1.tar.gz
Source3: https://github.com/SELinuxProject/selinux/releases/download/20190125/selinux-sandbox-2.9-rc1.tar.gz
Source4: https://github.com/SELinuxProject/selinux/releases/download/20190125/selinux-dbus-2.9-rc1.tar.gz
Source5: https://github.com/SELinuxProject/selinux/releases/download/20190125/semodule-utils-2.9-rc1.tar.gz
Source6: https://github.com/SELinuxProject/selinux/releases/download/20190125/restorecond-2.9-rc1.tar.gz
Source0: https://github.com/SELinuxProject/selinux/releases/download/20190301/policycoreutils-2.9-rc2.tar.gz
Source1: https://github.com/SELinuxProject/selinux/releases/download/20190301/selinux-python-2.9-rc2.tar.gz
Source2: https://github.com/SELinuxProject/selinux/releases/download/20190301/selinux-gui-2.9-rc2.tar.gz
Source3: https://github.com/SELinuxProject/selinux/releases/download/20190301/selinux-sandbox-2.9-rc2.tar.gz
Source4: https://github.com/SELinuxProject/selinux/releases/download/20190301/selinux-dbus-2.9-rc2.tar.gz
Source5: https://github.com/SELinuxProject/selinux/releases/download/20190301/semodule-utils-2.9-rc2.tar.gz
Source6: https://github.com/SELinuxProject/selinux/releases/download/20190301/restorecond-2.9-rc2.tar.gz
URL: https://github.com/SELinuxProject/selinux
Source12: policycoreutils_man_ru2.tar.bz2
Source13: system-config-selinux.png
Source14: sepolicy-icons.tgz
Source15: selinux-autorelabel
@ -37,17 +36,17 @@ Source22: gui-po.tgz
Source23: sandbox-po.tgz
# download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
# run:
# HEAD https://github.com/fedora-selinux/selinux/commit/a69fe203e41c9493e13ffafa51908d17da6fa7a2
# HEAD https://github.com/fedora-selinux/selinux/commit/cb42e1bf324698875492f6f8f7adf9c5f7778aab
# $ for i in policycoreutils selinux-python selinux-gui selinux-sandbox selinux-dbus semodule-utils restorecond; do
# VERSION=2.9-rc1 ./make-fedora-selinux-patch.sh $i
# VERSION=2.9-rc2 ./make-fedora-selinux-patch.sh $i
# done
Patch: policycoreutils-fedora.patch
Patch1: selinux-python-fedora.patch
Patch2: selinux-gui-fedora.patch
Patch3: selinux-sandbox-fedora.patch
Patch4: selinux-dbus-fedora.patch
# Patch4: selinux-dbus-fedora.patch
Patch5: semodule-utils-fedora.patch
Patch6: restorecond-fedora.patch
# Patch6: restorecond-fedora.patch
Obsoletes: policycoreutils < 2.0.61-2
Conflicts: filesystem < 3, selinux-policy-base < 3.13.1-138
# initscripts < 9.66 shipped fedora-autorelabel services which are renamed to selinux-relabel
@ -90,33 +89,33 @@ to switch roles.
%setup -q -T -D -a 6 -n selinux
%patch -p0 -b .policycoreutils-fedora
cp %{SOURCE13} selinux-gui-%{version}-rc1/
tar -xvf %{SOURCE14} -C selinux-python-%{version}-rc1/sepolicy/
cp %{SOURCE13} selinux-gui-%{version}-rc2/
tar -xvf %{SOURCE14} -C selinux-python-%{version}-rc2/sepolicy/
%patch1 -p0 -b .selinux-python
%patch2 -p0 -b .selinux-gui
%patch3 -p0 -b .selinux-sandbox
%patch4 -p0 -b .selinux-dbus
# %patch4 -p0 -b .selinux-dbus
%patch5 -p0 -b .semodule-utils
%patch6 -p0 -b .restorecond
# %patch6 -p0 -b .restorecond
# Since patches containing translation changes were too big, translations were moved to separate tarballs
# For more information see README.translations
tar -x -f %{SOURCE20} -C policycoreutils-%{version}-rc1 -z
tar -x -f %{SOURCE21} -C selinux-python-%{version}-rc1 -z
tar -x -f %{SOURCE22} -C selinux-gui-%{version}-rc1 -z
tar -x -f %{SOURCE23} -C selinux-sandbox-%{version}-rc1 -z
tar -x -f %{SOURCE20} -C policycoreutils-%{version}-rc2 -z
tar -x -f %{SOURCE21} -C selinux-python-%{version}-rc2 -z
tar -x -f %{SOURCE22} -C selinux-gui-%{version}-rc2 -z
tar -x -f %{SOURCE23} -C selinux-sandbox-%{version}-rc2 -z
%build
%set_build_flags
export PYTHON=%{__python3}
make -C policycoreutils-%{version}-rc1 LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-python-%{version}-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-gui-%{version}-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-sandbox-%{version}-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-dbus-%{version}-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C semodule-utils-%{version}-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C restorecond-%{version}-rc1 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C policycoreutils-%{version}-rc2 LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-python-%{version}-rc2 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-gui-%{version}-rc2 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-sandbox-%{version}-rc2 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C selinux-dbus-%{version}-rc2 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C semodule-utils-%{version}-rc2 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
make -C restorecond-%{version}-rc2 SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
%install
mkdir -p %{buildroot}%{_bindir}
@ -126,26 +125,25 @@ mkdir -p %{buildroot}%{_mandir}/man5
mkdir -p %{buildroot}%{_mandir}/man8
%{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}/
make -C policycoreutils-%{version}-rc1 LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C policycoreutils-%{version}-rc2 LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-python-%{version}-rc1 PYTHON=%{__python2} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-python-%{version}-rc1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-python-%{version}-rc2 PYTHON=%{__python2} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-python-%{version}-rc2 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-gui-%{version}-rc1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-gui-%{version}-rc2 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-sandbox-%{version}-rc1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-sandbox-%{version}-rc2 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-dbus-%{version}-rc1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C selinux-dbus-%{version}-rc2 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C semodule-utils-%{version}-rc1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C semodule-utils-%{version}-rc2 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C restorecond-%{version}-rc1 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
make -C restorecond-%{version}-rc2 PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
# Systemd
rm -rf %{buildroot}/%{_sysconfdir}/rc.d/init.d/restorecond
tar -jxf %{SOURCE12} -C %{buildroot}/
rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
rm -f %{buildroot}/usr/share/man/ru/man8/open_init_pty.8.gz
rm -f %{buildroot}/usr/share/man/ru/man8/semodule_deps.8.gz
@ -491,7 +489,7 @@ system-config-selinux is a utility for managing the SELinux environment
%dir %{_datadir}/bash-completion
%{_datadir}/bash-completion/completions/setsebool
%{!?_licensedir:%global license %%doc}
%license policycoreutils-%{version}-rc1/COPYING
%license policycoreutils-%{version}-rc2/COPYING
%doc %{_usr}/share/doc/%{name}
%package restorecond
@ -510,8 +508,46 @@ The policycoreutils-restorecond package contains the restorecond service.
%{_datadir}/dbus-1/services/org.selinux.Restorecond.service
%{_mandir}/man8/restorecond.8*
%{_mandir}/ru/man8/restorecond.8*
/usr/share/man/ru/man1/audit2why.1.gz
/usr/share/man/ru/man1/newrole.1.gz
/usr/share/man/ru/man5/sandbox.5.gz
/usr/share/man/ru/man5/selinux_config.5.gz
/usr/share/man/ru/man5/sestatus.conf.5.gz
/usr/share/man/ru/man8/genhomedircon.8.gz
/usr/share/man/ru/man8/open_init_pty.8.gz
/usr/share/man/ru/man8/restorecon_xattr.8.gz
/usr/share/man/ru/man8/sandbox.8.gz
/usr/share/man/ru/man8/selinux-polgengui.8.gz
/usr/share/man/ru/man8/semanage-boolean.8.gz
/usr/share/man/ru/man8/semanage-dontaudit.8.gz
/usr/share/man/ru/man8/semanage-export.8.gz
/usr/share/man/ru/man8/semanage-fcontext.8.gz
/usr/share/man/ru/man8/semanage-ibendport.8.gz
/usr/share/man/ru/man8/semanage-ibpkey.8.gz
/usr/share/man/ru/man8/semanage-import.8.gz
/usr/share/man/ru/man8/semanage-interface.8.gz
/usr/share/man/ru/man8/semanage-login.8.gz
/usr/share/man/ru/man8/semanage-module.8.gz
/usr/share/man/ru/man8/semanage-node.8.gz
/usr/share/man/ru/man8/semanage-permissive.8.gz
/usr/share/man/ru/man8/semanage-port.8.gz
/usr/share/man/ru/man8/semanage-user.8.gz
/usr/share/man/ru/man8/semodule_unpackage.8.gz
/usr/share/man/ru/man8/sepolgen.8.gz
/usr/share/man/ru/man8/sepolicy-booleans.8.gz
/usr/share/man/ru/man8/sepolicy-communicate.8.gz
/usr/share/man/ru/man8/sepolicy-generate.8.gz
/usr/share/man/ru/man8/sepolicy-gui.8.gz
/usr/share/man/ru/man8/sepolicy-interface.8.gz
/usr/share/man/ru/man8/sepolicy-manpage.8.gz
/usr/share/man/ru/man8/sepolicy-network.8.gz
/usr/share/man/ru/man8/sepolicy-transition.8.gz
/usr/share/man/ru/man8/sepolicy.8.gz
/usr/share/man/ru/man8/seunshare.8.gz
/usr/share/man/ru/man8/system-config-selinux.8.gz
%{!?_licensedir:%global license %%doc}
%license policycoreutils-%{version}-rc1/COPYING
%license policycoreutils-%{version}-rc2/COPYING
%post
%systemd_post selinux-autorelabel-mark.service
@ -529,6 +565,9 @@ The policycoreutils-restorecond package contains the restorecond service.
%systemd_postun_with_restart restorecond.service
%changelog
* Mon Mar 11 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-0.rc2.1
- SELinux userspace 2.9-rc2 release
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9-0.rc1.1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

13
restorecond-fedora.patch
View File

@ -1,13 +0,0 @@
diff --git restorecond-2.9-rc1/Makefile restorecond-2.9-rc1/Makefile
index 8a0ada1..6155ca4 100644
--- restorecond-2.9-rc1/Makefile
+++ restorecond-2.9-rc1/Makefile
@@ -50,7 +50,7 @@ install: all
-mkdir -p $(DESTDIR)$(AUTOSTARTDIR)
install -m 644 restorecond.desktop $(DESTDIR)$(AUTOSTARTDIR)/restorecond.desktop
-mkdir -p $(DESTDIR)$(DBUSSERVICEDIR)
- install -m 600 org.selinux.Restorecond.service $(DESTDIR)$(DBUSSERVICEDIR)/org.selinux.Restorecond.service
+ install -m 644 org.selinux.Restorecond.service $(DESTDIR)$(DBUSSERVICEDIR)/org.selinux.Restorecond.service
-mkdir -p $(DESTDIR)$(SYSTEMDDIR)/system
install -m 644 restorecond.service $(DESTDIR)$(SYSTEMDDIR)/system/
relabel: install

17
selinux-dbus-fedora.patch
View File

@ -1,17 +0,0 @@
diff --git selinux-dbus-2.9-rc1/org.selinux.policy selinux-dbus-2.9-rc1/org.selinux.policy
index 0126610..9772127 100644
--- selinux-dbus-2.9-rc1/org.selinux.policy
+++ selinux-dbus-2.9-rc1/org.selinux.policy
@@ -70,9 +70,9 @@
<allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
- <action id="org.selinux.change_policy_type">
- <description>SELinux write access</description>
- <message>System policy prevents change_policy_type access to SELinux</message>
+ <action id="org.selinux.change_default_mode">
+ <description>Change SELinux default enforcing mode</description>
+ <message>System policy prevents change_default_policy access to SELinux</message>
<defaults>
<allow_any>no</allow_any>
<allow_inactive>no</allow_inactive>

121
selinux-gui-fedora.patch
View File

@ -1,8 +1,8 @@
diff --git selinux-gui-2.9-rc1/Makefile selinux-gui-2.9-rc1/Makefile
index d42348b..1959e7d 100644
--- selinux-gui-2.9-rc1/Makefile
+++ selinux-gui-2.9-rc1/Makefile
@@ -20,6 +20,7 @@ system-config-selinux.ui \
diff --git selinux-gui-2.9-rc2/Makefile selinux-gui-2.9-rc2/Makefile
index c2f982d..1767c40 100644
--- selinux-gui-2.9-rc2/Makefile
+++ selinux-gui-2.9-rc2/Makefile
@@ -21,6 +21,7 @@ system-config-selinux.ui \
usersPage.py
all: $(TARGETS) system-config-selinux.py polgengui.py
@ -10,7 +10,7 @@ index d42348b..1959e7d 100644
install: all
-mkdir -p $(DESTDIR)$(MANDIR)/man8
@@ -45,6 +46,8 @@ install: all
@@ -52,6 +53,8 @@ install: all
install -m 644 sepolicy_$${i}.png $(DESTDIR)$(DATADIR)/icons/hicolor/$${i}x$${i}/apps/sepolicy.png; \
done
install -m 644 org.selinux.config.policy $(DESTDIR)$(DATADIR)/polkit-1/actions/
@ -19,10 +19,10 @@ index d42348b..1959e7d 100644
clean:
indent:
diff --git selinux-gui-2.9-rc1/booleansPage.py selinux-gui-2.9-rc1/booleansPage.py
diff --git selinux-gui-2.9-rc2/booleansPage.py selinux-gui-2.9-rc2/booleansPage.py
index 7849bea..dd12b6d 100644
--- selinux-gui-2.9-rc1/booleansPage.py
+++ selinux-gui-2.9-rc1/booleansPage.py
--- selinux-gui-2.9-rc2/booleansPage.py
+++ selinux-gui-2.9-rc2/booleansPage.py
@@ -38,7 +38,7 @@ DISABLED = 2
##
## I18N
@ -32,10 +32,10 @@ index 7849bea..dd12b6d 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/domainsPage.py selinux-gui-2.9-rc1/domainsPage.py
diff --git selinux-gui-2.9-rc2/domainsPage.py selinux-gui-2.9-rc2/domainsPage.py
index bad5140..6bbe4de 100644
--- selinux-gui-2.9-rc1/domainsPage.py
+++ selinux-gui-2.9-rc1/domainsPage.py
--- selinux-gui-2.9-rc2/domainsPage.py
+++ selinux-gui-2.9-rc2/domainsPage.py
@@ -30,7 +30,7 @@ from semanagePage import *
##
## I18N
@ -45,10 +45,10 @@ index bad5140..6bbe4de 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/fcontextPage.py selinux-gui-2.9-rc1/fcontextPage.py
diff --git selinux-gui-2.9-rc2/fcontextPage.py selinux-gui-2.9-rc2/fcontextPage.py
index 370bbee..e424366 100644
--- selinux-gui-2.9-rc1/fcontextPage.py
+++ selinux-gui-2.9-rc1/fcontextPage.py
--- selinux-gui-2.9-rc2/fcontextPage.py
+++ selinux-gui-2.9-rc2/fcontextPage.py
@@ -47,7 +47,7 @@ class context:
##
## I18N
@ -58,10 +58,10 @@ index 370bbee..e424366 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/loginsPage.py selinux-gui-2.9-rc1/loginsPage.py
diff --git selinux-gui-2.9-rc2/loginsPage.py selinux-gui-2.9-rc2/loginsPage.py
index b67eb8b..cbfb0cc 100644
--- selinux-gui-2.9-rc1/loginsPage.py
+++ selinux-gui-2.9-rc1/loginsPage.py
--- selinux-gui-2.9-rc2/loginsPage.py
+++ selinux-gui-2.9-rc2/loginsPage.py
@@ -29,7 +29,7 @@ from semanagePage import *
##
## I18N
@ -71,10 +71,10 @@ index b67eb8b..cbfb0cc 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/modulesPage.py selinux-gui-2.9-rc1/modulesPage.py
diff --git selinux-gui-2.9-rc2/modulesPage.py selinux-gui-2.9-rc2/modulesPage.py
index 34c5d9e..627ad95 100644
--- selinux-gui-2.9-rc1/modulesPage.py
+++ selinux-gui-2.9-rc1/modulesPage.py
--- selinux-gui-2.9-rc2/modulesPage.py
+++ selinux-gui-2.9-rc2/modulesPage.py
@@ -30,7 +30,7 @@ from semanagePage import *
##
## I18N
@ -84,11 +84,11 @@ index 34c5d9e..627ad95 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/po/Makefile selinux-gui-2.9-rc1/po/Makefile
diff --git selinux-gui-2.9-rc2/po/Makefile selinux-gui-2.9-rc2/po/Makefile
new file mode 100644
index 0000000..a0f5439
--- /dev/null
+++ selinux-gui-2.9-rc1/po/Makefile
+++ selinux-gui-2.9-rc2/po/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for the PO files (translation) catalog
@ -172,11 +172,11 @@ index 0000000..a0f5439
+.PHONY: missing depend
+
+relabel:
diff --git selinux-gui-2.9-rc1/po/POTFILES selinux-gui-2.9-rc1/po/POTFILES
diff --git selinux-gui-2.9-rc2/po/POTFILES selinux-gui-2.9-rc2/po/POTFILES
new file mode 100644
index 0000000..1795c5c
--- /dev/null
+++ selinux-gui-2.9-rc1/po/POTFILES
+++ selinux-gui-2.9-rc2/po/POTFILES
@@ -0,0 +1,17 @@
+../booleansPage.py
+../domainsPage.py
@ -195,41 +195,10 @@ index 0000000..1795c5c
+../system-config-selinux.py
+../system-config-selinux.ui
+../usersPage.py
diff --git selinux-gui-2.9-rc1/polgen.ui selinux-gui-2.9-rc1/polgen.ui
index aa4c70a..6a8c067 100644
--- selinux-gui-2.9-rc1/polgen.ui
+++ selinux-gui-2.9-rc1/polgen.ui
@@ -1975,7 +1975,7 @@ Tab</property>
<object class="GtkLabel" id="label17">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Add File</property>
+ <property name="label" translatable="yes">Add File</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -2028,7 +2028,7 @@ Tab</property>
<object class="GtkLabel" id="label16">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Add Directory</property>
+ <property name="label" translatable="yes">Add Directory</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -2176,7 +2176,7 @@ Tab</property>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Add Boolean</property>
+ <property name="label" translatable="yes">Add Boolean</property>
<property name="use_underline">True</property>
</object>
<packing>
diff --git selinux-gui-2.9-rc1/polgengui.py selinux-gui-2.9-rc1/polgengui.py
index 1601dbe..7e0d9d0 100644
--- selinux-gui-2.9-rc1/polgengui.py
+++ selinux-gui-2.9-rc1/polgengui.py
diff --git selinux-gui-2.9-rc2/polgengui.py selinux-gui-2.9-rc2/polgengui.py
index b1cc993..46a1bd2 100644
--- selinux-gui-2.9-rc2/polgengui.py
+++ selinux-gui-2.9-rc2/polgengui.py
@@ -63,7 +63,7 @@ def get_all_modules():
##
## I18N
@ -239,10 +208,10 @@ index 1601dbe..7e0d9d0 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/portsPage.py selinux-gui-2.9-rc1/portsPage.py
diff --git selinux-gui-2.9-rc2/portsPage.py selinux-gui-2.9-rc2/portsPage.py
index 30f5838..a537ecc 100644
--- selinux-gui-2.9-rc1/portsPage.py
+++ selinux-gui-2.9-rc1/portsPage.py
--- selinux-gui-2.9-rc2/portsPage.py
+++ selinux-gui-2.9-rc2/portsPage.py
@@ -35,7 +35,7 @@ from semanagePage import *
##
## I18N
@ -252,10 +221,10 @@ index 30f5838..a537ecc 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/semanagePage.py selinux-gui-2.9-rc1/semanagePage.py
diff --git selinux-gui-2.9-rc2/semanagePage.py selinux-gui-2.9-rc2/semanagePage.py
index 4127804..5361d69 100644
--- selinux-gui-2.9-rc1/semanagePage.py
+++ selinux-gui-2.9-rc1/semanagePage.py
--- selinux-gui-2.9-rc2/semanagePage.py
+++ selinux-gui-2.9-rc2/semanagePage.py
@@ -22,7 +22,7 @@ from gi.repository import Gdk, Gtk
##
## I18N
@ -265,10 +234,10 @@ index 4127804..5361d69 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/statusPage.py selinux-gui-2.9-rc1/statusPage.py
diff --git selinux-gui-2.9-rc2/statusPage.py selinux-gui-2.9-rc2/statusPage.py
index 766854b..a8f079b 100644
--- selinux-gui-2.9-rc1/statusPage.py
+++ selinux-gui-2.9-rc1/statusPage.py
--- selinux-gui-2.9-rc2/statusPage.py
+++ selinux-gui-2.9-rc2/statusPage.py
@@ -35,7 +35,7 @@ RELABELFILE = "/.autorelabel"
##
## I18N
@ -278,10 +247,10 @@ index 766854b..a8f079b 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/system-config-selinux.py selinux-gui-2.9-rc1/system-config-selinux.py
index ce7c74b..a81e9dd 100644
--- selinux-gui-2.9-rc1/system-config-selinux.py
+++ selinux-gui-2.9-rc1/system-config-selinux.py
diff --git selinux-gui-2.9-rc2/system-config-selinux.py selinux-gui-2.9-rc2/system-config-selinux.py
index c42301b..1e0d5eb 100644
--- selinux-gui-2.9-rc2/system-config-selinux.py
+++ selinux-gui-2.9-rc2/system-config-selinux.py
@@ -45,7 +45,7 @@ import selinux
##
## I18N
@ -291,10 +260,10 @@ index ce7c74b..a81e9dd 100644
try:
import gettext
kwargs = {}
diff --git selinux-gui-2.9-rc1/usersPage.py selinux-gui-2.9-rc1/usersPage.py
diff --git selinux-gui-2.9-rc2/usersPage.py selinux-gui-2.9-rc2/usersPage.py
index 26794ed..d15d4c5 100644
--- selinux-gui-2.9-rc1/usersPage.py
+++ selinux-gui-2.9-rc1/usersPage.py
--- selinux-gui-2.9-rc2/usersPage.py
+++ selinux-gui-2.9-rc2/usersPage.py
@@ -29,7 +29,7 @@ from semanagePage import *
##
## I18N

235
selinux-python-fedora.patch
View File

@ -1,17 +1,17 @@
diff --git selinux-python-2.9-rc1/Makefile selinux-python-2.9-rc1/Makefile
diff --git selinux-python-2.9-rc2/Makefile selinux-python-2.9-rc2/Makefile
index 9b66d52..00312db 100644
--- selinux-python-2.9-rc1/Makefile
+++ selinux-python-2.9-rc1/Makefile
--- selinux-python-2.9-rc2/Makefile
+++ selinux-python-2.9-rc2/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = sepolicy audit2allow semanage sepolgen chcat
+SUBDIRS = sepolicy audit2allow semanage sepolgen chcat po
all install relabel clean indent test:
@for subdir in $(SUBDIRS); do \
diff --git selinux-python-2.9-rc1/chcat/chcat selinux-python-2.9-rc1/chcat/chcat
index 5bef007..27c537e 100755
--- selinux-python-2.9-rc1/chcat/chcat
+++ selinux-python-2.9-rc1/chcat/chcat
diff --git selinux-python-2.9-rc2/chcat/chcat selinux-python-2.9-rc2/chcat/chcat
index ba39868..df2509f 100755
--- selinux-python-2.9-rc2/chcat/chcat
+++ selinux-python-2.9-rc2/chcat/chcat
@@ -30,7 +30,7 @@ import getopt
import selinux
import seobject
@ -21,11 +21,11 @@ index 5bef007..27c537e 100755
try:
import gettext
kwargs = {}
diff --git selinux-python-2.9-rc1/po/Makefile selinux-python-2.9-rc1/po/Makefile
diff --git selinux-python-2.9-rc2/po/Makefile selinux-python-2.9-rc2/po/Makefile
new file mode 100644
index 0000000..4e052d5
--- /dev/null
+++ selinux-python-2.9-rc1/po/Makefile
+++ selinux-python-2.9-rc2/po/Makefile
@@ -0,0 +1,83 @@
+#
+# Makefile for the PO files (translation) catalog
@ -110,11 +110,11 @@ index 0000000..4e052d5
+.PHONY: missing depend
+
+relabel:
diff --git selinux-python-2.9-rc1/po/POTFILES selinux-python-2.9-rc1/po/POTFILES
diff --git selinux-python-2.9-rc2/po/POTFILES selinux-python-2.9-rc2/po/POTFILES
new file mode 100644
index 0000000..128eb87
--- /dev/null
+++ selinux-python-2.9-rc1/po/POTFILES
+++ selinux-python-2.9-rc2/po/POTFILES
@@ -0,0 +1,10 @@
+../audit2allow/audit2allow
+../chcat/chcat
@ -126,10 +126,10 @@ index 0000000..128eb87
+../sepolicy/sepolicy/__init__.py
+../sepolicy/sepolicy/interface.py
+../sepolicy/sepolicy.py
diff --git selinux-python-2.9-rc1/semanage/semanage selinux-python-2.9-rc1/semanage/semanage
index 49add51..18f4a6a 100644
--- selinux-python-2.9-rc1/semanage/semanage
+++ selinux-python-2.9-rc1/semanage/semanage
diff --git selinux-python-2.9-rc2/semanage/semanage selinux-python-2.9-rc2/semanage/semanage
index 144cc00..56db3e0 100644
--- selinux-python-2.9-rc2/semanage/semanage
+++ selinux-python-2.9-rc2/semanage/semanage
@@ -27,7 +27,7 @@ import traceback
import argparse
import seobject
@ -139,87 +139,11 @@ index 49add51..18f4a6a 100644
try:
import gettext
kwargs = {}
@@ -609,19 +609,19 @@ def setupInterfaceParser(subparsers):
def handleModule(args):
OBJECT = seobject.moduleRecords(args)
- if args.action == "add":
- OBJECT.add(args.module_name, args.priority)
- if args.action == "enable":
- OBJECT.set_enabled(args.module_name, True)
- if args.action == "disable":
- OBJECT.set_enabled(args.module_name, False)
- if args.action == "remove":
- OBJECT.delete(args.module_name, args.priority)
- if args.action is "deleteall":
+ if args.action_add:
+ OBJECT.add(args.action_add, args.priority)
+ if args.action_enable:
+ OBJECT.set_enabled(args.action_enable, True)
+ if args.action_disable:
+ OBJECT.set_enabled(args.action_disable, False)
+ if args.action_remove:
+ OBJECT.delete(args.action_remove, args.priority)
+ if args.action == "deleteall":
OBJECT.deleteall()
if args.action == "list":
OBJECT.list(args.noheading, args.locallist)
- if args.action is "extract":
+ if args.action == "extract":
for i in OBJECT.customized():
print("module %s" % str(i))
@@ -635,14 +635,13 @@ def setupModuleParser(subparsers):
parser_add_priority(moduleParser, "module")
mgroup = moduleParser.add_mutually_exclusive_group(required=True)
- parser_add_add(mgroup, "module")
parser_add_list(mgroup, "module")
parser_add_extract(mgroup, "module")
parser_add_deleteall(mgroup, "module")
- mgroup.add_argument('-r', '--remove', dest='action', action='store_const', const='remove', help=_("Remove a module"))
- mgroup.add_argument('-d', '--disable', dest='action', action='store_const', const='disable', help=_("Disable a module"))
- mgroup.add_argument('-e', '--enable', dest='action', action='store_const', const='enable', help=_("Enable a module"))
- moduleParser.add_argument('module_name', nargs='?', default=None, help=_('Name of the module to act on'))
+ mgroup.add_argument('-a', '--add', dest='action_add', action='store', nargs=1, metavar='module_name', help=_("Add a module"))
+ mgroup.add_argument('-r', '--remove', dest='action_remove', action='store', nargs='+', metavar='module_name', help=_("Remove a module"))
+ mgroup.add_argument('-d', '--disable', dest='action_disable', action='store', nargs='+', metavar='module_name', help=_("Disable a module"))
+ mgroup.add_argument('-e', '--enable', dest='action_enable', action='store', nargs='+', metavar='module_name', help=_("Enable a module"))
moduleParser.set_defaults(func=handleModule)
@@ -744,9 +743,7 @@ def handlePermissive(args):
if args.action is "delete":
OBJECT.delete(args.type)
else:
- args.parser.print_usage(sys.stderr)
- sys.stderr.write(_('semanage permissive: error: the following argument is required: type\n'))
- sys.exit(1)
+ args.parser.error(message=_('semanage permissive: error: the following argument is required: type\n'))
def setupPermissiveParser(subparsers):
diff --git selinux-python-2.9-rc1/semanage/semanage.8 selinux-python-2.9-rc1/semanage/semanage.8
index 0bdb90f..0cdcfcc 100644
--- selinux-python-2.9-rc1/semanage/semanage.8
+++ selinux-python-2.9-rc1/semanage/semanage.8
@@ -57,9 +57,8 @@ to SELinux user identities (which controls the initial security context
assigned to Linux users when they login and bounds their authorized role set)
as well as security context mappings for various kinds of objects, such
as network ports, interfaces, infiniband pkeys and endports, and nodes (hosts)
-as well as the file context mapping. See the EXAMPLES section below for some
-examples of common usage. Note that the semanage login command deals with the
-mapping from Linux usernames (logins) to SELinux user identities,
+as well as the file context mapping. Note that the semanage login command deals
+with the mapping from Linux usernames (logins) to SELinux user identities,
while the semanage user command deals with the mapping from SELinux
user identities to authorized role sets. In most cases, only the
former mapping needs to be adjusted by the administrator; the latter
diff --git selinux-python-2.9-rc1/semanage/seobject.py selinux-python-2.9-rc1/semanage/seobject.py
index 556d3ba..c9aaebe 100644
--- selinux-python-2.9-rc1/semanage/seobject.py
+++ selinux-python-2.9-rc1/semanage/seobject.py
@@ -30,10 +30,10 @@ import sys
diff --git selinux-python-2.9-rc2/semanage/seobject.py selinux-python-2.9-rc2/semanage/seobject.py
index 13fdf53..58497e3 100644
--- selinux-python-2.9-rc2/semanage/seobject.py
+++ selinux-python-2.9-rc2/semanage/seobject.py
@@ -29,10 +29,10 @@ import sys
import stat
import socket
from semanage import *
@ -232,38 +156,7 @@ index 556d3ba..c9aaebe 100644
try:
import gettext
@@ -401,6 +401,8 @@ class moduleRecords(semanageRecords):
print("%-25s %-9s %-5s %s" % (t[0], t[2], t[3], disabled))
def add(self, file, priority):
+ if type(file) == list:
+ file = file[0]
if not os.path.exists(file):
raise ValueError(_("Module does not exist: %s ") % file)
@@ -413,7 +415,9 @@ class moduleRecords(semanageRecords):
self.commit()
def set_enabled(self, module, enable):
- for m in module.split():
+ if type(module) == str:
+ module = module.split()
+ for m in module:
rc, key = semanage_module_key_create(self.sh)
if rc < 0:
raise ValueError(_("Could not create module key"))
@@ -435,7 +439,9 @@ class moduleRecords(semanageRecords):
if rc < 0:
raise ValueError(_("Invalid priority %d (needs to be between 1 and 999)") % priority)
- for m in module.split():
+ if type(module) == str:
+ module = module.split()
+ for m in module:
rc = semanage_module_remove(self.sh, m)
if rc < 0 and rc != -2:
raise ValueError(_("Could not remove module %s (remove failed)") % m)
@@ -1852,13 +1858,13 @@ class nodeRecords(semanageRecords):
@@ -1851,13 +1851,13 @@ class nodeRecords(semanageRecords):
# verify valid comination
if len(mask) == 0 or mask[0] == "/":
@ -282,10 +175,10 @@ index 556d3ba..c9aaebe 100644
try:
newprotocol = self.protocol.index(protocol)
diff --git selinux-python-2.9-rc1/sepolgen/src/sepolgen/sepolgeni18n.py selinux-python-2.9-rc1/sepolgen/src/sepolgen/sepolgeni18n.py
diff --git selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py
index 998c435..56ebd80 100644
--- selinux-python-2.9-rc1/sepolgen/src/sepolgen/sepolgeni18n.py
+++ selinux-python-2.9-rc1/sepolgen/src/sepolgen/sepolgeni18n.py
--- selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py
+++ selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py
@@ -19,7 +19,7 @@
try:
@ -295,10 +188,10 @@ index 998c435..56ebd80 100644
_ = t.gettext
except:
def _(str):
diff --git selinux-python-2.9-rc1/sepolicy/sepolicy.py selinux-python-2.9-rc1/sepolicy/sepolicy.py
index 8cc7e8c..759f43e 100755
--- selinux-python-2.9-rc1/sepolicy/sepolicy.py
+++ selinux-python-2.9-rc1/sepolicy/sepolicy.py
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy.py selinux-python-2.9-rc2/sepolicy/sepolicy.py
index 1934cd8..8bd6a57 100755
--- selinux-python-2.9-rc2/sepolicy/sepolicy.py
+++ selinux-python-2.9-rc2/sepolicy/sepolicy.py
@@ -27,7 +27,7 @@ import selinux
import sepolicy
from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text
@ -308,11 +201,11 @@ index 8cc7e8c..759f43e 100755
try:
import gettext
kwargs = {}
diff --git selinux-python-2.9-rc1/sepolicy/sepolicy/__init__.py selinux-python-2.9-rc1/sepolicy/sepolicy/__init__.py
index 6f72947..1b116f6 100644
--- selinux-python-2.9-rc1/sepolicy/sepolicy/__init__.py
+++ selinux-python-2.9-rc1/sepolicy/sepolicy/__init__.py
@@ -15,7 +15,7 @@ import os
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/__init__.py selinux-python-2.9-rc2/sepolicy/sepolicy/__init__.py
index 6aed31b..b6ca57c 100644
--- selinux-python-2.9-rc2/sepolicy/sepolicy/__init__.py
+++ selinux-python-2.9-rc2/sepolicy/sepolicy/__init__.py
@@ -13,7 +13,7 @@ import os
import re
import gzip
@ -321,7 +214,7 @@ index 6f72947..1b116f6 100644
try:
import gettext
kwargs = {}
@@ -1211,27 +1211,14 @@ def boolean_desc(boolean):
@@ -1209,27 +1209,14 @@ def boolean_desc(boolean):
def get_os_version():
@ -355,11 +248,11 @@ index 6f72947..1b116f6 100644
def reinit():
diff --git selinux-python-2.9-rc1/sepolicy/sepolicy/generate.py selinux-python-2.9-rc1/sepolicy/sepolicy/generate.py
index 37ddfc7..a25a749 100644
--- selinux-python-2.9-rc1/sepolicy/sepolicy/generate.py
+++ selinux-python-2.9-rc1/sepolicy/sepolicy/generate.py
@@ -51,7 +51,7 @@ import sepolgen.defaults as defaults
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/generate.py selinux-python-2.9-rc2/sepolicy/sepolicy/generate.py
index 019e783..93caede 100644
--- selinux-python-2.9-rc2/sepolicy/sepolicy/generate.py
+++ selinux-python-2.9-rc2/sepolicy/sepolicy/generate.py
@@ -49,7 +49,7 @@ import sepolgen.defaults as defaults
##
## I18N
##
@ -368,7 +261,7 @@ index 37ddfc7..a25a749 100644
try:
import gettext
kwargs = {}
@@ -102,7 +102,9 @@ def get_all_ports():
@@ -100,7 +100,9 @@ def get_all_ports():
for p in sepolicy.info(sepolicy.PORT):
if p['type'] == "reserved_port_t" or \
p['type'] == "port_t" or \
@ -379,11 +272,11 @@ index 37ddfc7..a25a749 100644
continue
dict[(p['low'], p['high'], p['protocol'])] = (p['type'], p.get('range'))
return dict
diff --git selinux-python-2.9-rc1/sepolicy/sepolicy/gui.py selinux-python-2.9-rc1/sepolicy/sepolicy/gui.py
index fde233a..fe9e630 100644
--- selinux-python-2.9-rc1/sepolicy/sepolicy/gui.py
+++ selinux-python-2.9-rc1/sepolicy/sepolicy/gui.py
@@ -43,7 +43,7 @@ import os
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/gui.py selinux-python-2.9-rc2/sepolicy/sepolicy/gui.py
index 00fd7a1..805cee6 100644
--- selinux-python-2.9-rc2/sepolicy/sepolicy/gui.py
+++ selinux-python-2.9-rc2/sepolicy/sepolicy/gui.py
@@ -41,7 +41,7 @@ import os
import re
import unicodedata
@ -392,11 +285,11 @@ index fde233a..fe9e630 100644
try:
import gettext
kwargs = {}
diff --git selinux-python-2.9-rc1/sepolicy/sepolicy/interface.py selinux-python-2.9-rc1/sepolicy/sepolicy/interface.py
index 18374dc..ca0122d 100644
--- selinux-python-2.9-rc1/sepolicy/sepolicy/interface.py
+++ selinux-python-2.9-rc1/sepolicy/sepolicy/interface.py
@@ -32,7 +32,7 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/interface.py selinux-python-2.9-rc2/sepolicy/sepolicy/interface.py
index 583091a..e2b8d23 100644
--- selinux-python-2.9-rc2/sepolicy/sepolicy/interface.py
+++ selinux-python-2.9-rc2/sepolicy/sepolicy/interface.py
@@ -30,7 +30,7 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us
##
## I18N
##
@ -405,11 +298,11 @@ index 18374dc..ca0122d 100644
try:
import gettext
kwargs = {}
diff --git selinux-python-2.9-rc1/sepolicy/sepolicy/manpage.py selinux-python-2.9-rc1/sepolicy/sepolicy/manpage.py
index cfcb7c3..2cb3c7e 100755
--- selinux-python-2.9-rc1/sepolicy/sepolicy/manpage.py
+++ selinux-python-2.9-rc1/sepolicy/sepolicy/manpage.py
@@ -126,8 +126,33 @@ def gen_domains():
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/manpage.py selinux-python-2.9-rc2/sepolicy/sepolicy/manpage.py
index 1d36796..67d3930 100755
--- selinux-python-2.9-rc2/sepolicy/sepolicy/manpage.py
+++ selinux-python-2.9-rc2/sepolicy/sepolicy/manpage.py
@@ -125,8 +125,33 @@ def gen_domains():
domains.sort()
return domains
@ -444,7 +337,7 @@ index cfcb7c3..2cb3c7e 100755
def _gen_types():
global types
@@ -150,10 +175,6 @@ def prettyprint(f, trim):
@@ -149,10 +174,6 @@ def prettyprint(f, trim):
manpage_domains = []
manpage_roles = []
@ -455,7 +348,7 @@ index cfcb7c3..2cb3c7e 100755
def get_alphabet_manpages(manpage_list):
alphabet_manpages = dict.fromkeys(string.ascii_letters, [])
for i in string.ascii_letters:
@@ -183,7 +204,7 @@ def convert_manpage_to_html(html_manpage, manpage):
@@ -182,7 +203,7 @@ def convert_manpage_to_html(html_manpage, manpage):
class HTMLManPages:
"""
@ -464,7 +357,7 @@ index cfcb7c3..2cb3c7e 100755
"""
def __init__(self, manpage_roles, manpage_domains, path, os_version):
@@ -191,9 +212,9 @@ class HTMLManPages:
@@ -190,9 +211,9 @@ class HTMLManPages:
self.manpage_domains = get_alphabet_manpages(manpage_domains)
self.os_version = os_version
self.old_path = path + "/"
@ -476,7 +369,7 @@ index cfcb7c3..2cb3c7e 100755
self.__gen_html_manpages()
else:
print("SELinux HTML man pages can not be generated for this %s" % os_version)
@@ -202,7 +223,6 @@ class HTMLManPages:
@@ -201,7 +222,6 @@ class HTMLManPages:
def __gen_html_manpages(self):
self._write_html_manpage()
self._gen_index()
@ -484,7 +377,7 @@ index cfcb7c3..2cb3c7e 100755
self._gen_css()
def _write_html_manpage(self):
@@ -220,67 +240,21 @@ class HTMLManPages:
@@ -219,67 +239,21 @@ class HTMLManPages:
convert_manpage_to_html((self.new_path + r.rsplit("_selinux", 1)[0] + ".html"), self.old_path + r)
def _gen_index(self):
@ -556,7 +449,7 @@ index cfcb7c3..2cb3c7e 100755
for letter in self.manpage_roles:
if len(self.manpage_roles[letter]):
fd.write("""
@@ -424,6 +398,9 @@ class ManPage:
@@ -423,6 +397,9 @@ class ManPage:
self.all_file_types = sepolicy.get_all_file_types()
self.role_allows = sepolicy.get_all_role_allows()
self.types = _gen_types()
@ -566,7 +459,7 @@ index cfcb7c3..2cb3c7e 100755
if self.source_files:
self.fcpath = self.root + "file_contexts"
@@ -736,10 +713,13 @@ Default Defined Ports:""")
@@ -735,10 +712,13 @@ Default Defined Ports:""")
def _file_context(self):
flist = []
@ -580,7 +473,7 @@ index cfcb7c3..2cb3c7e 100755
if f in self.fcdict:
mpaths = mpaths + self.fcdict[f]["regex"]
if len(mpaths) == 0:
@@ -791,19 +771,20 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
@@ -790,19 +770,20 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
.PP
""" % {'domainname': self.domainname, 'equiv': e, 'alt': e.split('/')[-1]})
@ -604,7 +497,7 @@ index cfcb7c3..2cb3c7e 100755
self.fd.write(r"""
.I The following file types are defined for %(domainname)s:
@@ -974,11 +955,7 @@ All executeables with the default executable label, usually stored in /usr/bin a
@@ -973,11 +954,7 @@ All executeables with the default executable label, usually stored in /usr/bin a
%s""" % ", ".join(paths))
def _mcs_types(self):

40
selinux-sandbox-fedora.patch
View File

@ -1,8 +1,8 @@
diff --git selinux-sandbox-2.9-rc1/Makefile selinux-sandbox-2.9-rc1/Makefile
index 49c1d3f..9e45329 100644
--- selinux-sandbox-2.9-rc1/Makefile
+++ selinux-sandbox-2.9-rc1/Makefile
@@ -12,6 +12,7 @@ override LDLIBS += -lselinux -lcap-ng
diff --git selinux-sandbox-2.9-rc2/Makefile selinux-sandbox-2.9-rc2/Makefile
index 9da5e58..b817824 100644
--- selinux-sandbox-2.9-rc2/Makefile
+++ selinux-sandbox-2.9-rc2/Makefile
@@ -13,6 +13,7 @@ override LDLIBS += -lselinux -lcap-ng
SEUNSHARE_OBJS = seunshare.o
all: sandbox seunshare sandboxX.sh start
@ -10,7 +10,7 @@ index 49c1d3f..9e45329 100644
seunshare: $(SEUNSHARE_OBJS)
@@ -30,6 +31,7 @@ install: all
@@ -39,6 +40,7 @@ install: all
install -m 755 start $(DESTDIR)$(SHAREDIR)
-mkdir -p $(DESTDIR)$(SYSCONFDIR)
install -m 644 sandbox.conf $(DESTDIR)$(SYSCONFDIR)/sandbox
@ -18,11 +18,11 @@ index 49c1d3f..9e45329 100644
test:
@$(PYTHON) test_sandbox.py -v
diff --git selinux-sandbox-2.9-rc1/po/Makefile selinux-sandbox-2.9-rc1/po/Makefile
diff --git selinux-sandbox-2.9-rc2/po/Makefile selinux-sandbox-2.9-rc2/po/Makefile
new file mode 100644
index 0000000..0556bbe
--- /dev/null
+++ selinux-sandbox-2.9-rc1/po/Makefile
+++ selinux-sandbox-2.9-rc2/po/Makefile
@@ -0,0 +1,82 @@
+#
+# Makefile for the PO files (translation) catalog
@ -106,17 +106,17 @@ index 0000000..0556bbe
+.PHONY: missing depend
+
+relabel:
diff --git selinux-sandbox-2.9-rc1/po/POTFILES selinux-sandbox-2.9-rc1/po/POTFILES
diff --git selinux-sandbox-2.9-rc2/po/POTFILES selinux-sandbox-2.9-rc2/po/POTFILES
new file mode 100644
index 0000000..deff3f2
--- /dev/null
+++ selinux-sandbox-2.9-rc1/po/POTFILES
+++ selinux-sandbox-2.9-rc2/po/POTFILES
@@ -0,0 +1 @@
+../sandbox
diff --git selinux-sandbox-2.9-rc1/sandbox selinux-sandbox-2.9-rc1/sandbox
index c07a1d8..948496d 100644
--- selinux-sandbox-2.9-rc1/sandbox
+++ selinux-sandbox-2.9-rc1/sandbox
diff --git selinux-sandbox-2.9-rc2/sandbox selinux-sandbox-2.9-rc2/sandbox
index 1dec07a..707959a 100644
--- selinux-sandbox-2.9-rc2/sandbox
+++ selinux-sandbox-2.9-rc2/sandbox
@@ -37,7 +37,7 @@ import sepolicy
SEUNSHARE = "/usr/sbin/seunshare"
@ -144,10 +144,10 @@ index c07a1d8..948496d 100644
help=_("alternate window manager"))
parser.add_option("-l", "--level", dest="level",
diff --git selinux-sandbox-2.9-rc1/sandbox.8 selinux-sandbox-2.9-rc1/sandbox.8
diff --git selinux-sandbox-2.9-rc2/sandbox.8 selinux-sandbox-2.9-rc2/sandbox.8
index d83fee7..90ef495 100644
--- selinux-sandbox-2.9-rc1/sandbox.8
+++ selinux-sandbox-2.9-rc1/sandbox.8
--- selinux-sandbox-2.9-rc2/sandbox.8
+++ selinux-sandbox-2.9-rc2/sandbox.8
@@ -77,7 +77,7 @@ Specifies the windowsize when creating an X based Sandbox. The default windowsiz
\fB\-W\fR \fB\-\-windowmanager\fR
Select alternative window manager to run within
@ -157,10 +157,10 @@ index d83fee7..90ef495 100644
.TP
\fB\-X\fR
Create an X based Sandbox for gui apps, temporary files for
diff --git selinux-sandbox-2.9-rc1/sandboxX.sh selinux-sandbox-2.9-rc1/sandboxX.sh
diff --git selinux-sandbox-2.9-rc2/sandboxX.sh selinux-sandbox-2.9-rc2/sandboxX.sh
index eaa500d..c211ebc 100644
--- selinux-sandbox-2.9-rc1/sandboxX.sh
+++ selinux-sandbox-2.9-rc1/sandboxX.sh
--- selinux-sandbox-2.9-rc2/sandboxX.sh
+++ selinux-sandbox-2.9-rc2/sandboxX.sh
@@ -6,21 +6,7 @@ export TITLE="Sandbox $context -- `grep ^#TITLE: ~/.sandboxrc | /usr/bin/cut -b8
[ -z $2 ] && export DPI="96" || export DPI="$2"
trap "exit 0" HUP

6
semodule-utils-fedora.patch
View File

@ -1,7 +1,7 @@
diff --git semodule-utils-2.9-rc1/semodule_package/semodule_package.c semodule-utils-2.9-rc1/semodule_package/semodule_package.c
diff --git semodule-utils-2.9-rc2/semodule_package/semodule_package.c semodule-utils-2.9-rc2/semodule_package/semodule_package.c
index 3515234..7b75b3f 100644
--- semodule-utils-2.9-rc1/semodule_package/semodule_package.c
+++ semodule-utils-2.9-rc1/semodule_package/semodule_package.c
--- semodule-utils-2.9-rc2/semodule_package/semodule_package.c
+++ semodule-utils-2.9-rc2/semodule_package/semodule_package.c
@@ -74,6 +74,7 @@ static int file_to_data(const char *path, char **data, size_t * len)
}
if (!sb.st_size) {

15
sources
View File

@ -1,11 +1,10 @@
SHA512 (policycoreutils-2.9-rc1.tar.gz) = 6a3a7d4652b44e54c287b327ad691dd0575c6a45fbf1f4676b8182e05760defc37dfa6aaf2e6ab5a77e124d76d1f699c4859c0595a3f9e8ade04ff5ad186fb32
SHA512 (selinux-python-2.9-rc1.tar.gz) = afd7686ed21c55aa3fc45934d252da1a7d8a44651ef210bf54d4feeedcb72b9092be2d3becc9ff9c8caba53088d33ad97824e0655e04a47c122b45ea6c3e6455
SHA512 (selinux-gui-2.9-rc1.tar.gz) = 611e3a2cf55c5def9ec60a1ffd59ab30c3c394a8bf20fa6c83b84af5672813c435b3469c8490ff5f75a5ae75fec9ac3014c0aacb4a9fadecc90f683fb61e5722
SHA512 (selinux-sandbox-2.9-rc1.tar.gz) = 324b0448aa2656e401f2aeebb162626844f5b43f65c305e05c64284964d18ee4e38e98bb9e767e7f4fbf405fd8475fa70a9c5aa0c60d43880036adea0c146779
SHA512 (selinux-dbus-2.9-rc1.tar.gz) = f20357788250fe3e6ad3985d093877abdc09deda485a0a69f6563f6540c28c7ad61402bde09f53086d1f73fdc174c959bae50a223962eea3ffa6f4db09cdcec4
SHA512 (semodule-utils-2.9-rc1.tar.gz) = 2e03dd8c23ad1b2f2492194ccd4a6fc39d4ee2d513778264b794011121c3b6eb896dab4a2236cf3934d1e200ad1f86ba6223bb6ac7aa81b1fd4c2a700dc7081a
SHA512 (restorecond-2.9-rc1.tar.gz) = 6d0b0e3e36dfe567cf5349801078bc6ff9c6a7e7f2afc13f7ae775c9ae1d74fddfce14f3c83933f386e110ae5b4836c633d8307c9c4bce2000a3230bfcdb64eb
SHA512 (policycoreutils_man_ru2.tar.bz2) = 7272801da169b8d7dd3f8b7e368a63a4fbb7ae94599f9384bc450d142e6b2a3805ab542d650cbe9c8978c2d8e5c56ef4c11f361abfefeaf184ec3a4b0d2afb4c
SHA512 (policycoreutils-2.9-rc2.tar.gz) = 3aaabfdbcf7bef05b6cfe2d35b897cd531409a472a73e715797ca69571ae40d1d8ccd42c64177d6d5150cd8fbd1e35cf179036c05a6d658cafe66546c90154ab
SHA512 (restorecond-2.9-rc2.tar.gz) = 12d07d37979034e47c881fd62af34c28e4bbcd8cd95350ab4ac961828e3137ccd56ec1774219daf1e87a54f40731c7976c975c934f932e073bb84c734599685d
SHA512 (selinux-dbus-2.9-rc2.tar.gz) = 368ed771546f544de50c950761735b767b17790183e25c412a26010c00293d08cc70581e85fed57a695244c14fda6233034bfc9432ada43043a01f97cc017cfe
SHA512 (selinux-gui-2.9-rc2.tar.gz) = 8f02370845f229c98913cc1b048c3412cb6bd60fe36cbc8d76da3788189238cde32084d44fce0b0975c460fa5fdcd0f5402bbfd3ba27bab05f015aa742ace776
SHA512 (selinux-python-2.9-rc2.tar.gz) = 04b0c057396d2265798b0c211a0f058f97fa9483a94c6486c480dc1bbf41f321d74b7049b7adb1c559a15101d29f7bf73350823ee9c4af7e8d6327702a55f6a0
SHA512 (selinux-sandbox-2.9-rc2.tar.gz) = 687abd1ab0ff4102d0ee096043e9b21290760d66c18ecc3fb5aa02cd5a2763dd74d67e808cfa07998098ec80af23d6a603632928c3ff2dcc8e9ef9c06362e2aa
SHA512 (semodule-utils-2.9-rc2.tar.gz) = 2aa8fed977e8bb3a28eaf9628bf895183be35858270ca9d737007018693b5cae6eeb77be390cf651a15b8d7449ef62c5351a0a17c7386d7d8f62677073c60462
SHA512 (gui-po.tgz) = 8b4a2ed5f246ea3d6086e2f8b7df37b0e43318b1a1d4dc5aae7cfa32ee6b4e0a39fc0b8f08ff062fd776d54a4c9b88f641d3109f7d8b5ec11b44383c902fefa5
SHA512 (policycoreutils-po.tgz) = 8dd151bc67345106fec5daae1a133e74202484509357883e21e1eaccb8283098dc153a8f77e2d4dd0e899995eb07dedf0f7fca68507df35593a7f95482a4cb28
SHA512 (python-po.tgz) = c9d88b9523f41b13f53403c0a98fe2fd6ba67afa51d41b56a856340e387eee00d6bd5416cd595a4bf657eaa02797ac3fe25a2a5de17b5f6bb6a2566d14c6c63f