diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch index a9d65fc..88e4778 100644 --- a/libselinux-rhat.patch +++ b/libselinux-rhat.patch @@ -128,6 +128,190 @@ index 0000000..8077658 +++ b/libselinux/man/man3/selinux_set_policy_root.3 @@ -0,0 +1 @@ +.so man3/selinux_policy_root.3 +diff --git a/libselinux/man/man5/secolor.conf.5 b/libselinux/man/man5/secolor.conf.5 +deleted file mode 100644 +index b834577..0000000 +--- a/libselinux/man/man5/secolor.conf.5 ++++ /dev/null +@@ -1,178 +0,0 @@ +-.TH "secolor.conf" "5" "08 April 2011" "SELinux API documentation" +-.SH "NAME" +-secolor.conf \- The SELinux color configuration file +-. +-.SH "DESCRIPTION" +-This optional file controls the color to be associated to the context components associated to the +-.I raw +-context passed by +-.BR selinux_raw_context_to_color "(3)," +-when context related information is to be displayed in color by an SELinux-aware application. +-.sp +-.BR selinux_raw_context_to_color "(3)" +-obtains this color information from the active policy +-.B secolor.conf +-file as returned by +-.BR selinux_colors_path "(3)." +-. +-.SH "FILE FORMAT" +-The file format is as follows: +-.RS +-.B color +-.I color_name +-.BI "= #"color_mask +-.br +-[...] +-.sp +-.I context_component string +-.B = +-.I fg_color_name bg_color_name +-.br +-[...] +-.sp +-.RE +- +-Where: +-.br +-.B color +-.RS +-The color keyword. Each color entry is on a new line. +-.RE +-.I color_name +-.RS +-A single word name for the color (e.g. red). +-.RE +-.I color_mask +-.RS +-A color mask starting with a hash (#) that describes the hexadecimal RGB colors with black being #000000 and white being #ffffff. +-.RE +-.I context_component +-.RS +-The context component name that must be one of the following: +-.br +-.RS +-user, role, type or range +-.RE +-Each +-.IR context_component " " string " ..." +-entry is on a new line. +-.RE +-.I string +-.RS +-This is the +-.I context_component +-string that will be matched with the +-.I raw +-context component passed by +-.BR selinux_raw_context_to_color "(3)." +-.br +-A wildcard '*' may be used to match any undefined string for the user, role and type +-.I context_component +-entries only. +-.RE +- +-.I fg_color_name +-.RS +-The color_name string that will be used as the foreground color. +-A +-.I color_mask +-may also be used. +-.RE +-.I bg_color_name +-.RS +-The color_name string that will be used as the background color. +-A +-.I color_mask +-may also be used. +-.RE +-. +-.SH "EXAMPLES" +-Example 1 entries are: +-.RS +-color black = #000000 +-.br +-color green = #008000 +-.br +-color yellow = #ffff00 +-.br +-color blue = #0000ff +-.br +-color white = #ffffff +-.br +-color red = #ff0000 +-.br +-color orange = #ffa500 +-.br +-color tan = #D2B48C +-.sp +-user * = black white +-.br +-role * = white black +-.br +-type * = tan orange +-.br +-range s0\-s0:c0.c1023 = black green +-.br +-range s1\-s1:c0.c1023 = white green +-.br +-range s3\-s3:c0.c1023 = black tan +-.br +-range s5\-s5:c0.c1023 = white blue +-.br +-range s7\-s7:c0.c1023 = black red +-.br +-range s9\-s9:c0.c1023 = black orange +-.br +-range s15:c0.c1023 = black yellow +-.RE +- +-.sp +-Example 2 entries are: +-.RS +-color black = #000000 +-.br +-color green = #008000 +-.br +-color yellow = #ffff00 +-.br +-color blue = #0000ff +-.br +-color white = #ffffff +-.br +-color red = #ff0000 +-.br +-color orange = #ffa500 +-.br +-color tan = #d2b48c +-.sp +-user unconfined_u = #ff0000 green +-.br +-role unconfined_r = red #ffffff +-.br +-type unconfined_t = red orange +-.br +-user user_u = black green +-.br +-role user_r = white black +-.br +-type user_t = tan red +-.br +-user xguest_u = black yellow +-.br +-role xguest_r = black red +-.br +-type xguest_t = black green +-.br +-user sysadm_u = white black +-.br +-range s0:c0.c1023 = black white +-.br +-user * = black white +-.br +-role * = black white +-.br +-type * = black white +-.RE +-. +-.SH "SEE ALSO" +-.BR selinux "(8), " selinux_raw_context_to_color "(3), " selinux_colors_path "(3)" diff --git a/libselinux/man/man8/matchpathcon.8 b/libselinux/man/man8/matchpathcon.8 index 368991f..5d60789 100644 --- a/libselinux/man/man8/matchpathcon.8 diff --git a/libselinux.spec b/libselinux.spec index 105537a..48977ac 100644 --- a/libselinux.spec +++ b/libselinux.spec @@ -10,7 +10,7 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 2.1.13 -Release: 11%{?dist} +Release: 12%{?dist} License: Public Domain Group: System Environment/Libraries Source: %{name}-%{version}.tgz @@ -241,6 +241,9 @@ rm -rf %{buildroot} %{ruby_sitearch}/selinux.so %changelog +* Tue Mar 26 2013 Dan Walsh - 2.1.13-12 +- Move secolor.conf.5 into mcstrans package and out of libselinux + * Wed Mar 20 2013 Dan Walsh - 2.1.13-11 - Fix python bindings for selinux_check_access