!96 upgrade version to 6.5.0

From: @wguanghao 
Reviewed-by: @swf504 
Signed-off-by: @swf504

0002-po-fix-German-translation.patch

@@ -1,32 +0,0 @@
-From 0fc0d398f32bf751c4d6da3b5609c962310a75d7 Mon Sep 17 00:00:00 2001
-From: Yaakov Selkowitz <yselkowi@redhat.com>
-Date: Tue, 27 Jun 2023 17:29:31 -0400
-Subject: [PATCH] po: fix German translation
-
-gettext-0.22 raises an error on what is clearly an typo in the translation:
-
-  de.po:3087: 'msgstr' is not a valid C format string, unlike 'msgid'.
-  Reason: In the directive number 2, the argument size specifier is invalid.
-
-Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
-Reviewed-by: Darrick J. Wong <djwong@kernel.org>
----
- po/de.po | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/de.po b/po/de.po
-index 944b0e9..a6f8fde 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -3084,7 +3084,7 @@ msgstr "%llu Spezialdateien\n"
- #: .././estimate/xfs_estimate.c:191
- #, c-format
- msgid "%s will take about %.1f megabytes\n"
--msgstr "%s wird etwa %.lf Megabytes einnehmen\n"
-+msgstr "%s wird etwa %.1f Megabytes einnehmen\n"
- 
- #: .././estimate/xfs_estimate.c:198
- #, c-format
--- 
-2.41.0
-

0003-xfs_repair-fix-incorrect-dabtree-hashval-comparison.patch

@@ -1,36 +0,0 @@
-From b7b81f336ac02f4e4f24e0844a7fb3023c489667 Mon Sep 17 00:00:00 2001
-From: "Darrick J. Wong" <djwong@kernel.org>
-Date: Tue, 14 Mar 2023 18:01:55 -0700
-Subject: [PATCH] xfs_repair: fix incorrect dabtree hashval comparison
-
-If an xattr structure contains enough names with the same hash value to
-fill multiple xattr leaf blocks with names all hashing to the same
-value, then the dabtree nodes will contain consecutive entries with the
-same hash value.
-
-This causes false corruption reports in xfs_repair because it's not
-expecting such a huge same-hashing structure.  Fix that.
-
-Signed-off-by: Darrick J. Wong <djwong@kernel.org>
-Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
-Signed-off-by: Carlos Maiolino <cem@kernel.org>
----
- repair/da_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/repair/da_util.c b/repair/da_util.c
-index 7239c2e..b229422 100644
---- a/repair/da_util.c
-+++ b/repair/da_util.c
-@@ -330,7 +330,7 @@ _("%s block used/count inconsistency - %d/%hu\n"),
- 	/*
- 	 * hash values monotonically increasing ???
- 	 */
--	if (cursor->level[this_level].hashval >=
-+	if (cursor->level[this_level].hashval >
- 				be32_to_cpu(nodehdr.btree[entry].hashval)) {
- 		do_warn(
- _("%s block hashvalue inconsistency, expected > %u / saw %u\n"),
--- 
-1.8.3.1
-

xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch

@@ -1,17 +1,19 @@
-diff --git a/mkfs/xfs_mkfs.c b/../xfs_mkfs.c.bak
+diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
-index 9dd0e79..49e3224 100644
+index c522cb4..4f16335 100644
 --- a/mkfs/xfs_mkfs.c
-+++ b/../xfs_mkfs.c.bak
++++ b/mkfs/xfs_mkfs.c
-@@ -13,6 +13,8 @@
+@@ -14,7 +14,9 @@
- #include "libfrog/crc32cselftest.h"
+ #include "libfrog/dahashselftest.h"
  #include "proto.h"
  #include <ini.h>
+-
 +#include <linux/version.h>
 +#include <sys/utsname.h>
- 
++ 
  #define TERABYTES(count, blog)	((uint64_t)(count) << (40 - (blog)))
  #define GIGABYTES(count, blog)	((uint64_t)(count) << (30 - (blog)))
-@@ -3998,6 +4000,23 @@ cfgfile_parse(
+ #define MEGABYTES(count, blog)	((uint64_t)(count) << (20 - (blog)))
+@@ -4072,6 +4074,23 @@ cfgfile_parse(
  		cli->cfgfile);
  }
  
@@ -35,7 +37,7 @@ index 9dd0e79..49e3224 100644
  int
  main(
  	int			argc,
-@@ -4077,7 +4096,15 @@ main(
+@@ -4150,7 +4169,15 @@ main(
  	};
  
  	struct list_head	buffer_list;

xfsprogs.spec

@@ -1,6 +1,6 @@
 Name:           xfsprogs
-Version:        6.1.1
+Version:        6.5.0
-Release:        4
+Release:        1
 Summary:        Administration and debugging tools for the XFS file system
 License:        GPL+ and LGPLv2+
 URL:            https://xfs.wiki.kernel.org
@@ -20,8 +20,6 @@ Conflicts:      xfsdump < 3.0.1
 
 Patch0:		xfsprogs-5.12.0-default-bigtime-inobtcnt-on.patch
 Patch1:		0001-xfsprogs-Add-sw64-architecture.patch
-Patch2:		0002-po-fix-German-translation.patch
-Patch3:		0003-xfs_repair-fix-incorrect-dabtree-hashval-comparison.patch
 
 %description
 xfsprogs are the userspace utilities that manage XFS filesystems.
@@ -87,6 +85,7 @@ rm -rf %{buildroot}%{_datadir}/doc/xfsprogs/
 %exclude %{_sbindir}/xfs_scrub*
 %exclude %{_unitdir}/xfs_scrub*
 %exclude %{_usr}/%{_lib}/xfsprogs/xfs_scrub*
+%{_udevrulesdir}/64-xfs.rules
 
 %files xfs_scrub
 %{_sbindir}/xfs_scrub*
@@ -106,6 +105,9 @@ rm -rf %{buildroot}%{_datadir}/doc/xfsprogs/
 
 
 %changelog
+* Mon Jan 8 2024 wuguanghao <wuguanghao3@huawei.com> - 6.5.0-1
+- upgrade version to 6.5.0
+ 
 * Wed Dec 27 2023 wuguanghao <wuguanghao3@huawei.com> - 6.1.1-4
 - backport patch from community