rpms/policycoreutils/devel .cvsignore, 1.186, 1.187 policycoreutils-gui.patch, 1.73, 1.74 policycoreutils-po.patch, 1.37, 1.38 policycoreutils-rhat.patch, 1.385, 1.386 policycoreutils.spec, 1.549, 1.550 sources, 1.191, 1.192

Daniel J Walsh dwalsh at fedoraproject.org
Fri Aug 29 19:06:12 UTC 2008


Author: dwalsh

Update of /cvs/extras/rpms/policycoreutils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29067

Modified Files:
	.cvsignore policycoreutils-gui.patch policycoreutils-po.patch 
	policycoreutils-rhat.patch policycoreutils.spec sources 
Log Message:
* Thu Aug 28 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-1
- Update to upstream
	* Merged semanage node support from Christian Kuester.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/.cvsignore,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- .cvsignore	5 Aug 2008 14:18:33 -0000	1.186
+++ .cvsignore	29 Aug 2008 19:05:21 -0000	1.187
@@ -186,3 +186,4 @@
 sepolgen-1.0.13.tgz
 policycoreutils-2.0.53.tgz
 policycoreutils-2.0.54.tgz
+policycoreutils-2.0.55.tgz

policycoreutils-gui.patch:

Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- policycoreutils-gui.patch	11 Aug 2008 15:58:06 -0000	1.73
+++ policycoreutils-gui.patch	29 Aug 2008 19:05:21 -0000	1.74
@@ -1,7 +1,7 @@
 diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/Makefile policycoreutils-2.0.54/gui/Makefile
 --- nsapolicycoreutils/gui/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.54/gui/Makefile	2008-08-06 18:05:28.000000000 -0400
-@@ -0,0 +1,36 @@
++++ policycoreutils-2.0.54/gui/Makefile	2008-08-11 12:20:26.000000000 -0400
+@@ -0,0 +1,37 @@
 +# Installation directories.
 +PREFIX ?= ${DESTDIR}/usr
 +SHAREDIR ?= $(PREFIX)/share/system-config-selinux
@@ -9,6 +9,7 @@
 +TARGETS= \
 +booleansPage.py \
 +fcontextPage.py \
++html_util.py \
 +loginsPage.py \
 +mappingsPage.py \
 +modulesPage.py \

policycoreutils-po.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.37 -r 1.38 policycoreutils-po.patch
Index: policycoreutils-po.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-po.patch,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- policycoreutils-po.patch	29 Jul 2008 13:30:54 -0000	1.37
+++ policycoreutils-po.patch	29 Aug 2008 19:05:21 -0000	1.38
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.52/po/.cvsignore
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/.cvsignore policycoreutils-2.0.54/po/.cvsignore
 --- nsapolicycoreutils/po/.cvsignore	1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.52/po/.cvsignore	2008-07-29 09:06:29.000000000 -0400
++++ policycoreutils-2.0.54/po/.cvsignore	2008-08-06 18:05:28.000000000 -0400
 @@ -0,0 +1,16 @@
 +*.gmo
 +*.mo
@@ -18,9 +18,9 @@
 +po2tbl.sed.in
 +stamp-cat-id
 +stamp-it
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.52/po/Makefile
---- nsapolicycoreutils/po/Makefile	2008-06-12 23:25:23.000000000 -0400
-+++ policycoreutils-2.0.52/po/Makefile	2008-07-29 09:06:29.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/Makefile policycoreutils-2.0.54/po/Makefile
+--- nsapolicycoreutils/po/Makefile	2008-08-05 09:58:34.000000000 -0400
++++ policycoreutils-2.0.54/po/Makefile	2008-08-06 18:05:28.000000000 -0400
 @@ -23,20 +23,61 @@
  POFILES		= $(wildcard *.po)
  MOFILES		= $(patsubst %.po,%.mo,$(POFILES))
@@ -100,9 +100,9 @@
  install: $(MOFILES)
  	@for n in $(MOFILES); do \
  	    l=`basename $$n .mo`; \
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.52/po/POTFILES
---- nsapolicycoreutils/po/POTFILES	2008-06-12 23:25:24.000000000 -0400
-+++ policycoreutils-2.0.52/po/POTFILES	2008-07-29 09:06:29.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES policycoreutils-2.0.54/po/POTFILES
+--- nsapolicycoreutils/po/POTFILES	2008-08-05 09:58:34.000000000 -0400
++++ policycoreutils-2.0.54/po/POTFILES	2008-08-06 18:05:28.000000000 -0400
 @@ -1,10 +1,54 @@
 -	../load_policy/load_policy.c \
 -	../newrole/newrole.c \
@@ -166,9 +166,9 @@
 +	../gui/templates/var_spool.py \
 +	../secon/secon.c \
 +
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.52/po/POTFILES.in
---- nsapolicycoreutils/po/POTFILES.in	2008-06-12 23:25:23.000000000 -0400
-+++ policycoreutils-2.0.52/po/POTFILES.in	2008-07-29 09:06:29.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/POTFILES.in policycoreutils-2.0.54/po/POTFILES.in
+--- nsapolicycoreutils/po/POTFILES.in	2008-08-05 09:58:34.000000000 -0400
++++ policycoreutils-2.0.54/po/POTFILES.in	2008-08-06 18:05:28.000000000 -0400
 @@ -2,9 +2,7 @@
  run_init/run_init.c
  semodule_link/semodule_link.c
@@ -228,19 +228,19 @@
 +gui/templates/var_run.py
 +gui/templates/var_spool.py
  secon/secon.c
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.52/po/af.po
---- nsapolicycoreutils/po/af.po	2008-06-12 23:25:23.000000000 -0400
-+++ policycoreutils-2.0.52/po/af.po	2008-07-29 09:29:36.000000000 -0400
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/af.po policycoreutils-2.0.54/po/af.po
+--- nsapolicycoreutils/po/af.po	2008-08-05 09:58:34.000000000 -0400
++++ policycoreutils-2.0.54/po/af.po	2008-08-11 12:04:05.000000000 -0400
 @@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2006-11-21 14:21-0500\n"
