rpms/policycoreutils/F-9 policycoreutils-po.patch, 1.34, 1.35 policycoreutils.spec, 1.525, 1.526
Daniel J Walsh (dwalsh)
fedora-extras-commits at redhat.com
Fri Jun 27 11:06:03 UTC 2008
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24877
Modified Files:
policycoreutils-po.patch policycoreutils.spec
Log Message:
* Tue Jun 24 2008 Dan Walsh <dwalsh at redhat.com> 2.0.49-10
- Fix spelling of enforcement
policycoreutils-po.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.34 -r 1.35 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils-po.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- policycoreutils-po.patch 12 May 2008 13:05:48 -0000 1.34
+++ policycoreutils-po.patch 27 Jun 2008 11:04:18 -0000 1.35
@@ -1,16 +1,246 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.47/po/af.po
---- nsapolicycoreutils/po/af.po 2007-07-16 14:20:42.000000000 -0400
-+++ policycoreutils-2.0.47/po/af.po 2008-05-07 11:11:19.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.49/po/.cvsignore
+--- nsapolicycoreutils/po/.cvsignore 1969-12-31 19:00:00.000000000 -0500
++++ policycoreutils-2.0.49/po/.cvsignore 2008-06-23 07:03:37.000000000 -0400
+@@ -0,0 +1,16 @@
++*.gmo
++*.mo
++*.pot
++.intltool-merge-cache
++Makefile
++Makefile.in
++Makefile.in.in
++POTFILES
++cat-id-tbl.c
++messages
++missing
++notexist
++po2tbl.sed
++po2tbl.sed.in
++stamp-cat-id
++stamp-it
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.49/po/Makefile
+--- nsapolicycoreutils/po/Makefile 2008-06-12 23:25:23.000000000 -0400
++++ policycoreutils-2.0.49/po/Makefile 2008-06-23 07:03:37.000000000 -0400
+@@ -23,20 +23,61 @@
+ POFILES = $(wildcard *.po)
+ MOFILES = $(patsubst %.po,%.mo,$(POFILES))
+ POTFILES = \
+- ../load_policy/load_policy.c \
+- ../newrole/newrole.c \
++ ../run_init/open_init_pty.c \
+ ../run_init/run_init.c \
++ ../semodule_link/semodule_link.c \
++ ../audit2allow/audit2allow \
++ ../semanage/seobject.py \
++ ../setsebool/setsebool.c \
++ ../newrole/newrole.c \
++ ../load_policy/load_policy.c \
++ ../sestatus/sestatus.c \
++ ../semodule/semodule.c \
+ ../setfiles/setfiles.c \
+- ../scripts/genhomedircon \
++ ../semodule_package/semodule_package.c \
++ ../semodule_deps/semodule_deps.c \
++ ../semodule_expand/semodule_expand.c \
+ ../scripts/chcat \
+- ../semanage/semanage \
+- ../semanage/seobject.py \
+- ../audit2allow/audit2allow \
+- ../audit2allow/avc.py \
++ ../scripts/fixfiles \
++ ../restorecond/stringslist.c \
++ ../restorecond/restorecond.h \
++ ../restorecond/utmpwatcher.h \
++ ../restorecond/stringslist.h \
++ ../restorecond/restorecond.c \
++ ../restorecond/utmpwatcher.c \
++ ../gui/booleansPage.py \
++ ../gui/fcontextPage.py \
++ ../gui/loginsPage.py \
++ ../gui/mappingsPage.py \
++ ../gui/modulesPage.py \
++ ../gui/polgen.glade \
++ ../gui/polgengui.py \
++ ../gui/polgen.py \
++ ../gui/portsPage.py \
++ ../gui/selinux.tbl \
++ ../gui/semanagePage.py \
++ ../gui/statusPage.py \
++ ../gui/system-config-selinux.glade \
++ ../gui/system-config-selinux.py \
++ ../gui/translationsPage.py \
++ ../gui/usersPage.py \
++ ../gui/templates/executable.py \
++ ../gui/templates/__init__.py \
++ ../gui/templates/network.py \
++ ../gui/templates/rw.py \
++ ../gui/templates/script.py \
++ ../gui/templates/semodule.py \
++ ../gui/templates/tmp.py \
++ ../gui/templates/user.py \
++ ../gui/templates/var_lib.py \
++ ../gui/templates/var_log.py \
++ ../gui/templates/var_run.py \
++ ../gui/templates/var_spool.py \
++ ../secon/secon.c \
+
+ #default:: clean
+
+-all:: $(MOFILES)
++all:: update-po $(MOFILES)
+
+ $(POTFILE): $(POTFILES)
+ $(XGETTEXT) --keyword=_ --keyword=N_ $(POTFILES)
+@@ -64,8 +105,6 @@
+ @rm -fv *mo *~ .depend
+ @rm -rf tmp
+
+-indent:
+-
+ install: $(MOFILES)
+ @for n in $(MOFILES); do \
+ l=`basename $$n .mo`; \
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.49/po/POTFILES
+--- nsapolicycoreutils/po/POTFILES 2008-06-12 23:25:24.000000000 -0400
++++ policycoreutils-2.0.49/po/POTFILES 2008-06-23 07:03:37.000000000 -0400
+@@ -1,10 +1,54 @@
+- ../load_policy/load_policy.c \
+- ../newrole/newrole.c \
++ ../run_init/open_init_pty.c \
+ ../run_init/run_init.c \
+- ../setfiles/setfiles.c \
+- ../scripts/genhomedircon \
+- ../scripts/chcat \
+- ../semanage/semanage \
+- ../semanage/seobject.py \
++ ../semodule_link/semodule_link.c \
+ ../audit2allow/audit2allow \
+- ../audit2allow/avc.py
++ ../semanage/seobject.py \
++ ../restorecon/restorecon.c \
++ ../setsebool/setsebool.c \
++ ../newrole/newrole.c \
++ ../load_policy/load_policy.c \
++ ../sestatus/sestatus.c \
++ ../semodule/semodule.c \
++ ../setfiles/setfiles.c \
++ ../semodule_package/semodule_package.c \
++ ../semodule_deps/semodule_deps.c \
++ ../semodule_expand/semodule_expand.c \
++ ../scripts/genhomedircon \
++ ../scripts/chcat \
++ ../scripts/fixfiles \
++ ../restorecond/stringslist.c \
++ ../restorecond/restorecond.h \
++ ../restorecond/utmpwatcher.h \
++ ../restorecond/stringslist.h \
++ ../restorecond/restorecond.c \
++ ../restorecond/utmpwatcher.c \
++ ../gui/booleansPage.py \
++ ../gui/fcontextPage.py \
++ ../gui/loginsPage.py \
++ ../gui/mappingsPage.py \
++ ../gui/modulesPage.py \
++ ../gui/polgen.glade \
++ ../gui/polgengui.py \
++ ../gui/polgen.py \
++ ../gui/portsPage.py \
++ ../gui/selinux.tbl \
++ ../gui/semanagePage.py \
++ ../gui/statusPage.py \
++ ../gui/system-config-selinux.glade \
++ ../gui/system-config-selinux.py \
++ ../gui/translationsPage.py \
++ ../gui/usersPage.py \
++ ../gui/templates/executable.py \
++ ../gui/templates/__init__.py \
++ ../gui/templates/network.py \
++ ../gui/templates/rw.py \
++ ../gui/templates/script.py \
++ ../gui/templates/semodule.py \
++ ../gui/templates/tmp.py \
++ ../gui/templates/user.py \
++ ../gui/templates/var_lib.py \
++ ../gui/templates/var_log.py \
++ ../gui/templates/var_run.py \
++ ../gui/templates/var_spool.py \
++ ../secon/secon.c \
++
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.49/po/POTFILES.in
+--- nsapolicycoreutils/po/POTFILES.in 2008-06-12 23:25:23.000000000 -0400
++++ policycoreutils-2.0.49/po/POTFILES.in 2008-06-23 07:03:37.000000000 -0400
+@@ -2,9 +2,7 @@
+ run_init/run_init.c
+ semodule_link/semodule_link.c
+ audit2allow/audit2allow
+-audit2allow/avc.py
+ semanage/seobject.py
+-restorecon/restorecon.c
+ setsebool/setsebool.c
+ newrole/newrole.c
+ load_policy/load_policy.c
+@@ -14,8 +12,6 @@
+ semodule_package/semodule_package.c
+ semodule_deps/semodule_deps.c
+ semodule_expand/semodule_expand.c
+-audit2why/audit2why.c
+-scripts/genhomedircon
+ scripts/chcat
[...220771 lines suppressed...]
+
-+#: ../gui/polgen.py:158
++#: ../gui/polgen.py:190
+msgid "You must enter a name for your confined process/user"
+msgstr ""
+
-+#: ../gui/polgen.py:235
++#: ../gui/polgen.py:268
+msgid "USER Types are not allowed executables"
+msgstr ""
+
-+#: ../gui/polgen.py:241
++#: ../gui/polgen.py:274
+msgid "Only DAEMON apps can use an init script"
+msgstr ""
+
-+#: ../gui/polgen.py:259
++#: ../gui/polgen.py:292
+msgid "use_syslog must be a boolean value "
+msgstr ""
+
-+#: ../gui/polgen.py:280
++#: ../gui/polgen.py:313
+msgid "USER Types autoomatically get a tmp type"
+msgstr ""
+
-+#: ../gui/polgen.py:673
++#: ../gui/polgen.py:709
+msgid "You must enter the executable path for your confined process"
+msgstr ""
+
-+#: ../gui/polgen.py:784
-+msgid "Type Enforcment file"
++#: ../gui/polgen.py:828
++msgid "Type Enforcement file"
+msgstr ""
+
-+#: ../gui/polgen.py:785
++#: ../gui/polgen.py:829
+msgid "Interface file"
+msgstr ""
+
-+#: ../gui/polgen.py:786
++#: ../gui/polgen.py:830
+msgid "File Contexts file"
+msgstr ""
+
-+#: ../gui/polgen.py:787
++#: ../gui/polgen.py:831
+msgid "Setup Script"
+msgstr ""
+
@@ -304383,14 +302933,12 @@
+
+#: ../gui/selinux.tbl:4
+msgid ""
-+"Allow gadmin SELinux user accounts to execute files in his home directory "
-+"or /tmp"
++"Allow gadmin SELinux user account to execute files in home directory or /tmp"
+msgstr ""
+
+#: ../gui/selinux.tbl:5
+msgid ""
-+"Allow guest SELinux user accounts to execute files in his home directory or /"
-+"tmp"
++"Allow guest SELinux user account to execute files in home directory or /tmp"
+msgstr ""
+
+#: ../gui/selinux.tbl:6 ../gui/selinux.tbl:9 ../gui/selinux.tbl:16
@@ -304429,20 +302977,18 @@
+
+#: ../gui/selinux.tbl:11
+msgid ""
-+"Allow staff SELinux user accounts to execute files in his home directory or /"
-+"tmp"
++"Allow staff SELinux user account to execute files in home directory or /tmp"
+msgstr ""
+
+#: ../gui/selinux.tbl:12
+msgid ""
-+"Allow sysadm SELinux user accounts to execute files in his home directory "
-+"or /tmp"
++"Allow sysadm SELinux user account to execute files in home directory or /tmp"
+msgstr ""
+
+#: ../gui/selinux.tbl:13
+msgid ""
-+"Allow unconfined SELinux user accounts to execute files in his home "
-+"directory or /tmp"
++"Allow unconfined SELinux user account to execute files in home directory or /"
++"tmp"
+msgstr ""
+
+#: ../gui/selinux.tbl:14
@@ -304455,8 +303001,7 @@
+
+#: ../gui/selinux.tbl:15
+msgid ""
-+"Allow user SELinux user accounts to execute files in his home directory or /"
-+"tmp"
++"Allow user SELinux user account to execute files in home directory or /tmp"
+msgstr ""
+
+#: ../gui/selinux.tbl:16
@@ -304486,8 +303031,7 @@
+
+#: ../gui/selinux.tbl:20
+msgid ""
-+"Allow xguest SELinux user accounts to execute files in his home directory "
-+"or /tmp"
++"Allow xguest SELinux user account to execute files in home directory or /tmp"
+msgstr ""
+
+#: ../gui/selinux.tbl:21 ../gui/selinux.tbl:228 ../gui/selinux.tbl:229
@@ -305097,8 +303641,11 @@
+
+#: ../gui/selinux.tbl:162
+msgid "Allow ssh to run from inetd instead of as a daemon"
-+msgstr ""
-+
+ msgstr ""
+
+-#: ../run_init/run_init.c:380
+-#, c-format
+-msgid "authentication failed.\n"
+#: ../gui/selinux.tbl:163
+msgid "Allow Samba to share nfs directories"
msgstr ""
@@ -305663,34 +304210,34 @@
-#: ../semanage/seobject.py:692
-#, python-format
-msgid "Could not set type in port context for %s/%s"
-+#: ../gui/statusPage.py:78
-+msgid "Enforcing"
++#: ../gui/statusPage.py:69
++msgid "Permissive"
msgstr ""
-#: ../semanage/seobject.py:697
-#, python-format
-msgid "Could not set mls fields in port context for %s/%s"
-+#: ../gui/statusPage.py:79
-+msgid "Permissive"
++#: ../gui/statusPage.py:70
++msgid "Enforcing"
msgstr ""
-#: ../semanage/seobject.py:701
-#, python-format
-msgid "Could not set port context for %s/%s"
-+#: ../gui/statusPage.py:84
++#: ../gui/statusPage.py:75
+msgid "Disabled"
msgstr ""
-#: ../semanage/seobject.py:709 ../semanage/seobject.py:713
-#, python-format
-msgid "Could not add port %s/%s"
-+#: ../gui/statusPage.py:104
++#: ../gui/statusPage.py:94
+msgid "Status"
msgstr ""
-#: ../semanage/seobject.py:722 ../semanage/seobject.py:919
-msgid "Requires setype or serange"
-+#: ../gui/statusPage.py:143
++#: ../gui/statusPage.py:133
+msgid ""
+"Changing the policy type will cause a relabel of the entire file system on "
+"the next boot. Relabeling takes a long time depending on the size of the "
@@ -305699,7 +304246,7 @@
-#: ../semanage/seobject.py:724
-msgid "Requires setype"
-+#: ../gui/statusPage.py:158
++#: ../gui/statusPage.py:147
+msgid ""
+"Changing to SELinux disabled requires a reboot. It is not recommended. If "
+"you later decide to turn SELinux back on, the system will be required to "
@@ -305712,7 +304259,7 @@
-#: ../semanage/seobject.py:732 ../semanage/seobject.py:766
-#, python-format
-msgid "Port %s/%s is not defined"
-+#: ../gui/statusPage.py:163
++#: ../gui/statusPage.py:152
+msgid ""
+"Changing to SELinux enabled will cause a relabel of the entire file system "
+"on the next boot. Relabeling takes a long time depending on the size of the "
@@ -305876,9 +304423,9 @@
-msgid "Could not query interface %s"
+#: ../gui/system-config-selinux.glade:1547
+msgid ""
-+"Enforcing\n"
-+"Permissive\n"
+"Disabled\n"
++"Permissive\n"
++"Enforcing\n"
msgstr ""
-#: ../semanage/seobject.py:948 ../semanage/seobject.py:952
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/F-9/policycoreutils.spec,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -r1.525 -r1.526
--- policycoreutils.spec 24 Jun 2008 10:17:29 -0000 1.525
+++ policycoreutils.spec 27 Jun 2008 11:04:22 -0000 1.526
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.49
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -191,7 +191,7 @@
fi
%changelog
-* Tue Jun 24 2008 Dan Walsh <dwalsh at redhat.com> 2.0.49-9
+* Tue Jun 24 2008 Dan Walsh <dwalsh at redhat.com> 2.0.49-10
- Fix spelling of enforcement
* Mon Jun 23 2008 Dan Walsh <dwalsh at redhat.com> 2.0.49-8
More information about the fedora-extras-commits
mailing list