Compare commits
10 Commits
318e96a6e5
...
5861e7b064
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5861e7b064 | ||
|
|
928b01bcd0 | ||
|
|
f1d4aa64be | ||
|
|
7d108565ed | ||
|
|
3f50fd546e | ||
|
|
f79aa96ccd | ||
|
|
83fa4a6553 | ||
|
|
114ce166df | ||
|
|
4899b08577 | ||
|
|
c36e2e25c1 |
30
0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch
Normal file
30
0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
From 8d7fa4cc89713e3e98afeec7cc6f1002855d4ac3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kamil Dudka <kdudka@redhat.com>
|
||||||
|
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
|
||||||
|
|
||||||
81
0004-fix-stale-attr-references.patch
Normal file
81
0004-fix-stale-attr-references.patch
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
From dc4237cdec4e09709b13c15ba09f2f8715b3c173 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= <stepnem@gmail.com>
|
||||||
|
Date: Mon, 7 Mar 2022 23:03:55 +0100
|
||||||
|
Subject: Fix stale attr(5) references
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
The man page has been named xattr(7) since 2015, cf. the following
|
||||||
|
man-pages commit:
|
||||||
|
|
||||||
|
commit 43834827b827
|
||||||
|
Author: Michael Kerrisk <mtk.manpages@gmail.com>
|
||||||
|
Date: Wed Apr 22 14:29:42 2015 +0200
|
||||||
|
|
||||||
|
xattr.7: Rename from attr.7
|
||||||
|
|
||||||
|
Signed-off-by: Štěpán Němec <stepnem@gmail.com>
|
||||||
|
---
|
||||||
|
README | 2 +-
|
||||||
|
man/man1/attr.1 | 2 +-
|
||||||
|
man/man1/getfattr.1 | 4 ++--
|
||||||
|
man/man1/setfattr.1 | 2 +-
|
||||||
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/README b/README
|
||||||
|
index 006c344..937e394 100644
|
||||||
|
--- a/README
|
||||||
|
+++ b/README
|
||||||
|
@@ -6,7 +6,7 @@ Package home: http://savannah.nongnu.org/projects/attr
|
||||||
|
See the file doc/INSTALL for build, installation and post-
|
||||||
|
install configuration steps.
|
||||||
|
|
||||||
|
-Refer to the attr(5) manual page for general extended attribute
|
||||||
|
+Refer to the xattr(7) manual page for general extended attribute
|
||||||
|
(EA) information and references to other EA manual pages.
|
||||||
|
|
||||||
|
For more information on the build process, please refer to
|
||||||
|
diff --git a/man/man1/attr.1 b/man/man1/attr.1
|
||||||
|
index 84e80de..ebbd2ef 100644
|
||||||
|
--- a/man/man1/attr.1
|
||||||
|
+++ b/man/man1/attr.1
|
||||||
|
@@ -210,5 +210,5 @@ or
|
||||||
|
.BR attr_set (3),
|
||||||
|
.BR attr_multi (3),
|
||||||
|
.BR attr_remove (3),
|
||||||
|
-.BR attr (5),
|
||||||
|
+.BR xattr (7),
|
||||||
|
.BR xfsdump (8)
|
||||||
|
diff --git a/man/man1/getfattr.1 b/man/man1/getfattr.1
|
||||||
|
index 95da3fb..df8bb8a 100644
|
||||||
|
--- a/man/man1/getfattr.1
|
||||||
|
+++ b/man/man1/getfattr.1
|
||||||
|
@@ -90,7 +90,7 @@ The default value for
|
||||||
|
is "^user\\\\.",
|
||||||
|
which includes all the attributes in the user namespace. Specify "\-" for
|
||||||
|
including all attributes. Refer to
|
||||||
|
-.BR attr (5)
|
||||||
|
+.BR xattr (7)
|
||||||
|
for a more detailed discussion of namespaces.
|
||||||
|
.TP
|
||||||
|
.B \-\-absolute-names
|
||||||
|
@@ -139,4 +139,4 @@ or
|
||||||
|
.RI < acl-devel@nongnu.org >.
|
||||||
|
.SH "SEE ALSO"
|
||||||
|
.BR setfattr (1),
|
||||||
|
-.BR attr (5)
|
||||||
|
+.BR xattr (7)
|
||||||
|
diff --git a/man/man1/setfattr.1 b/man/man1/setfattr.1
|
||||||
|
index 50dd58f..e011ca7 100644
|
||||||
|
--- a/man/man1/setfattr.1
|
||||||
|
+++ b/man/man1/setfattr.1
|
||||||
|
@@ -118,4 +118,4 @@ or
|
||||||
|
.RI < acl-devel@nongnu.org >.
|
||||||
|
.SH "SEE ALSO"
|
||||||
|
.BR getfattr (1),
|
||||||
|
-.BR attr (5)
|
||||||
|
+.BR xattr (7)
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
|
|
||||||
14
attr.spec
14
attr.spec
@ -1,7 +1,7 @@
|
|||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
Name: attr
|
Name: attr
|
||||||
Version: 2.5.1
|
Version: 2.5.1
|
||||||
Release: 2
|
Release: 5
|
||||||
Summary: Commands for Manipulating Filesystem Extended Attributes
|
Summary: Commands for Manipulating Filesystem Extended Attributes
|
||||||
License: GPLv2+ AND LGPLv2+
|
License: GPLv2+ AND LGPLv2+
|
||||||
URL: https://savannah.nongnu.org/projects/attr
|
URL: https://savannah.nongnu.org/projects/attr
|
||||||
@ -10,6 +10,8 @@ Source0: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.
|
|||||||
# fix test-suite failure with perl-5.26.0 (#1473853)
|
# fix test-suite failure with perl-5.26.0 (#1473853)
|
||||||
Patch1: 0001-bypass-wrong-output-when-enabled-selinux.patch
|
Patch1: 0001-bypass-wrong-output-when-enabled-selinux.patch
|
||||||
Patch2: 0002-dont-skip-security.evm-when-copy-xattr.patch
|
Patch2: 0002-dont-skip-security.evm-when-copy-xattr.patch
|
||||||
|
Patch3: 0003-attr-eliminate-a-dead-store-in-attr_copy_action.patch
|
||||||
|
Patch4: 0004-fix-stale-attr-references.patch
|
||||||
|
|
||||||
BuildRequires: gettext, libtool, chrpath, gcc,
|
BuildRequires: gettext, libtool, chrpath, gcc,
|
||||||
Provides: libattr
|
Provides: libattr
|
||||||
@ -26,7 +28,6 @@ with the SGI IRIX tool of the same name.
|
|||||||
%package -n libattr-devel
|
%package -n libattr-devel
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Summary: Header files for libattr
|
Summary: Header files for libattr
|
||||||
Obsoletes: libattr
|
|
||||||
Requires: glibc-headers
|
Requires: glibc-headers
|
||||||
|
|
||||||
%description -n libattr-devel
|
%description -n libattr-devel
|
||||||
@ -96,6 +97,15 @@ fi
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 30 2024 wangmian <wangmian19@h-partners.com> - 2.5.1-5
|
||||||
|
- fix stale attr(5) references
|
||||||
|
|
||||||
|
* Mon Dec 26 2022 tangyuchen <tangyuchen5@huawei.com> - 2.5.1-4
|
||||||
|
- fix redundant spec code
|
||||||
|
|
||||||
|
* Sat Oct 29 2022 wangzhiqiang <wangzhiqiang95@huawei.com> - 2.5.1-3
|
||||||
|
- fix compile warning
|
||||||
|
|
||||||
* Mon Jan 24 2022 volcanodragon <linfeilong@huawei.com> - 2.5.1-2
|
* Mon Jan 24 2022 volcanodragon <linfeilong@huawei.com> - 2.5.1-2
|
||||||
- dont skip security.evm copy for ima
|
- dont skip security.evm copy for ima
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user