-+"POT-Creation-Date: 2008-06-30 11:47-0400\n"
++"POT-Creation-Date: 2008-08-08 13:53-0400\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"
-@@ -16,1013 +16,3176 @@
+@@ -16,1013 +16,3198 @@
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
@@ -344,229 +344,219 @@
 -#: ../newrole/newrole.c:464 ../newrole/newrole.c:562
 -#, c-format
 -msgid "Error changing uid, aborting.\n"
-+#: ../semanage/seobject.py:113 ../semanage/seobject.py:117
-+msgid "global"
++#: ../semanage/seobject.py:49
++msgid "Could not create semanage handle"
  msgstr ""
  
 -#: ../newrole/newrole.c:470 ../newrole/newrole.c:525 ../newrole/newrole.c:557
 -#, c-format
 -msgid "Error resetting KEEPCAPS, aborting\n"
-+#: ../semanage/seobject.py:172
-+msgid "translations not supported on non-MLS machines"
++#: ../semanage/seobject.py:56
++msgid "SELinux policy is not managed or store cannot be accessed."
  msgstr ""
  
 -#: ../newrole/newrole.c:477
 -#, c-format
 -msgid "Error dropping SETUID capability, aborting\n"
-+#: ../semanage/seobject.py:179
-+#, python-format
-+msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
++#: ../semanage/seobject.py:61
++msgid "Cannot read policy store."
  msgstr ""
  
 -#: ../newrole/newrole.c:482 ../newrole/newrole.c:536
 -#, c-format
 -msgid "Error freeing caps\n"
-+#: ../semanage/seobject.py:212
-+msgid "Level"
++#: ../semanage/seobject.py:66
++msgid "Could not establish semanage connection"
  msgstr ""
  
 -#: ../newrole/newrole.c:580
 -#, c-format
 -msgid "Error connecting to audit system.\n"
-+#: ../semanage/seobject.py:212 ../gui/system-config-selinux.glade:651
-+#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
-+msgid "Translation"
++#: ../semanage/seobject.py:137 ../semanage/seobject.py:141
++msgid "global"
  msgstr ""
  
 -#: ../newrole/newrole.c:586
 -#, c-format
 -msgid "Error allocating memory.\n"
-+#: ../semanage/seobject.py:220 ../semanage/seobject.py:234
-+#, python-format
-+msgid "Translations can not contain spaces '%s' "
++#: ../semanage/seobject.py:196
++msgid "translations not supported on non-MLS machines"
  msgstr ""
  
 -#: ../newrole/newrole.c:593
 -#, c-format
 -msgid "Error sending audit message.\n"
-+#: ../semanage/seobject.py:223
++#: ../semanage/seobject.py:203
 +#, python-format
-+msgid "Invalid Level '%s' "
++msgid "Unable to open %s: translations not supported on non-MLS machines: %s"
  msgstr ""
  
 -#: ../newrole/newrole.c:634 ../newrole/newrole.c:978
 -#, c-format
 -msgid "Could not determine enforcing mode.\n"
-+#: ../semanage/seobject.py:226
-+#, python-format
-+msgid "%s already defined in translations"
++#: ../semanage/seobject.py:236
++msgid "Level"
  msgstr ""
  
 -#: ../newrole/newrole.c:641
 -#, c-format
 -msgid "Error!  Could not open %s.\n"
-+#: ../semanage/seobject.py:238
-+#, python-format
-+msgid "%s not defined in translations"
++#: ../semanage/seobject.py:236 ../gui/system-config-selinux.glade:651
++#: ../gui/translationsPage.py:43 ../gui/translationsPage.py:59
++msgid "Translation"
  msgstr ""
  
 -#: ../newrole/newrole.c:646
 -#, c-format
 -msgid "%s!  Could not get current context for %s, not relabeling tty.\n"
-+#: ../semanage/seobject.py:266
-+msgid "Permissive Types"
++#: ../semanage/seobject.py:244 ../semanage/seobject.py:258
++#, python-format
++msgid "Translations can not contain spaces '%s' "
  msgstr ""
  
 -#: ../newrole/newrole.c:656
 -#, c-format
 -msgid "%s!  Could not get new context for %s, not relabeling tty.\n"
-+#: ../semanage/seobject.py:316
-+msgid "Could not create semanage handle"
++#: ../semanage/seobject.py:247
++#, python-format
++msgid "Invalid Level '%s' "
  msgstr ""
  
 -#: ../newrole/newrole.c:666
 -#, c-format
 -msgid "%s!  Could not set new context for %s\n"
-+#: ../semanage/seobject.py:325
-+msgid "SELinux policy is not managed or store cannot be accessed."
++#: ../semanage/seobject.py:250
++#, python-format
++msgid "%s already defined in translations"
  msgstr ""
  
[...200029 lines suppressed...]
  msgstr ""
  
 -#: ../semanage/seobject.py:1077 ../semanage/seobject.py:1081
 -#, python-format
 -msgid "Could not add file context for %s"
-+#: ../gui/system-config-selinux.glade:2011
-+msgid "Toggle between all and customized file context"
++#: ../gui/system-config-selinux.glade:2013
++msgid "Delete File Context"
  msgstr ""
  
 -#: ../semanage/seobject.py:1089
 -msgid "Requires setype, serange or seuser"
-+#: ../gui/system-config-selinux.glade:2130
-+msgid "label38"
++#: ../gui/system-config-selinux.glade:2029
++msgid "Toggle between all and customized file context"
  msgstr ""
  
 -#: ../semanage/seobject.py:1099 ../semanage/seobject.py:1144
 -#, python-format
 -msgid "File context for %s is not defined"
