Upgrade to upstream

* sandbox: move sandbox.conf.5 to just sandbox.5
	* po: Makefile use -p to preserve times to allow multilib simultatious installs
	* of po files
	* sandbox: Allow user to specify the DPI value for X in a sandbox
	* sandbox: make sure the domain launching sandbox has at least 100 categories
	* sandbox: do not try forever to find available category set
	* sandbox: only complain if sandbox unable to launch
	* sandbox: init script run twice is still successful
	* semanage: print local and dristo equiv rules
	* semanage: check file equivalence rules for conflict
	* semanage: Make sure semanage fcontext -l -C prints even if local keys
	* are not defined
	* semanage: change src,dst to target,substitute for equivalency
	* sestatus: Updated sestatus and man pages.
	* Added SELinux config file man page.
	* add clean target to man Makefile

policycoreutils-sepolgen.patch

@@ -163,29 +163,3 @@ index 0e6b502..4882999 100644
              self.module.children.append(rule)
  
  
-diff --git a/sepolgen/src/sepolgen/refparser.py b/sepolgen/src/sepolgen/refparser.py
-index 955784d..9a79340 100644
---- a/sepolgen/src/sepolgen/refparser.py
-+++ b/sepolgen/src/sepolgen/refparser.py
-@@ -245,7 +245,7 @@ def t_refpolicywarn(t):
-     t.lexer.lineno += 1
- 
- def t_IDENTIFIER(t):
--    r'[a-zA-Z_\$\"][a-zA-Z0-9_\-\.\$\*\"]*'
-+    r'[a-zA-Z_\$\"][a-zA-Z0-9_\-\.\$\*\"~]*'
-     # Handle any keywords
-     t.type = reserved.get(t.value,'IDENTIFIER')
-     return t
-diff --git a/sepolgen/src/sepolgen/yacc.py b/sepolgen/src/sepolgen/yacc.py
-index 58332de..2f3c09d 100644
---- a/sepolgen/src/sepolgen/yacc.py
-+++ b/sepolgen/src/sepolgen/yacc.py
-@@ -594,7 +594,7 @@ class MiniProduction:
-     pass
- 
- # regex matching identifiers
--_is_identifier = re.compile(r'^[a-zA-Z0-9_-]+$')
-+_is_identifier = re.compile(r'^[a-zA-Z0-9_-~]+$')
- 
- # -----------------------------------------------------------------------------
- # add_production()

policycoreutils.spec

@@ -1,13 +1,13 @@
 %define	libauditver	2.1.3-4
-%define libsepolver 	2.1.3-2
+%define libsepolver 	2.1.4-1
-%define	libsemanagever	2.1.4-3
+%define	libsemanagever	2.1.5-1
-%define	libselinuxver	2.1.7-1
+%define	libselinuxver	2.1.7-2
-%define	sepolgenver	1.1.3
+%define	sepolgenver	1.1.4
 
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
-Version: 2.1.8
+Version: 2.1.9
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: GPLv2
 Group:	 System Environment/Base
 # Based on git repository with tag 20101221
@@ -80,6 +80,7 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}%{_mandir}/man1
+mkdir -p %{buildroot}%{_mandir}/man5
 mkdir -p %{buildroot}%{_mandir}/man8
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 mkdir -p %{buildroot}%{_sysconfdir}/security/console.apps
@@ -183,7 +184,7 @@ The policycoreutils-sandbox package contains the scripts to create graphical san
 %defattr(-,root,root,-)
 %{_datadir}/sandbox/sandboxX.sh
 %{_datadir}/sandbox/start
-%attr(0755,root,root) %caps(cap_setpcap,cap_setuid,cap_fowner,cap_dac_override,cap_sys_admin,cap_sys_nice=pe) %{_sbindir}/seunshare
+%caps(cap_setpcap,cap_setuid,cap_fowner,cap_dac_override,cap_sys_admin,cap_sys_nice=pe) %{_sbindir}/seunshare
 %{_mandir}/man8/seunshare.8*
 %{_mandir}/man5/sandbox.5*
 
@@ -278,6 +279,8 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/pam.d/run_init
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 # selinux-policy Requires: policycoreutils, so we own this set of directories and our files within them
+%{_mandir}/man5/selinux_config.5.gz
+%{_mandir}/man5/sestatus.conf.5.gz
 %{_mandir}/man8/fixfiles.8*
 %{_mandir}/ru/man8/fixfiles.8*
 %{_mandir}/man8/load_policy.8*
@@ -352,6 +355,28 @@ fi
 /bin/systemctl try-restart restorecond.service >/dev/null 2>&1 || :
 
 %changelog
+* Tue Dec 6 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.9-1
+- Upgrade to upstream
+	* sandbox: move sandbox.conf.5 to just sandbox.5
+	* po: Makefile use -p to preserve times to allow multilib simultatious installs
+	* of po files
+	* sandbox: Allow user to specify the DPI value for X in a sandbox
+	* sandbox: make sure the domain launching sandbox has at least 100 categories
+	* sandbox: do not try forever to find available category set
+	* sandbox: only complain if sandbox unable to launch
+	* sandbox: init script run twice is still successful
+	* semanage: print local and dristo equiv rules
+	* semanage: check file equivalence rules for conflict
+	* semanage: Make sure semanage fcontext -l -C prints even if local keys
+	* are not defined
+	* semanage: change src,dst to target,substitute for equivalency
+	* sestatus: Updated sestatus and man pages.
+	* Added SELinux config file man page.
+	* add clean target to man Makefile
+
+* Wed Nov 30 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.8-8
+- Fix semange fcontext -a  to check for more conflicts on equivalency
+
 * Tue Nov 29 2011 Dan Walsh <dwalsh@redhat.com> - 2.1.8-7
 - Fix dpi handling in sandbox 
 - Make sure semanage fcontext -l -C prints if only local equiv have changed

sources

@@ -1,3 +1,3 @@
 59d33101d57378ce69889cc078addf90  policycoreutils_man_ru2.tar.bz2
-135674afd4eecd02ef441a9fd1d2c08a  policycoreutils-2.1.8.tgz
+c7d17d1cb82dcb6f0dc15d3ce2203f27  policycoreutils-2.1.9.tgz
-3bd4588bcf8608c6e8a18ad5a8b68971  sepolgen-1.1.3.tgz
+fb184a69c16fd775527e0ca3176a422d  sepolgen-1.1.4.tgz