18e735df1b
Using patches from git makes it clean which changes are included in Fedora New workflow: 1. clone https://github.com/fedora-selinux/selinux 2. create patchset $ git format-patch 20190315 -- policycoreutils python gui sandbox dbus semodule-utils restorecond 3. update spec file $ for j in [0-9]*.patch; do printf "Patch%s: %s\n" ${j/-*/} $j; done # deleted: restorecond-fedora.patch
307 lines
8.2 KiB
Diff
307 lines
8.2 KiB
Diff
From 57cd23e11e1a700802a5955e84a0a7e04c30ec73 Mon Sep 17 00:00:00 2001
|
|
From: Petr Lautrbach <plautrba@redhat.com>
|
|
Date: Mon, 6 Aug 2018 13:37:07 +0200
|
|
Subject: [PATCH] Use correct gettext domains in python/ gui/ sandbox/
|
|
|
|
https://github.com/fedora-selinux/selinux/issues/43
|
|
---
|
|
gui/booleansPage.py | 2 +-
|
|
gui/domainsPage.py | 2 +-
|
|
gui/fcontextPage.py | 2 +-
|
|
gui/loginsPage.py | 2 +-
|
|
gui/modulesPage.py | 2 +-
|
|
gui/polgengui.py | 2 +-
|
|
gui/portsPage.py | 2 +-
|
|
gui/semanagePage.py | 2 +-
|
|
gui/statusPage.py | 2 +-
|
|
gui/system-config-selinux.py | 2 +-
|
|
gui/usersPage.py | 2 +-
|
|
python/chcat/chcat | 2 +-
|
|
python/semanage/semanage | 2 +-
|
|
python/semanage/seobject.py | 2 +-
|
|
python/sepolgen/src/sepolgen/sepolgeni18n.py | 2 +-
|
|
python/sepolicy/sepolicy.py | 2 +-
|
|
python/sepolicy/sepolicy/__init__.py | 2 +-
|
|
python/sepolicy/sepolicy/generate.py | 2 +-
|
|
python/sepolicy/sepolicy/gui.py | 2 +-
|
|
python/sepolicy/sepolicy/interface.py | 2 +-
|
|
sandbox/sandbox | 2 +-
|
|
21 files changed, 21 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/gui/booleansPage.py b/gui/booleansPage.py
|
|
index 7849bea2..dd12b6d6 100644
|
|
--- a/gui/booleansPage.py
|
|
+++ b/gui/booleansPage.py
|
|
@@ -38,7 +38,7 @@ DISABLED = 2
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/domainsPage.py b/gui/domainsPage.py
|
|
index bad5140d..6bbe4de5 100644
|
|
--- a/gui/domainsPage.py
|
|
+++ b/gui/domainsPage.py
|
|
@@ -30,7 +30,7 @@ from semanagePage import *
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/fcontextPage.py b/gui/fcontextPage.py
|
|
index 370bbee4..e424366d 100644
|
|
--- a/gui/fcontextPage.py
|
|
+++ b/gui/fcontextPage.py
|
|
@@ -47,7 +47,7 @@ class context:
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/loginsPage.py b/gui/loginsPage.py
|
|
index b67eb8bc..cbfb0cc2 100644
|
|
--- a/gui/loginsPage.py
|
|
+++ b/gui/loginsPage.py
|
|
@@ -29,7 +29,7 @@ from semanagePage import *
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/modulesPage.py b/gui/modulesPage.py
|
|
index cb856b2d..26ac5404 100644
|
|
--- a/gui/modulesPage.py
|
|
+++ b/gui/modulesPage.py
|
|
@@ -30,7 +30,7 @@ from semanagePage import *
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/polgengui.py b/gui/polgengui.py
|
|
index b1cc9937..46a1bd2c 100644
|
|
--- a/gui/polgengui.py
|
|
+++ b/gui/polgengui.py
|
|
@@ -63,7 +63,7 @@ def get_all_modules():
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/portsPage.py b/gui/portsPage.py
|
|
index 30f58383..a537ecc8 100644
|
|
--- a/gui/portsPage.py
|
|
+++ b/gui/portsPage.py
|
|
@@ -35,7 +35,7 @@ from semanagePage import *
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/semanagePage.py b/gui/semanagePage.py
|
|
index 4127804f..5361d69c 100644
|
|
--- a/gui/semanagePage.py
|
|
+++ b/gui/semanagePage.py
|
|
@@ -22,7 +22,7 @@ from gi.repository import Gdk, Gtk
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/statusPage.py b/gui/statusPage.py
|
|
index 766854b1..a8f079b9 100644
|
|
--- a/gui/statusPage.py
|
|
+++ b/gui/statusPage.py
|
|
@@ -35,7 +35,7 @@ RELABELFILE = "/.autorelabel"
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/system-config-selinux.py b/gui/system-config-selinux.py
|
|
index c42301b6..1e0d5eb1 100644
|
|
--- a/gui/system-config-selinux.py
|
|
+++ b/gui/system-config-selinux.py
|
|
@@ -45,7 +45,7 @@ import selinux
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/gui/usersPage.py b/gui/usersPage.py
|
|
index 26794ed5..d15d4c5a 100644
|
|
--- a/gui/usersPage.py
|
|
+++ b/gui/usersPage.py
|
|
@@ -29,7 +29,7 @@ from semanagePage import *
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-gui"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/python/chcat/chcat b/python/chcat/chcat
|
|
index ba398684..df2509f2 100755
|
|
--- a/python/chcat/chcat
|
|
+++ b/python/chcat/chcat
|
|
@@ -30,7 +30,7 @@ import getopt
|
|
import selinux
|
|
import seobject
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/python/semanage/semanage b/python/semanage/semanage
|
|
index 144cc000..56db3e0d 100644
|
|
--- a/python/semanage/semanage
|
|
+++ b/python/semanage/semanage
|
|
@@ -27,7 +27,7 @@ import traceback
|
|
import argparse
|
|
import seobject
|
|
import sys
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
|
|
index 13fdf531..b90b1070 100644
|
|
--- a/python/semanage/seobject.py
|
|
+++ b/python/semanage/seobject.py
|
|
@@ -29,7 +29,7 @@ import sys
|
|
import stat
|
|
import socket
|
|
from semanage import *
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
import sepolicy
|
|
import setools
|
|
from IPy import IP
|
|
diff --git a/python/sepolgen/src/sepolgen/sepolgeni18n.py b/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
|
index 998c4356..56ebd807 100644
|
|
--- a/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
|
+++ b/python/sepolgen/src/sepolgen/sepolgeni18n.py
|
|
@@ -19,7 +19,7 @@
|
|
|
|
try:
|
|
import gettext
|
|
- t = gettext.translation( 'yumex' )
|
|
+ t = gettext.translation( 'selinux-python' )
|
|
_ = t.gettext
|
|
except:
|
|
def _(str):
|
|
diff --git a/python/sepolicy/sepolicy.py b/python/sepolicy/sepolicy.py
|
|
index 1934cd86..8bd6a579 100755
|
|
--- a/python/sepolicy/sepolicy.py
|
|
+++ b/python/sepolicy/sepolicy.py
|
|
@@ -27,7 +27,7 @@ import selinux
|
|
import sepolicy
|
|
from sepolicy import get_os_version, get_conditionals, get_conditionals_format_text
|
|
import argparse
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/python/sepolicy/sepolicy/__init__.py b/python/sepolicy/sepolicy/__init__.py
|
|
index 0c66f4d5..b6ca57c3 100644
|
|
--- a/python/sepolicy/sepolicy/__init__.py
|
|
+++ b/python/sepolicy/sepolicy/__init__.py
|
|
@@ -13,7 +13,7 @@ import os
|
|
import re
|
|
import gzip
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
|
|
index 019e7836..7175d36b 100644
|
|
--- a/python/sepolicy/sepolicy/generate.py
|
|
+++ b/python/sepolicy/sepolicy/generate.py
|
|
@@ -49,7 +49,7 @@ import sepolgen.defaults as defaults
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/python/sepolicy/sepolicy/gui.py b/python/sepolicy/sepolicy/gui.py
|
|
index 00fd7a11..805cee67 100644
|
|
--- a/python/sepolicy/sepolicy/gui.py
|
|
+++ b/python/sepolicy/sepolicy/gui.py
|
|
@@ -41,7 +41,7 @@ import os
|
|
import re
|
|
import unicodedata
|
|
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/python/sepolicy/sepolicy/interface.py b/python/sepolicy/sepolicy/interface.py
|
|
index 583091ae..e2b8d23b 100644
|
|
--- a/python/sepolicy/sepolicy/interface.py
|
|
+++ b/python/sepolicy/sepolicy/interface.py
|
|
@@ -30,7 +30,7 @@ __all__ = ['get_all_interfaces', 'get_interfaces_from_xml', 'get_admin', 'get_us
|
|
##
|
|
## I18N
|
|
##
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-python"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
diff --git a/sandbox/sandbox b/sandbox/sandbox
|
|
index 1dec07ac..a12403b3 100644
|
|
--- a/sandbox/sandbox
|
|
+++ b/sandbox/sandbox
|
|
@@ -37,7 +37,7 @@ import sepolicy
|
|
|
|
SEUNSHARE = "/usr/sbin/seunshare"
|
|
SANDBOXSH = "/usr/share/sandbox/sandboxX.sh"
|
|
-PROGNAME = "policycoreutils"
|
|
+PROGNAME = "selinux-sandbox"
|
|
try:
|
|
import gettext
|
|
kwargs = {}
|
|
--
|
|
2.22.0
|
|
|