-+#: ../gui/system-config-selinux.glade:2167
-+msgid "Add SELinux User Mapping"
++#: ../gui/system-config-selinux.glade:2148
++msgid "label38"
  msgstr ""
  
 -#: ../semanage/seobject.py:1103
 -#, python-format
 -msgid "Could not query file context for %s"
-+#: ../gui/system-config-selinux.glade:2183
-+msgid "Modify SELinux User Mapping"
++#: ../gui/system-config-selinux.glade:2185
++msgid "Add SELinux User Mapping"
  msgstr ""
  
 -#: ../semanage/seobject.py:1120 ../semanage/seobject.py:1124
 -#, python-format
 -msgid "Could not modify file context for %s"
-+#: ../gui/system-config-selinux.glade:2199
-+msgid "Delete SELinux User Mapping"
++#: ../gui/system-config-selinux.glade:2201
++msgid "Modify SELinux User Mapping"
  msgstr ""
  
 -#: ../semanage/seobject.py:1142
 -#, python-format
 -msgid "File context for %s is defined in policy, cannot be deleted"
-+#: ../gui/system-config-selinux.glade:2316
-+msgid "label39"
++#: ../gui/system-config-selinux.glade:2217
++msgid "Delete SELinux User Mapping"
  msgstr ""
  
 -#: ../semanage/seobject.py:1152 ../semanage/seobject.py:1156
 -#, python-format
 -msgid "Could not delete file context for %s"
-+#: ../gui/system-config-selinux.glade:2353
-+msgid "Add Translation"
++#: ../gui/system-config-selinux.glade:2334
++msgid "label39"
  msgstr ""
  
 -#: ../semanage/seobject.py:1164
 -msgid "Could not list file contexts"
-+#: ../gui/system-config-selinux.glade:2369
-+msgid "Modify Translation"
++#: ../gui/system-config-selinux.glade:2371
++msgid "Add Translation"
  msgstr ""
  
 -#: ../semanage/seobject.py:1168
 -msgid "Could not list local file contexts"
-+#: ../gui/system-config-selinux.glade:2385
-+msgid "Delete Translation"
++#: ../gui/system-config-selinux.glade:2387
++msgid "Modify Translation"
  msgstr ""
  
 -#: ../semanage/seobject.py:1203
 -msgid "Requires value"
-+#: ../gui/system-config-selinux.glade:2502
-+msgid "label41"
++#: ../gui/system-config-selinux.glade:2403
++msgid "Delete Translation"
  msgstr ""
  
 -#: ../semanage/seobject.py:1211 ../semanage/seobject.py:1245
 -#: ../semanage/seobject.py:1251
 -#, python-format
 -msgid "Could not check if boolean %s is defined"
-+#: ../gui/system-config-selinux.glade:2555
-+msgid "Modify SELinux User"
++#: ../gui/system-config-selinux.glade:2520
++msgid "label41"
  msgstr ""
  
 -#: ../semanage/seobject.py:1213 ../semanage/seobject.py:1247
 -#, python-format
 -msgid "Boolean %s is not defined"
-+#: ../gui/system-config-selinux.glade:2688
-+msgid "label40"
++#: ../gui/system-config-selinux.glade:2573
++msgid "Modify SELinux User"
  msgstr ""
  
 -#: ../semanage/seobject.py:1217
 -#, python-format
 -msgid "Could not query file context %s"
-+#: ../gui/system-config-selinux.glade:2725
-+msgid "Add Network Port"
++#: ../gui/system-config-selinux.glade:2706
++msgid "label40"
  msgstr ""
  
 -#: ../semanage/seobject.py:1229 ../semanage/seobject.py:1233
 -#, python-format
 -msgid "Could not modify boolean %s"
-+#: ../gui/system-config-selinux.glade:2741
-+msgid "Edit Network Port"
++#: ../gui/system-config-selinux.glade:2743
++msgid "Add Network Port"
  msgstr ""
  
 -#: ../semanage/seobject.py:1253
 -#, python-format
 -msgid "Boolean %s is defined in policy, cannot be deleted"
-+#: ../gui/system-config-selinux.glade:2757
-+msgid "Delete Network Port"
++#: ../gui/system-config-selinux.glade:2759
++msgid "Edit Network Port"
  msgstr ""
  
 -#: ../semanage/seobject.py:1261 ../semanage/seobject.py:1265
 -#, python-format
 -msgid "Could not delete boolean %s"
-+#: ../gui/system-config-selinux.glade:2793
-+#: ../gui/system-config-selinux.glade:2811
-+msgid "Toggle between Customized and All Ports"
++#: ../gui/system-config-selinux.glade:2775
++msgid "Delete Network Port"
  msgstr ""
  
 -#: ../semanage/seobject.py:1273
 -msgid "Could not list booleans"
-+#: ../gui/system-config-selinux.glade:2930
-+msgid "label42"
++#: ../gui/system-config-selinux.glade:2811
++#: ../gui/system-config-selinux.glade:2829
++msgid "Toggle between Customized and All Ports"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:183
 -#, c-format
 -msgid "Generating type enforcment file: %s.te"
-+#: ../gui/system-config-selinux.glade:2967
-+msgid "Generate new policy module"
++#: ../gui/system-config-selinux.glade:2948
++msgid "label42"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:189 ../audit2allow/audit2allow:194
 -msgid "Compiling policy"
-+#: ../gui/system-config-selinux.glade:2983
-+msgid "Load policy module"
++#: ../gui/system-config-selinux.glade:2985
++msgid "Generate new policy module"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:205
 -msgid ""
 -"\n"
 -"******************** IMPORTANT ***********************\n"
