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/0004-fix-stale-attr-references.patch b/0004-fix-stale-attr-references.patch deleted file mode 100644 index 6aa222c81341f25a5b3a6e5f27d8a67588db16e1..0000000000000000000000000000000000000000 --- a/0004-fix-stale-attr-references.patch +++ /dev/null @@ -1,81 +0,0 @@ -From dc4237cdec4e09709b13c15ba09f2f8715b3c173 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= -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 - Date: Wed Apr 22 14:29:42 2015 +0200 - - xattr.7: Rename from attr.7 - -Signed-off-by: Štěpán Němec ---- - 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 - 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.xz b/attr-2.5.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..bad30c07c5b2398543905355633c54937f4b5e80 Binary files /dev/null and b/attr-2.5.2.tar.xz differ diff --git a/attr.spec b/attr.spec index ff9e28392a53551cdc34262a739170dae2e57d0d..4f51faa00c50251bdab19495c0ef3cd6c23d6b07 100644 --- a/attr.spec +++ b/attr.spec @@ -1,21 +1,18 @@ -%{!?_licensedir:%global license %%doc} Name: attr -Version: 2.5.1 -Release: 5 +Version: 2.5.2 +Release: 1 Summary: Commands for Manipulating Filesystem Extended Attributes -License: GPLv2+ AND LGPLv2+ +License: GPL-2.0-or-later URL: https://savannah.nongnu.org/projects/attr -Source0: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.tar.gz +Source0: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.tar.xz # 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 -Patch4: 0004-fix-stale-attr-references.patch -BuildRequires: gettext, libtool, chrpath, gcc, -Provides: libattr -Obsoletes: libattr +BuildRequires: gettext, libtool, chrpath, gcc +Provides: libattr = %{version}-%{release} +Obsoletes: libattr < %{version}-%{release} Conflicts: xfsdump < 3.1.8 Conflicts: filesystem < 3 @@ -26,7 +23,7 @@ An attr(1) command is also provided which is largely compatible with the SGI IRIX tool of the same name. %package -n libattr-devel -License: LGPLv2+ +License: LGPL-2.1-or-later Summary: Header files for libattr Requires: glibc-headers @@ -37,28 +34,24 @@ For Linux programs, the documented system call API is the recommended interface, but an SGI IRIX compatibility interface is also provided. -%package help -Summary: Including man files for attr -Requires: man - -%description help -This contains man files for the using of attr +%package_help %prep %autosetup -n %{name}-%{version} -p1 %build -%configure --disable-silent-rules -make %{?_smp_mflags} +%configure --disable-silent-rules --disable-static +%make_build %install %make_install +%delete_la + # remove rpath chrpath -d $RPM_BUILD_ROOT%{_bindir}/attr chrpath -d $RPM_BUILD_ROOT%{_bindir}/getfattr chrpath -d $RPM_BUILD_ROOT%{_bindir}/setfattr - # handle docs on our own rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}* @@ -75,9 +68,6 @@ else 'the test-suite will NOT run ***' fi -%post -n %{name} -p /sbin/ldconfig -%postun -n %{name} -p /sbin/ldconfig - %files -f %{name}.lang %doc doc/CHANGES %license doc/COPYING* @@ -88,15 +78,15 @@ fi %files -n libattr-devel %{_libdir}/libattr.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/libattr.a -%{_libdir}/libattr.la %{_includedir}/attr %files help -%{_mandir}/man1/* -%{_mandir}/man3/* +%{_mandir}/man?/* %changelog +* Sun Aug 11 2024 Funda Wang - 2.5.2-1 +- update to 2.5.2 + * Tue Jul 30 2024 wangmian - 2.5.1-5 - fix stale attr(5) references