From a07306cc6275aece12f4591ab0f8b9c864824ed6 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Sun, 1 Sep 2024 19:25:40 +0800 Subject: [PATCH 1/2] support clang --- 0001-fix-patch-0.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 0001-fix-patch-0.patch diff --git a/0001-fix-patch-0.patch b/0001-fix-patch-0.patch new file mode 100644 index 0000000..3f38b8b --- /dev/null +++ b/0001-fix-patch-0.patch @@ -0,0 +1,25 @@ +From dd5f2b019977b66d6aef4e1727c4d93850cae9ff Mon Sep 17 00:00:00 2001 +From: "Shencb@123" <1944340417@qq.com> +Date: Sun, 1 Sep 2024 19:23:12 +0800 +Subject: [PATCH] fix patch +0 + +--- + bugfix-sysstat-10.1.5-read-ttyAMA-first-for-arm64.patch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bugfix-sysstat-10.1.5-read-ttyAMA-first-for-arm64.patch b/bugfix-sysstat-10.1.5-read-ttyAMA-first-for-arm64.patch +index 87eee5f..ffbfc2f 100644 +--- a/bugfix-sysstat-10.1.5-read-ttyAMA-first-for-arm64.patch ++++ b/bugfix-sysstat-10.1.5-read-ttyAMA-first-for-arm64.patch +@@ -41,7 +41,7 @@ index 68e2799..8ccfec4 100644 + - return 0; + + if ((fp = fopen(TTYAMA, "r")) == NULL) { + + if ((fp = fopen(SERIAL, "r")) == NULL) { +-+ return; +++ return 0; + + } + + } + +-- +2.45.2.windows.1 + -- Gitee From 82bf7de63b57ca01351f40a4c1cea75a35ad4a48 Mon Sep 17 00:00:00 2001 From: "Shencb@123" <1944340417@qq.com> Date: Sun, 1 Sep 2024 19:28:04 +0800 Subject: [PATCH 2/2] support clang --- sysstat.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sysstat.spec b/sysstat.spec index 8a6f518..7d4bdcd 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -1,6 +1,6 @@ Name: sysstat Version: 12.7.5 -Release: 2 +Release: 3 Summary: System performance tools for the Linux operating system License: GPLv2+ URL: http://sebastien.godard.pagesperso-orange.fr/ @@ -14,6 +14,7 @@ Requires(preun): systemd Requires(postun): systemd Patch9000: bugfix-sysstat-10.1.5-read-ttyAMA-first-for-arm64.patch +Patch9001:0001-fix-patch-0.patch %description The sysstat package contains various utilities, common to many commercial @@ -88,6 +89,9 @@ fi %{_mandir}/man*/* %changelog +* Tue Aug 27 2024 shenchenbang <1944340417@qq.com> - 12.7.5-3 +- Fix patch + * Thu Feb 29 2024 zhangliangpengkun - 12.7.5-2 - Fix the incorrect command 'is-enable' to 'is-enabled'. -- Gitee