rpms/policycoreutils/devel .cvsignore, 1.196, 1.197 policycoreutils-po.patch, 1.53, 1.54 policycoreutils-rhat.patch, 1.423, 1.424 policycoreutils.spec, 1.614, 1.615 policycoreutils_man_ru2.tar.bz2, 1.1, 1.2 sources, 1.202, 1.203
Daniel J Walsh
dwalsh at fedoraproject.org
Wed Jul 29 13:44:12 UTC 2009
- Previous message (by thread): rpms/php-pear-File-Bittorrent2/devel import.log, NONE, 1.1 php-pear-File-Bittorrent-dos2unix.patch, NONE, 1.1 php-pear-File-Bittorrent2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/php-pear-File-Bittorrent2/F-10 import.log, NONE, 1.1 php-pear-File-Bittorrent-dos2unix.patch, NONE, 1.1 php-pear-File-Bittorrent2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwalsh
Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31287
Modified Files:
.cvsignore policycoreutils-po.patch policycoreutils-rhat.patch
policycoreutils.spec policycoreutils_man_ru2.tar.bz2 sources
Log Message:
* Sun Jul 29 2009 Dan Walsh <dwalsh at redhat.com> 2.0.68-1
- Fix location of man pages
- Update to upstream
* Modify setfiles to exclude mounts without seclabel option in
/proc/mounts on kernels >= 2.6.30 from Thomas Liu.
* Re-enable disable_dontaudit rules upon semodule -B from Christopher
Pardy and Dan Walsh.
* setfiles converted to fts from Thomas Liu.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- .cvsignore 26 Jun 2009 18:48:24 -0000 1.196
+++ .cvsignore 29 Jul 2009 13:43:53 -0000 1.197
@@ -199,3 +199,6 @@ policycoreutils-2.0.62.tgz
sepolgen-1.0.16.tgz
policycoreutils-2.0.63.tgz
policycoreutils-2.0.64.tgz
+policycoreutils-2.0.65.tgz
+policycoreutils-2.0.67.tgz
+policycoreutils-2.0.68.tgz
policycoreutils-po.patch:
Makefile | 28
POTFILES | 28
POTFILES.in | 1
af.po | 2449 +++++++++++++++++++++++--
am.po | 2449 +++++++++++++++++++++++--
ar.po | 2449 +++++++++++++++++++++++--
as.po | 3499 ++++++++++++++++++++++--------------
be.po | 2449 +++++++++++++++++++++++--
bg.po | 3605 ++++++++++++++++++++++---------------
bn.po | 2449 +++++++++++++++++++++++--
bn_IN.po | 4066 ++++++++++++++++++++++++------------------
bs.po | 2505 +++++++++++++++++++++++---
ca.po | 2906 +++++++++++++++++++++++++-----
cs.po | 2841 ++++++++++++++++++++++++-----
cy.po | 2449 +++++++++++++++++++++++--
da.po | 3128 +++++++++++++++++++++++++++-----
de.po | 3786 ++++++++++++++++++++++-----------------
el.po | 2512 +++++++++++++++++++++++---
en_GB.po | 2505 +++++++++++++++++++++++---
es.po | 4575 ++++++++++++++++++++++++++---------------------
et.po | 2447 +++++++++++++++++++++++--
eu_ES.po | 2449 +++++++++++++++++++++++--
fa.po | 2449 +++++++++++++++++++++++--
fi.po | 2449 +++++++++++++++++++++++--
fr.po | 3856 +++++++++++++++++++++++-----------------
gl.po | 2447 +++++++++++++++++++++++--
gu.po | 4130 ++++++++++++++++++++++++------------------
he.po | 2449 +++++++++++++++++++++++--
hi.po | 4117 ++++++++++++++++++++++++------------------
hr.po | 2997 ++++++++++++++++++++-----------
hu.po | 3071 +++++++++++++++++++++++++++----
hy.po | 2449 +++++++++++++++++++++++--
id.po | 2447 +++++++++++++++++++++++--
is.po | 2449 +++++++++++++++++++++++--
it.po | 4531 ++++++++++++++++++++++++++---------------------
ja.po | 4183 ++++++++++++++++++++++++-------------------
ka.po | 2449 +++++++++++++++++++++++--
kn.po | 3841 ++++++++++-----------------------------
ko.po | 2793 ++++++++++++++++++++++++-----
ku.po | 2449 +++++++++++++++++++++++--
lo.po | 2449 +++++++++++++++++++++++--
lt.po | 2449 +++++++++++++++++++++++--
lv.po | 2449 +++++++++++++++++++++++--
mai.po | 3462 ++++++++++++++++++++++++++++++++++++
mk.po | 2505 +++++++++++++++++++++++---
ml.po | 4274 ++++++++++++++++++++++++--------------------
mr.po | 4156 ++++++++++++++++++++++++-------------------
ms.po | 2498 +++++++++++++++++++++++--
my.po | 2449 +++++++++++++++++++++++--
nb.po | 2485 +++++++++++++++++++++++--
nl.po | 2776 +++++++++++++++++++++++-----
nn.po | 2449 +++++++++++++++++++++++--
no.po | 1272 -------------
nso.po | 2449 +++++++++++++++++++++++--
or.po | 3984 +++++++++++++++++++++++------------------
pa.po | 4075 +++++++++++++++++++++++-------------------
pl.po | 4014 +++++++++++++++++++++++------------------
policycoreutils.pot | 2431 +++++++++++++++++++++++--
pt.po | 4999 ++++++++++++++++++++++++++++------------------------
pt_BR.po | 4979 ++++++++++++++++++++++++++++-----------------------
ro.po | 2449 +++++++++++++++++++++++--
ru.po | 3459 +++++++++++++++++++++++------------
si.po | 2449 +++++++++++++++++++++++--
sk.po | 2505 +++++++++++++++++++++++---
sl.po | 2449 +++++++++++++++++++++++--
sq.po | 2449 +++++++++++++++++++++++--
sr.po | 4125 ++++++++++++++++++++++++------------------
sr at latin.po | 4135 ++++++++++++++++++++++++-------------------
sv.po | 3165 ++++++++++++++++++++++----------
ta.po | 3210 +++++++++++++++++++++------------
te.po | 4069 +++++++++++++++++++++++-------------------
th.po | 2449 +++++++++++++++++++++++--
tr.po | 2449 +++++++++++++++++++++++--
uk.po | 2505 +++++++++++++++++++++++---
ur.po | 2449 +++++++++++++++++++++++--
vi.po | 2449 +++++++++++++++++++++++--
zh_CN.po | 3887 +++++++++++++++++++++++-----------------
zh_TW.po | 4174 ++++++++++++++++++++++++-------------------
zu.po | 2449 +++++++++++++++++++++++--
79 files changed, 171996 insertions(+), 59014 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.53 -r 1.54 policycoreutils-po.patchIndex: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- policycoreutils-po.patch 26 Jun 2009 18:48:25 -0000 1.53
+++ policycoreutils-po.patch 29 Jul 2009 13:43:53 -0000 1.54
@@ -1,137 +1,81 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.64/po/af.po
---- nsapolicycoreutils/po/af.po 2008-09-22 13:25:06.000000000 -0400
-+++ policycoreutils-2.0.64/po/af.po 2009-06-26 14:46:40.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.67/po/af.po
+--- nsapolicycoreutils/po/af.po 2009-06-30 07:56:04.000000000 -0400
++++ policycoreutils-2.0.67/po/af.po 2009-07-07 16:48:10.000000000 -0400
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2008-09-09 13:24-0400\n"
+-"POT-Creation-Date: 2009-06-24 10:53-0400\n"
+"POT-Creation-Date: 2009-01-21 17:13-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
-@@ -85,818 +85,821 @@
- msgid "To make this policy package active, execute:"
- msgstr ""
-
--#: ../semanage/seobject.py:49
-+#: ../semanage/seobject.py:48
- msgid "Could not create semanage handle"
- msgstr ""
-
--#: ../semanage/seobject.py:56
-+#: ../semanage/seobject.py:55
- msgid "SELinux policy is not managed or store cannot be accessed."
- msgstr ""
-
--#: ../semanage/seobject.py:61
-+#: ../semanage/seobject.py:60
- msgid "Cannot read policy store."
- msgstr ""
-
--#: ../semanage/seobject.py:66
-+#: ../semanage/seobject.py:65
- msgid "Could not establish semanage connection"
- msgstr ""
-
--#: ../semanage/seobject.py:137 ../semanage/seobject.py:141
--msgid "global"
-+#: ../semanage/seobject.py:70
-+msgid "Could not test MLS enabled status"
- msgstr ""
-
--#: ../semanage/seobject.py:196
--msgid "translations not supported on non-MLS machines"
-+#: ../semanage/seobject.py:142 ../semanage/seobject.py:146
-+msgid "global"
- msgstr ""
-
--#: ../semanage/seobject.py:203
-+#: ../semanage/seobject.py:206
- #, python-format
- msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
- msgstr ""
-
--#: ../semanage/seobject.py:236
-+#: ../semanage/seobject.py:239
+@@ -118,7 +118,9 @@
msgid "Level"
msgstr ""
--#: ../semanage/seobject.py:236 ../gui/system-config-selinux.glade:651
--#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
+-#: ../semanage/seobject.py:239
+#: ../semanage/seobject.py:239 ../gui/system-config-selinux.glade:651
+#: ../gui/system-config-selinux.glade:2683 ../gui/translationsPage.py:43
+#: ../gui/translationsPage.py:59
msgid "Translation"
msgstr ""
--#: ../semanage/seobject.py:244 ../semanage/seobject.py:258
-+#: ../semanage/seobject.py:247 ../semanage/seobject.py:261
- #, python-format
- msgid "Translations can not contain spaces '%s' "
- msgstr ""
-
--#: ../semanage/seobject.py:247
-+#: ../semanage/seobject.py:250
- #, python-format
- msgid "Invalid Level '%s' "
- msgstr ""
-
--#: ../semanage/seobject.py:250
-+#: ../semanage/seobject.py:253
- #, python-format
- msgid "%s already defined in translations"
- msgstr ""
-
--#: ../semanage/seobject.py:262
-+#: ../semanage/seobject.py:265
- #, python-format
+@@ -142,764 +144,763 @@
msgid "%s not defined in translations"
msgstr ""
--#: ../semanage/seobject.py:288
+-#: ../semanage/seobject.py:290
+#: ../semanage/seobject.py:291
msgid "Not yet implemented"
msgstr ""
--#: ../semanage/seobject.py:295
+-#: ../semanage/seobject.py:294
+-msgid "Semanage transaction already in progress"
+-msgstr ""
+-
+-#: ../semanage/seobject.py:303
+#: ../semanage/seobject.py:298
msgid "Could not start semanage transaction"
msgstr ""
--#: ../semanage/seobject.py:301
+-#: ../semanage/seobject.py:309
+#: ../semanage/seobject.py:304
msgid "Could not commit semanage transaction"
msgstr ""
--#: ../semanage/seobject.py:311
+-#: ../semanage/seobject.py:313
+-msgid "Semanage transaction not in progress"
+-msgstr ""
+-
+-#: ../semanage/seobject.py:325
+#: ../semanage/seobject.py:314
msgid "Could not list SELinux modules"
msgstr ""
--#: ../semanage/seobject.py:322
+-#: ../semanage/seobject.py:336
+#: ../semanage/seobject.py:325
msgid "Permissive Types"
msgstr ""
--#: ../semanage/seobject.py:352
+-#: ../semanage/seobject.py:378
+#: ../semanage/seobject.py:355
#, python-format
msgid "Could not set permissive domain %s (module installation failed)"
msgstr ""
--#: ../semanage/seobject.py:366
+-#: ../semanage/seobject.py:384
+#: ../semanage/seobject.py:369
#, python-format
msgid "Could not remove permissive domain %s (remove failed)"
msgstr ""
--#: ../semanage/seobject.py:392 ../semanage/seobject.py:452
--#: ../semanage/seobject.py:498 ../semanage/seobject.py:580
--#: ../semanage/seobject.py:647 ../semanage/seobject.py:705
--#: ../semanage/seobject.py:915 ../semanage/seobject.py:1482
--#: ../semanage/seobject.py:1542 ../semanage/seobject.py:1554
--#: ../semanage/seobject.py:1633 ../semanage/seobject.py:1684
+-#: ../semanage/seobject.py:410 ../semanage/seobject.py:470
+-#: ../semanage/seobject.py:516 ../semanage/seobject.py:598
+-#: ../semanage/seobject.py:665 ../semanage/seobject.py:723
+-#: ../semanage/seobject.py:933 ../semanage/seobject.py:1506
+-#: ../semanage/seobject.py:1570 ../semanage/seobject.py:1582
+-#: ../semanage/seobject.py:1663 ../semanage/seobject.py:1714
+#: ../semanage/seobject.py:395 ../semanage/seobject.py:455
+#: ../semanage/seobject.py:501 ../semanage/seobject.py:583
+#: ../semanage/seobject.py:650 ../semanage/seobject.py:708
@@ -142,455 +86,455 @@ diff --exclude-from=exclude -N -u -r nsa
msgid "Could not create a key for %s"
msgstr ""
--#: ../semanage/seobject.py:396 ../semanage/seobject.py:456
--#: ../semanage/seobject.py:502 ../semanage/seobject.py:508
+-#: ../semanage/seobject.py:414 ../semanage/seobject.py:474
+-#: ../semanage/seobject.py:520 ../semanage/seobject.py:526
+#: ../semanage/seobject.py:399 ../semanage/seobject.py:459
+#: ../semanage/seobject.py:505 ../semanage/seobject.py:511
#, python-format
msgid "Could not check if login mapping for %s is defined"
msgstr ""
--#: ../semanage/seobject.py:398
+-#: ../semanage/seobject.py:416
+#: ../semanage/seobject.py:401
#, python-format
msgid "Login mapping for %s is already defined"
msgstr ""
--#: ../semanage/seobject.py:403
+-#: ../semanage/seobject.py:421
+#: ../semanage/seobject.py:406
#, python-format
msgid "Linux Group %s does not exist"
[...429192 lines suppressed...]
++msgid "Toggle between all and customized file context"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2150
- msgid "label38"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2185
++msgid "label38"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2187
- msgid "Add SELinux User Mapping"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2201
++msgid "Add SELinux User Mapping"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2203
- msgid "Modify SELinux User Mapping"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2217
++msgid "Modify SELinux User Mapping"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2219
- msgid "Delete SELinux User Mapping"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2334
++msgid "Delete SELinux User Mapping"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2337
- msgid "label39"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2371
--msgid "Add Translation"
++msgid "label39"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2374
+msgid "Add User"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2387
--msgid "Modify Translation"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2390
+msgid "Modify User"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2403
--msgid "Delete Translation"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2406
+msgid "Delete User"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2520
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2524
- msgid "label41"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2573
--msgid "Modify SELinux User"
++msgid "label41"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2561
+msgid "Add Translation"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2706
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2577
+msgid "Modify Translation"
+msgstr ""
@@ -185856,63 +282528,52 @@ diff --exclude-from=exclude -N -u -r nsa
+msgstr ""
+
+#: ../gui/system-config-selinux.glade:2711
- msgid "label40"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2743
++msgid "label40"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2748
- msgid "Add Network Port"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2759
++msgid "Add Network Port"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2764
- msgid "Edit Network Port"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2775
++msgid "Edit Network Port"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2780
- msgid "Delete Network Port"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2811
--#: ../gui/system-config-selinux.glade:2829
++msgid "Delete Network Port"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2816
+#: ../gui/system-config-selinux.glade:2834
- msgid "Toggle between Customized and All Ports"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2948
++msgid "Toggle between Customized and All Ports"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2954
- msgid "label42"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:2985
++msgid "label42"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:2991
- msgid "Generate new policy module"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:3001
++msgid "Generate new policy module"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:3007
- msgid "Load policy module"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:3017
++msgid "Load policy module"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:3023
- msgid "Remove loadable policy module"
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:3053
++msgid "Remove loadable policy module"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:3059
- msgid ""
- "Enable/Disable additional audit rules, that are normally not reported in the "
- "log files."
- msgstr ""
-
--#: ../gui/system-config-selinux.glade:3172
++msgid ""
++"Enable/Disable additional audit rules, that are normally not reported in the "
++"log files."
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:3179
- msgid "label44"
- msgstr ""
-
++msgid "label44"
++msgstr ""
++
+#: ../gui/system-config-selinux.glade:3216
+msgid "Change process mode to permissive."
+msgstr ""
@@ -185929,6 +282590,11 @@ diff --exclude-from=exclude -N -u -r nsa
+msgid "label59"
+msgstr ""
+
- #: ../gui/translationsPage.py:53
- msgid "Sensitvity Level"
- msgstr ""
++#: ../gui/translationsPage.py:53
++msgid "Sensitvity Level"
++msgstr ""
++
++#: ../gui/usersPage.py:138
++#, python-format
++msgid "SELinux user '%s' is required"
++msgstr ""
policycoreutils-rhat.patch:
Makefile | 2
restorecond/Makefile | 20 +
restorecond/org.selinux.Restorecond.service | 3
restorecond/restorecond.c | 399 +++-------------------------
restorecond/restorecond.conf | 5
restorecond/restorecond.desktop | 7
restorecond/restorecond.h | 19 +
restorecond/restorecond_user.conf | 2
restorecond/user.c | 220 +++++++++++++++
restorecond/walk.c | 30 ++
restorecond/watch.c | 346 ++++++++++++++++++++++++
scripts/Makefile | 3
scripts/fixfiles | 2
scripts/sandbox | 139 +++++++++
scripts/sandbox.8 | 22 +
scripts/sandbox.py | 67 ++++
semanage/semanage | 59 +++-
semanage/semanage.8 | 2
semanage/seobject.py | 283 +++++++++++++------
19 files changed, 1168 insertions(+), 462 deletions(-)
Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -p -r1.423 -r1.424
--- policycoreutils-rhat.patch 26 Jun 2009 19:02:05 -0000 1.423
+++ policycoreutils-rhat.patch 29 Jul 2009 13:44:02 -0000 1.424
@@ -1,26 +1,15 @@
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-2.0.64/audit2allow/audit2allow
---- nsapolicycoreutils/audit2allow/audit2allow 2009-01-13 08:45:35.000000000 -0500
-+++ policycoreutils-2.0.64/audit2allow/audit2allow 2009-06-26 14:57:32.000000000 -0400
-@@ -126,6 +126,7 @@
- elif self.__options.audit:
- try:
- messages = audit.get_audit_msgs()
-+ messages += audit.get_log_msgs()
- except OSError, e:
- sys.stderr.write('could not run ausearch - "%s"\n' % str(e))
- sys.exit(1)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.64/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.68/Makefile
--- nsapolicycoreutils/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.64/Makefile 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/Makefile 2009-07-29 09:34:07.000000000 -0400
@@ -1,4 +1,4 @@
-SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po
+SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po gui
INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.64/restorecond/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/Makefile policycoreutils-2.0.68/restorecond/Makefile
--- nsapolicycoreutils/restorecond/Makefile 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/Makefile 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/Makefile 2009-07-29 09:30:07.000000000 -0400
@@ -2,16 +2,23 @@
PREFIX ?= ${DESTDIR}/usr
SBINDIR ?= $(PREFIX)/sbin
@@ -62,16 +51,16 @@ diff --exclude-from=exclude --exclude=se
relabel: install
/sbin/restorecon $(SBINDIR)/restorecond
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.64/restorecond/org.selinux.Restorecond.service
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/org.selinux.Restorecond.service policycoreutils-2.0.68/restorecond/org.selinux.Restorecond.service
--- nsapolicycoreutils/restorecond/org.selinux.Restorecond.service 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/org.selinux.Restorecond.service 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/org.selinux.Restorecond.service 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.selinux.Restorecond
+Exec=/usr/sbin/restorecond -u
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.64/restorecond/restorecond.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-2.0.68/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2009-02-18 16:44:47.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/restorecond.c 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/restorecond.c 2009-07-29 09:30:07.000000000 -0400
@@ -48,294 +48,37 @@
#include <signal.h>
#include <string.h>
@@ -540,9 +529,9 @@ diff --exclude-from=exclude --exclude=se
}
+
+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.64/restorecond/restorecond.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.68/restorecond/restorecond.conf
--- nsapolicycoreutils/restorecond/restorecond.conf 2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.64/restorecond/restorecond.conf 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/restorecond.conf 2009-07-29 09:30:07.000000000 -0400
@@ -4,8 +4,5 @@
/etc/mtab
/var/run/utmp
@@ -553,9 +542,9 @@ diff --exclude-from=exclude --exclude=se
/root/.ssh/*
-
-
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.64/restorecond/restorecond.desktop
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.desktop policycoreutils-2.0.68/restorecond/restorecond.desktop
--- nsapolicycoreutils/restorecond/restorecond.desktop 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/restorecond.desktop 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/restorecond.desktop 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=File Context maintainer
@@ -564,9 +553,9 @@ diff --exclude-from=exclude --exclude=se
+Encoding=UTF-8
+Type=Application
+StartupNotify=false
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.64/restorecond/restorecond.h
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.h policycoreutils-2.0.68/restorecond/restorecond.h
--- nsapolicycoreutils/restorecond/restorecond.h 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.64/restorecond/restorecond.h 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/restorecond.h 2009-07-29 09:30:07.000000000 -0400
@@ -24,7 +24,22 @@
#ifndef RESTORED_CONFIG_H
#define RESTORED_CONFIG_H
@@ -592,15 +581,15 @@ diff --exclude-from=exclude --exclude=se
+extern void watch_list_free(int fd);
#endif
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.64/restorecond/restorecond_user.conf
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond_user.conf policycoreutils-2.0.68/restorecond/restorecond_user.conf
--- nsapolicycoreutils/restorecond/restorecond_user.conf 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/restorecond_user.conf 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/restorecond_user.conf 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,2 @@
+~/*
+~/public_html/*
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.64/restorecond/user.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/user.c policycoreutils-2.0.68/restorecond/user.c
--- nsapolicycoreutils/restorecond/user.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/user.c 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/user.c 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,220 @@
+/*
+ * restorecond
@@ -822,9 +811,9 @@ diff --exclude-from=exclude --exclude=se
+ return 0;
+}
+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.64/restorecond/walk.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/walk.c policycoreutils-2.0.68/restorecond/walk.c
--- nsapolicycoreutils/restorecond/walk.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/walk.c 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/walk.c 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,30 @@
+#define _XOPEN_SOURCE 500
+#include <ftw.h>
@@ -856,9 +845,9 @@ diff --exclude-from=exclude --exclude=se
+ printf("Total Dirs %d\n",ctr);
+ exit(EXIT_SUCCESS);
+}
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.64/restorecond/watch.c
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/watch.c policycoreutils-2.0.68/restorecond/watch.c
--- nsapolicycoreutils/restorecond/watch.c 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/restorecond/watch.c 2009-06-26 14:57:32.000000000 -0400
++++ policycoreutils-2.0.68/restorecond/watch.c 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,346 @@
+#define _GNU_SOURCE
+#include <sys/inotify.h>
@@ -1206,9 +1195,21 @@ diff --exclude-from=exclude --exclude=se
+ exitApp("Error watching config file.");
+}
+
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.64/scripts/Makefile
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-2.0.68/scripts/fixfiles
+--- nsapolicycoreutils/scripts/fixfiles 2009-06-23 15:36:07.000000000 -0400
++++ policycoreutils-2.0.68/scripts/fixfiles 2009-07-29 09:31:44.000000000 -0400
+@@ -129,7 +129,7 @@
+ if [ ! -z "$FILEPATH" ]; then
+ if [ -x /usr/bin/find ]; then
+ /usr/bin/find "$FILEPATH" \
+- ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o fstype btrfs \) -prune -o -print0 | \
++ ! \( -fstype ext2 -o -fstype ext3 -o -fstype ext4 -o -fstype ext4dev -o -fstype gfs2 -o -fstype jfs -o -fstype xfs -o -fstype btrfs \) -prune -o -print0 | \
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -0 -f - 2>&1 >> $LOGFILE
+ else
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $FILEPATH 2>&1 >> $LOGFILE
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/Makefile policycoreutils-2.0.68/scripts/Makefile
--- nsapolicycoreutils/scripts/Makefile 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.64/scripts/Makefile 2009-06-26 14:57:40.000000000 -0400
++++ policycoreutils-2.0.68/scripts/Makefile 2009-07-29 09:30:07.000000000 -0400
@@ -5,11 +5,12 @@
MANDIR ?= $(PREFIX)/share/man
LOCALEDIR ?= /usr/share/locale
@@ -1223,9 +1224,9 @@ diff --exclude-from=exclude --exclude=se
install -m 755 fixfiles $(DESTDIR)/sbin
install -m 755 genhomedircon $(SBINDIR)
-mkdir -p $(MANDIR)/man8
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.64/scripts/sandbox
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox policycoreutils-2.0.68/scripts/sandbox
--- nsapolicycoreutils/scripts/sandbox 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/scripts/sandbox 2009-06-26 14:57:40.000000000 -0400
++++ policycoreutils-2.0.68/scripts/sandbox 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,139 @@
+#!/usr/bin/python -E
+import os, sys, getopt, socket, random, fcntl
@@ -1366,9 +1367,9 @@ diff --exclude-from=exclude --exclude=se
+ error_exit(error.args[1])
+
+ sys.exit(rc)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.64/scripts/sandbox.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.8 policycoreutils-2.0.68/scripts/sandbox.8
--- nsapolicycoreutils/scripts/sandbox.8 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/scripts/sandbox.8 2009-06-26 14:57:40.000000000 -0400
++++ policycoreutils-2.0.68/scripts/sandbox.8 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,22 @@
+.TH SANDBOX "8" "May 2009" "chcat" "User Commands"
+.SH NAME
@@ -1392,9 +1393,9 @@ diff --exclude-from=exclude --exclude=se
+.TP
+runcon(1)
+.PP
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.64/scripts/sandbox.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/scripts/sandbox.py policycoreutils-2.0.68/scripts/sandbox.py
--- nsapolicycoreutils/scripts/sandbox.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.64/scripts/sandbox.py 2009-06-26 14:57:40.000000000 -0400
++++ policycoreutils-2.0.68/scripts/sandbox.py 2009-07-29 09:30:07.000000000 -0400
@@ -0,0 +1,67 @@
+#!/usr/bin/python
+import os, sys, getopt, socket, random, fcntl
@@ -1463,9 +1464,9 @@ diff --exclude-from=exclude --exclude=se
+ mount(mount_src, filecon)
+ umount(filecon)
+os.execvp(cmds[0], cmds)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.64/semanage/semanage
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.68/semanage/semanage
--- nsapolicycoreutils/semanage/semanage 2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.64/semanage/semanage 2009-06-26 14:57:40.000000000 -0400
++++ policycoreutils-2.0.68/semanage/semanage 2009-07-29 09:34:44.000000000 -0400
@@ -44,16 +44,17 @@
text = _("""
semanage [ -S store ] -i [ input_file | - ]
@@ -1499,7 +1500,7 @@ diff --exclude-from=exclude --exclude=se
-F, --file Treat target as an input file for command, change multiple settings
-p, --proto Port protocol (tcp or udp) or internet protocol version of node (ipv4 or ipv6)
-M, --mask Netmask
-+ -e, --equil Make target equil to this paths labeling
++ -e, --equal Make target equal to this paths labeling
-P, --prefix Prefix for home directory labeling
-L, --level Default SELinux Level (MLS/MCS Systems only)
-R, --roles SELinux Roles (ex: "sysadm_r staff_r")
@@ -1508,7 +1509,7 @@ diff --exclude-from=exclude --exclude=se
valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
valid_option["fcontext"] = []
- valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range']
-+ valid_option["fcontext"] += valid_everyone + [ '-e', '--equil', '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range']
++ valid_option["fcontext"] += valid_everyone + [ '-e', '--equal', '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range']
valid_option["translation"] = []
valid_option["translation"] += valid_everyone + [ '-T', '--trans' ]
valid_option["boolean"] = []
@@ -1523,7 +1524,7 @@ diff --exclude-from=exclude --exclude=se
locallist = False
use_file = False
store = ""
-+ equil=""
++ equal=""
+ dontaudit = ""
+
@@ -1540,7 +1541,7 @@ diff --exclude-from=exclude --exclude=se
'delete',
'deleteall',
+ 'dontaudit=',
-+ 'equil=',
++ 'equal=',
'ftype=',
'file',
'help',
@@ -1558,8 +1559,8 @@ diff --exclude-from=exclude --exclude=se
- ftype=a
+ ftype = a
+
-+ if o == "-e" or o == "--equil":
-+ equil = a
++ if o == "-e" or o == "--equal":
++ equal = a
if o == "-F" or o == "--file":
use_file = True
@@ -1606,10 +1607,10 @@ diff --exclude-from=exclude --exclude=se
if object == "fcontext":
- OBJECT.add(target, setype, ftype, serange, seuser)
-+ if equil == "":
++ if equal == "":
+ OBJECT.add(target, setype, ftype, serange, seuser)
+ else:
-+ OBJECT.add_equil(target, equil)
++ OBJECT.add_equal(target, equal)
if object == "permissive":
OBJECT.add(target)
@@ -1628,10 +1629,10 @@ diff --exclude-from=exclude --exclude=se
if object == "fcontext":
- OBJECT.modify(target, setype, ftype, serange, seuser)
-+ if equil == "":
++ if equal == "":
+ OBJECT.modify(target, setype, ftype, serange, seuser)
+ else:
-+ OBJECT.modify_equil(target, equil)
++ OBJECT.modify_equal(target, equal)
return
@@ -1644,9 +1645,9 @@ diff --exclude-from=exclude --exclude=se
elif object == "node":
OBJECT.delete(target, mask, proto)
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.64/semanage/semanage.8
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.68/semanage/semanage.8
--- nsapolicycoreutils/semanage/semanage.8 2008-08-28 09:34:24.000000000 -0400
-+++ policycoreutils-2.0.64/semanage/semanage.8 2009-06-26 14:57:40.000000000 -0400
++++ policycoreutils-2.0.68/semanage/semanage.8 2009-07-29 09:30:07.000000000 -0400
@@ -21,6 +21,8 @@
.br
.B semanage permissive \-{a|d} type
@@ -1656,9 +1657,9 @@ diff --exclude-from=exclude --exclude=se
.B semanage translation \-{a|d|m} [\-T] level
.P
-diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.64/semanage/seobject.py
+diff --exclude-from=exclude --exclude=sepolgen-1.0.16 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.68/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2009-05-18 13:53:14.000000000 -0400
-+++ policycoreutils-2.0.64/semanage/seobject.py 2009-06-26 14:57:40.000000000 -0400
++++ policycoreutils-2.0.68/semanage/seobject.py 2009-07-29 09:35:07.000000000 -0400
@@ -1,5 +1,5 @@
#! /usr/bin/python -E
-# Copyright (C) 2005, 2006, 2007, 2008 Red Hat
@@ -2208,7 +2209,7 @@ diff --exclude-from=exclude --exclude=se
def __init__(self, store = ""):
semanageRecords.__init__(self, store)
+ self.equiv = {}
-+ self.equil_ind = False
++ self.equal_ind = False
+ try:
+ fd = open(selinux.selinux_file_context_subs_path(), "r")
+ for i in fd.readlines():
@@ -2219,7 +2220,7 @@ diff --exclude-from=exclude --exclude=se
+ pass
+
+ def commit(self):
-+ if self.equil_ind:
++ if self.equal_ind:
+ subs_file = selinux.selinux_file_context_subs_path()
+ tmpfile = "%s.tmp" % subs_file
+ fd = open(tmpfile, "w")
@@ -2231,23 +2232,23 @@ diff --exclude-from=exclude --exclude=se
+ except:
+ pass
+ os.rename(tmpfile,subs_file)
-+ self.equil_ind = False
++ self.equal_ind = False
+ semanageRecords.commit(self)
+
-+ def add_equil(self, src, dst):
++ def add_equal(self, src, dst):
+ self.begin()
+ if src in self.equiv.keys():
+ raise ValueError(_("Equivalence class for %s already exists") % src)
+ self.equiv[src] = dst
-+ self.equil_ind = True
++ self.equal_ind = True
+ self.commit()
+
-+ def modify_equil(self, src, dst):
++ def modify_equal(self, src, dst):
+ self.begin()
+ if src not in self.equiv.keys():
+ raise ValueError(_("Equivalence class for %s does not exists") % src)
+ self.equiv[src] = dst
-+ self.equil_ind = True
++ self.equal_ind = True
+ self.commit()
def createcon(self, target, seuser = "system_u"):
@@ -2323,14 +2324,14 @@ diff --exclude-from=exclude --exclude=se
-
+
+ self.equiv = {}
-+ self.equil_ind = True
++ self.equal_ind = True
self.commit()
def __delete(self, target, ftype):
- (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
+ if target in self.equiv.keys():
+ self.equiv.pop(target)
-+ self.equil_ind = True
++ self.equal_ind = True
+ return
+
+ (rc, k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.614
retrieving revision 1.615
diff -u -p -r1.614 -r1.615
--- policycoreutils.spec 26 Jul 2009 19:07:44 -0000 1.614
+++ policycoreutils.spec 29 Jul 2009 13:44:03 -0000 1.615
@@ -5,8 +5,8 @@
%define sepolgenver 1.0.16
Summary: SELinux policy core utilities
Name: policycoreutils
-Version: 2.0.64
-Release: 3%{?dist}
+Version: 2.0.68
+Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -81,6 +81,7 @@ install -m 644 %{SOURCE4} %{buildroot}%{
install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/console.apps/system-config-selinux
install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/security/console.apps/selinux-polgengui
tar -jxf %{SOURCE8} -C %{buildroot}/
+rm -f %{buildroot}/usr/share/man/ru/man8/genhomedircon.8.gz
ln -sf consolehelper %{buildroot}%{_bindir}/system-config-selinux
ln -sf consolehelper %{buildroot}%{_bindir}/selinux-polgengui
@@ -121,6 +122,17 @@ The policycoreutils-python package conta
%dir /var/lib/sepolgen
%dir /var/lib/selinux
/var/lib/sepolgen/perm_map
+%dir %{_datadir}/sandbox
+%{_mandir}/man1/audit2allow.1*
+%{_mandir}/ru/man1/audit2allow.1*
+%{_mandir}/man1/audit2why.1*
+%{_mandir}/ru/man1/audit2why.1*
+%{_mandir}/man8/chcat.8*
+%{_mandir}/ru/man8/chcat.8*
+%{_mandir}/man8/semanage.8*
+%{_mandir}/ru/man8/semanage.8*
+%{_mandir}/man8/fixfiles.8*
+%{_mandir}/ru/man8/fixfiles.8*
%post python
[ -f /usr/share/selinux/devel/include/build.conf ] && /usr/bin/sepolgen-ifgen
@@ -198,9 +210,6 @@ rm -rf %{buildroot}
%{_bindir}/semodule_expand
%{_bindir}/semodule_link
%{_bindir}/semodule_package
-%{_mandir}/man*/*
-# selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
-%{_mandir}/ru/
%config(noreplace) %{_sysconfdir}/pam.d/newrole
%config(noreplace) %{_sysconfdir}/pam.d/run_init
%config(noreplace) %{_sysconfdir}/sestatus.conf
@@ -209,6 +218,35 @@ rm -rf %{buildroot}
%config(noreplace) /etc/selinux/restorecond_user.conf
%{_sysconfdir}/xdg/autostart/restorecond.desktop
%{_datadir}/dbus-1/services/org.selinux.Restorecond.service
+# selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
+%{_mandir}/man8/load_policy.8*
+%{_mandir}/ru/man8/load_policy.8*
+%{_mandir}/man8/open_init_pty.8*
+%{_mandir}/ru/man8/open_init_pty.8*
+%{_mandir}/man8/restorecon.8*
+%{_mandir}/ru/man8/restorecon.8*
+%{_mandir}/man8/restorecond.8*
+%{_mandir}/ru/man8/restorecond.8*
+%{_mandir}/man8/run_init.8*
+%{_mandir}/ru/man8/run_init.8*
+%{_mandir}/man8/semodule.8*
+%{_mandir}/ru/man8/semodule.8*
+%{_mandir}/man8/semodule_deps.8*
+%{_mandir}/ru/man8/semodule_deps.8*
+%{_mandir}/man8/semodule_expand.8*
+%{_mandir}/ru/man8/semodule_expand.8*
+%{_mandir}/man8/semodule_link.8*
+%{_mandir}/ru/man8/semodule_link.8*
+%{_mandir}/man8/semodule_package.8*
+%{_mandir}/ru/man8/semodule_package.8*
+%{_mandir}/man8/sestatus.8*
+%{_mandir}/ru/man8/sestatus.8*
+%{_mandir}/man8/setfiles.8*
+%{_mandir}/ru/man8/setfiles.8*
+%{_mandir}/man8/setsebool.8*
+%{_mandir}/ru/man8/setsebool.8*
+%{_mandir}/man1/secon.1*
+%{_mandir}/ru/man1/secon.1*
%preun
if [ $1 -eq 0 ]; then
@@ -229,6 +267,15 @@ else
fi
%changelog
+* Sun Jul 29 2009 Dan Walsh <dwalsh at redhat.com> 2.0.68-1
+- Fix location of man pages
+- Update to upstream
+ * Modify setfiles to exclude mounts without seclabel option in
+ /proc/mounts on kernels >= 2.6.30 from Thomas Liu.
+ * Re-enable disable_dontaudit rules upon semodule -B from Christopher
+ Pardy and Dan Walsh.
+ * setfiles converted to fts from Thomas Liu.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.64-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: policycoreutils_man_ru2.tar.bz2
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils_man_ru2.tar.bz2,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
Binary files /tmp/cvspRcWbC and /tmp/cvsEM7a5x differ
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -p -r1.202 -r1.203
--- sources 26 Jun 2009 18:48:41 -0000 1.202
+++ sources 29 Jul 2009 13:44:04 -0000 1.203
@@ -1,2 +1,2 @@
e1b5416c3e0d76e5d702b3f54f4def45 sepolgen-1.0.16.tgz
-d70351e2caf19dd096c3329e67f22753 policycoreutils-2.0.64.tgz
+aed0ab49649832c19b650e9edefb3c64 policycoreutils-2.0.68.tgz
- Previous message (by thread): rpms/php-pear-File-Bittorrent2/devel import.log, NONE, 1.1 php-pear-File-Bittorrent-dos2unix.patch, NONE, 1.1 php-pear-File-Bittorrent2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/php-pear-File-Bittorrent2/F-10 import.log, NONE, 1.1 php-pear-File-Bittorrent-dos2unix.patch, NONE, 1.1 php-pear-File-Bittorrent2.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list