SELinux userspace 2.9 release
This commit is contained in:
parent
8008fc1f39
commit
f62c86f32c
7
.gitignore
vendored
7
.gitignore
vendored
@ -294,3 +294,10 @@ policycoreutils-2.0.83.tgz
|
||||
/selinux-python-2.9-rc2.tar.gz
|
||||
/selinux-sandbox-2.9-rc2.tar.gz
|
||||
/semodule-utils-2.9-rc2.tar.gz
|
||||
/policycoreutils-2.9.tar.gz
|
||||
/restorecond-2.9.tar.gz
|
||||
/selinux-dbus-2.9.tar.gz
|
||||
/selinux-gui-2.9.tar.gz
|
||||
/selinux-python-2.9.tar.gz
|
||||
/selinux-sandbox-2.9.tar.gz
|
||||
/semodule-utils-2.9.tar.gz
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff --git policycoreutils-2.9-rc2/po/Makefile policycoreutils-2.9-rc2/po/Makefile
|
||||
diff --git policycoreutils-2.9/po/Makefile policycoreutils-2.9/po/Makefile
|
||||
index 575e143..18bc1df 100644
|
||||
--- policycoreutils-2.9-rc2/po/Makefile
|
||||
+++ policycoreutils-2.9-rc2/po/Makefile
|
||||
--- policycoreutils-2.9/po/Makefile
|
||||
+++ policycoreutils-2.9/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-rc2/po/POTFILES policycoreutils-2.9-rc2/po/POTFILES
|
||||
diff --git policycoreutils-2.9/po/POTFILES policycoreutils-2.9/po/POTFILES
|
||||
new file mode 100644
|
||||
index 0000000..12237dc
|
||||
--- /dev/null
|
||||
+++ policycoreutils-2.9-rc2/po/POTFILES
|
||||
+++ policycoreutils-2.9/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-rc2/scripts/fixfiles policycoreutils-2.9-rc2/scripts/fixfiles
|
||||
diff --git policycoreutils-2.9/scripts/fixfiles policycoreutils-2.9/scripts/fixfiles
|
||||
index b277958..53d28c7 100755
|
||||
--- policycoreutils-2.9-rc2/scripts/fixfiles
|
||||
+++ policycoreutils-2.9-rc2/scripts/fixfiles
|
||||
--- policycoreutils-2.9/scripts/fixfiles
|
||||
+++ policycoreutils-2.9/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-rc2/setfiles/setfiles.8 policycoreutils-2.9-rc2/setfiles/setfiles.8
|
||||
diff --git policycoreutils-2.9/setfiles/setfiles.8 policycoreutils-2.9/setfiles/setfiles.8
|
||||
index ccaaf4d..a8a76c8 100644
|
||||
--- policycoreutils-2.9-rc2/setfiles/setfiles.8
|
||||
+++ policycoreutils-2.9-rc2/setfiles/setfiles.8
|
||||
--- policycoreutils-2.9/setfiles/setfiles.8
|
||||
+++ policycoreutils-2.9/setfiles/setfiles.8
|
||||
@@ -57,7 +57,7 @@ check the validity of the contexts against the specified binary policy.
|
||||
.TP
|
||||
.B \-d
|
||||
|
@ -1,7 +1,7 @@
|
||||
%global libauditver 2.1.3-4
|
||||
%global libsepolver 2.9-0.rc2
|
||||
%global libsemanagever 2.9-0.rc2
|
||||
%global libselinuxver 2.9-0.rc2
|
||||
%global libsepolver 2.9-1
|
||||
%global libsemanagever 2.9-1
|
||||
%global libselinuxver 2.9-1
|
||||
%global sepolgenver 2.9
|
||||
|
||||
%global generatorsdir %{_prefix}/lib/systemd/system-generators
|
||||
@ -12,16 +12,16 @@
|
||||
Summary: SELinux policy core utilities
|
||||
Name: policycoreutils
|
||||
Version: 2.9
|
||||
Release: 0.rc2.1%{?dist}
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2
|
||||
# https://github.com/SELinuxProject/selinux/wiki/Releases
|
||||
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
|
||||
Source0: https://github.com/SELinuxProject/selinux/releases/download/20190315/policycoreutils-2.9.tar.gz
|
||||
Source1: https://github.com/SELinuxProject/selinux/releases/download/20190315/selinux-python-2.9.tar.gz
|
||||
Source2: https://github.com/SELinuxProject/selinux/releases/download/20190315/selinux-gui-2.9.tar.gz
|
||||
Source3: https://github.com/SELinuxProject/selinux/releases/download/20190315/selinux-sandbox-2.9.tar.gz
|
||||
Source4: https://github.com/SELinuxProject/selinux/releases/download/20190315/selinux-dbus-2.9.tar.gz
|
||||
Source5: https://github.com/SELinuxProject/selinux/releases/download/20190315/semodule-utils-2.9.tar.gz
|
||||
Source6: https://github.com/SELinuxProject/selinux/releases/download/20190315/restorecond-2.9.tar.gz
|
||||
URL: https://github.com/SELinuxProject/selinux
|
||||
Source13: system-config-selinux.png
|
||||
Source14: sepolicy-icons.tgz
|
||||
@ -36,9 +36,9 @@ 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/cb42e1bf324698875492f6f8f7adf9c5f7778aab
|
||||
# HEAD https://github.com/fedora-selinux/selinux/commit/431f72836d6c02450725cf6ffb1c7223b9fa6acc
|
||||
# $ for i in policycoreutils selinux-python selinux-gui selinux-sandbox selinux-dbus semodule-utils restorecond; do
|
||||
# VERSION=2.9-rc2 ./make-fedora-selinux-patch.sh $i
|
||||
# VERSION=2.9 ./make-fedora-selinux-patch.sh $i
|
||||
# done
|
||||
Patch: policycoreutils-fedora.patch
|
||||
Patch1: selinux-python-fedora.patch
|
||||
@ -89,8 +89,8 @@ to switch roles.
|
||||
%setup -q -T -D -a 6 -n selinux
|
||||
%patch -p0 -b .policycoreutils-fedora
|
||||
|
||||
cp %{SOURCE13} selinux-gui-%{version}-rc2/
|
||||
tar -xvf %{SOURCE14} -C selinux-python-%{version}-rc2/sepolicy/
|
||||
cp %{SOURCE13} selinux-gui-%{version}/
|
||||
tar -xvf %{SOURCE14} -C selinux-python-%{version}/sepolicy/
|
||||
%patch1 -p0 -b .selinux-python
|
||||
%patch2 -p0 -b .selinux-gui
|
||||
%patch3 -p0 -b .selinux-sandbox
|
||||
@ -100,22 +100,22 @@ tar -xvf %{SOURCE14} -C selinux-python-%{version}-rc2/sepolicy/
|
||||
|
||||
# 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}-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
|
||||
tar -x -f %{SOURCE20} -C policycoreutils-%{version} -z
|
||||
tar -x -f %{SOURCE21} -C selinux-python-%{version} -z
|
||||
tar -x -f %{SOURCE22} -C selinux-gui-%{version} -z
|
||||
tar -x -f %{SOURCE23} -C selinux-sandbox-%{version} -z
|
||||
|
||||
%build
|
||||
%set_build_flags
|
||||
export PYTHON=%{__python3}
|
||||
|
||||
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
|
||||
make -C policycoreutils-%{version} LSPP_PRIV=y SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" LIBSEPOLA="%{_libdir}/libsepol.a" all
|
||||
make -C selinux-python-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
|
||||
make -C selinux-gui-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
|
||||
make -C selinux-sandbox-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
|
||||
make -C selinux-dbus-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
|
||||
make -C semodule-utils-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
|
||||
make -C restorecond-%{version} SBINDIR="%{_sbindir}" LSPP_PRIV=y LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" all
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
@ -125,20 +125,20 @@ mkdir -p %{buildroot}%{_mandir}/man5
|
||||
mkdir -p %{buildroot}%{_mandir}/man8
|
||||
%{__mkdir} -p %{buildroot}/%{_usr}/share/doc/%{name}/
|
||||
|
||||
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 policycoreutils-%{version} LSPP_PRIV=y DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" SEMODULE_PATH="/usr/sbin" 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-python-%{version} PYTHON=%{__python2} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
|
||||
make -C selinux-python-%{version} 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-gui-%{version} 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-sandbox-%{version} 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 selinux-dbus-%{version} 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 semodule-utils-%{version} 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
|
||||
make -C restorecond-%{version} PYTHON=%{__python3} DESTDIR="%{buildroot}" SBINDIR="%{_sbindir}" LIBDIR="%{_libdir}" LIBSEPOLA="%{_libdir}/libsepol.a" install
|
||||
|
||||
|
||||
# Systemd
|
||||
@ -154,21 +154,6 @@ rm -f %{buildroot}/usr/share/man/ru/man8/run_init.8*
|
||||
rm -f %{buildroot}/usr/share/man/man8/run_init.8*
|
||||
rm -f %{buildroot}/etc/pam.d/run_init*
|
||||
|
||||
ln -sf /usr/share/system-config-selinux/polgengui.py %{buildroot}%{_bindir}/selinux-polgengui
|
||||
|
||||
desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category Settings \
|
||||
%{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.desktop
|
||||
|
||||
desktop-file-install --dir %{buildroot}%{_datadir}/applications --add-category Settings \
|
||||
%{buildroot}%{_datadir}/system-config-selinux/sepolicy.desktop
|
||||
|
||||
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
|
||||
%{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop
|
||||
|
||||
rm -f %{buildroot}%{_datadir}/system-config-selinux/selinux-polgengui.desktop
|
||||
rm -f %{buildroot}%{_datadir}/system-config-selinux/sepolicy.desktop
|
||||
rm -f %{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.desktop
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1566618
|
||||
# we don't need python2 sepolicy gui files anymore
|
||||
rm -f %{buildroot}%{python2_sitelib}/sepolicy/gui.*
|
||||
@ -199,7 +184,6 @@ pathfix.py -i "%{__python3} -Es" -p \
|
||||
%{buildroot}%{_bindir}/sepolgen-ifgen \
|
||||
%{buildroot}%{_datadir}/system-config-selinux/system-config-selinux.py \
|
||||
%{buildroot}%{_datadir}/system-config-selinux/selinux_server.py \
|
||||
%{buildroot}%{_datadir}/system-config-selinux/polgengui.py \
|
||||
%nil
|
||||
|
||||
# clean up ~ files from pathfix - https://bugzilla.redhat.com/show_bug.cgi?id=1546990
|
||||
@ -424,8 +408,6 @@ system-config-selinux is a utility for managing the SELinux environment
|
||||
%{_datadir}/system-config-selinux/system-config-selinux.png
|
||||
%{_datadir}/system-config-selinux/*Page.py
|
||||
%{_datadir}/system-config-selinux/__pycache__/*Page.*
|
||||
%{_datadir}/system-config-selinux/polgengui.py
|
||||
%{_datadir}/system-config-selinux/__pycache__/polgengui.*
|
||||
%{_datadir}/system-config-selinux/system-config-selinux.py
|
||||
%{_datadir}/system-config-selinux/__pycache__/system-config-selinux.*
|
||||
%{_datadir}/system-config-selinux/*.ui
|
||||
@ -489,7 +471,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}-rc2/COPYING
|
||||
%license policycoreutils-%{version}/COPYING
|
||||
%doc %{_usr}/share/doc/%{name}
|
||||
|
||||
%package restorecond
|
||||
@ -547,7 +529,7 @@ The policycoreutils-restorecond package contains the restorecond service.
|
||||
/usr/share/man/ru/man8/system-config-selinux.8.gz
|
||||
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license policycoreutils-%{version}-rc2/COPYING
|
||||
%license policycoreutils-%{version}/COPYING
|
||||
|
||||
%post
|
||||
%systemd_post selinux-autorelabel-mark.service
|
||||
@ -565,6 +547,9 @@ The policycoreutils-restorecond package contains the restorecond service.
|
||||
%systemd_postun_with_restart restorecond.service
|
||||
|
||||
%changelog
|
||||
* Mon Mar 18 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-1
|
||||
- SELinux userspace 2.9 release
|
||||
|
||||
* Mon Mar 11 2019 Petr Lautrbach <plautrba@redhat.com> - 2.9-0.rc2.1
|
||||
- SELinux userspace 2.9-rc2 release
|
||||
|
||||
|
@ -1,8 +1,16 @@
|
||||
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 \
|
||||
diff --git selinux-gui-2.9/Makefile selinux-gui-2.9/Makefile
|
||||
index c2f982d..5a5bf6d 100644
|
||||
--- selinux-gui-2.9/Makefile
|
||||
+++ selinux-gui-2.9/Makefile
|
||||
@@ -5,6 +5,7 @@ BINDIR ?= $(PREFIX)/bin
|
||||
SHAREDIR ?= $(PREFIX)/share/system-config-selinux
|
||||
DATADIR ?= $(PREFIX)/share
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
+DESKTOPDIR ?= $(PREFIX)/share/applications
|
||||
|
||||
TARGETS= \
|
||||
booleansPage.py \
|
||||
@@ -21,6 +22,7 @@ system-config-selinux.ui \
|
||||
usersPage.py
|
||||
|
||||
all: $(TARGETS) system-config-selinux.py polgengui.py
|
||||
@ -10,7 +18,28 @@ index c2f982d..1767c40 100644
|
||||
|
||||
install: all
|
||||
-mkdir -p $(DESTDIR)$(MANDIR)/man8
|
||||
@@ -52,6 +53,8 @@ install: all
|
||||
@@ -29,9 +31,10 @@ install: all
|
||||
-mkdir -p $(DESTDIR)$(DATADIR)/pixmaps
|
||||
-mkdir -p $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps
|
||||
-mkdir -p $(DESTDIR)$(DATADIR)/polkit-1/actions/
|
||||
+ -mkdir -p $(DESTDIR)$(DESKTOPDIR)
|
||||
install -m 755 system-config-selinux.py $(DESTDIR)$(SHAREDIR)
|
||||
install -m 755 system-config-selinux $(DESTDIR)$(BINDIR)
|
||||
- install -m 755 polgengui.py $(DESTDIR)$(SHAREDIR)
|
||||
+ install -m 755 polgengui.py $(DESTDIR)$(BINDIR)/selinux-polgengui
|
||||
install -m 644 $(TARGETS) $(DESTDIR)$(SHAREDIR)
|
||||
install -m 644 system-config-selinux.8 $(DESTDIR)$(MANDIR)/man8
|
||||
install -m 644 selinux-polgengui.8 $(DESTDIR)$(MANDIR)/man8
|
||||
@@ -44,7 +47,7 @@ install: all
|
||||
install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/pixmaps
|
||||
install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/icons/hicolor/24x24/apps
|
||||
install -m 644 system-config-selinux.png $(DESTDIR)$(DATADIR)/system-config-selinux
|
||||
- install -m 644 *.desktop $(DESTDIR)$(DATADIR)/system-config-selinux
|
||||
+ install -m 644 *.desktop $(DESTDIR)$(DESKTOPDIR)
|
||||
-mkdir -p $(DESTDIR)$(DATADIR)/pixmaps
|
||||
install -m 644 sepolicy_256.png $(DESTDIR)$(DATADIR)/pixmaps/sepolicy.png
|
||||
for i in 16 22 32 48 256; do \
|
||||
@@ -52,6 +55,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 +48,10 @@ index c2f982d..1767c40 100644
|
||||
clean:
|
||||
|
||||
indent:
|
||||
diff --git selinux-gui-2.9-rc2/booleansPage.py selinux-gui-2.9-rc2/booleansPage.py
|
||||
diff --git selinux-gui-2.9/booleansPage.py selinux-gui-2.9/booleansPage.py
|
||||
index 7849bea..dd12b6d 100644
|
||||
--- selinux-gui-2.9-rc2/booleansPage.py
|
||||
+++ selinux-gui-2.9-rc2/booleansPage.py
|
||||
--- selinux-gui-2.9/booleansPage.py
|
||||
+++ selinux-gui-2.9/booleansPage.py
|
||||
@@ -38,7 +38,7 @@ DISABLED = 2
|
||||
##
|
||||
## I18N
|
||||
@ -32,10 +61,10 @@ index 7849bea..dd12b6d 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/domainsPage.py selinux-gui-2.9-rc2/domainsPage.py
|
||||
diff --git selinux-gui-2.9/domainsPage.py selinux-gui-2.9/domainsPage.py
|
||||
index bad5140..6bbe4de 100644
|
||||
--- selinux-gui-2.9-rc2/domainsPage.py
|
||||
+++ selinux-gui-2.9-rc2/domainsPage.py
|
||||
--- selinux-gui-2.9/domainsPage.py
|
||||
+++ selinux-gui-2.9/domainsPage.py
|
||||
@@ -30,7 +30,7 @@ from semanagePage import *
|
||||
##
|
||||
## I18N
|
||||
@ -45,10 +74,10 @@ index bad5140..6bbe4de 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/fcontextPage.py selinux-gui-2.9-rc2/fcontextPage.py
|
||||
diff --git selinux-gui-2.9/fcontextPage.py selinux-gui-2.9/fcontextPage.py
|
||||
index 370bbee..e424366 100644
|
||||
--- selinux-gui-2.9-rc2/fcontextPage.py
|
||||
+++ selinux-gui-2.9-rc2/fcontextPage.py
|
||||
--- selinux-gui-2.9/fcontextPage.py
|
||||
+++ selinux-gui-2.9/fcontextPage.py
|
||||
@@ -47,7 +47,7 @@ class context:
|
||||
##
|
||||
## I18N
|
||||
@ -58,10 +87,10 @@ index 370bbee..e424366 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/loginsPage.py selinux-gui-2.9-rc2/loginsPage.py
|
||||
diff --git selinux-gui-2.9/loginsPage.py selinux-gui-2.9/loginsPage.py
|
||||
index b67eb8b..cbfb0cc 100644
|
||||
--- selinux-gui-2.9-rc2/loginsPage.py
|
||||
+++ selinux-gui-2.9-rc2/loginsPage.py
|
||||
--- selinux-gui-2.9/loginsPage.py
|
||||
+++ selinux-gui-2.9/loginsPage.py
|
||||
@@ -29,7 +29,7 @@ from semanagePage import *
|
||||
##
|
||||
## I18N
|
||||
@ -71,10 +100,10 @@ index b67eb8b..cbfb0cc 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/modulesPage.py selinux-gui-2.9-rc2/modulesPage.py
|
||||
index 34c5d9e..627ad95 100644
|
||||
--- selinux-gui-2.9-rc2/modulesPage.py
|
||||
+++ selinux-gui-2.9-rc2/modulesPage.py
|
||||
diff --git selinux-gui-2.9/modulesPage.py selinux-gui-2.9/modulesPage.py
|
||||
index 34c5d9e..26ac540 100644
|
||||
--- selinux-gui-2.9/modulesPage.py
|
||||
+++ selinux-gui-2.9/modulesPage.py
|
||||
@@ -30,7 +30,7 @@ from semanagePage import *
|
||||
##
|
||||
## I18N
|
||||
@ -84,11 +113,20 @@ index 34c5d9e..627ad95 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/po/Makefile selinux-gui-2.9-rc2/po/Makefile
|
||||
@@ -118,7 +118,7 @@ class modulesPage(semanagePage):
|
||||
|
||||
def new_module(self, args):
|
||||
try:
|
||||
- Popen(["/usr/share/system-config-selinux/polgengui.py"])
|
||||
+ Popen(["selinux-polgengui"])
|
||||
except ValueError as e:
|
||||
self.error(e.args[0])
|
||||
|
||||
diff --git selinux-gui-2.9/po/Makefile selinux-gui-2.9/po/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..a0f5439
|
||||
--- /dev/null
|
||||
+++ selinux-gui-2.9-rc2/po/Makefile
|
||||
+++ selinux-gui-2.9/po/Makefile
|
||||
@@ -0,0 +1,82 @@
|
||||
+#
|
||||
+# Makefile for the PO files (translation) catalog
|
||||
@ -172,11 +210,11 @@ index 0000000..a0f5439
|
||||
+.PHONY: missing depend
|
||||
+
|
||||
+relabel:
|
||||
diff --git selinux-gui-2.9-rc2/po/POTFILES selinux-gui-2.9-rc2/po/POTFILES
|
||||
diff --git selinux-gui-2.9/po/POTFILES selinux-gui-2.9/po/POTFILES
|
||||
new file mode 100644
|
||||
index 0000000..1795c5c
|
||||
--- /dev/null
|
||||
+++ selinux-gui-2.9-rc2/po/POTFILES
|
||||
+++ selinux-gui-2.9/po/POTFILES
|
||||
@@ -0,0 +1,17 @@
|
||||
+../booleansPage.py
|
||||
+../domainsPage.py
|
||||
@ -195,10 +233,10 @@ index 0000000..1795c5c
|
||||
+../system-config-selinux.py
|
||||
+../system-config-selinux.ui
|
||||
+../usersPage.py
|
||||
diff --git selinux-gui-2.9-rc2/polgengui.py selinux-gui-2.9-rc2/polgengui.py
|
||||
diff --git selinux-gui-2.9/polgengui.py selinux-gui-2.9/polgengui.py
|
||||
index b1cc993..46a1bd2 100644
|
||||
--- selinux-gui-2.9-rc2/polgengui.py
|
||||
+++ selinux-gui-2.9-rc2/polgengui.py
|
||||
--- selinux-gui-2.9/polgengui.py
|
||||
+++ selinux-gui-2.9/polgengui.py
|
||||
@@ -63,7 +63,7 @@ def get_all_modules():
|
||||
##
|
||||
## I18N
|
||||
@ -208,10 +246,10 @@ index b1cc993..46a1bd2 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/portsPage.py selinux-gui-2.9-rc2/portsPage.py
|
||||
diff --git selinux-gui-2.9/portsPage.py selinux-gui-2.9/portsPage.py
|
||||
index 30f5838..a537ecc 100644
|
||||
--- selinux-gui-2.9-rc2/portsPage.py
|
||||
+++ selinux-gui-2.9-rc2/portsPage.py
|
||||
--- selinux-gui-2.9/portsPage.py
|
||||
+++ selinux-gui-2.9/portsPage.py
|
||||
@@ -35,7 +35,7 @@ from semanagePage import *
|
||||
##
|
||||
## I18N
|
||||
@ -221,10 +259,10 @@ index 30f5838..a537ecc 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/semanagePage.py selinux-gui-2.9-rc2/semanagePage.py
|
||||
diff --git selinux-gui-2.9/semanagePage.py selinux-gui-2.9/semanagePage.py
|
||||
index 4127804..5361d69 100644
|
||||
--- selinux-gui-2.9-rc2/semanagePage.py
|
||||
+++ selinux-gui-2.9-rc2/semanagePage.py
|
||||
--- selinux-gui-2.9/semanagePage.py
|
||||
+++ selinux-gui-2.9/semanagePage.py
|
||||
@@ -22,7 +22,7 @@ from gi.repository import Gdk, Gtk
|
||||
##
|
||||
## I18N
|
||||
@ -234,10 +272,10 @@ index 4127804..5361d69 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/statusPage.py selinux-gui-2.9-rc2/statusPage.py
|
||||
diff --git selinux-gui-2.9/statusPage.py selinux-gui-2.9/statusPage.py
|
||||
index 766854b..a8f079b 100644
|
||||
--- selinux-gui-2.9-rc2/statusPage.py
|
||||
+++ selinux-gui-2.9-rc2/statusPage.py
|
||||
--- selinux-gui-2.9/statusPage.py
|
||||
+++ selinux-gui-2.9/statusPage.py
|
||||
@@ -35,7 +35,7 @@ RELABELFILE = "/.autorelabel"
|
||||
##
|
||||
## I18N
|
||||
@ -247,10 +285,10 @@ index 766854b..a8f079b 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/system-config-selinux.py selinux-gui-2.9-rc2/system-config-selinux.py
|
||||
diff --git selinux-gui-2.9/system-config-selinux.py selinux-gui-2.9/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
|
||||
--- selinux-gui-2.9/system-config-selinux.py
|
||||
+++ selinux-gui-2.9/system-config-selinux.py
|
||||
@@ -45,7 +45,7 @@ import selinux
|
||||
##
|
||||
## I18N
|
||||
@ -260,10 +298,10 @@ index c42301b..1e0d5eb 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-gui-2.9-rc2/usersPage.py selinux-gui-2.9-rc2/usersPage.py
|
||||
diff --git selinux-gui-2.9/usersPage.py selinux-gui-2.9/usersPage.py
|
||||
index 26794ed..d15d4c5 100644
|
||||
--- selinux-gui-2.9-rc2/usersPage.py
|
||||
+++ selinux-gui-2.9-rc2/usersPage.py
|
||||
--- selinux-gui-2.9/usersPage.py
|
||||
+++ selinux-gui-2.9/usersPage.py
|
||||
@@ -29,7 +29,7 @@ from semanagePage import *
|
||||
##
|
||||
## I18N
|
||||
|
@ -1,17 +1,17 @@
|
||||
diff --git selinux-python-2.9-rc2/Makefile selinux-python-2.9-rc2/Makefile
|
||||
diff --git selinux-python-2.9/Makefile selinux-python-2.9/Makefile
|
||||
index 9b66d52..00312db 100644
|
||||
--- selinux-python-2.9-rc2/Makefile
|
||||
+++ selinux-python-2.9-rc2/Makefile
|
||||
--- selinux-python-2.9/Makefile
|
||||
+++ selinux-python-2.9/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-rc2/chcat/chcat selinux-python-2.9-rc2/chcat/chcat
|
||||
diff --git selinux-python-2.9/chcat/chcat selinux-python-2.9/chcat/chcat
|
||||
index ba39868..df2509f 100755
|
||||
--- selinux-python-2.9-rc2/chcat/chcat
|
||||
+++ selinux-python-2.9-rc2/chcat/chcat
|
||||
--- selinux-python-2.9/chcat/chcat
|
||||
+++ selinux-python-2.9/chcat/chcat
|
||||
@@ -30,7 +30,7 @@ import getopt
|
||||
import selinux
|
||||
import seobject
|
||||
@ -21,11 +21,11 @@ index ba39868..df2509f 100755
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-python-2.9-rc2/po/Makefile selinux-python-2.9-rc2/po/Makefile
|
||||
diff --git selinux-python-2.9/po/Makefile selinux-python-2.9/po/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..4e052d5
|
||||
--- /dev/null
|
||||
+++ selinux-python-2.9-rc2/po/Makefile
|
||||
+++ selinux-python-2.9/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-rc2/po/POTFILES selinux-python-2.9-rc2/po/POTFILES
|
||||
diff --git selinux-python-2.9/po/POTFILES selinux-python-2.9/po/POTFILES
|
||||
new file mode 100644
|
||||
index 0000000..128eb87
|
||||
--- /dev/null
|
||||
+++ selinux-python-2.9-rc2/po/POTFILES
|
||||
+++ selinux-python-2.9/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-rc2/semanage/semanage selinux-python-2.9-rc2/semanage/semanage
|
||||
diff --git selinux-python-2.9/semanage/semanage selinux-python-2.9/semanage/semanage
|
||||
index 144cc00..56db3e0 100644
|
||||
--- selinux-python-2.9-rc2/semanage/semanage
|
||||
+++ selinux-python-2.9-rc2/semanage/semanage
|
||||
--- selinux-python-2.9/semanage/semanage
|
||||
+++ selinux-python-2.9/semanage/semanage
|
||||
@@ -27,7 +27,7 @@ import traceback
|
||||
import argparse
|
||||
import seobject
|
||||
@ -139,10 +139,10 @@ index 144cc00..56db3e0 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-python-2.9-rc2/semanage/seobject.py selinux-python-2.9-rc2/semanage/seobject.py
|
||||
diff --git selinux-python-2.9/semanage/seobject.py selinux-python-2.9/semanage/seobject.py
|
||||
index 13fdf53..58497e3 100644
|
||||
--- selinux-python-2.9-rc2/semanage/seobject.py
|
||||
+++ selinux-python-2.9-rc2/semanage/seobject.py
|
||||
--- selinux-python-2.9/semanage/seobject.py
|
||||
+++ selinux-python-2.9/semanage/seobject.py
|
||||
@@ -29,10 +29,10 @@ import sys
|
||||
import stat
|
||||
import socket
|
||||
@ -175,10 +175,10 @@ index 13fdf53..58497e3 100644
|
||||
|
||||
try:
|
||||
newprotocol = self.protocol.index(protocol)
|
||||
diff --git selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
diff --git selinux-python-2.9/sepolgen/src/sepolgen/sepolgeni18n.py selinux-python-2.9/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
index 998c435..56ebd80 100644
|
||||
--- selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
+++ selinux-python-2.9-rc2/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
--- selinux-python-2.9/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
+++ selinux-python-2.9/sepolgen/src/sepolgen/sepolgeni18n.py
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
try:
|
||||
@ -188,10 +188,10 @@ index 998c435..56ebd80 100644
|
||||
_ = t.gettext
|
||||
except:
|
||||
def _(str):
|
||||
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy.py selinux-python-2.9-rc2/sepolicy/sepolicy.py
|
||||
diff --git selinux-python-2.9/sepolicy/sepolicy.py selinux-python-2.9/sepolicy/sepolicy.py
|
||||
index 1934cd8..8bd6a57 100755
|
||||
--- selinux-python-2.9-rc2/sepolicy/sepolicy.py
|
||||
+++ selinux-python-2.9-rc2/sepolicy/sepolicy.py
|
||||
--- selinux-python-2.9/sepolicy/sepolicy.py
|
||||
+++ selinux-python-2.9/sepolicy/sepolicy.py
|
||||
@@ -27,7 +27,7 @@ import selinux
|
||||
import sepolicy
|
||||
from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text
|
||||
@ -201,10 +201,10 @@ index 1934cd8..8bd6a57 100755
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/__init__.py selinux-python-2.9-rc2/sepolicy/sepolicy/__init__.py
|
||||
diff --git selinux-python-2.9/sepolicy/sepolicy/__init__.py selinux-python-2.9/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
|
||||
--- selinux-python-2.9/sepolicy/sepolicy/__init__.py
|
||||
+++ selinux-python-2.9/sepolicy/sepolicy/__init__.py
|
||||
@@ -13,7 +13,7 @@ import os
|
||||
import re
|
||||
import gzip
|
||||
@ -248,10 +248,10 @@ index 6aed31b..b6ca57c 100644
|
||||
|
||||
|
||||
def reinit():
|
||||
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/generate.py selinux-python-2.9-rc2/sepolicy/sepolicy/generate.py
|
||||
diff --git selinux-python-2.9/sepolicy/sepolicy/generate.py selinux-python-2.9/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
|
||||
--- selinux-python-2.9/sepolicy/sepolicy/generate.py
|
||||
+++ selinux-python-2.9/sepolicy/sepolicy/generate.py
|
||||
@@ -49,7 +49,7 @@ import sepolgen.defaults as defaults
|
||||
##
|
||||
## I18N
|
||||
@ -272,10 +272,10 @@ index 019e783..93caede 100644
|
||||
continue
|
||||
dict[(p['low'], p['high'], p['protocol'])] = (p['type'], p.get('range'))
|
||||
return dict
|
||||
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/gui.py selinux-python-2.9-rc2/sepolicy/sepolicy/gui.py
|
||||
diff --git selinux-python-2.9/sepolicy/sepolicy/gui.py selinux-python-2.9/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
|
||||
--- selinux-python-2.9/sepolicy/sepolicy/gui.py
|
||||
+++ selinux-python-2.9/sepolicy/sepolicy/gui.py
|
||||
@@ -41,7 +41,7 @@ import os
|
||||
import re
|
||||
import unicodedata
|
||||
@ -285,10 +285,10 @@ index 00fd7a1..805cee6 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/interface.py selinux-python-2.9-rc2/sepolicy/sepolicy/interface.py
|
||||
diff --git selinux-python-2.9/sepolicy/sepolicy/interface.py selinux-python-2.9/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
|
||||
--- selinux-python-2.9/sepolicy/sepolicy/interface.py
|
||||
+++ selinux-python-2.9/sepolicy/sepolicy/interface.py
|
||||
@@ -30,7 +30,7 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us
|
||||
##
|
||||
## I18N
|
||||
@ -298,10 +298,10 @@ index 583091a..e2b8d23 100644
|
||||
try:
|
||||
import gettext
|
||||
kwargs = {}
|
||||
diff --git selinux-python-2.9-rc2/sepolicy/sepolicy/manpage.py selinux-python-2.9-rc2/sepolicy/sepolicy/manpage.py
|
||||
diff --git selinux-python-2.9/sepolicy/sepolicy/manpage.py selinux-python-2.9/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
|
||||
--- selinux-python-2.9/sepolicy/sepolicy/manpage.py
|
||||
+++ selinux-python-2.9/sepolicy/sepolicy/manpage.py
|
||||
@@ -125,8 +125,33 @@ def gen_domains():
|
||||
domains.sort()
|
||||
return domains
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff --git selinux-sandbox-2.9-rc2/Makefile selinux-sandbox-2.9-rc2/Makefile
|
||||
diff --git selinux-sandbox-2.9/Makefile selinux-sandbox-2.9/Makefile
|
||||
index 9da5e58..b817824 100644
|
||||
--- selinux-sandbox-2.9-rc2/Makefile
|
||||
+++ selinux-sandbox-2.9-rc2/Makefile
|
||||
--- selinux-sandbox-2.9/Makefile
|
||||
+++ selinux-sandbox-2.9/Makefile
|
||||
@@ -13,6 +13,7 @@ override LDLIBS += -lselinux -lcap-ng
|
||||
SEUNSHARE_OBJS = seunshare.o
|
||||
|
||||
@ -18,11 +18,11 @@ index 9da5e58..b817824 100644
|
||||
|
||||
test:
|
||||
@$(PYTHON) test_sandbox.py -v
|
||||
diff --git selinux-sandbox-2.9-rc2/po/Makefile selinux-sandbox-2.9-rc2/po/Makefile
|
||||
diff --git selinux-sandbox-2.9/po/Makefile selinux-sandbox-2.9/po/Makefile
|
||||
new file mode 100644
|
||||
index 0000000..0556bbe
|
||||
--- /dev/null
|
||||
+++ selinux-sandbox-2.9-rc2/po/Makefile
|
||||
+++ selinux-sandbox-2.9/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-rc2/po/POTFILES selinux-sandbox-2.9-rc2/po/POTFILES
|
||||
diff --git selinux-sandbox-2.9/po/POTFILES selinux-sandbox-2.9/po/POTFILES
|
||||
new file mode 100644
|
||||
index 0000000..deff3f2
|
||||
--- /dev/null
|
||||
+++ selinux-sandbox-2.9-rc2/po/POTFILES
|
||||
+++ selinux-sandbox-2.9/po/POTFILES
|
||||
@@ -0,0 +1 @@
|
||||
+../sandbox
|
||||
diff --git selinux-sandbox-2.9-rc2/sandbox selinux-sandbox-2.9-rc2/sandbox
|
||||
diff --git selinux-sandbox-2.9/sandbox selinux-sandbox-2.9/sandbox
|
||||
index 1dec07a..707959a 100644
|
||||
--- selinux-sandbox-2.9-rc2/sandbox
|
||||
+++ selinux-sandbox-2.9-rc2/sandbox
|
||||
--- selinux-sandbox-2.9/sandbox
|
||||
+++ selinux-sandbox-2.9/sandbox
|
||||
@@ -37,7 +37,7 @@ import sepolicy
|
||||
|
||||
SEUNSHARE = "/usr/sbin/seunshare"
|
||||
@ -144,10 +144,10 @@ index 1dec07a..707959a 100644
|
||||
help=_("alternate window manager"))
|
||||
|
||||
parser.add_option("-l", "--level", dest="level",
|
||||
diff --git selinux-sandbox-2.9-rc2/sandbox.8 selinux-sandbox-2.9-rc2/sandbox.8
|
||||
diff --git selinux-sandbox-2.9/sandbox.8 selinux-sandbox-2.9/sandbox.8
|
||||
index d83fee7..90ef495 100644
|
||||
--- selinux-sandbox-2.9-rc2/sandbox.8
|
||||
+++ selinux-sandbox-2.9-rc2/sandbox.8
|
||||
--- selinux-sandbox-2.9/sandbox.8
|
||||
+++ selinux-sandbox-2.9/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-rc2/sandboxX.sh selinux-sandbox-2.9-rc2/sandboxX.sh
|
||||
diff --git selinux-sandbox-2.9/sandboxX.sh selinux-sandbox-2.9/sandboxX.sh
|
||||
index eaa500d..c211ebc 100644
|
||||
--- selinux-sandbox-2.9-rc2/sandboxX.sh
|
||||
+++ selinux-sandbox-2.9-rc2/sandboxX.sh
|
||||
--- selinux-sandbox-2.9/sandboxX.sh
|
||||
+++ selinux-sandbox-2.9/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
|
||||
|
@ -1,7 +1,7 @@
|
||||
diff --git semodule-utils-2.9-rc2/semodule_package/semodule_package.c semodule-utils-2.9-rc2/semodule_package/semodule_package.c
|
||||
diff --git semodule-utils-2.9/semodule_package/semodule_package.c semodule-utils-2.9/semodule_package/semodule_package.c
|
||||
index 3515234..7b75b3f 100644
|
||||
--- semodule-utils-2.9-rc2/semodule_package/semodule_package.c
|
||||
+++ semodule-utils-2.9-rc2/semodule_package/semodule_package.c
|
||||
--- semodule-utils-2.9/semodule_package/semodule_package.c
|
||||
+++ semodule-utils-2.9/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) {
|
||||
|
14
sources
14
sources
@ -1,10 +1,10 @@
|
||||
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 (policycoreutils-2.9.tar.gz) = d8356115671ba66de05f1c13193ab47fab69cc4d09603a92171ed40afafc084dd191591bf336b7d722de637378ad09622ebb6eca85c06063ca9ddd6db10e02a2
|
||||
SHA512 (restorecond-2.9.tar.gz) = 6de9dd4c6b8e5d8275221aba5df27437998f635cfe83a5da75de479e260ceea884a36253eb873a8d71e1a77ed67544d8657fb75fe409af1f630052ce73ec5d8a
|
||||
SHA512 (selinux-dbus-2.9.tar.gz) = f7a9ab2975eb97ff389a78ddaa2fcf3cd1c5fe590abdbe6aa0aa0c3f0c3a96cc0f34ce54b14e0348b46c1de9257ebe5288e16d585c96a9d8149d969788af359e
|
||||
SHA512 (selinux-gui-2.9.tar.gz) = b6e1847c9f2668670cbe9c2fc65e18001eb03e1d73af049ad6520af486950cf657885a9fb71ad9679c0060fb3ee7dd166d4354e863ad517a9f3aee93587ea57e
|
||||
SHA512 (selinux-python-2.9.tar.gz) = 1138661128635004fec04dc5e39f035680b5f21beb1b79f3328690a1b93a3984d522a02724af793340112a5e647d363dda8a7d3536de959b34ffd69aa396254d
|
||||
SHA512 (selinux-sandbox-2.9.tar.gz) = 429994f6140d7ba03b023681d04b365af837e23c5d64e998f849febe08872549bffc0bc490717d6f500332845ec849483ba0d3dfffa77e02b6a2cd2f631c9f1f
|
||||
SHA512 (semodule-utils-2.9.tar.gz) = 688f1fcb34042b837019302debda76847691657709130b99bf937a85774a0ae69d789ee82b0633a4d2dc661dc6d0a1706a878ac681317df2abe68418bec3f952
|
||||
SHA512 (gui-po.tgz) = 8b4a2ed5f246ea3d6086e2f8b7df37b0e43318b1a1d4dc5aae7cfa32ee6b4e0a39fc0b8f08ff062fd776d54a4c9b88f641d3109f7d8b5ec11b44383c902fefa5
|
||||
SHA512 (policycoreutils-po.tgz) = 8dd151bc67345106fec5daae1a133e74202484509357883e21e1eaccb8283098dc153a8f77e2d4dd0e899995eb07dedf0f7fca68507df35593a7f95482a4cb28
|
||||
SHA512 (python-po.tgz) = c9d88b9523f41b13f53403c0a98fe2fd6ba67afa51d41b56a856340e387eee00d6bd5416cd595a4bf657eaa02797ac3fe25a2a5de17b5f6bb6a2566d14c6c63f
|
||||
|
Loading…
Reference in New Issue
Block a user