From 06bf218760679441a16ff73ca33ee26888bdceb8 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jan 29 2019 15:26:39 +0000
Subject: import policycoreutils-2.5-29.el7_6.1


---

diff --git a/SOURCES/policycoreutils-rhel.patch b/SOURCES/policycoreutils-rhel.patch
index f453d08..6682859 100644
--- a/SOURCES/policycoreutils-rhel.patch
+++ b/SOURCES/policycoreutils-rhel.patch
@@ -2671,7 +2671,7 @@ index 472785c..f33a0ea 100755
      print(_("Usage %s -l -d user ...") % sys.argv[0])
      print(_("Usage %s -L") % sys.argv[0])
 diff --git policycoreutils-2.5/scripts/fixfiles policycoreutils-2.5/scripts/fixfiles
-index 5c29eb9..401be3f 100755
+index 5c29eb9..3aeda48 100755
 --- policycoreutils-2.5/scripts/fixfiles
 +++ policycoreutils-2.5/scripts/fixfiles
 @@ -116,6 +116,7 @@ exclude_dirs() {
@@ -2722,7 +2722,7 @@ index 5c29eb9..401be3f 100755
      exit $?
  fi
  [ -x /usr/sbin/genhomedircon ] && /usr/sbin/genhomedircon
-@@ -242,7 +248,12 @@ then
+@@ -242,7 +248,13 @@ then
  		echo "${p1}" >> $TEMPFCFILE
  		logit "skipping the directory ${p}"
  	done
@@ -2731,12 +2731,13 @@ index 5c29eb9..401be3f 100755
 +	/bin/cp -p ${FC_SUB_DIST} ${TEMPFCFILE}.subs_dist &>/dev/null || exit
 +	/bin/cp -p ${FC_SUB} ${TEMPFCFILE}.subs &>/dev/null || exit
 +	/bin/cp -p ${FC_HOMEDIRS} ${TEMPFCFILE}.homedirs &>/dev/null || exit
-+	/bin/cp -p ${FC_LOCAL} ${TEMPFCFILE}.local &>/dev/null || exit
++	# file_contexts.local does not always exist
++	/bin/cp -p ${FC_LOCAL} ${TEMPFCFILE}.local &>/dev/null
 +
  fi
  if [ ! -z "$RPMFILES" ]; then
      for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
-@@ -251,7 +262,7 @@ if [ ! -z "$RPMFILES" ]; then
+@@ -251,7 +263,7 @@ if [ ! -z "$RPMFILES" ]; then
      exit $?
  fi
  if [ ! -z "$FILEPATH" ]; then
@@ -2745,7 +2746,7 @@ index 5c29eb9..401be3f 100755
      return
  fi
  if [  -n "${FILESYSTEMSRW}" ]; then
-@@ -264,15 +275,15 @@ if [ ${OPTION} != "Relabel" ]; then
+@@ -264,15 +276,15 @@ if [ ${OPTION} != "Relabel" ]; then
      return
  fi
  echo "Cleaning up labels on /tmp"
diff --git a/SPECS/policycoreutils.spec b/SPECS/policycoreutils.spec
index 4646530..034ada9 100644
--- a/SPECS/policycoreutils.spec
+++ b/SPECS/policycoreutils.spec
@@ -8,7 +8,7 @@
 Summary: SELinux policy core utilities
 Name:	 policycoreutils
 Version: 2.5
-Release: 29%{?dist}
+Release: 29%{?dist}.1
 License: GPLv2
 Group:	 System Environment/Base
 # https://github.com/SELinuxProject/selinux/wiki/Releases
@@ -390,6 +390,9 @@ The policycoreutils-restorecond package contains the restorecond service.
 %systemd_postun_with_restart restorecond.service
 
 %changelog
+* Wed Jan 16 2019 Vit Mojzis <vmojzis@redhat.com> - 2.5-29.1
+- scripts/fixfiles: Do not fail on file_contexts.local (#1665813)
+
 * Tue Sep 18 2018 Vit Mojzis <vmojzis@redhat.com> - 2.5-29
 - gui: Make all polgen button labels translatable (#1569451)
 - Update translations (#1569451)