-+#: ../gui/system-config-selinux.glade:2999
-+msgid "Remove loadable policy module"
++#: ../gui/system-config-selinux.glade:3001
++msgid "Load policy module"
  msgstr ""
  
 -#: ../audit2allow/audit2allow:206
 -#, c-format
-+#: ../gui/system-config-selinux.glade:3035
++#: ../gui/system-config-selinux.glade:3017
++msgid "Remove loadable policy module"
++msgstr ""
++
++#: ../gui/system-config-selinux.glade:3053
  msgid ""
 -"In order to load this newly created policy package into the kernel,\n"
 -"you are required to execute \n"
@@ -304248,7 +306367,7 @@
 -#: ../audit2allow/audit2allow:211
 -#, c-format
 -msgid "Options Error: %s "
-+#: ../gui/system-config-selinux.glade:3154
++#: ../gui/system-config-selinux.glade:3172
 +msgid "label44"
 +msgstr ""
 +

policycoreutils-rhat.patch:

Index: policycoreutils-rhat.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- policycoreutils-rhat.patch	8 Aug 2008 21:04:55 -0000	1.385
+++ policycoreutils-rhat.patch	29 Aug 2008 19:05:24 -0000	1.386
@@ -1,5 +1,5 @@
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/Makefile policycoreutils-2.0.54/Makefile
---- nsapolicycoreutils/Makefile	2008-08-05 09:58:35.000000000 -0400
+--- nsapolicycoreutils/Makefile	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.54/Makefile	2008-08-06 18:05:28.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
@@ -8,7 +8,7 @@
  INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
  
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-2.0.54/restorecond/restorecond.conf
---- nsapolicycoreutils/restorecond/restorecond.conf	2008-08-05 09:58:27.000000000 -0400
+--- nsapolicycoreutils/restorecond/restorecond.conf	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.54/restorecond/restorecond.conf	2008-08-06 18:05:28.000000000 -0400
 @@ -1,3 +1,4 @@
 +/etc/services
@@ -16,29 +16,36 @@
  /etc/samba/secrets.tdb
  /etc/mtab
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-2.0.54/semanage/semanage
---- nsapolicycoreutils/semanage/semanage	2008-08-05 09:58:26.000000000 -0400
+--- nsapolicycoreutils/semanage/semanage	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.54/semanage/semanage	2008-08-07 08:18:35.000000000 -0400
 @@ -20,7 +20,7 @@
  #                                        02111-1307  USA
  #
  #  
 -import os, sys, getopt
-+import sys, getopt
++import sys, getopt, re
  import seobject
  import selinux
  PROGNAME="policycoreutils"
-@@ -43,7 +43,9 @@
+@@ -43,13 +43,14 @@
  if __name__ == '__main__':
  
  	def usage(message = ""):
 -		print _("""
+-semanage {boolean|login|user|port|interface|node|fcontext|translation} -{l|D} [-n]
 +               raise ValueError(_("""
 +semanage [ -S store ] -i [ input_file | - ]
 +
- semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] 
++semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] 
  semanage login -{a|d|m} [-sr] login_name | %groupname
  semanage user -{a|d|m} [-LrRP] selinux_name
-@@ -59,6 +61,7 @@
+ semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range
+ semanage interface -{a|d|m} [-tr] interface_spec
+-semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] addr
+ semanage fcontext -{a|d|m} [-frst] file_spec
+ semanage translation -{a|d|m} [-T] level
+ semanage boolean -{d|m} [--on|--off|-1|-0] -F boolean | boolean_file
+@@ -60,6 +61,7 @@
  	-a, --add        Add a OBJECT record NAME
  	-d, --delete     Delete a OBJECT record NAME
  	-m, --modify     Modify a OBJECT record NAME
@@ -46,7 +53,17 @@
  	-l, --list       List the OBJECTS
  	-C, --locallist  List OBJECTS local customizations
  	-D, --deleteall  Remove all OBJECTS local customizations
-@@ -89,9 +92,8 @@
+@@ -81,8 +83,7 @@
+ 		-p (named pipe) 
+ 
+         -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
++	-p, --proto      Port protocol (tcp or udp)
+ 	-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")
+@@ -91,9 +92,8 @@
  	-s, --seuser     SELinux User Name
  	-t, --type       SELinux Type for the object
  	-r, --range      MLS/MCS Security Range (MLS/MCS Systems only)
@@ -58,7 +75,18 @@
  		
  	def errorExit(error):
  		sys.stderr.write("%s: " % sys.argv[0])
-@@ -120,12 +122,53 @@
+@@ -111,9 +111,7 @@
+ 		valid_option["port"] = []
+ 		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--proto' ]
+ 		valid_option["interface"] = []
+-		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range']
+-		valid_option["node"] = []
+-		valid_option["node"] += valid_everyone + [ '-M', '--mask', '-t', '--type', '-r', '--range', '-p', '--protocol']
++		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] 
+ 		valid_option["fcontext"] = []
+ 		valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser',  '-t', '--type', '-r', '--range'] 
+ 		valid_option["translation"] = []
+@@ -124,16 +122,56 @@
  		valid_option["permissive"] += [ '-a', '--add', '-d', '--delete', '-l', '--list', '-h', '--help', '-n', '--noheading', '-D', '--deleteall' ]
  		return valid_option
  
@@ -118,7 +146,11 @@
  		serange = ""
  		port = ""
  		proto = ""
-@@ -146,24 +189,23 @@
+-		mask = ""
+ 		selevel = ""
+ 		setype = ""
+ 		ftype = ""
+@@ -151,24 +189,23 @@
  		locallist = False
  		use_file = False
                  store = ""
