[libselinux/f16] Switch to use ":" as prefix separator rather then "; "

[Daniel J Walsh]

commit 37244b5b3b991d5f88ecdfc2eff7d4767a71006c
Author: Dan Walsh <dwalsh at redhat.com>
Date:   Wed Sep 14 22:02:29 2011 -0400

    Switch to use ":" as prefix separator rather then ";"

 .gitignore            |    1 +
 libselinux-rhat.patch |   14 +++++++-------
 libselinux.spec       |    5 ++++-
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2f655e6..936d759 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,3 +186,4 @@ libselinux-2.0.96.tgz
 /libselinux-2.0.102.tgz
 /libselinux-2.1.0.tgz
 /libselinux-2.1.4.tgz
+/libselinux-2.1.5.tgz
diff --git a/libselinux-rhat.patch b/libselinux-rhat.patch
index 60675f0..bd18a47 100644
--- a/libselinux-rhat.patch
+++ b/libselinux-rhat.patch
@@ -1,5 +1,5 @@
 diff --git a/libselinux/man/man3/matchpathcon.3 b/libselinux/man/man3/matchpathcon.3
-index cdbb252..0cc2268 100644
+index cdbb252..e2a4371 100644
 --- a/libselinux/man/man3/matchpathcon.3
 +++ b/libselinux/man/man3/matchpathcon.3
 @@ -8,7 +8,7 @@ matchpathcon, matchpathcon_index \- get the default SELinux security context for
@@ -16,12 +16,12 @@ index cdbb252..0cc2268 100644
  by
  .I prefix.
 -
-+prefix can have multiple paths separated by ";", for example "/dev;/var/run;/tmp"
++prefix can have multiple paths separated by ":", for example "/dev:/var/run:/tmp"
  .sp
  .B matchpathcon_fini
  frees the memory allocated by a prior call to
 diff --git a/libselinux/man/man3/selabel_open.3 b/libselinux/man/man3/selabel_open.3
-index 8674e37..23df23b 100644
+index 8674e37..89bb4d3 100644
 --- a/libselinux/man/man3/selabel_open.3
 +++ b/libselinux/man/man3/selabel_open.3
 @@ -66,6 +66,13 @@ A non-null value for this option enables context validation.  By default,
@@ -30,7 +30,7 @@ index 8674e37..23df23b 100644
  Note that an invalid context may not be treated as an error unless it is actually encountered during a lookup operation.
 +.TP
 +.B SELABEL_OPT_SUBSET
-+A ";" separates string of path prefixes that tell the system to only loads entries with regular expressions that could match this strings. For example "/dev;/var/run;/tmp".  This option can cause the system to use less memory and work faster, but you should only use paths that begin with a prefix.
++A ":" separates string of path prefixes that tell the system to only loads entries with regular expressions that could match this strings. For example "/dev:/var/run:/tmp".  This option can cause the system to use less memory and work faster, but you should only use paths that begin with a prefix.
 +.TP
 +.B SELABEL_OPT_PATH
 +A string representing an alternate path the the regular expressions.
@@ -56,7 +56,7 @@ index b245364..7c47222 100644
  	rc = vfprintf(stderr, fmt, ap);
  	va_end(ap);
 diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c
-index 3b8346d..ead3b0b 100644
+index 3b8346d..02f3f98 100644
 --- a/libselinux/src/label_file.c
 +++ b/libselinux/src/label_file.c
 @@ -27,6 +27,7 @@
@@ -125,10 +125,10 @@ index 3b8346d..ead3b0b 100644
 +			char *ptr;
 +			i = 0;
 +			if (opts[n].value) {
-+				prefix_array[i] = strtok_r((char *)opts[n].value, ";", &ptr);
++				prefix_array[i] = strtok_r((char *)opts[n].value, ":", &ptr);
 +				while ((prefix_array[i] != NULL) && i < MAX_PREFIX - 1) {
 +					i++;
-+					prefix_array[i] = strtok_r(NULL, ";", &ptr);
++					prefix_array[i] = strtok_r(NULL, ":", &ptr);
 +				}
 +			}
 +
diff --git a/libselinux.spec b/libselinux.spec
index 6d3048b..b8adc7f 100644
--- a/libselinux.spec
+++ b/libselinux.spec
@@ -7,7 +7,7 @@
 Summary: SELinux library and simple utilities
 Name: libselinux
 Version: 2.1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Public Domain
 Group: System Environment/Libraries
 Source: %{name}-%{version}.tgz
@@ -231,6 +231,9 @@ rm -rf %{buildroot}
 %{ruby_sitearch}/selinux.so
 
 %changelog
+* Wed Sep 14 2011 Dan Walsh <dwalsh at redhat.com> - 2.1.5-5
+- Switch to use ":" as prefix separator rather then ";"
+
 * Thu Sep  8 2011 Ville Skyttä <ville.skytta at iki.fi> - 2.1.5-4
 - Avoid unnecessary shell invocation in %%post.