rpms/policycoreutils/devel policycoreutils-gui.patch, 1.83, 1.84 policycoreutils.spec, 1.591, 1.592
Daniel J Walsh
dwalsh at fedoraproject.org
Mon Feb 16 14:21:38 UTC 2009
- Previous message (by thread): rpms/libarchive/devel .cvsignore, 1.7, 1.8 libarchive.spec, 1.7, 1.8 sources, 1.7, 1.8
- Next message (by thread): rpms/policycoreutils/F-10 policycoreutils-gui.patch, 1.83, 1.84 policycoreutils.spec, 1.578, 1.579
- 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-serv531
Modified Files:
policycoreutils-gui.patch policycoreutils.spec
Log Message:
* Mon Feb 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-10
- Fix script created by polgengui to not refer to selinux-policy-devel
policycoreutils-gui.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.83 -r 1.84 policycoreutils-gui.patch
Index: policycoreutils-gui.patch
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils-gui.patch,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- policycoreutils-gui.patch 21 Jan 2009 22:15:52 -0000 1.83
+++ policycoreutils-gui.patch 16 Feb 2009 14:21:37 -0000 1.84
@@ -5768,3315 +5768,6 @@
+</widget>
+
+</glade-interface>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.glade.bak policycoreutils-2.0.61/gui/polgen.glade.bak
---- nsapolicycoreutils/gui/polgen.glade.bak 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgen.glade.bak 2009-01-20 09:49:03.000000000 -0500
-@@ -0,0 +1,3305 @@
-+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-+
-+<glade-interface>
-+<requires lib="gnome"/>
-+
-+<widget class="GtkFileChooserDialog" id="filechooserdialog">
-+ <property name="border_width">5</property>
-+ <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-+ <property name="local_only">True</property>
-+ <property name="select_multiple">True</property>
-+ <property name="show_hidden">True</property>
-+ <property name="do_overwrite_confirmation">False</property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_MOUSE</property>
-+ <property name="modal">False</property>
-+ <property name="resizable">True</property>
-+ <property name="destroy_with_parent">False</property>
-+ <property name="decorated">True</property>
-+ <property name="skip_taskbar_hint">False</property>
-+ <property name="skip_pager_hint">False</property>
-+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+ <property name="focus_on_map">True</property>
-+ <property name="urgency_hint">False</property>
-+
-+ <child internal-child="vbox">
-+ <widget class="GtkVBox" id="dialog-vbox1">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">24</property>
-+
-+ <child internal-child="action_area">
-+ <widget class="GtkHButtonBox" id="dialog-action_area1">
-+ <property name="visible">True</property>
-+ <property name="layout_style">GTK_BUTTONBOX_END</property>
-+
-+ <child>
-+ <widget class="GtkButton" id="button5">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-cancel</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ <property name="response_id">-6</property>
-+ </widget>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkButton" id="button6">
-+ <property name="visible">True</property>
-+ <property name="can_default">True</property>
-+ <property name="has_default">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="label">gtk-add</property>
-+ <property name="use_stock">True</property>
-+ <property name="relief">GTK_RELIEF_NORMAL</property>
-+ <property name="focus_on_click">True</property>
-+ <property name="response_id">-5</property>
-+ </widget>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">False</property>
-+ <property name="fill">True</property>
-+ <property name="pack_type">GTK_PACK_END</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
-+<widget class="GtkAboutDialog" id="about_dialog">
-+ <property name="border_width">5</property>
-+ <property name="destroy_with_parent">False</property>
-+ <property name="name" translatable="yes">Polgen</property>
-+ <property name="copyright" translatable="yes">Red Hat 2007</property>
-+ <property name="license" translatable="yes">GPL</property>
-+ <property name="wrap_license">False</property>
-+ <property name="website">www.redhat.com</property>
-+ <property name="authors">Daniel Walsh <dwalsh at redhat.com></property>
-+ <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
-+</widget>
-+
-+<widget class="GtkWindow" id="main_window">
-+ <property name="border_width">12</property>
-+ <property name="visible">True</property>
-+ <property name="title" translatable="yes">SELinux Policy Generation Tool</property>
-+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
-+ <property name="window_position">GTK_WIN_POS_NONE</property>
-+ <property name="modal">False</property>
-+ <property name="resizable">True</property>
-+ <property name="destroy_with_parent">False</property>
-+ <property name="decorated">True</property>
-+ <property name="skip_taskbar_hint">False</property>
-+ <property name="skip_pager_hint">False</property>
-+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-+ <property name="focus_on_map">True</property>
-+ <property name="urgency_hint">False</property>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox11">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">18</property>
-+
-+ <child>
-+ <widget class="GtkNotebook" id="notebook1">
-+ <property name="visible">True</property>
-+ <property name="show_tabs">False</property>
-+ <property name="show_border">False</property>
-+ <property name="tab_pos">GTK_POS_TOP</property>
-+ <property name="scrollable">False</property>
-+ <property name="enable_popup">False</property>
-+
-+ <child>
-+ <widget class="GnomeDruidPageEdge" id="start_page">
-+ <property name="visible">True</property>
-+ <property name="position">GNOME_EDGE_START</property>
-+ <property name="title" translatable="yes">SELinux Policy Generation Tool</property>
-+ <property name="text" translatable="yes">This tool can be used to generate a policy framework, to confine applications or users using SELinux.
-+
-+The tool generates:
-+Type enforcement file (te)
-+Interface file (if)
-+File context file (fc)
-+Shell script (sh) - used to compile and install the policy. </property>
-+ </widget>
-+ <packing>
-+ <property name="tab_expand">True</property>
-+ <property name="tab_fill">True</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label25">
-+ <property name="visible">True</property>
-+ <property name="label">label25</property>
-+ <property name="use_underline">False</property>
-+ <property name="use_markup">False</property>
-+ <property name="justify">GTK_JUSTIFY_LEFT</property>
-+ <property name="wrap">False</property>
-+ <property name="selectable">False</property>
-+ <property name="xalign">0.5</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xpad">0</property>
-+ <property name="ypad">0</property>
-+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+ <property name="width_chars">-1</property>
-+ <property name="single_line_mode">False</property>
-+ <property name="angle">0</property>
-+ </widget>
-+ <packing>
-+ <property name="type">tab</property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GnomeDruidPageStandard" id="select_type_page">
-+ <property name="visible">True</property>
-+ <property name="title" translatable="yes">Select type of the application/user role to be confined</property>
-+ <signal name="next" handler="on_select_type_page_next" last_modification_time="Sat, 04 Aug 2007 11:39:15 GMT"/>
-+
-+ <child internal-child="vbox">
-+ <widget class="GtkVBox" id="druid-vbox17">
-+ <property name="border_width">18</property>
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">6</property>
-+
-+ <child>
-+ <widget class="GtkVBox" id="vbox14">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
-+ <property name="spacing">0</property>
-+
-+ <child>
-+ <widget class="GtkHBox" id="hbox16">
-+ <property name="visible">True</property>
-+ <property name="homogeneous">False</property>
[...3027 lines suppressed...]
-+ <property name="single_line_mode">False</property>
-+ <property name="angle">0</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">0</property>
-+ <property name="right_attach">1</property>
-+ <property name="top_attach">0</property>
-+ <property name="bottom_attach">1</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkLabel" id="label49">
-+ <property name="visible">True</property>
-+ <property name="label" translatable="yes">Description</property>
-+ <property name="use_underline">False</property>
-+ <property name="use_markup">False</property>
-+ <property name="justify">GTK_JUSTIFY_LEFT</property>
-+ <property name="wrap">False</property>
-+ <property name="selectable">False</property>
-+ <property name="xalign">0</property>
-+ <property name="yalign">0.5</property>
-+ <property name="xpad">0</property>
-+ <property name="ypad">0</property>
-+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-+ <property name="width_chars">-1</property>
-+ <property name="single_line_mode">False</property>
-+ <property name="angle">0</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">0</property>
-+ <property name="right_attach">1</property>
-+ <property name="top_attach">1</property>
-+ <property name="bottom_attach">2</property>
-+ <property name="x_options">fill</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkEntry" id="boolean_name_entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text" translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char">•</property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">2</property>
-+ <property name="top_attach">0</property>
-+ <property name="bottom_attach">1</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+
-+ <child>
-+ <widget class="GtkEntry" id="boolean_description_entry">
-+ <property name="visible">True</property>
-+ <property name="can_focus">True</property>
-+ <property name="editable">True</property>
-+ <property name="visibility">True</property>
-+ <property name="max_length">0</property>
-+ <property name="text" translatable="yes"></property>
-+ <property name="has_frame">True</property>
-+ <property name="invisible_char">•</property>
-+ <property name="activates_default">False</property>
-+ </widget>
-+ <packing>
-+ <property name="left_attach">1</property>
-+ <property name="right_attach">2</property>
-+ <property name="top_attach">1</property>
-+ <property name="bottom_attach">2</property>
-+ <property name="y_options"></property>
-+ </packing>
-+ </child>
-+ </widget>
-+ <packing>
-+ <property name="padding">0</property>
-+ <property name="expand">True</property>
-+ <property name="fill">True</property>
-+ </packing>
-+ </child>
-+ </widget>
-+ </child>
-+</widget>
-+
-+</glade-interface>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep policycoreutils-2.0.61/gui/polgen.gladep
--- nsapolicycoreutils/gui/polgen.gladep 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.61/gui/polgen.gladep 2009-01-20 09:49:03.000000000 -0500
@@ -9088,17 +5779,6 @@
+ <name></name>
+ <program_name></program_name>
+</glade-project>
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgen.gladep.bak policycoreutils-2.0.61/gui/polgen.gladep.bak
---- nsapolicycoreutils/gui/polgen.gladep.bak 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/polgen.gladep.bak 2009-01-20 09:49:03.000000000 -0500
-@@ -0,0 +1,7 @@
-+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
-+
-+<glade-project>
-+ <name></name>
-+ <program_name></program_name>
-+</glade-project>
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/polgengui.py policycoreutils-2.0.61/gui/polgengui.py
--- nsapolicycoreutils/gui/polgengui.py 1969-12-31 19:00:00.000000000 -0500
+++ policycoreutils-2.0.61/gui/polgengui.py 2009-01-20 09:49:03.000000000 -0500
@@ -15333,9 +12013,9 @@
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/executable.py policycoreutils-2.0.61/gui/templates/executable.py
--- nsapolicycoreutils/gui/templates/executable.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/executable.py 2009-01-20 09:49:03.000000000 -0500
++++ policycoreutils-2.0.61/gui/templates/executable.py 2009-02-09 13:43:32.000000000 -0500
@@ -0,0 +1,352 @@
-+# Copyright (C) 2007 Red Hat
++# Copyright (C) 2007-2009 Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# policygentool is a tool for the initial generation of SELinux policy
@@ -15373,8 +12053,8 @@
+"""
+
+te_initscript_types="""
-+type TEMPLATETYPE_script_exec_t;
-+init_script_type(TEMPLATETYPE_script_exec_t)
++type TEMPLATETYPE_initrc_exec_t;
++init_script_type(TEMPLATETYPE_initrc_exec_t)
+"""
+
+te_dbusd_types="""\
@@ -15598,10 +12278,10 @@
+#
+interface(`TEMPLATETYPE_script_domtrans',`
+ gen_require(`
-+ type TEMPLATETYPE_script_exec_t;
++ type TEMPLATETYPE_initrc_exec_t;
+ ')
+
-+ init_script_domtrans_spec($1,TEMPLATETYPE_script_exec_t)
++ init_labeled_script_domtrans($1,TEMPLATETYPE_initrc_exec_t)
+')
+"""
+
@@ -15663,13 +12343,13 @@
+
+if_initscript_admin="""
+ gen_require(`
-+ type TEMPLATETYPE_script_exec_t;
++ type TEMPLATETYPE_initrc_exec_t;
+ ')
+
+ # Allow TEMPLATETYPE_t to restart the apache service
+ TEMPLATETYPE_script_domtrans($1)
+ domain_system_change_exemption($1)
-+ role_transition $2 TEMPLATETYPE_script_exec_t system_r;
++ role_transition $2 TEMPLATETYPE_initrc_exec_t system_r;
+ allow $2 system_r;
+"""
+
@@ -15684,7 +12364,7 @@
+"""
+fc_initscript="""\
+
-+EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_script_exec_t,s0)
++EXECUTABLE -- gen_context(system_u:object_r:TEMPLATETYPE_initrc_exec_t,s0)
+"""
+
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/__init__.py policycoreutils-2.0.61/gui/templates/__init__.py
@@ -15927,8 +12607,8 @@
+"""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/gui/templates/script.py policycoreutils-2.0.61/gui/templates/script.py
--- nsapolicycoreutils/gui/templates/script.py 1969-12-31 19:00:00.000000000 -0500
-+++ policycoreutils-2.0.61/gui/templates/script.py 2009-01-20 09:49:03.000000000 -0500
-@@ -0,0 +1,105 @@
++++ policycoreutils-2.0.61/gui/templates/script.py 2009-02-16 09:19:35.000000000 -0500
+@@ -0,0 +1,99 @@
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
+#
@@ -15963,12 +12643,6 @@
+exit 1
+fi
+
-+if [ ! -f /usr/share/selinux/devel/Makefile ]; then
-+echo 'selinux-policy-devel not installed, package required for building policy'
-+echo '# yum install selinux-policy-devel'
-+exit 1
-+fi
-+
+if [ $# -eq 1 ]; then
+ if [ "$1" = "--update" ] ; then
+ time=`ls -l --time-style="+%x %X" TEMPLATEFILE.te | awk '{ printf "%s %s", $6, $7 }'`
Index: policycoreutils.spec
===================================================================
RCS file: /cvs/extras/rpms/policycoreutils/devel/policycoreutils.spec,v
retrieving revision 1.591
retrieving revision 1.592
diff -u -r1.591 -r1.592
--- policycoreutils.spec 9 Feb 2009 18:37:16 -0000 1.591
+++ policycoreutils.spec 16 Feb 2009 14:21:38 -0000 1.592
@@ -6,7 +6,7 @@
Summary: SELinux policy core utilities
Name: policycoreutils
Version: 2.0.61
-Release: 8%{?dist}
+Release: 10%{?dist}
License: GPLv2+
Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -221,6 +221,12 @@
fi
%changelog
+* Mon Feb 16 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-10
+- Fix script created by polgengui to not refer to selinux-policy-devel
+
+* Mon Feb 9 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-9
+- Change initc scripts to use proper labeling on gui
+
* Mon Feb 9 2009 Dan Walsh <dwalsh at redhat.com> 2.0.61-8
- Add obsoletes to cause policycoreuils to update both python and non python version
- Previous message (by thread): rpms/libarchive/devel .cvsignore, 1.7, 1.8 libarchive.spec, 1.7, 1.8 sources, 1.7, 1.8
- Next message (by thread): rpms/policycoreutils/F-10 policycoreutils-gui.patch, 1.83, 1.84 policycoreutils.spec, 1.578, 1.579
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list