@@ -135,7 +167,7 @@
 +		args = argv[1:]
  
  		gopts, cmds = getopt.getopt(args,
--					    '01adf:lhmnp:s:FCDR:L:r:t:T:P:S:',
+-					    '01adf:lhmnp:s:FCDR:L:r:t:T:P:S:M:',
 +					    '01adf:i:lhmnp:s:FCDR:L:r:t:T:P:S:',
  					    ['add',
  					     'delete',
@@ -147,7 +179,17 @@
  					     'list', 
  					     'modify',
  					     'noheading',
-@@ -187,16 +229,16 @@
+@@ -183,8 +220,7 @@
+ 					     'roles=',
+ 					     'type=',
+ 					     'trans=',
+-					     'prefix=',
+-                         'mask='
++					     'prefix='
+ 					     ])
+ 		for o, a in gopts:
+ 			if o not in option_dict[object]:
+@@ -193,16 +229,16 @@
  		for o,a in gopts:
  			if o == "-a" or o == "--add":
  				if modify or delete:
@@ -167,7 +209,7 @@
  				deleteall = True
  			if o == "-f"  or o == "--ftype":
  				ftype=a
-@@ -205,7 +247,7 @@
+@@ -211,7 +247,7 @@
  				use_file = True
  
  			if o == "-h" or o == "--help":
@@ -176,7 +218,7 @@
  
  			if o == "-n" or o == "--noheading":
  				heading = False
-@@ -215,7 +257,7 @@
+@@ -221,7 +257,7 @@
  
  			if o == "-m"or o == "--modify":
  				if delete or add:
@@ -185,7 +227,7 @@
  				modify = True
  				
  			if o == "-S" or o == '--store':
-@@ -223,7 +265,7 @@
+@@ -229,7 +265,7 @@
  
  			if o == "-r" or o == '--range':
  				if is_mls_enabled == 0:
@@ -194,7 +236,7 @@
  				serange = a
  
  			if o == "-l" or o == "--list":
-@@ -231,7 +273,7 @@
+@@ -237,7 +273,7 @@
  
  			if o == "-L" or o == '--level':
  				if is_mls_enabled == 0:
@@ -203,7 +245,27 @@
  				selevel = a
  
  			if o == "-p" or o == '--proto':
-@@ -286,14 +328,14 @@
+@@ -252,9 +288,6 @@
+ 			if o == "-s" or o == "--seuser":
+ 				seuser = a
+ 
+-			if o == "-M" or o == '--mask':
+-				mask = a
+-
+ 			if o == "-t" or o == "--type":
+ 				setype = a
+ 
+@@ -277,9 +310,6 @@
+ 		
+ 		if object == "interface":
+ 			OBJECT = seobject.interfaceRecords(store)
+-
+-		if object == "node":
+-			OBJECT = seobject.nodeRecords(store)
+ 		
+ 		if object == "fcontext":
+ 			OBJECT = seobject.fcontextRecords(store)
+@@ -298,14 +328,14 @@
                                 OBJECT.list(heading, locallist, use_file)
  			else:
                                 OBJECT.list(heading, locallist)
@@ -221,7 +283,7 @@
                          
                  target = cmds[0]
  
-@@ -305,10 +347,7 @@
+@@ -317,10 +347,7 @@
  				OBJECT.add(target, setrans)
  
  			if object == "user":
@@ -233,7 +295,15 @@
  
  			if object == "port":
  				OBJECT.add(target, proto, serange, setype)
-@@ -321,7 +360,7 @@
+@@ -328,15 +355,12 @@
+ 			if object == "interface":
+ 				OBJECT.add(target, serange, setype)
+ 
+-			if object == "node":
+-				OBJECT.add(target, mask, proto, serange, setype)
+-
+ 			if object == "fcontext":
+ 				OBJECT.add(target, setype, ftype, serange, seuser)
  			if object == "permissive":
  				OBJECT.add(target)
  
@@ -242,7 +312,13 @@
  			
  		if modify:
  			if object == "boolean":
-@@ -346,7 +385,7 @@
+@@ -358,13 +382,10 @@
+ 			if object == "interface":
+ 				OBJECT.modify(target, serange, setype)
+ 
+-			if object == "node":
+-				OBJECT.modify(target, mask, proto, serange, setype)
+-
  			if object == "fcontext":
  				OBJECT.modify(target, setype, ftype, serange, seuser)
  
@@ -251,7 +327,13 @@
  
  		if delete:
  			if object == "port":
-@@ -358,16 +397,69 @@
+@@ -373,22 +394,72 @@
+ 			elif object == "fcontext":
+ 				OBJECT.delete(target, ftype)
+ 
+-			elif object == "node":
+-				OBJECT.delete(target, mask, proto)
+-
  			else:
  				OBJECT.delete(target)
  
@@ -326,8 +408,38 @@
  		errorExit(error.args[1])
 -	except KeyboardInterrupt, error:
 -		sys.exit(0)
+diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-2.0.54/semanage/semanage.8
+--- nsapolicycoreutils/semanage/semanage.8	2008-08-28 09:34:24.000000000 -0400
++++ policycoreutils-2.0.54/semanage/semanage.8	2008-08-05 09:58:59.000000000 -0400
+@@ -3,7 +3,7 @@
+ semanage \- SELinux Policy Management tool
+ 
+ .SH "SYNOPSIS"
+-.B semanage {boolean|login|user|port|interface|node|fcontext|translation} \-{l|D} [\-n] [\-S store]
++.B semanage {boolean|login|user|port|interface|fcontext|translation} \-{l|D} [\-n] [\-S store] 
+ .br
+ .B semanage boolean \-{d|m} [\-\-on|\-\-off|\-1|\-0] -F boolean | boolean_file
+ .br
+@@ -15,8 +15,6 @@
+ .br
+ .B semanage interface \-{a|d|m} [\-tr] interface_spec
+ .br
+-.B semanage node -{a|d|m} [-tr] [ -p protocol ] [-M netmask] address
+-.br
+ .B semanage fcontext \-{a|d|m} [\-frst] file_spec
+ .br
+ .B semanage permissive \-{a|d} type
+@@ -80,7 +78,7 @@
+ Do not print heading when listing OBJECTS.
+ .TP
+ .I                \-p, \-\-proto
+-Protocol for the specified port (tcp|udp) or internet protocol version for the specified node (ipv4|ipv6).
++Protocol for the specified port (tcp|udp).
+ .TP
+ .I                \-r, \-\-range      
+ MLS/MCS Security Range (MLS/MCS Systems only)
 diff --exclude-from=exclude --exclude=sepolgen-1.0.13 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.54/semanage/seobject.py
