From da6f13a01b96313d7251b3acb957a4ef97b13a4e Mon Sep 17 00:00:00 2001
From: Xiaojie Chen <jackxjchen@tencent.com>
Date: Fri, 3 Jul 2026 14:14:48 +0800
Subject: [PATCH] Upgrade to version 2.6.0 (fix CVE-2026-54371)

---
 attr.spec                  | 8 ++++++--
 sources                    | 2 +-
 xattr-conf-nfs4-acls.patch | 9 ++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/attr.spec b/attr.spec
index 4c0c4c8..3cefca1 100644
--- a/attr.spec
+++ b/attr.spec
@@ -1,7 +1,7 @@
 Summary:       Utilities for managing filesystem extended attributes
 Name:          attr
-Version:       2.5.1
-Release:       6%{?dist}
+Version:       2.6.0
+Release:       1%{?dist}
 License:       GPLv2+
 URL:           https://savannah.nongnu.org/projects/attr
 Source0:       https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.tar.xz
@@ -72,6 +72,10 @@ rm -rf %{buildroot}%{_docdir}/%{name}*
 %{_mandir}/man3/attr_*.3.*
 
 %changelog
+* Fri Jul 03 2026 Xiaojie Chen <jackxjchen@tencent.com> - 2.6.0-1
+- [Type] security
+- [DESC] Upgrade to version 2.6.0 (fix CVE-2026-54371)
+
 * Thu Sep 26 2024 OpenCloudOS Release Engineering <releng@opencloudos.tech> - 2.5.1-6
 - Rebuilt for clarifying the packages requirement in BaseOS and AppStream
 
diff --git a/sources b/sources
index 377a1c3..6affe70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (attr-2.5.1.tar.xz) = 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932
+SHA512 (attr-2.6.0.tar.xz) = 870d0c34fbaa7520aad058ecd6509fe8eddd17430781a16d1e80484d4947307a7c641f0449183cbac1da611a85f82c9bee2d2d7bff76170fc2195b123100d22e
diff --git a/xattr-conf-nfs4-acls.patch b/xattr-conf-nfs4-acls.patch
index 140f56b..0cd0a67 100644
--- a/xattr-conf-nfs4-acls.patch
+++ b/xattr-conf-nfs4-acls.patch
@@ -1,12 +1,11 @@
-diff -uprN attr-2.5.1.orig/xattr.conf attr-2.5.1/xattr.conf
---- attr-2.5.1.orig/xattr.conf	2022-07-12 16:06:41.154817278 +0800
-+++ attr-2.5.1/xattr.conf	2022-07-12 16:08:18.463692311 +0800
-@@ -7,8 +7,6 @@
+diff -uprN attr-2.6.0.orig/xattr.conf attr-2.6.0/xattr.conf
+--- attr-2.6.0.orig/xattr.conf	2026-06-26 20:32:15.000000000 +0800
++++ attr-2.6.0/xattr.conf	2026-07-03 14:06:35.575687784 +0800
+@@ -7,7 +7,6 @@
  #   permissions - copy when trying to preserve permissions.
  #   skip - do not copy.
  
 -system.nfs4_acl			permissions
--system.nfs4acl			permissions
  system.posix_acl_access		permissions
  system.posix_acl_default	permissions
  trusted.SGI_ACL_DEFAULT		skip		# xfs specific
-- 
Gitee