diff --git a/0001-bypass-wrong-output-when-enabled-selinux.patch b/0001-bypass-wrong-output-when-enabled-selinux.patch index a9ce9d339891bbce40afcab794b14edc3e0bc794..eb464ed514c697d74e633cd30dcd3cd6d652238c 100644 --- a/0001-bypass-wrong-output-when-enabled-selinux.patch +++ b/0001-bypass-wrong-output-when-enabled-selinux.patch @@ -1,7 +1,7 @@ -From 20576addae44d7256617806e4504524e0d1c9b13 Mon Sep 17 00:00:00 2001 +From d16338c2bf67e2b141bddc9c1f582f9699b18d6c Mon Sep 17 00:00:00 2001 From: Shijie Luo Date: Sun, 15 Mar 2020 14:15:42 -0400 -Subject: [PATCH 7/7] bypass wrong output when enabled selinux +Subject: [PATCH 1/2] bypass wrong output when enabled selinux When enforced selinux, excuting command getfattr may output something about selinux. Bypass these messages to make testcases go success. @@ -12,7 +12,7 @@ Signed-off-by: Shijie Luo 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/test/run b/test/run -index 07e916c..7e46a70 100755 +index 07e916c..7e46a70 100644 --- a/test/run +++ b/test/run @@ -160,21 +160,27 @@ sub process_test($$$$) { @@ -51,5 +51,5 @@ index 07e916c..7e46a70 100755 } my $good = !(grep /!/, @good); -- -1.8.3.1 +2.25.1 diff --git a/0002-dont-skip-security.evm-when-copy-xattr.patch b/0002-dont-skip-security.evm-when-copy-xattr.patch index c0ce82b315f06793108d7f3fbf13e9df58babf68..934fc05f80e146614da5115b2fa6f8c80a595755 100644 --- a/0002-dont-skip-security.evm-when-copy-xattr.patch +++ b/0002-dont-skip-security.evm-when-copy-xattr.patch @@ -1,7 +1,7 @@ -From 0aa9a1568fc318345c4123fc19f825933f8dcb66 Mon Sep 17 00:00:00 2001 +From 74d8c12dd0c064f9a93b3094795fce194672fe03 Mon Sep 17 00:00:00 2001 From: zhangtianxing3 Date: Mon, 24 Jan 2022 11:39:36 +0800 -Subject: [PATCH] dont skip security.evm when copy xattr +Subject: [PATCH 2/2] dont skip security.evm when copy xattr IMA feature need to use security.evm, so we should not skip @@ -23,5 +23,5 @@ index 1affac5..07d3403 100644 +#security.evm skip # may only be written by kernel afs.* skip # AFS metadata and ACLs -- -1.8.3.1 +2.25.1 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 deleted file mode 100644 index c94414bddf2385d02c142f9013a632e1d893fc39..0000000000000000000000000000000000000000 --- a/0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-2.5.1.tar.gz b/attr-2.5.1.tar.gz deleted file mode 100644 index dbb77f7c6fd26cc54b8993360090b2807bc6caaf..0000000000000000000000000000000000000000 Binary files a/attr-2.5.1.tar.gz and /dev/null differ diff --git a/attr-2.5.2.tar.gz b/attr-2.5.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..0869208210d24c636bd0378d022f0fdf168bdb8f Binary files /dev/null and b/attr-2.5.2.tar.gz differ diff --git a/attr.spec b/attr.spec index b7f130e99e9e13ebdd609791131e8cb7073b8de3..429c32d77c2c7dfeedd4cd403632e6442f7ed86e 100644 --- a/attr.spec +++ b/attr.spec @@ -1,7 +1,7 @@ %{!?_licensedir:%global license %%doc} Name: attr -Version: 2.5.1 -Release: 4 +Version: 2.5.2 +Release: 1 Summary: Commands for Manipulating Filesystem Extended Attributes License: GPLv2+ AND LGPLv2+ URL: https://savannah.nongnu.org/projects/attr @@ -10,7 +10,6 @@ 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 +95,13 @@ fi %{_mandir}/man3/* %changelog +* Wed Jan 31 2024 tangyuchen - 2.5.2-1 +- Upgrade to attr-2.5.2 + - Update doc: drop obsolete PORTING guide and include standard INSTALL file + - Update build: fix autoconf and automake incompatibility and version requirement + - Update man: fix various typos and remove mdoc-specific macros + - Bug fixes: eliminate dead store + * Mon Dec 26 2022 tangyuchen - 2.5.1-4 - fix redundant spec code