---- nsapolicycoreutils/semanage/seobject.py	2008-08-05 09:58:26.000000000 -0400
+--- nsapolicycoreutils/semanage/seobject.py	2008-08-28 09:34:24.000000000 -0400
 +++ policycoreutils-2.0.54/semanage/seobject.py	2008-08-08 17:02:42.000000000 -0400
 @@ -26,7 +26,6 @@
  PROGNAME="policycoreutils"
@@ -412,11 +524,11 @@
 +               else:
 +                      self.sh=get_handle(store)
 +                      self.transaction = False
- 
--               rc = semanage_connect(self.sh)
++
 +        def deleteall(self):
 +               raise ValueError(_("Not yet implemented"))
-+
+ 
+-               rc = semanage_connect(self.sh)
 +        def begin(self):
 +               if self.transaction:
 +                      return
@@ -897,12 +1009,7 @@
 -					raise ValueError(_("Requires prefix, roles, level or range"))
 -				else:
 -					raise ValueError(_("Requires prefix or roles"))
-+                if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
-+                       if is_mls_enabled == 1:
-+                              raise ValueError(_("Requires prefix, roles, level or range"))
-+                       else:
-+                              raise ValueError(_("Requires prefix or roles"))
- 
+-
 -			(rc,k) = semanage_user_key_create(self.sh, name)
 -			if rc < 0:
 -				raise ValueError(_("Could not create a key for %s") % name)
@@ -912,7 +1019,12 @@
 -				raise ValueError(_("Could not check if SELinux user %s is defined") % name)
 -			if not exists:
 -				raise ValueError(_("SELinux user %s is not defined") % name)
--
++                if prefix == "" and len(roles) == 0  and serange == "" and selevel == "":
++                       if is_mls_enabled == 1:
++                              raise ValueError(_("Requires prefix, roles, level or range"))
++                       else:
++                              raise ValueError(_("Requires prefix or roles"))
+ 
 -			(rc,u) = semanage_user_query(self.sh, k)
 -			if rc < 0:
 -				raise ValueError(_("Could not query user for %s") % name)
@@ -1185,7 +1297,236 @@
  	def get_all(self, locallist = 0):
  		ddict = {}
                  if locallist:
