diff --git a/.policycoreutils.metadata b/.policycoreutils.metadata new file mode 100644 index 0000000..b6f1b41 --- /dev/null +++ b/.policycoreutils.metadata @@ -0,0 +1,5 @@ +c1d6c443723b91295ca887eeea5c2d84a420593f selinux-3.6.tar.gz +8aec9d92a940e35756c4cf66891db7b070e00c5c selinux-policycoreutils.zip +6a9a8a86bf4b66b484533e5a5b91acd9f2ba4ed1 selinux-python.zip +c2957ae26fcabe856439915bc03fb7d25c91b724 selinux-gui.zip +c9b684345b0b6940afd38d8679e2838ad7ef5ffe selinux-sandbox.zip diff --git a/0020-fixfiles-drop-unnecessary-line-endings.patch b/0020-fixfiles-drop-unnecessary-line-endings.patch new file mode 100644 index 0000000..44bfc59 --- /dev/null +++ b/0020-fixfiles-drop-unnecessary-line-endings.patch @@ -0,0 +1,78 @@ +From be02ae5d861e4a80bb80f9b1a659315efb5b2aab Mon Sep 17 00:00:00 2001 +From: Petr Lautrbach +Date: Thu, 6 Jun 2024 11:50:39 +0200 +Subject: [PATCH] fixfiles: drop unnecessary \ line endings +Content-type: text/plain + +See https://github.com/koalaman/shellcheck/issues/2769 + +Fixes: + $ shellcheck -S error fixfiles + + In fixfiles line 189: + # These two sorts need to be separate commands \ + ^-- SC1143 (error): This backslash is part of a comment and does not continue the line. + + For more information: + https://www.shellcheck.net/wiki/SC1143 -- This backslash is part of a comme... + +Signed-off-by: Petr Lautrbach +Acked-by: James Carter +--- + policycoreutils/scripts/fixfiles | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) + +diff --git a/policycoreutils/scripts/fixfiles b/policycoreutils/scripts/fixfiles +index ebe64563c7d7..13ac07414c14 100755 +--- a/policycoreutils/scripts/fixfiles ++++ b/policycoreutils/scripts/fixfiles +@@ -174,10 +174,10 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ]; then + test -z "$TEMPFILE" && exit + PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX` + sed -r -e 's,:s0, ,g' $PREFC | sort -u > ${PREFCTEMPFILE} +- sed -r -e 's,:s0, ,g' $FC | sort -u | \ +- /usr/bin/diff -b ${PREFCTEMPFILE} - | \ +- grep '^[<>]'|cut -c3-| grep ^/ | \ +- grep -Ev '(^/home|^/root|^/tmp)' |\ ++ sed -r -e 's,:s0, ,g' $FC | sort -u | ++ /usr/bin/diff -b ${PREFCTEMPFILE} - | ++ grep '^[<>]'|cut -c3-| grep ^/ | ++ grep -Ev '(^/home|^/root|^/tmp)' | + sed -r -e 's,[[:blank:]].*,,g' \ + -e 's|\(([/[:alnum:]]+)\)\?|{\1,}|g' \ + -e 's|([/[:alnum:]])\?|{\1,}|g' \ +@@ -186,19 +186,19 @@ if [ -f ${PREFC} -a -x /usr/bin/diff ]; then + -e 's|\(.*|*|g' \ + -e 's|\[.*|*|g' \ + -e 's|\.\*.*|*|g' \ +- -e 's|\.\+.*|*|g' | \ +- # These two sorts need to be separate commands \ +- sort -u | \ +- sort -d | \ +- while read pattern ; \ +- do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then \ +- echo "$pattern"; \ +- case "$pattern" in *"*") \ ++ -e 's|\.\+.*|*|g' | ++ # These two sorts need to be separate commands ++ sort -u | ++ sort -d | ++ while read pattern ; ++ do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then ++ echo "$pattern"; ++ case "$pattern" in *"*") + echo "$pattern" | sed -e 's,^,^,' -e 's,\*$,,g' >> ${TEMPFILE};; +- esac; \ +- fi; \ +- done | \ +- ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -; \ ++ esac; ++ fi; ++ done | ++ ${RESTORECON} ${VERBOSE} ${EXCLUDEDIRS} ${FORCEFLAG} ${THREADS} $* -i -R -f -; + rm -f ${TEMPFILE} ${PREFCTEMPFILE} + fi + } +-- +2.44.0 + diff --git a/policycoreutils.spec b/policycoreutils.spec index 15daab1..46dba11 100644 --- a/policycoreutils.spec +++ b/policycoreutils.spec @@ -55,6 +55,7 @@ Patch0016: 0016-Revert-policycoreutils-Remove-the-Russian-translatio.patch Patch0017: 0017-Revert-gui-Remove-the-Russian-translations.patch Patch0018: 0018-python-semanage-Allow-modifying-records-on-add.patch Patch0019: 0019-python-semanage-Do-not-sort-local-fcontext-definitio.patch +Patch0020: 0020-fixfiles-drop-unnecessary-line-endings.patch # Patch list end Obsoletes: policycoreutils < 2.0.61-2 Conflicts: filesystem < 3, selinux-policy-base < 3.13.1-138