From c36e2e25c1d2e197f78dc19f120299d2d81b139e Mon Sep 17 00:00:00 2001 From: wangzhiqiang Date: Sat, 29 Oct 2022 10:31:24 +0800 Subject: [PATCH] fix compile warning (cherry picked from commit f0a2d810df74081a67ce97e185f3e9b052a8fd69) --- ...ate-a-dead-store-in-attr_copy_action.patch | 30 +++++++++++++++++++ attr.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch diff --git a/0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch b/0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch new file mode 100644 index 0000000..c94414b --- /dev/null +++ b/0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch @@ -0,0 +1,30 @@ +From 8d7fa4cc89713e3e98afeec7cc6f1002855d4ac3 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Mon, 19 Apr 2021 15:10:48 +0200 +Subject: [PATCH] attr: eliminate a dead store in attr_copy_action() + +... reported by clang: + +libattr/attr_copy_action.c:158:22: warning[deadcode.DeadStores]: Value stored to 'action' during its initialization is never read +--- + libattr/attr_copy_action.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libattr/attr_copy_action.c b/libattr/attr_copy_action.c +index 279f2df..d41dd2e 100644 +--- a/libattr/attr_copy_action.c ++++ b/libattr/attr_copy_action.c +@@ -155,9 +155,8 @@ fail: + int + attr_copy_action(const char *name, struct error_context *ctx) + { +- struct attr_action *action = attr_actions; +- + if (!attr_parse_attr_conf(ctx)) { ++ struct attr_action *action; + for (action = attr_actions; action; action = action->next) { + if (!fnmatch(action->pattern, name, 0)) + return action->action; +-- +2.33.0 + diff --git a/attr.spec b/attr.spec index ab96d46..defa92f 100644 --- a/attr.spec +++ b/attr.spec @@ -1,7 +1,7 @@ %{!?_licensedir:%global license %%doc} Name: attr Version: 2.5.1 -Release: 2 +Release: 3 Summary: Commands for Manipulating Filesystem Extended Attributes License: GPLv2+ AND LGPLv2+ URL: https://savannah.nongnu.org/projects/attr @@ -10,6 +10,7 @@ Source0: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}. # fix test-suite failure with perl-5.26.0 (#1473853) Patch1: 0001-bypass-wrong-output-when-enabled-selinux.patch Patch2: 0002-dont-skip-security.evm-when-copy-xattr.patch +Patch3: 0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch BuildRequires: gettext, libtool, chrpath, gcc, Provides: libattr @@ -96,6 +97,9 @@ fi %{_mandir}/man3/* %changelog +* Sat Oct 29 2022 wangzhiqiang - 2.5.1-3 +- fix compile warning + * Mon Jan 24 2022 volcanodragon - 2.5.1-2 - dont skip security.evm copy for ima -- Gitee