From da315322e81581040a8503e8670af575e86c9925 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Fri, 23 Aug 2019 13:28:31 +0200 Subject: [PATCH] policycoreutils-2.9-4.fc31 - fixfiles: Fix unbound variable problem --- ...fixfiles-Fix-unbound-variable-proble.patch | 32 +++++++++++++++++++ policycoreutils.spec | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0024-policycoreutils-fixfiles-Fix-unbound-variable-proble.patch diff --git a/0024-policycoreutils-fixfiles-Fix-unbound-variable-proble.patch b/0024-policycoreutils-fixfiles-Fix-unbound-variable-proble.patch new file mode 100644 index 0000000..3388535 --- /dev/null +++ b/0024-policycoreutils-fixfiles-Fix-unbound-variable-proble.patch @@ -0,0 +1,32 @@ +From e240bf9a547374dff8e7998b0bedce1d523b3dd4 Mon Sep 17 00:00:00 2001 +From: Vit Mojzis +Date: Wed, 21 Aug 2019 17:43:25 +0200 +Subject: [PATCH] policycoreutils/fixfiles: Fix unbound variable problem + +Fix a typo introduced in commit d3f8b2c3cd909 ("policycoreutils/fixfiles: Fix +[-B] [-F] onboot"), which broke "fixfiles relabel": + + #fixfiles relabel + /sbin/fixfiles: line 151: $1: unbound variable + +Signed-off-by: Vit Mojzis +--- + policycoreutils/scripts/fixfiles | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles +index a9d27d13..df0042aa 100755 +--- a/policycoreutils/scripts/fixfiles ++++ b/policycoreutils/scripts/fixfiles +@@ -215,7 +215,7 @@ OPTION=$1 + shift + + # [-B | -N time ] +-if [ -z "$BOOTTIME" ]; then ++if [ -n "$BOOTTIME" ]; then + newer $BOOTTIME $* + return + fi +-- +2.23.0 + diff --git a/policycoreutils.spec b/policycoreutils.spec index a62722c..3feea47 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -12,7 +12,7 @@ Summary: SELinux policy core utilities Name: policycoreutils Version: 2.9 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 # https://github.com/SELinuxProject/selinux/wiki/Releases Source0: https://github.com/SELinuxProject/selinux/releases/download/20190315/policycoreutils-2.9.tar.gz @@ -61,6 +61,7 @@ Patch0020: 0020-python-Use-ipaddress-instead-of-IPy.patch Patch0021: 0021-python-semanage-Do-not-traceback-when-the-default-po.patch Patch0022: 0022-policycoreutils-fixfiles-Fix-B-F-onboot.patch Patch0023: 0023-policycoreutils-fixfiles-Force-full-relabel-when-SEL.patch +Patch0024: 0024-policycoreutils-fixfiles-Fix-unbound-variable-proble.patch Obsoletes: policycoreutils < 2.0.61-2 Conflicts: filesystem < 3, selinux-policy-base < 3.13.1-138 @@ -535,6 +536,9 @@ The policycoreutils-restorecond package contains the restorecond service. %systemd_postun_with_restart restorecond.service %changelog +* Fri Aug 23 2019 Petr Lautrbach - 2.9-4 +- fixfiles: Fix unbound variable problem + * Mon Aug 5 2019 Petr Lautrbach - 2.9-3 - Drop python2-policycoreutils - Update ru man page translations