-@@ -1035,7 +1011,7 @@
+@@ -1031,236 +1007,11 @@
+ 				rec += ", %s" % p
+ 			print rec
+ 
+-class nodeRecords(semanageRecords):
+-       def __init__(self, store = ""):
+-               semanageRecords.__init__(self,store)
+-
+-       def add(self, addr, mask, proto, serange, ctype):
+-               if addr == "":
+-                       raise ValueError(_("Node Address is required"))
+-
+-               if mask == "":
+-                       raise ValueError(_("Node Netmask is required"))
+-
+-	       if proto == "ipv4":
+-                       proto = 0
+-               elif proto == "ipv6":
+-                       proto = 1
+-               else:
+-                      raise ValueError(_("Unknown or missing protocol"))
+-
+-
+-               if is_mls_enabled == 1:
+-                       if serange == "":
+-                               serange = "s0"
+-                       else:
+-                               serange = untranslate(serange)
+-
+-               if ctype == "":
+-                       raise ValueError(_("SELinux Type is required"))
+-
+-               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
+-               if rc < 0:
+-                       raise ValueError(_("Could not create key for %s") % addr)
+-               if rc < 0:
+-                       raise ValueError(_("Could not check if addr %s is defined") % addr)
+-
+-               (rc,exists) = semanage_node_exists(self.sh, k)
+-               if exists:
+-                       raise ValueError(_("Addr %s already defined") % addr)
+-
+-               (rc,node) = semanage_node_create(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not create addr for %s") % addr)
+-
+-               rc = semanage_node_set_addr(self.sh, node, proto, addr)
+-               (rc, con) = semanage_context_create(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not create context for %s") % addr)
+-
+-               rc = semanage_node_set_mask(self.sh, node, proto, mask)
+-               if rc < 0:
+-                       raise ValueError(_("Could not set mask for %s") % addr)
+-
+-
+-               rc = semanage_context_set_user(self.sh, con, "system_u")
+-               if rc < 0:
+-                       raise ValueError(_("Could not set user in addr context for %s") % addr)
+-
+-               rc = semanage_context_set_role(self.sh, con, "object_r")
+-               if rc < 0:
+-                       raise ValueError(_("Could not set role in addr context for %s") % addr)
+-
+-               rc = semanage_context_set_type(self.sh, con, ctype)
+-               if rc < 0:
+-                       raise ValueError(_("Could not set type in addr context for %s") % addr)
+-
+-               if serange != "":
+-                       rc = semanage_context_set_mls(self.sh, con, serange)
+-                       if rc < 0:
+-                               raise ValueError(_("Could not set mls fields in addr context for %s") % addr)
+-
+-               rc = semanage_node_set_con(self.sh, node, con)
+-               if rc < 0:
+-                       raise ValueError(_("Could not set addr context for %s") % addr)
+-
+-               rc = semanage_begin_transaction(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not start semanage transaction"))
+-
+-               rc = semanage_node_modify_local(self.sh, k, node)
+-               if rc < 0:
+-                       raise ValueError(_("Could not add addr %s") % addr)
+-
+-               rc = semanage_commit(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not add addr %s") % addr)
+-
+-               semanage_context_free(con)
+-               semanage_node_key_free(k)
+-               semanage_node_free(node)
+-
+-       def modify(self, addr, mask, proto, serange, setype):
+-               if addr == "":
+-                       raise ValueError(_("Node Address is required"))
+-
+-               if mask == "":
+-                       raise ValueError(_("Node Netmask is required"))
+-               if proto == "ipv4":
+-                       proto = 0
+-               elif proto == "ipv6":
+-                       proto = 1
+-	       else:
+-		      raise ValueError(_("Unknown or missing protocol"))
+-
+-
+-               if serange == "" and setype == "":
+-                       raise ValueError(_("Requires setype or serange"))
+-
+-               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
+-               if rc < 0:
+-                       raise ValueError(_("Could not create key for %s") % addr)
+-
+-               (rc,exists) = semanage_node_exists(self.sh, k)
+-               if rc < 0:
+-                       raise ValueError(_("Could not check if addr %s is defined") % addr)
+-               if not exists:
+-                       raise ValueError(_("Addr %s is not defined") % addr)
+-
+-               (rc,node) = semanage_node_query(self.sh, k)
+-               if rc < 0:
+-                       raise ValueError(_("Could not query addr %s") % addr)
+-
+-               con = semanage_node_get_con(node)
+-
+-               if serange != "":
+-                       semanage_context_set_mls(self.sh, con, untranslate(serange))
+-               if setype != "":
+-                       semanage_context_set_type(self.sh, con, setype)
+-
+-               rc = semanage_begin_transaction(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not start semanage transaction"))
+-
+-               rc = semanage_node_modify_local(self.sh, k, node)
+-               if rc < 0:
+-                       raise ValueError(_("Could not modify addr %s") % addr)
+-
+-               rc = semanage_commit(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not modify addr %s") % addr)
+-
+-               semanage_node_key_free(k)
+-               semanage_node_free(node)
+-
+-       def delete(self, addr, mask, proto):
+-               if addr == "":
+-                       raise ValueError(_("Node Address is required"))
+-
+-               if mask == "":
+-                       raise ValueError(_("Node Netmask is required"))
+-
+-	       if proto == "ipv4":
+-                       proto = 0
+-               elif proto == "ipv6":
+-                       proto = 1
+-               else:
+-                      raise ValueError(_("Unknown or missing protocol"))
+-
+-               (rc,k) = semanage_node_key_create(self.sh, addr, mask, proto)
+-               if rc < 0:
+-                       raise ValueError(_("Could not create key for %s") % addr)
+-
+-               (rc,exists) = semanage_node_exists(self.sh, k)
+-               if rc < 0:
+-                       raise ValueError(_("Could not check if addr %s is defined") % addr)
+-               if not exists:
+-                       raise ValueError(_("Addr %s is not defined") % addr)
+-
+-               (rc,exists) = semanage_node_exists_local(self.sh, k)
+-               if rc < 0:
+-                       raise ValueError(_("Could not check if addr %s is defined") % addr)
+-               if not exists:
+-                       raise ValueError(_("Addr %s is defined in policy, cannot be deleted") % addr)
+-
+-               rc = semanage_begin_transaction(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not start semanage transaction"))
+-
+-               rc = semanage_node_del_local(self.sh, k)
+-               if rc < 0:
+-                       raise ValueError(_("Could not delete addr %s") % addr)
+-
+-               rc = semanage_commit(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not delete addr %s") % addr)
+-
+-               semanage_node_key_free(k)
+-
+-       def get_all(self, locallist = 0):
+-               ddict = {}
+-	       if locallist :
+-			(rc, self.ilist) = semanage_node_list_local(self.sh)
+-	       else:
+-	                (rc, self.ilist) = semanage_node_list(self.sh)
+-               if rc < 0:
+-                       raise ValueError(_("Could not list addrs"))
+-
+-               for node in self.ilist:
+-                       con = semanage_node_get_con(node)
+-                       addr = semanage_node_get_addr(self.sh, node)
+-                       mask = semanage_node_get_mask(self.sh, node)
+-                       proto = semanage_node_get_proto(node)
+-		       if proto == 0:
+-				proto = "ipv4"
+-		       elif proto == 1:
+-				proto = "ipv6"
+-                       ddict[(addr[1], mask[1], proto)] = (semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con))
+-
+-               return ddict
+-
+-       def list(self, heading = 1, locallist = 0):
+-               if heading:
+-                       print "%-18s %-18s %-5s %-5s\n" % ("IP Address", "Netmask", "Protocol", "Context")
+-               ddict = self.get_all(locallist)
+-               keys = ddict.keys()
+-               keys.sort()
+-               if is_mls_enabled:
+-			for k in keys:
+-				val = ''
+-				for fields in k:
+-					val = val + '\t' + str(fields)
+-                                print "%-18s %-18s %-5s %s:%s:%s:%s " % (k[0],k[1],k[2],ddict[k][0], ddict[k][1],ddict[k][2], translate(ddict[k][3], False))
+-               else:
+-                       for k in keys:
+-                               print "%-18s %-18s %-5s %s:%s:%s " % (k[0],k[1],k[2],ddict[k][0], ddict[k][1],ddict[k][2])
+-
+-
+ class interfaceRecords(semanageRecords):
  	def __init__(self, store = ""):
  		semanageRecords.__init__(self, store)
  
@@ -1194,7 +1535,7 @@
  		if is_mls_enabled == 1:
  			if serange == "":
  				serange = "s0"
-@@ -1089,23 +1065,20 @@
+@@ -1314,23 +1065,20 @@
  		if rc < 0:
  			raise ValueError(_("Could not set message context for %s") % interface)
  
@@ -1224,7 +1565,7 @@
  		if serange == "" and setype == "":
  			raise ValueError(_("Requires setype or serange"))
  
-@@ -1130,22 +1103,19 @@
+@@ -1355,22 +1103,19 @@
  		if setype != "":
  			semanage_context_set_type(self.sh, con, setype)
  
@@ -1253,7 +1594,7 @@
  		(rc,k) = semanage_iface_key_create(self.sh, interface)
  		if rc < 0:
  			raise ValueError(_("Could not create key for %s") % interface)
-@@ -1162,20 +1132,17 @@
+@@ -1387,20 +1132,17 @@
  		if not exists:
  			raise ValueError(_("Interface %s is defined in policy, cannot be deleted") % interface)
  
@@ -1279,7 +1620,7 @@
  	def get_all(self, locallist = 0):
  		ddict = {}
                  if locallist:
-@@ -1234,7 +1201,7 @@
+@@ -1459,7 +1201,7 @@
                 if target == "" or target.find("\n") >= 0:
                        raise ValueError(_("Invalid file specification"))
                        
@@ -1288,7 +1629,7 @@
                  self.validate(target)
  
  		if is_mls_enabled == 1:
-@@ -1275,24 +1242,22 @@
+@@ -1500,24 +1242,22 @@
  
  		semanage_fcontext_set_type(fcontext, file_types[ftype])
  
@@ -1320,7 +1661,7 @@
  		if serange == "" and setype == "" and seuser == "":
  			raise ValueError(_("Requires setype, serange or seuser"))
                  self.validate(target)
-@@ -1333,29 +1298,25 @@
+@@ -1558,29 +1298,25 @@
                         if rc < 0:
                                raise ValueError(_("Could not set file context for %s") % target)
                         
@@ -1357,7 +1698,7 @@
  
  		for fcontext in flist:
                         target = semanage_fcontext_get_expr(fcontext)
-@@ -1370,11 +1331,9 @@
+@@ -1595,11 +1331,9 @@
                                raise ValueError(_("Could not delete the file context %s") % target)
                         semanage_fcontext_key_free(k)
  	
@@ -1371,7 +1712,7 @@
  		(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
  		if rc < 0:
  			raise ValueError(_("Could not create a key for %s") % target)
-@@ -1391,20 +1350,17 @@
+@@ -1616,20 +1350,17 @@
  			else:
  				raise ValueError(_("File context for %s is not defined") % target)
  
@@ -1397,7 +1738,7 @@
  	def get_all(self, locallist = 0):
  		l = []
                  if locallist:
-@@ -1486,9 +1442,8 @@
+@@ -1711,9 +1442,8 @@
  
  	def modify(self, name, value=None, use_file=False):
                  
@@ -1409,7 +1750,7 @@
                  if use_file:
                         fd = open(name)
                         for b in fd.read().split("\n"):
-@@ -1498,18 +1453,16 @@
+@@ -1723,18 +1453,16 @@
  
                                try:
                                       boolname, val = b.split("=")
@@ -1431,7 +1772,7 @@
  
                  (rc,k) = semanage_bool_key_create(self.sh, name)
                  if rc < 0:
-@@ -1526,42 +1479,30 @@
+@@ -1751,42 +1479,30 @@
  		if not exists:
  			raise ValueError(_("Boolean %s is defined in policy, cannot be deleted") % name)
  


Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -r1.549 -r1.550
--- policycoreutils.spec	11 Aug 2008 15:58:06 -0000	1.549
+++ policycoreutils.spec	29 Aug 2008 19:05:25 -0000	1.550
@@ -1,12 +1,12 @@
 %define	libauditver	1.4.2-1
 %define	libsepolver	2.0.19-1
-%define	libsemanagever	2.0.5-1
+%define	libsemanagever	2.0.27-2
 %define	libselinuxver	2.0.46-5
 %define	sepolgenver	1.0.13
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.0.54
-Release: 6%{?dist}
+Version: 2.0.55
+Release: 1%{?dist}
 License: GPLv2+
 Group:	 System Environment/Base
 Source:	 http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -26,7 +26,7 @@
 
 BuildRequires: pam-devel libsepol-static >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver}  libcap-devel audit-libs-devel >=  %{libauditver} gettext
 Requires: /bin/mount /bin/egrep /bin/awk /usr/bin/diff rpm /bin/sed 
-Requires: libselinux >=  %{libselinuxver} libsepol >= %{libsepolver} libsemanage >= %{libsemanagever} coreutils audit-libs-python >=  %{libauditver} checkpolicy libselinux-python
+Requires: libselinux >=  %{libselinuxver} libsepol >= %{libsepolver} libsemanage-python >= %{libsemanagever} coreutils audit-libs-python >=  %{libauditver} checkpolicy libselinux-python
 Requires(post): /sbin/service /sbin/chkconfig 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -192,6 +192,13 @@
 fi
 
 %changelog
+* Thu Aug 28 2008 Dan Walsh <dwalsh at redhat.com> 2.0.55-1
+- Update to upstream
+	* Merged semanage node support from Christian Kuester.
+
+* Fri Aug 15 2008 Dan Walsh <dwalsh at redhat.com> 2.0.54-7
+- Add require libsemanage-python
+
 * Mon Aug 11 2008 Dan Walsh <dwalsh at redhat.com> 2.0.54-6
 - Add missing html_util.py file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/sources,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- sources	5 Aug 2008 14:18:33 -0000	1.191
+++ sources	29 Aug 2008 19:05:25 -0000	1.192
@@ -1,2 +1,2 @@
 b6756a012c26f414e4a5f8f438ce2188  sepolgen-1.0.13.tgz
-b1d1bc767b4806a17d0986ab4016cf9b  policycoreutils-2.0.54.tgz
+0c606d0237e6588d0bc01137fe948644  policycoreutils-2.0.55.tgz




More information about the fedora-extras-commits mailing list